diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp index 2a14548c0..cb500618c 100644 --- a/client/ui/controllers/pageController.cpp +++ b/client/ui/controllers/pageController.cpp @@ -37,8 +37,8 @@ PageController::PageController(const QSharedPointer &serversModel, connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); }); connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); }); #endif - - m_bConnectTrigger = false; + + m_isTriggeredByConnectButton = false; } QString PageController::getInitialPage() @@ -148,12 +148,12 @@ void PageController::drawerClose() } } -bool PageController::isConnectTrigger() +bool PageController::isTriggeredByConnectButton() { - return m_bConnectTrigger; + return m_isTriggeredByConnectButton; } -void PageController::setConnectTrigger(bool trigger) +void PageController::setTriggeredBtConnectButton(bool trigger) { - m_bConnectTrigger = trigger; + m_isTriggeredByConnectButton = trigger; } diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h index d16c36a6d..70732bd9c 100644 --- a/client/ui/controllers/pageController.h +++ b/client/ui/controllers/pageController.h @@ -85,8 +85,8 @@ public slots: void drawerClose(); - bool isConnectTrigger(); - void setConnectTrigger(bool trigger); + bool isTriggeredByConnectButton(); + void setTriggeredBtConnectButton(bool trigger); signals: void goToPage(PageLoader::PageEnum page, bool slide = true); @@ -125,7 +125,7 @@ private: PageLoader::PageEnum m_currentRootPage; int m_drawerLayer; - bool m_bConnectTrigger; + bool m_isTriggeredByConnectButton; }; #endif // PAGECONTROLLER_H diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml index b5c94ea85..76e83da5a 100644 --- a/client/ui/qml/Components/ConnectButton.qml +++ b/client/ui/qml/Components/ConnectButton.qml @@ -139,7 +139,7 @@ Button { onClicked: { if (!ContainersModel.isAnyContainerInstalled()) { - PageController.setConnectTrigger(true) + PageController.setTriggeredBtConnectButton(true) ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex() PageController.goToPage(PageEnum.PageSetupWizardEasy) diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml index 08542b23b..a5c2eddf7 100644 --- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml +++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml @@ -184,8 +184,8 @@ PageType { borderWidth: 1 visible: { - if (PageController.isConnectTrigger()) { - PageController.setConnectTrigger(false) + if (PageController.isTriggeredByConnectButton()) { + PageController.setTriggeredBtConnectButton(false) return ContainersModel.isAnyContainerInstalled() }