flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 03:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #115 Main connect button only opens the login view

Browse Source
This commit is contained in:
Mat Sutcliffe
2021-09-01 20:40:12 +01:00
parent fbbfd5ebe2
commit 8952229b82
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/swiftguistandard/swiftguistd.cpp
View File

@@ -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<int>(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);
}
}