From ea551ab0a0f39d15d013a8e8a930c42cd2f85811 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 6 Sep 2021 12:30:26 +0300
Subject: [PATCH] qml ui protocols separated

---
 client/resources.qrc                                        | 6 +++---
 client/ui/qml/Pages/{ => Protocols}/PageProtoCloak.qml      | 4 ++--
 client/ui/qml/Pages/{ => Protocols}/PageProtoOpenVPN.qml    | 4 ++--
 client/ui/qml/Pages/{ => Protocols}/PageProtoShadowSock.qml | 4 ++--
 client/ui/qml/main.qml                                      | 1 +
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename client/ui/qml/Pages/{ => Protocols}/PageProtoCloak.qml (98%)
 rename client/ui/qml/Pages/{ => Protocols}/PageProtoOpenVPN.qml (99%)
 rename client/ui/qml/Pages/{ => Protocols}/PageProtoShadowSock.qml (98%)

diff --git a/client/resources.qrc b/client/resources.qrc
index 0f64386f..06d95401 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -72,9 +72,6 @@
         <file>ui/qml/Pages/PageNewServer.qml</file>
         <file>ui/qml/Pages/PageNewServerConfiguring.qml</file>
         <file>ui/qml/Pages/PageNewServerProtocol.qml</file>
-        <file>ui/qml/Pages/PageProtoCloak.qml</file>
-        <file>ui/qml/Pages/PageProtoOpenVPN.qml</file>
-        <file>ui/qml/Pages/PageProtoShadowSock.qml</file>
         <file>ui/qml/Pages/PageServerList.qml</file>
         <file>ui/qml/Pages/PageServerProtocols.qml</file>
         <file>ui/qml/Pages/PageServerSetting.qml</file>
@@ -103,5 +100,8 @@
         <file>ui/qml/Config/qmldir</file>
         <file>images/background_connected.png</file>
         <file>images/background_connected@2x.png</file>
+        <file>ui/qml/Pages/Protocols/PageProtoCloak.qml</file>
+        <file>ui/qml/Pages/Protocols/PageProtoOpenVPN.qml</file>
+        <file>ui/qml/Pages/Protocols/PageProtoShadowSock.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Pages/PageProtoCloak.qml b/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
similarity index 98%
rename from client/ui/qml/Pages/PageProtoCloak.qml
rename to client/ui/qml/Pages/Protocols/PageProtoCloak.qml
index 0f9f59c8..1038bd40 100644
--- a/client/ui/qml/Pages/PageProtoCloak.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import "./"
-import "../Controls"
-import "../Config"
+import "../../Controls"
+import "../../Config"
 
 Item {
     id: root
diff --git a/client/ui/qml/Pages/PageProtoOpenVPN.qml b/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
similarity index 99%
rename from client/ui/qml/Pages/PageProtoOpenVPN.qml
rename to client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
index ca777a7e..089de7f1 100644
--- a/client/ui/qml/Pages/PageProtoOpenVPN.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import "./"
-import "../Controls"
-import "../Config"
+import "../../Controls"
+import "../../Config"
 
 Item {
     id: root
diff --git a/client/ui/qml/Pages/PageProtoShadowSock.qml b/client/ui/qml/Pages/Protocols/PageProtoShadowSock.qml
similarity index 98%
rename from client/ui/qml/Pages/PageProtoShadowSock.qml
rename to client/ui/qml/Pages/Protocols/PageProtoShadowSock.qml
index 255cda5a..b5d0d966 100644
--- a/client/ui/qml/Pages/PageProtoShadowSock.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoShadowSock.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import "./"
-import "../Controls"
-import "../Config"
+import "../../Controls"
+import "../../Config"
 
 Item {
     id: root
diff --git a/client/ui/qml/main.qml b/client/ui/qml/main.qml
index b0e3136d..d013ab67 100644
--- a/client/ui/qml/main.qml
+++ b/client/ui/qml/main.qml
@@ -7,6 +7,7 @@ import Qt.labs.platform 1.1
 import QtQuick.Dialogs 1.1
 import "./"
 import "Pages"
+import "Pages/Protocols"
 import "Config"
 
 Window {