From 8952229b82d18463edd96aa35cf5e94d62a11ad6 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Wed, 1 Sep 2021 20:40:12 +0100 Subject: [PATCH] Issue #115 Main connect button only opens the login view --- src/swiftguistandard/swiftguistd.cpp | 31 ++++++++++------------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index e088afd6d..15f31a3c8 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -244,30 +244,21 @@ bool SwiftGuiStd::isMainPageSelected(SwiftGuiStd::MainPageIndex mainPage) const void SwiftGuiStd::loginRequested() { if (!sGui || sGui->isShuttingDown() || !sGui->getIContextNetwork()) { return; } - if (ui->sw_MainMiddle->currentIndex() == static_cast(MainPageLogin)) + + const bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier; + if (shift) { - // already main page, we fake a re-trigger here - // emit this->currentMainInfoAreaChanged(ui->sw_MainMiddle->currentWidget()); - ui->comp_Login->toggleNetworkConnection(); + if (!m_loginDialog) { m_loginDialog.reset(new CLoginDialog(this)); } + connect(m_loginDialog.data(), &CLoginDialog::requestNetworkSettings, this, &SwiftGuiStd::displayNetworkSettings); + if (!CBuildConfig::isLocalDeveloperDebugBuild()) + { + m_loginDialog->setAutoLogoff(true); + } + m_loginDialog->show(); } else { - // const bool connected = sGui->getIContextNetwork()->isConnected(); - const bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier; - if (shift) - { - if (!m_loginDialog) { m_loginDialog.reset(new CLoginDialog(this)); } - connect(m_loginDialog.data(), &CLoginDialog::requestNetworkSettings, this, &SwiftGuiStd::displayNetworkSettings); - if (!CBuildConfig::isLocalDeveloperDebugBuild()) - { - m_loginDialog->setAutoLogoff(true); - } - m_loginDialog->show(); - } - else - { - this->setMainPage(MainPageLogin); - } + this->setMainPage(MainPageLogin); } }