diff --git a/client/ui/qml/DefaultVpn/Pages/PageHome.qml b/client/ui/qml/DefaultVpn/Pages/PageHome.qml index 2310feab..34556746 100644 --- a/client/ui/qml/DefaultVpn/Pages/PageHome.qml +++ b/client/ui/qml/DefaultVpn/Pages/PageHome.qml @@ -85,7 +85,7 @@ Page { Layout.topMargin: 10 Layout.preferredWidth: defaultServerDropDown.width - visible: ServersModel.defaultServerImagePathCollapsed !== "" + visible: (ServersModel.defaultServerImagePathCollapsed !== "") && drawer.isCollapsedStateActive text: ServersModel.defaultServerDescriptionCollapsed diff --git a/client/ui/qml/DefaultVpn/Pages/PageSettingsApiServerInfo.qml b/client/ui/qml/DefaultVpn/Pages/PageSettingsApiServerInfo.qml index 9ca76f5d..32d1ccc8 100644 --- a/client/ui/qml/DefaultVpn/Pages/PageSettingsApiServerInfo.qml +++ b/client/ui/qml/DefaultVpn/Pages/PageSettingsApiServerInfo.qml @@ -7,6 +7,8 @@ import QtQuick.Layouts import PageEnum 1.0 import Config 1.0 +import SortFilterProxyModel 0.2 + import "../Components" import "../Controls" import "../Controls/TextTypes" @@ -14,6 +16,33 @@ import "../Controls/TextTypes" Page { id: root + property var processedServer + + Connections { + target: ServersModel + + function onProcessedServerChanged() { + root.processedServer = proxyServersModel.get(0) + } + } + + SortFilterProxyModel { + id: proxyServersModel + objectName: "proxyServersModel" + + sourceModel: ServersModel + filters: [ + ValueFilter { + roleName: "isCurrentlyProcessed" + value: true + } + ] + + Component.onCompleted: { + root.processedServer = proxyServersModel.get(0) + } + } + ColumnLayout { anchors.fill: parent spacing: 0 @@ -47,7 +76,7 @@ Page { Layout.fillWidth: true - text: qsTr("Amnezia Premium settings") + text: root.processedServer.name horizontalAlignment: Qt.AlignLeft verticalAlignment: Qt.AlignVCenter