BackButton.qml added

client/resources.qrc

@@ -103,5 +103,6 @@
         <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/Controls/BackButton.qml</file>
     </qresource>
 </RCC>

client/ui/qml/Controls/BackButton.qml

@@ -0,0 +1,10 @@
+ImageButtonType {
+    x: 10
+    y: 10
+    width: 26
+    height: 20
+    icon.source: "qrc:/images/arrow_left.png"
+    onClicked: {
+        UiLogic.closePage()
+    }
+}

client/ui/qml/Pages/PageAppSetting.qml

@@ -6,16 +6,8 @@ import "../Config"
 
 PageBase {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageGeneralSettings.qml

@@ -7,16 +7,8 @@ import "../Config"
 
 Item {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Rectangle {
         y: 40

client/ui/qml/Pages/PageNetworkSetting.qml

@@ -6,16 +6,8 @@ import "../Config"
 
 Item {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageNewServer.qml

@@ -7,6 +7,9 @@ import "../Config"
 
 Item {
     id: root
+    BackButton {
+        id: back_from_new_server
+    }
     Text {
         font.family: "Lato"
         font.styleName: "normal"
@@ -68,16 +71,4 @@ Item {
         y: GC.trY(590)
         source: "qrc:/images/AmneziaVPN.png"
     }
-    ImageButtonType {
-        id: back_from_new_server
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
-    }
-
 }

client/ui/qml/Pages/PageNewServerProtocols.qml

@@ -6,16 +6,8 @@ import "../Config"
 
 Item {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageServerContainers.qml

@@ -7,16 +7,8 @@ import "../Config"
 Item {
     id: root
     enabled: ServerContainersLogic.pageEnabled
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageServerList.qml

@@ -8,16 +8,8 @@ import "../Config"
 
 Item {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageServerSettings.qml

@@ -9,16 +9,8 @@ Item {
     id: root
     enabled: ServerSettingsLogic.pageEnabled
 
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageSetupWizard.qml

@@ -7,16 +7,8 @@ import "../Config"
 
 Item {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back_from_setup_wizard
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageSetupWizardHighLevel.qml

@@ -7,16 +7,8 @@ import "../Config"
 
 Item {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back_from_setup_wizard
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageSetupWizardLowLevel.qml

@@ -6,16 +6,8 @@ import "../Config"
 
 Item {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back_from_setup_wizard
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageSetupWizardVPNMode.qml

@@ -6,16 +6,8 @@ import "../Config"
 
 Item {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back_from_setup_wizard
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Text {
         font.family: "Lato"

client/ui/qml/Pages/PageShareConnection.qml

@@ -6,18 +6,9 @@ import "../Config"
 
 Item {
     id: root
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
-
     ScrollView {
         x: 10
         y: 40

client/ui/qml/Pages/PageSites.qml

@@ -8,6 +8,9 @@ import "../Config"
 
 Item {
     id: root
+    BackButton {
+        id: back
+    }
     Text {
         font.family: "Lato"
         font.styleName: "normal"
@@ -48,17 +51,6 @@ Item {
             SitesLogic.onPushButtonAddCustomSitesClicked()
         }
     }
-    ImageButtonType {
-        id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
-    }
     BlueButtonType {
         id: sites_add
         x: 260

client/ui/qml/Pages/PageStart.qml

@@ -6,6 +6,9 @@ import "../Config"
 
 Item {
     id: root
+    BackButton {
+        id: back_from_start
+    }
     Image {
         anchors.horizontalCenter: root.horizontalCenter
         width: GC.trW(150)
@@ -292,18 +295,4 @@ Item {
                 visible: false
             }
         }
-
-
-    ImageButtonType {
-        id: back_from_start
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        visible: StartPageLogic.pushButtonBackFromStartVisible
-        onClicked: {
-            UiLogic.closePage()
-        }
-    }
 }

client/ui/qml/Pages/Protocols/PageProtoCloak.qml

@@ -7,16 +7,8 @@ import "../../Config"
 Item {
     id: root
     enabled: CloakLogic.pageProtoCloakEnabled
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Item {
         x: 0

client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml

@@ -7,16 +7,8 @@ import "../../Config"
 Item {
     id: root
     enabled: OpenVpnLogic.pageProtoOpenVpnEnabled
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Item {
         x: 0

client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml

@@ -7,16 +7,8 @@ import "../../Config"
 Item {
     id: root
     enabled: ShadowSocksLogic.pageProtoShadowSocksEnabled
-    ImageButtonType {
+    BackButton {
         id: back
-        x: 10
-        y: 10
-        width: 26
-        height: 20
-        icon.source: "qrc:/images/arrow_left.png"
-        onClicked: {
-            UiLogic.closePage()
-        }
     }
     Item {
         x: 0