From 784ae0da53b1eb738a827f670d7acb257cb75ab7 Mon Sep 17 00:00:00 2001 From: ronoaer Date: Sun, 1 Oct 2023 12:11:13 +0800 Subject: [PATCH 1/2] updated visible logic of button 'set up later' --- client/ui/controllers/pageController.cpp | 12 ++++++++++++ client/ui/controllers/pageController.h | 6 ++++++ client/ui/qml/Components/ConnectButton.qml | 2 ++ client/ui/qml/Pages2/PageSetupWizardEasy.qml | 11 ++++++++++- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp index 7b8f74ab..2a14548c 100644 --- a/client/ui/controllers/pageController.cpp +++ b/client/ui/controllers/pageController.cpp @@ -37,6 +37,8 @@ PageController::PageController(const QSharedPointer &serversModel, connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); }); connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); }); #endif + + m_bConnectTrigger = false; } QString PageController::getInitialPage() @@ -145,3 +147,13 @@ void PageController::drawerClose() m_drawerLayer = 0; } } + +bool PageController::isConnectTrigger() +{ + return m_bConnectTrigger; +} + +void PageController::setConnectTrigger(bool trigger) +{ + m_bConnectTrigger = trigger; +} diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h index a8f883fe..d16c36a6 100644 --- a/client/ui/controllers/pageController.h +++ b/client/ui/controllers/pageController.h @@ -84,6 +84,10 @@ public slots: void drawerOpen(); void drawerClose(); + + bool isConnectTrigger(); + void setConnectTrigger(bool trigger); + signals: void goToPage(PageLoader::PageEnum page, bool slide = true); void goToStartPage(); @@ -120,6 +124,8 @@ private: PageLoader::PageEnum m_currentRootPage; int m_drawerLayer; + + bool m_bConnectTrigger; }; #endif // PAGECONTROLLER_H diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml index b7484c73..b5c94ea8 100644 --- a/client/ui/qml/Components/ConnectButton.qml +++ b/client/ui/qml/Components/ConnectButton.qml @@ -139,6 +139,8 @@ Button { onClicked: { if (!ContainersModel.isAnyContainerInstalled()) { + PageController.setConnectTrigger(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 4f94e985..08542b23 100644 --- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml +++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml @@ -183,7 +183,16 @@ PageType { textColor: "#D7D8DB" borderWidth: 1 - visible: ContainersModel.isAnyContainerInstalled() + visible: { + if (PageController.isConnectTrigger()) { + PageController.setConnectTrigger(false) + + return ContainersModel.isAnyContainerInstalled() + } + + + return true + } text: qsTr("Set up later") From e2d61cb5188d8526955eb71015b22694cc92c9a3 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Tue, 3 Oct 2023 22:38:17 +0500 Subject: [PATCH 2/2] renamed functions and variables --- client/ui/controllers/pageController.cpp | 12 ++++++------ client/ui/controllers/pageController.h | 6 +++--- client/ui/qml/Components/ConnectButton.qml | 2 +- client/ui/qml/Pages2/PageSetupWizardEasy.qml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp index 2a14548c..cb500618 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 d16c36a6..70732bd9 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 b5c94ea8..76e83da5 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 08542b23..a5c2eddf 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() }