mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-23 02:00:20 +07:00
updated visible logic of button 'set up later'
This commit is contained in:
@@ -37,6 +37,8 @@ PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
|
|||||||
connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); });
|
connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); });
|
||||||
connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); });
|
connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); });
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
m_bConnectTrigger = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString PageController::getInitialPage()
|
QString PageController::getInitialPage()
|
||||||
@@ -145,3 +147,13 @@ void PageController::drawerClose()
|
|||||||
m_drawerLayer = 0;
|
m_drawerLayer = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool PageController::isConnectTrigger()
|
||||||
|
{
|
||||||
|
return m_bConnectTrigger;
|
||||||
|
}
|
||||||
|
|
||||||
|
void PageController::setConnectTrigger(bool trigger)
|
||||||
|
{
|
||||||
|
m_bConnectTrigger = trigger;
|
||||||
|
}
|
||||||
|
|||||||
@@ -84,6 +84,10 @@ public slots:
|
|||||||
void drawerOpen();
|
void drawerOpen();
|
||||||
void drawerClose();
|
void drawerClose();
|
||||||
|
|
||||||
|
|
||||||
|
bool isConnectTrigger();
|
||||||
|
void setConnectTrigger(bool trigger);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void goToPage(PageLoader::PageEnum page, bool slide = true);
|
void goToPage(PageLoader::PageEnum page, bool slide = true);
|
||||||
void goToStartPage();
|
void goToStartPage();
|
||||||
@@ -120,6 +124,8 @@ private:
|
|||||||
|
|
||||||
PageLoader::PageEnum m_currentRootPage;
|
PageLoader::PageEnum m_currentRootPage;
|
||||||
int m_drawerLayer;
|
int m_drawerLayer;
|
||||||
|
|
||||||
|
bool m_bConnectTrigger;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PAGECONTROLLER_H
|
#endif // PAGECONTROLLER_H
|
||||||
|
|||||||
@@ -139,6 +139,8 @@ Button {
|
|||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (!ContainersModel.isAnyContainerInstalled()) {
|
if (!ContainersModel.isAnyContainerInstalled()) {
|
||||||
|
PageController.setConnectTrigger(true)
|
||||||
|
|
||||||
ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
|
ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
|
||||||
PageController.goToPage(PageEnum.PageSetupWizardEasy)
|
PageController.goToPage(PageEnum.PageSetupWizardEasy)
|
||||||
|
|
||||||
|
|||||||
@@ -183,7 +183,16 @@ PageType {
|
|||||||
textColor: "#D7D8DB"
|
textColor: "#D7D8DB"
|
||||||
borderWidth: 1
|
borderWidth: 1
|
||||||
|
|
||||||
visible: ContainersModel.isAnyContainerInstalled()
|
visible: {
|
||||||
|
if (PageController.isConnectTrigger()) {
|
||||||
|
PageController.setConnectTrigger(false)
|
||||||
|
|
||||||
|
return ContainersModel.isAnyContainerInstalled()
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
text: qsTr("Set up later")
|
text: qsTr("Set up later")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user