From 7b44a7015ea61a58f7c2fda0bbde01a74583fa0d Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Wed, 16 Apr 2025 14:05:07 +0800 Subject: [PATCH] chore: minor ui fixes --- client/ui/qml/DefaultVpn/Controls/InputType.qml | 3 ++- client/ui/qml/DefaultVpn/Pages/PageHome.qml | 5 ++--- client/ui/qml/DefaultVpn/Pages/PageSettingsServerInfo.qml | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/client/ui/qml/DefaultVpn/Controls/InputType.qml b/client/ui/qml/DefaultVpn/Controls/InputType.qml index 5670a7db..46fb0048 100644 --- a/client/ui/qml/DefaultVpn/Controls/InputType.qml +++ b/client/ui/qml/DefaultVpn/Controls/InputType.qml @@ -14,7 +14,7 @@ TextField { property string defaultBackgroundColor: Style.color.white property string defaultBorderColor: Style.color.gray3 - property string defaultTextColor: Style.color.gray6 + property string defaultTextColor: Style.color.black property string hoveredBackgroundColor: Style.color.white property string hoveredBorderColor: Style.color.gray6 @@ -44,6 +44,7 @@ TextField { selectionColor: Style.color.accent1 selectedTextColor: Style.color.white + placeholderTextColor: Style.color.gray6 font.pixelSize: 17 font.weight: 400 diff --git a/client/ui/qml/DefaultVpn/Pages/PageHome.qml b/client/ui/qml/DefaultVpn/Pages/PageHome.qml index 6bd1aee0..b0cf1ce6 100644 --- a/client/ui/qml/DefaultVpn/Pages/PageHome.qml +++ b/client/ui/qml/DefaultVpn/Pages/PageHome.qml @@ -85,9 +85,7 @@ Page { Layout.topMargin: 10 Layout.preferredWidth: defaultServerDropDown.width - visible: ServersModel.isDefaultServerFromApi && - ServersModel.defaultServerDescriptionCollapsed !== "" && - ServersModel.defaultServerDescriptionCollapsed !== ServersModel.defaultServerName + visible: ServersModel.defaultServerImagePathCollapsed !== "" text: ServersModel.defaultServerDescriptionCollapsed @@ -96,6 +94,7 @@ Page { PageController.showNotificationMessage(qsTr("Unable change server location while there is an active connection")) return } + ServersModel.setProcessedServerIndex(ServersModel.defaultIndex) PageController.goToPage(PageEnum.PageCountrySelector) } } diff --git a/client/ui/qml/DefaultVpn/Pages/PageSettingsServerInfo.qml b/client/ui/qml/DefaultVpn/Pages/PageSettingsServerInfo.qml index a2eb5f1f..8651db5c 100644 --- a/client/ui/qml/DefaultVpn/Pages/PageSettingsServerInfo.qml +++ b/client/ui/qml/DefaultVpn/Pages/PageSettingsServerInfo.qml @@ -65,6 +65,8 @@ Page { } XSmallTextType { + visible: false + Layout.leftMargin: 16 Layout.rightMargin: 16 Layout.bottomMargin: 8 @@ -74,6 +76,8 @@ Page { } InputType { + visible: false + id: textKey Layout.leftMargin: 16