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

Ref T228, when using dialog, the dialog class will handle all saving.

Browse Source 
Therefor "this->saveSettingsOnShutdown(false)"
This commit is contained in:
Klaus Basan
2018-01-18 01:32:24 +01:00
parent ee8ea8e599
commit 8273a9881f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackgui/guiapplication.cpp
View File

@@ -754,6 +754,7 @@ namespace BlackGui
QDialog::DialogCode CGuiApplication::showCloseDialog(QMainWindow *mainWindow, QCloseEvent *closeEvent) QDialog::DialogCode CGuiApplication::showCloseDialog(QMainWindow *mainWindow, QCloseEvent *closeEvent)
{ {
this->saveSettingsOnShutdown(false); // saving itself will be handled in dialog
const bool needsDialog = this->hasUnsavedSettings(); const bool needsDialog = this->hasUnsavedSettings();
if (!needsDialog) { return QDialog::Accepted; } if (!needsDialog) { return QDialog::Accepted; }
if (!m_closeDialog) if (!m_closeDialog)
@@ -761,15 +762,22 @@ namespace BlackGui
m_closeDialog = new CApplicationCloseDialog(mainWindow); m_closeDialog = new CApplicationCloseDialog(mainWindow);
if (mainWindow && !mainWindow->windowTitle().isEmpty()) if (mainWindow && !mainWindow->windowTitle().isEmpty())
{ {
this->setSettingsAutoSave(false); // will be handled by dialog
m_closeDialog->setWindowTitle(mainWindow->windowTitle()); m_closeDialog->setWindowTitle(mainWindow->windowTitle());
m_closeDialog->setModal(true); m_closeDialog->setModal(true);
} }
} }
// dialog will handle the saving
const QDialog::DialogCode c = static_cast<QDialog::DialogCode>(m_closeDialog->exec()); const QDialog::DialogCode c = static_cast<QDialog::DialogCode>(m_closeDialog->exec());
if (c == QDialog::Rejected)
// settings already saved when reaching here
switch (c)
{ {
case QDialog::Rejected:
if (closeEvent) { closeEvent->ignore(); } if (closeEvent) { closeEvent->ignore(); }
break;
default:
break;
} }
return c; return c;
} }