diff --git a/client/resources.qrc b/client/resources.qrc index 0f64386f2..06d954011 100644 --- a/client/resources.qrc +++ b/client/resources.qrc @@ -72,9 +72,6 @@ ui/qml/Pages/PageNewServer.qml ui/qml/Pages/PageNewServerConfiguring.qml ui/qml/Pages/PageNewServerProtocol.qml - ui/qml/Pages/PageProtoCloak.qml - ui/qml/Pages/PageProtoOpenVPN.qml - ui/qml/Pages/PageProtoShadowSock.qml ui/qml/Pages/PageServerList.qml ui/qml/Pages/PageServerProtocols.qml ui/qml/Pages/PageServerSetting.qml @@ -103,5 +100,8 @@ ui/qml/Config/qmldir images/background_connected.png images/background_connected@2x.png + ui/qml/Pages/Protocols/PageProtoCloak.qml + ui/qml/Pages/Protocols/PageProtoOpenVPN.qml + ui/qml/Pages/Protocols/PageProtoShadowSock.qml 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 0f9f59c87..1038bd405 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 ca777a7e0..089de7f13 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 255cda5ac..b5d0d966e 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 b0e3136dc..d013ab676 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 {