Only show action results when . prefix is used

nyalldawson · nyalldawson · commit a53516d71de6 · 2017-05-17T21:33:47.000+10:00
diff --git a/python/gui/locator/qgslocatorfilter.sip b/python/gui/locator/qgslocatorfilter.sip
@@ -139,6 +139,21 @@ class QgsLocatorFilter : QObject
  result.
 %End
 
+    bool useWithoutPrefix() const;
+%Docstring
+ Returns true if the filter should be used when no prefix
+ is entered.
+.. seealso:: setUseWithoutPrefix()
+ :rtype: bool
+%End
+
+    void setUseWithoutPrefix( bool useWithoutPrefix );
+%Docstring
+ Sets whether the filter should be used when no prefix
+ is entered.
+.. seealso:: useWithoutPrefix()
+%End
+
   signals:
 
     void resultFetched( const QgsLocatorResult &result );
diff --git a/src/app/locator/qgsinbuiltlocatorfilters.cpp b/src/app/locator/qgsinbuiltlocatorfilters.cpp
@@ -103,7 +103,7 @@ QgsActionLocatorFilter::QgsActionLocatorFilter( const QList<QWidget *> &parentOb
   : QgsLocatorFilter( parent )
   , mActionParents( parentObjectsForActions )
 {
-
+  setUseWithoutPrefix( false );
 }
 
 void QgsActionLocatorFilter::fetchResults( const QString &string, const QgsLocatorContext &context, QgsFeedback *feedback )
diff --git a/src/gui/locator/qgslocator.cpp b/src/gui/locator/qgslocator.cpp
@@ -89,18 +89,25 @@ void QgsLocator::fetchResults( const QString &string, const QgsLocatorContext &c
   }
   mFeedback = feedback;
 
-  mActiveFilters = mFilters;
+  mActiveFilters.clear();
   QString searchString = string;
   if ( searchString.indexOf( ' ' ) > 0 )
   {
     QString prefix = searchString.left( searchString.indexOf( ' ' ) );
     if ( mPrefixedFilters.contains( prefix ) )
     {
-      mActiveFilters.clear();
       mActiveFilters << mPrefixedFilters.value( prefix );
       searchString = searchString.mid( prefix.length() + 1 );
     }
   }
+  if ( mActiveFilters.isEmpty() )
+  {
+    Q_FOREACH ( QgsLocatorFilter *filter, mFilters )
+    {
+      if ( filter->useWithoutPrefix() )
+        mActiveFilters << filter;
+    }
+  }
 
   auto gatherFilterResults = [searchString, context, feedback]( QgsLocatorFilter * filter )
   {
diff --git a/src/gui/locator/qgslocatorfilter.cpp b/src/gui/locator/qgslocatorfilter.cpp
@@ -23,3 +23,18 @@ QgsLocatorFilter::QgsLocatorFilter( QObject *parent )
 {
 
 }
+
+bool QgsLocatorFilter::stringMatches( const QString &test, const QString &match )
+{
+  return QgsStringUtils::containsFuzzy( match, test );
+}
+
+bool QgsLocatorFilter::useWithoutPrefix() const
+{
+  return mUseWithoutPrefix;
+}
+
+void QgsLocatorFilter::setUseWithoutPrefix( bool useWithoutPrefix )
+{
+  mUseWithoutPrefix = useWithoutPrefix;
+}
diff --git a/src/gui/locator/qgslocatorfilter.h b/src/gui/locator/qgslocatorfilter.h
@@ -154,6 +154,20 @@ class GUI_EXPORT QgsLocatorFilter : public QObject
      */
     virtual void triggerResult( const QgsLocatorResult &result ) = 0;
 
+    /**
+     * Returns true if the filter should be used when no prefix
+     * is entered.
+     * \see setUseWithoutPrefix()
+     */
+    bool useWithoutPrefix() const;
+
+    /**
+     * Sets whether the filter should be used when no prefix
+     * is entered.
+     * \see useWithoutPrefix()
+     */
+    void setUseWithoutPrefix( bool useWithoutPrefix );
+
   signals:
 
     /**
@@ -162,6 +176,10 @@ class GUI_EXPORT QgsLocatorFilter : public QObject
      */
     void resultFetched( const QgsLocatorResult &result );
 
+  private:
+
+    bool mUseWithoutPrefix = true;
+
 };
 
 Q_DECLARE_METATYPE( QgsLocatorResult )

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ QgsActionLocatorFilter::QgsActionLocatorFilter( const QList<QWidget *> &parentOb`
`103`	`103`	`: QgsLocatorFilter( parent )`
`104`	`104`	`, mActionParents( parentObjectsForActions )`
`105`	`105`	`{`
`106`		`-`
	`106`	`+ setUseWithoutPrefix( false );`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`void QgsActionLocatorFilter::fetchResults( const QString &string, const QgsLocatorContext &context, QgsFeedback *feedback )`
Original file line number	Diff line number	Diff line change
`@@ -89,18 +89,25 @@ void QgsLocator::fetchResults( const QString &string, const QgsLocatorContext &c`
`89`	`89`	`}`
`90`	`90`	`mFeedback = feedback;`
`91`	`91`
`92`		`- mActiveFilters = mFilters;`
	`92`	`+ mActiveFilters.clear();`
`93`	`93`	`QString searchString = string;`
`94`	`94`	`if ( searchString.indexOf( ' ' ) > 0 )`
`95`	`95`	`{`
`96`	`96`	`QString prefix = searchString.left( searchString.indexOf( ' ' ) );`
`97`	`97`	`if ( mPrefixedFilters.contains( prefix ) )`
`98`	`98`	`{`
`99`		`- mActiveFilters.clear();`
`100`	`99`	`mActiveFilters << mPrefixedFilters.value( prefix );`
`101`	`100`	`searchString = searchString.mid( prefix.length() + 1 );`
`102`	`101`	`}`
`103`	`102`	`}`
	`103`	`+ if ( mActiveFilters.isEmpty() )`
	`104`	`+ {`
	`105`	`+ Q_FOREACH ( QgsLocatorFilter *filter, mFilters )`
	`106`	`+ {`
	`107`	`+ if ( filter->useWithoutPrefix() )`
	`108`	`+ mActiveFilters << filter;`
	`109`	`+ }`
	`110`	`+ }`
`104`	`111`
`105`	`112`	`auto gatherFilterResults = [searchString, context, feedback]( QgsLocatorFilter * filter )`
`106`	`113`	`{`