feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Decouple the big files warning from the other warnings

Browse Source 
The reset warnings button is used for resetting all the warnings that
are not an explicit option.

Change-Id: I3650f206bc0475b85cad61af5c4fbc14e5c532c8
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-09-01 11:39:39 +02:00
parent fb73a87033
commit f1e8aec7ac
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -212,7 +212,6 @@ void GeneralSettings::resetWarnings()
{ {
InfoBar::clearGloballySuppressed(); InfoBar::clearGloballySuppressed();
CheckableMessageBox::resetAllDoNotAskAgainQuestions(ICore::settings()); CheckableMessageBox::resetAllDoNotAskAgainQuestions(ICore::settings());
m_page->warnBeforeOpeningBigFiles->setChecked(true);
m_page->resetWarningsButton->setEnabled(false); m_page->resetWarningsButton->setEnabled(false);
} }
@@ -239,8 +238,7 @@ void GeneralSettings::updatePath()
bool GeneralSettings::canResetWarnings() const bool GeneralSettings::canResetWarnings() const
{ {
return InfoBar::anyGloballySuppressed() return InfoBar::anyGloballySuppressed()
|| CheckableMessageBox::hasSuppressedQuestions(ICore::settings()) || CheckableMessageBox::hasSuppressedQuestions(ICore::settings());
|| !EditorManagerPrivate::warnBeforeOpeningBigFilesEnabled();
} }
void GeneralSettings::variableHelpDialogCreator(const QString &helpText) void GeneralSettings::variableHelpDialogCreator(const QString &helpText)