Commit 095b7fc2 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Describe "Reset warnings" button

Disable the button if no warnings are suppressed

Task-number: QTCREATORBUG-8875
Change-Id: If019550eaf8e8745a506b512d206a2b0fd34dfeb
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent c3b6d150
......@@ -136,6 +136,7 @@ QWidget *GeneralSettings::createPage(QWidget *parent)
m_page->autoSaveCheckBox->setChecked(EditorManager::instance()->autoSaveEnabled());
m_page->autoSaveInterval->setValue(EditorManager::instance()->autoSaveInterval());
m_page->resetWarningsButton->setEnabled(Core::InfoBar::anyGloballySuppressed());
connect(m_page->resetColorButton, SIGNAL(clicked()),
this, SLOT(resetInterfaceColor()));
......@@ -207,7 +208,7 @@ void GeneralSettings::resetInterfaceColor()
void GeneralSettings::resetWarnings()
{
Core::InfoBar::clearGloballySuppressed();
QMessageBox::information(0, tr("Reset warnings"), tr("Done"));
m_page->resetWarningsButton->setEnabled(false);
}
void GeneralSettings::resetTerminal()
......
......@@ -109,6 +109,9 @@
</item>
<item row="3" column="0">
<widget class="QPushButton" name="resetWarningsButton">
<property name="toolTip">
<string>Re-enable all warnings which were suppressed using &quot;Don't show again&quot; button (e.g. missing highlighter).</string>
</property>
<property name="text">
<string comment="Button text">Reset warnings</string>
</property>
......
......@@ -152,6 +152,11 @@ void InfoBar::clearGloballySuppressed()
ICore::settings()->setValue(QLatin1String(C_SUPPRESSED_WARNINGS), QStringList());
}
bool InfoBar::anyGloballySuppressed()
{
return !globallySuppressed.isEmpty();
}
InfoBarDisplay::InfoBarDisplay(QObject *parent)
: QObject(parent)
......
......@@ -89,6 +89,7 @@ public:
static void globallySuppressInfo(Id id);
static void initializeGloballySuppressed();
static void clearGloballySuppressed();
static bool anyGloballySuppressed();
signals:
void changed();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment