mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 14:55:36 +08:00
Issue #115 Opening login view doesn't trigger disconnect countdown
This commit is contained in:
@@ -198,34 +198,13 @@ namespace BlackGui
|
||||
m_logoffCountdownTimer.stop(); // in any case stop the timer
|
||||
if (currentWidget != this && currentWidget != this->parentWidget())
|
||||
{
|
||||
// const bool wasVisible = m_visible;
|
||||
m_visible = false;
|
||||
m_logoffCountdownTimer.stop();
|
||||
|
||||
/** T639
|
||||
if (!wasVisible)
|
||||
{
|
||||
// set own values, and send signals
|
||||
this->setOwnModelAndIcaoValues();
|
||||
}
|
||||
**/
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_visible)
|
||||
{
|
||||
// already visible:
|
||||
// re-trigger! treat as same as OK
|
||||
this->toggleNetworkConnection();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_visible = true;
|
||||
this->setOwnModelAndIcaoValues();
|
||||
const bool isConnected = sGui->getIContextNetwork()->isConnected();
|
||||
this->setUiLoginState(isConnected);
|
||||
if (isConnected) { this->startLogoffTimerCountdown(); }
|
||||
}
|
||||
this->setOwnModelAndIcaoValues();
|
||||
const bool isConnected = sGui->getIContextNetwork()->isConnected();
|
||||
this->setUiLoginState(isConnected);
|
||||
}
|
||||
|
||||
// we decided to make it difficult for users to disable it
|
||||
|
||||
@@ -249,7 +249,6 @@ namespace BlackGui
|
||||
QScopedPointer<CDbQuickMappingWizard> m_mappingWizard; //!< mapping wizard
|
||||
BlackMisc::CDigestSignal m_changedLoginDataDigestSignal { this, &CLoginComponent::loginDataChangedDigest, 1500, 10 };
|
||||
bool m_autoPopupWizard = false; //!< automatically popup wizard if mapping is needed
|
||||
bool m_visible = false; //!< is this component selected?
|
||||
bool m_updatePilotOnServerChanges = true;
|
||||
const QIcon m_iconPlay {":/famfamfam/icons/famfamfam/icons/silk/control_play_blue.png"};
|
||||
const QIcon m_iconPause {":/famfamfam/icons/famfamfam/icons/silk/control_pause_blue.png"};
|
||||
|
||||
Reference in New Issue
Block a user