From f23ee28ec97074dbac26dc44e8437e4aacb48eb7 Mon Sep 17 00:00:00 2001 From: MrMirDan Date: Mon, 23 Feb 2026 10:23:12 +0200 Subject: [PATCH] update: server with xray configs --- client/ui/qml/Pages2/PageHome.qml | 4 ++-- client/ui/qml/Pages2/PageSettingsServersList.qml | 2 ++ .../ui/qml/Pages2/PageSettingsXRayAvailableConfigs.qml | 10 +--------- client/ui/qml/Pages2/PageSetupWizardConfigSource.qml | 4 ++-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml index d970de454..666b3e412 100644 --- a/client/ui/qml/Pages2/PageHome.qml +++ b/client/ui/qml/Pages2/PageHome.qml @@ -359,8 +359,8 @@ PageType { PageController.goToPage(PageEnum.PageSettingsApiServerInfo) } - /*} else if (ServersModel.getProcessedServerData("isConfigSelectionAvailable")) { - PageController.goToPage(PageEnum.PageSettingsXRayAvailableConfigs)*/ + } else if (ServersModel.getProcessedServerData("isXRayConfigSelectionAvailable")) { + PageController.goToPage(PageEnum.PageSettingsXRayAvailableConfigs) } else { PageController.goToPage(PageEnum.PageSettingsServerInfo) } diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml index c163b1eb9..297b561ed 100644 --- a/client/ui/qml/Pages2/PageSettingsServersList.qml +++ b/client/ui/qml/Pages2/PageSettingsServersList.qml @@ -97,6 +97,8 @@ PageType { } PageController.goToPage(PageEnum.PageSettingsApiServerInfo) + } else if (ServersModel.getProcessedServerData("isXRayConfigSelectionAvailable")) { + PageController.goToPage(PageEnum.PageSettingsXRayServerInfo) } else { PageController.goToPage(PageEnum.PageSettingsServerInfo) } diff --git a/client/ui/qml/Pages2/PageSettingsXRayAvailableConfigs.qml b/client/ui/qml/Pages2/PageSettingsXRayAvailableConfigs.qml index 99f7867e9..1f7139891 100644 --- a/client/ui/qml/Pages2/PageSettingsXRayAvailableConfigs.qml +++ b/client/ui/qml/Pages2/PageSettingsXRayAvailableConfigs.qml @@ -49,7 +49,7 @@ PageType { anchors.fill: parent - model: XRayConfigsModel + model: ServersModel currentIndex: 0 @@ -83,14 +83,6 @@ PageType { headerText: root.processedServer.name actionButtonFunction: function() { - /* TODO: chnge server info to processed - PageController.showBusyIndicator(true) - let result = ApiSettingsController.getAccountInfo(false) - PageController.showBusyIndicator(false) - if (!result) { - return - }*/ - PageController.goToPage(PageEnum.PageSettingsXRayServerInfo) } } diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml index 50d9164d0..830b3da10 100644 --- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml +++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml @@ -198,8 +198,8 @@ PageType { clickedFunc: function() { if (isValidUrl(textKey.textField.text)) { - ImportController.httpGet(textKey.textField.text) - return + ImportController.importLink(textKey.textField.text) + PageController.goToPageHome() } if (ImportController.extractConfigFromData(textKey.textField.text)) { PageController.goToPage(PageEnum.PageSetupWizardViewConfig)