forked from qt-creator/qt-creator
		
	Locator: Shuffle the priorities a bit
Introduce a "Highest" priority for the filters-filter. Keep "Low" available for lower priority than the default all projects and current project filter. Change-Id: I9152d2e6c64b65478416cee18183bce1240ee187 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
		@@ -50,6 +50,7 @@ CMakeLocatorFilter::CMakeLocatorFilter()
 | 
			
		||||
    setId("Build CMake target");
 | 
			
		||||
    setDisplayName(tr("Build CMake target"));
 | 
			
		||||
    setShortcutString(QLatin1String("cm"));
 | 
			
		||||
    setPriority(High);
 | 
			
		||||
 | 
			
		||||
    connect(SessionManager::instance(), SIGNAL(projectAdded(ProjectExplorer::Project*)),
 | 
			
		||||
            this, SLOT(slotProjectListUpdated()));
 | 
			
		||||
 
 | 
			
		||||
@@ -44,6 +44,7 @@ ExecuteFilter::ExecuteFilter()
 | 
			
		||||
    setId("Execute custom commands");
 | 
			
		||||
    setDisplayName(tr("Execute Custom Commands"));
 | 
			
		||||
    setShortcutString(QString(QLatin1Char('!')));
 | 
			
		||||
    setPriority(High);
 | 
			
		||||
    setIncludedByDefault(false);
 | 
			
		||||
 | 
			
		||||
    m_process = new Utils::QtcProcess(this);
 | 
			
		||||
 
 | 
			
		||||
@@ -84,7 +84,7 @@ class CORE_EXPORT ILocatorFilter : public QObject
 | 
			
		||||
    Q_OBJECT
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
    enum Priority {High = 0, Medium = 1, Low = 2};
 | 
			
		||||
    enum Priority {Highest = 0, High = 1, Medium = 2, Low = 3};
 | 
			
		||||
 | 
			
		||||
    ILocatorFilter(QObject *parent = 0);
 | 
			
		||||
    virtual ~ILocatorFilter() {}
 | 
			
		||||
 
 | 
			
		||||
@@ -50,7 +50,7 @@ LocatorFiltersFilter::LocatorFiltersFilter(Locator *plugin,
 | 
			
		||||
    setDisplayName(tr("Available filters"));
 | 
			
		||||
    setIncludedByDefault(true);
 | 
			
		||||
    setHidden(true);
 | 
			
		||||
    setPriority(High);
 | 
			
		||||
    setPriority(Highest);
 | 
			
		||||
    setConfigurable(false);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -47,6 +47,7 @@ OpenDocumentsFilter::OpenDocumentsFilter()
 | 
			
		||||
    setId("Open documents");
 | 
			
		||||
    setDisplayName(tr("Open Documents"));
 | 
			
		||||
    setShortcutString(QString(QLatin1Char('o')));
 | 
			
		||||
    setPriority(High);
 | 
			
		||||
    setIncludedByDefault(true);
 | 
			
		||||
 | 
			
		||||
    connect(EditorManager::instance(), SIGNAL(editorOpened(Core::IEditor*)),
 | 
			
		||||
 
 | 
			
		||||
@@ -45,6 +45,7 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppTools::CppModelManager *ma
 | 
			
		||||
    setId("Methods in current Document");
 | 
			
		||||
    setDisplayName(tr("C++ Symbols in Current Document"));
 | 
			
		||||
    setShortcutString(QString(QLatin1Char('.')));
 | 
			
		||||
    setPriority(High);
 | 
			
		||||
    setIncludedByDefault(false);
 | 
			
		||||
 | 
			
		||||
    search.setSymbolsToSearchFor(SymbolSearcher::Declarations |
 | 
			
		||||
 
 | 
			
		||||
@@ -46,7 +46,6 @@ AllProjectsFilter::AllProjectsFilter() : m_filesUpToDate(false)
 | 
			
		||||
    setId("Files in any project");
 | 
			
		||||
    setDisplayName(tr("Files in Any Project"));
 | 
			
		||||
    setShortcutString(QString(QLatin1Char('a')));
 | 
			
		||||
    setPriority(Low);
 | 
			
		||||
    setIncludedByDefault(true);
 | 
			
		||||
 | 
			
		||||
    connect(ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()),
 | 
			
		||||
 
 | 
			
		||||
@@ -45,7 +45,6 @@ CurrentProjectFilter::CurrentProjectFilter()
 | 
			
		||||
{
 | 
			
		||||
    setId("Files in current project");
 | 
			
		||||
    setDisplayName(tr("Files in Current Project"));
 | 
			
		||||
    setPriority(Low);
 | 
			
		||||
    setShortcutString(QString(QLatin1Char('p')));
 | 
			
		||||
    setIncludedByDefault(false);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user