refactory the forceCloseDrawer

amnezia-vpn · Sep 15, 2023 · 2fb85bc · 2fb85bc
1 parent 10d869f
commit 2fb85bc
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 141 deletions.
diff --git a/client/ui/qml/Components/QuestionDrawer.qml b/client/ui/qml/Components/QuestionDrawer.qml
@@ -18,7 +18,8 @@ DrawerType {
 
     width: parent.width
     height: parent.height * 0.5
-    needCloseButton: false
+    needCloseButton: true
+
 
     ColumnLayout {
         anchors.top: parent.top

diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
@@ -4,6 +4,14 @@ import QtQuick.Controls
 Drawer {
     property bool needCloseButton: true
 
+    Connections {
+        target: PageController
+
+        function onForceCloseDrawer() {
+            visible = false
+        }
+    }
+
     edge: Qt.BottomEdge
 
     clip: true

diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
@@ -39,14 +39,6 @@ Item {
     implicitWidth: rootButtonContent.implicitWidth
     implicitHeight: rootButtonContent.implicitHeight
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            menu.visible = false
-        }
-    }
-
     onMenuVisibleChanged: {
         if (menuVisible) {
             rootButtonBackground.border.color = rootButtonPressedBorderColor

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
@@ -48,15 +48,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            menu.visible = false
-            connectionTypeSelection.visible = false
-        }
-    }
-
     Rectangle {
         id: buttonBackground
         anchors.fill: buttonContent

diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -23,14 +23,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            //questionDrawer.visible = false;
-        }
-    }
-
     ColumnLayout {
         id: backButton
 

diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -39,14 +39,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            // questionDrawer.visible = false;
-        }
-    }
-
     FlickableType {
         id: fl
         anchors.top: header.bottom
@@ -98,14 +90,6 @@ PageType {
 
                         DividerType {}
 
-                        Connections {
-                            target: PageController
-
-                            function onForceCloseDrawer() {
-                                configContentDrawer.close()
-                            }
-                        }
-
                         DrawerType {
                             id: configContentDrawer
 

diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -23,14 +23,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            // questionDrawer.visible = false;
-        }
-    }
-
     ColumnLayout {
         id: backButton
 

diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -13,15 +13,6 @@ import "../Components"
 PageType {
     id: root
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            selectLanguageDrawer.close()
-            //questionDrawer.visible = false
-        }
-    }
-
     BackButtonType {
         id: backButton
 

diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -15,14 +15,6 @@ import "../Controls2/TextTypes"
 PageType {
     id: root
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            // questionDrawer.visible = false;
-        }
-    }
-
     BackButtonType {
         id: backButton
 

diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -65,14 +65,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            // questionDrawer.visible = false;
-        }
-    }
-
     FlickableType {
         id: fl
         anchors.top: parent.top

diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -76,14 +76,6 @@ PageType {
                     }
                 }
 
-                Connections {
-                    target: PageController
-
-                    function onForceCloseDrawer() {
-                        serverNameEditDrawer.visible = false
-                    }
-                }
-
                 DrawerType {
                     id: serverNameEditDrawer
 

diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -39,14 +39,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            // questionDrawer.visible = false;
-        }
-    }
-
     FlickableType {
         id: fl
         anchors.top: header.bottom

diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -44,14 +44,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            connectionTypeSelection.visible = false
-        }
-    }
-
     ConnectionTypeSelectionDrawer {
         id: connectionTypeSelection
     }

diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -32,15 +32,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            moreActionsDrawer.close()
-            importSitesDrawer.close()
-        }
-    }
-
     QtObject {
         id: routeMode
         property int allSites: 0

diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -17,14 +17,6 @@ import "../Components"
 PageType {
     id: root
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            showDetailsDrawer.close()
-        }
-    }
-
     SortFilterProxyModel {
         id: proxyContainersModel
         sourceModel: ContainersModel

diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -59,14 +59,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            connectionTypeSelection.visible = false
-        }
-    }
-
     FlickableType {
         id: fl
         anchors.top: parent.top

diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
@@ -71,15 +71,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            protocolSelector.visible = false
-            shareConnectionDrawer.close()
-        }
-    }
-
     property string fullConfigServerSelectorText
     property string connectionServerSelectorText
     property bool showContent: false

diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
@@ -90,14 +90,6 @@ Window  {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            privateKeyPassphraseDrawer.close()
-        }
-    }
-
     Item {
         anchors.right: parent.right
         anchors.left: parent.left