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

Modified IOptionsPage interface for Apply button

Browse Source 
The previous interface wasn't sufficient to properly support the Apply
button, since it didn't separate applying the changes from the cleanup
phase.

Designer settings pages still need some fixing.

Fixes Apply button causing problems for certain plugins, for example the
QuickOpen.
This commit is contained in:
Thorbjørn Lindeijer
2009-01-13 15:41:33 +01:00
parent e6f7cb68a5
commit 59c8b93309
36 changed files with 143 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/quickopen/settingspage.cpp
View File

@@ -67,30 +67,41 @@ QWidget *SettingsPage::createPage(QWidget *parent)
this, SLOT(removeCustomFilter()));
}
m_ui.refreshInterval->setValue(m_plugin->refreshInterval());
m_filters = m_plugin->filter();
m_customFilters = m_plugin->customFilter();
m_filters = m_plugin->filters();
m_customFilters = m_plugin->customFilters();
saveFilterStates();
updateFilterList();
return m_page;
}
void SettingsPage::finished(bool accepted)
void SettingsPage::apply()
{
if (!accepted) {
restoreFilterStates();
foreach (IQuickOpenFilter *filter, m_addedFilters)
delete filter;
} else {
foreach (IQuickOpenFilter *filter, m_removedFilters)
delete filter;
m_plugin->setFilter(m_filters);
m_plugin->setCustomFilter(m_customFilters);
m_plugin->setRefreshInterval(m_ui.refreshInterval->value());
requestRefresh();
m_plugin->saveSettings();
}
// Delete removed filters and clear added filters
qDeleteAll(m_removedFilters);
m_removedFilters.clear();
m_addedFilters.clear();
// Pass the new configuration on to the plugin
m_plugin->setFilters(m_filters);
m_plugin->setCustomFilters(m_customFilters);
m_plugin->setRefreshInterval(m_ui.refreshInterval->value());
requestRefresh();
m_plugin->saveSettings();
saveFilterStates();
}
void SettingsPage::finish()
{
// If settings were applied, this shouldn't change anything. Otherwise it
// makes sure the filter states aren't changed permanently.
restoreFilterStates();
// Delete added filters and clear removed filters
qDeleteAll(m_addedFilters);
m_addedFilters.clear();
m_removedFilters.clear();
// Further cleanup
m_filters.clear();
m_customFilters.clear();
m_refreshFilters.clear();