diff --git a/client/ui/qml/DefaultVpn/Pages/PageSettingsApiServerInfo.qml b/client/ui/qml/DefaultVpn/Pages/PageSettingsApiServerInfo.qml index a36f3014..1cdfd94a 100644 --- a/client/ui/qml/DefaultVpn/Pages/PageSettingsApiServerInfo.qml +++ b/client/ui/qml/DefaultVpn/Pages/PageSettingsApiServerInfo.qml @@ -26,6 +26,14 @@ Page { } } + Connections { + target: ApiConfigsController + + function onReloadServerFromApiFinished(message) { + PageController.showNotificationMessage(message) + } + } + SortFilterProxyModel { id: proxyServersModel objectName: "proxyServersModel" diff --git a/client/ui/qml/DefaultVpn/Pages/PageSettingsServerInfo.qml b/client/ui/qml/DefaultVpn/Pages/PageSettingsServerInfo.qml index 67d1ea9d..6a3696da 100644 --- a/client/ui/qml/DefaultVpn/Pages/PageSettingsServerInfo.qml +++ b/client/ui/qml/DefaultVpn/Pages/PageSettingsServerInfo.qml @@ -25,6 +25,10 @@ Page { } PageController.showNotificationMessage(finishedMessage) } + + function onApiConfigRemoved(message) { + PageController.showNotificationMessage(message) + } } ColumnLayout { @@ -96,7 +100,13 @@ Page { hoveredTextColor: Style.color.error pressedTextColor: Style.color.error - onClicked: resetConfirmationDialog.open() + onClicked: { + if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) { + PageController.showNotificationMessage(qsTr("Cannot reset API config during active connection")) + } else { + resetConfirmationDialog.open() + } + } } WhiteButtonWithBorder { @@ -125,13 +135,9 @@ Page { cancelButtonText: qsTr("Cancel") onConfirm: function() { - if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) { - PageController.showNotificationMessage(qsTr("Cannot reset API config during active connection")) - } else { - PageController.showBusyIndicator(true) - InstallController.removeApiConfig(ServersModel.processedIndex) - PageController.showBusyIndicator(false) - } + PageController.showBusyIndicator(true) + InstallController.removeApiConfig(ServersModel.processedIndex) + PageController.showBusyIndicator(false) } }