From 9377a0b545740cd0133c5a74b2d255caf6fc37a4 Mon Sep 17 00:00:00 2001 From: ronoaer Date: Fri, 6 Oct 2023 14:37:10 +0800 Subject: [PATCH] updated translated-text to connectStatusText in ConnectionController --- client/amnezia_application.cpp | 2 ++ client/ui/controllers/connectionController.cpp | 3 ++- client/ui/controllers/connectionController.h | 2 +- client/ui/qml/Pages2/PageStart.qml | 2 -- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp index 801b90b4..d8039d9b 100644 --- a/client/amnezia_application.cpp +++ b/client/amnezia_application.cpp @@ -330,6 +330,8 @@ void AmneziaApplication::initControllers() m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection)); m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get()); + connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(), &ConnectionController::onTranslationsUpdated); + m_pageController.reset(new PageController(m_serversModel, m_settings)); m_engine->rootContext()->setContextProperty("PageController", m_pageController.get()); diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp index 8df62a94..34ac1399 100644 --- a/client/ui/controllers/connectionController.cpp +++ b/client/ui/controllers/connectionController.cpp @@ -130,8 +130,9 @@ void ConnectionController::onCurrentContainerUpdated() } } -void ConnectionController::translateMemoryText() +void ConnectionController::onTranslationsUpdated() { + // get translated text of current state onConnectionStateChanged(getCurrentConnectionState()); } diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h index c1eaf38f..9d3082a2 100644 --- a/client/ui/controllers/connectionController.h +++ b/client/ui/controllers/connectionController.h @@ -34,7 +34,7 @@ public slots: void onCurrentContainerUpdated(); - void translateMemoryText(); + void onTranslationsUpdated(); signals: void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml index f36aac41..43366af7 100644 --- a/client/ui/qml/Pages2/PageStart.qml +++ b/client/ui/qml/Pages2/PageStart.qml @@ -171,8 +171,6 @@ PageType { onClicked: { tabBarStackView.goToTabBarPage(PageEnum.PageHome) ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex - - ConnectionController.translateMemoryText() } } TabImageButtonType {