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

Core: Sort find filters by name

Browse Source 
Change-Id: I8975b474cf8c009e5a634464a451ef922adb02ec
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-02-03 10:24:28 +02:00
committed by Orgad Shaneh
parent c31af6315f
commit be82a24a49
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/find/findplugin.cpp
View File

@@ -43,6 +43,7 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QMenu> #include <QMenu>
@@ -229,15 +230,17 @@ void FindPlugin::setupMenu()
void FindPlugin::setupFilterMenuItems() void FindPlugin::setupFilterMenuItems()
{ {
QList<IFindFilter*> findInterfaces = QList<IFindFilter*> findInterfaces = ExtensionSystem::PluginManager::getObjects<IFindFilter>();
ExtensionSystem::PluginManager::getObjects<IFindFilter>();
Command *cmd; Command *cmd;
ActionContainer *mfindadvanced = ActionManager::actionContainer(Constants::M_FIND_ADVANCED); ActionContainer *mfindadvanced = ActionManager::actionContainer(Constants::M_FIND_ADVANCED);
d->m_filterActions.clear(); d->m_filterActions.clear();
bool haveEnabledFilters = false; bool haveEnabledFilters = false;
const Id base("FindFilter."); const Id base("FindFilter.");
foreach (IFindFilter *filter, findInterfaces) { QList<IFindFilter *> sortedFilters = findInterfaces;
Utils::sort(sortedFilters, [](IFindFilter *a, IFindFilter *b) -> bool
{ return a->displayName() < b->displayName(); });
foreach (IFindFilter *filter, sortedFilters) {
QAction *action = new QAction(QLatin1String(" ") + filter->displayName(), this); QAction *action = new QAction(QLatin1String(" ") + filter->displayName(), this);
bool isEnabled = filter->isEnabled(); bool isEnabled = filter->isEnabled();
if (isEnabled) if (isEnabled)
@@ -253,7 +256,7 @@ void FindPlugin::setupFilterMenuItems()
connect(filter, &IFindFilter::enabledChanged, this, &FindPlugin::filterChanged); connect(filter, &IFindFilter::enabledChanged, this, &FindPlugin::filterChanged);
connect(filter, &IFindFilter::displayNameChanged, this, &FindPlugin::displayNameChanged); connect(filter, &IFindFilter::displayNameChanged, this, &FindPlugin::displayNameChanged);
} }
d->m_findDialog->setFindFilters(findInterfaces); d->m_findDialog->setFindFilters(sortedFilters);
d->m_openFindDialog->setEnabled(haveEnabledFilters); d->m_openFindDialog->setEnabled(haveEnabledFilters);
} }