Merge pull request #4218 from d3faultdotxbe/master

Add 'never show again' checkbox/pref to auto-exit confirm dialog
This commit is contained in:
sledgehammer999 2016-03-27 14:24:50 -05:00
commit 2b8327c807
7 changed files with 103 additions and 42 deletions

View file

@ -159,6 +159,7 @@ options_imp::options_imp(QWidget *parent)
#endif
connect(checkShowSplash, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkProgramExitConfirm, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkProgramAutoExitConfirm, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkPreventFromSuspend, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(comboTrayIcon, SIGNAL(currentIndexChanged(int)), this, SLOT(enableApplyButton()));
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) && !defined(QT_DBUS_LIB)
@ -433,6 +434,7 @@ void options_imp::saveOptions()
pref->setStartMinimized(startMinimized());
pref->setSplashScreenDisabled(isSlashScreenDisabled());
pref->setConfirmOnExit(checkProgramExitConfirm->isChecked());
pref->setDontConfirmAutoExit(!checkProgramAutoExitConfirm->isChecked());
pref->setPreventFromSuspend(preventFromSuspend());
#ifdef Q_OS_WIN
pref->setWinStartup(WinStartup());
@ -628,6 +630,7 @@ void options_imp::loadOptions()
checkShowSplash->setChecked(!pref->isSplashScreenDisabled());
checkStartMinimized->setChecked(pref->startMinimized());
checkProgramExitConfirm->setChecked(pref->confirmOnExit());
checkProgramAutoExitConfirm->setChecked(!pref->dontConfirmAutoExit());
checkShowSystray->setChecked(pref->systrayIntegration());
if (checkShowSystray->isChecked()) {