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

Lazy reset the unfiltered filter.

Browse Source 
Reviewed-by: ck
This commit is contained in:
kh1
2010-03-16 15:28:31 +01:00
parent c06323032a
commit 37871bc43c
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/help/helpplugin.cpp
View File

@@ -420,6 +420,27 @@ void HelpPlugin::pluginUpdateDocumentation()
updateDocumentation(); updateDocumentation();
} }
void HelpPlugin::resetFilter()
{
const QLatin1String weAddedFilterKey("UnfilteredFilterInserted");
const QLatin1String previousFilterNameKey("UnfilteredFilterName");
if (m_helpEngine->customValue(weAddedFilterKey).toInt() == 1) {
// we added a filter at some point, remove previously added filter
const QString &previousFilter =
m_helpEngine->customValue(previousFilterNameKey).toString();
if (!previousFilter.isEmpty())
m_helpEngine->removeCustomFilter(previousFilter);
}
// potentially remove a filter with new name
const QString filterName = tr("Unfiltered");
m_helpEngine->removeCustomFilter(filterName);
m_helpEngine->addCustomFilter(filterName, QStringList());
m_helpEngine->setCustomValue(weAddedFilterKey, 1);
m_helpEngine->setCustomValue(previousFilterNameKey, filterName);
m_helpEngine->setCurrentFilter(filterName);
}
bool HelpPlugin::updateDocumentation() bool HelpPlugin::updateDocumentation()
{ {
bool needsSetup = false; bool needsSetup = false;
@@ -617,25 +638,6 @@ void HelpPlugin::extensionsInitialized()
m_helpEngine->removeCustomFilter(filter); m_helpEngine->removeCustomFilter(filter);
} }
const QLatin1String weAddedFilterKey("UnfilteredFilterInserted");
const QLatin1String previousFilterNameKey("UnfilteredFilterName");
if (m_helpEngine->customValue(weAddedFilterKey).toInt() == 1) {
// we added a filter at some point, remove previously added filter
const QString &previousFilter =
m_helpEngine->customValue(previousFilterNameKey).toString();
if (!previousFilter.isEmpty())
m_helpEngine->removeCustomFilter(previousFilter);
}
// potentially remove a filter with new name
const QString filterName = tr("Unfiltered");
m_helpEngine->removeCustomFilter(filterName);
m_helpEngine->addCustomFilter(filterName, QStringList());
m_helpEngine->setCustomValue(weAddedFilterKey, 1);
m_helpEngine->setCustomValue(previousFilterNameKey, filterName);
m_helpEngine->setCurrentFilter(filterName);
m_bookmarkManager->setupBookmarkModels();
m_helpEngine->blockSignals(blocked); m_helpEngine->blockSignals(blocked);
@@ -733,6 +735,7 @@ void HelpPlugin::modeChanged(Core::IMode *mode)
qApp->processEvents(); qApp->processEvents();
qApp->setOverrideCursor(Qt::WaitCursor); qApp->setOverrideCursor(Qt::WaitCursor);
resetFilter();
m_centralWidget->setLastShownPages(); m_centralWidget->setLastShownPages();
connect(m_helpEngine, SIGNAL(setupFinished()), m_helpEngine->searchEngine(), connect(m_helpEngine, SIGNAL(setupFinished()), m_helpEngine->searchEngine(),
SLOT(indexDocumentation())); SLOT(indexDocumentation()));

1
src/plugins/help/helpplugin.h
View File

@@ -133,6 +133,7 @@ private slots:
void indexingFinished(); void indexingFinished();
private: private:
void resetFilter();
bool updateDocumentation(); bool updateDocumentation();
private: private: