Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/app/locator/qgsactionlocatorfilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

#include "qgsactionlocatorfilter.h"

#include "qgsstringutils.h"

#include <QAction>
#include <QMenu>
#include <QRegularExpression>
Expand Down Expand Up @@ -108,7 +110,7 @@ void QgsActionLocatorFilter::searchActions( const QString &string, QWidget *pare
result.displayString = searchText;
result.setUserData( QVariant::fromValue( action ) );
result.icon = action->icon();
result.score = fuzzyScore( result.displayString, string );
result.score = fuzzyScore( QgsStringUtils::unaccent( result.displayString ), QgsStringUtils::unaccent( string ) );

if ( result.score > 0 )
{
Expand Down
3 changes: 2 additions & 1 deletion src/app/locator/qgsbookmarklocatorfilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "qgisapp.h"
#include "qgsapplication.h"
#include "qgsfeedback.h"
#include "qgsstringutils.h"

#include "moc_qgsbookmarklocatorfilter.cpp"

Expand Down Expand Up @@ -59,7 +60,7 @@ void QgsBookmarkLocatorFilter::fetchResults( const QString &string, const QgsLoc
continue;
}

result.score = fuzzyScore( result.displayString, string );
result.score = fuzzyScore( QgsStringUtils::unaccent( result.displayString ), QgsStringUtils::unaccent( string ) );

if ( result.score > 0 )
emit resultFetched( result );
Expand Down
3 changes: 2 additions & 1 deletion src/app/locator/qgslayertreelocatorfilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "qgsiconutils.h"
#include "qgslayertree.h"
#include "qgsproject.h"
#include "qgsstringutils.h"

#include "moc_qgslayertreelocatorfilter.cpp"

Expand Down Expand Up @@ -55,7 +56,7 @@ void QgsLayerTreeLocatorFilter::fetchResults( const QString &string, const QgsLo
continue;
}

result.score = fuzzyScore( result.displayString, string );
result.score = fuzzyScore( QgsStringUtils::unaccent( result.displayString ), QgsStringUtils::unaccent( string ) );

if ( result.score > 0 )
emit resultFetched( result );
Expand Down
3 changes: 2 additions & 1 deletion src/app/locator/qgslayoutlocatorfilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "qgslayoutmanager.h"
#include "qgsmasterlayoutinterface.h"
#include "qgsproject.h"
#include "qgsstringutils.h"

#include "moc_qgslayoutlocatorfilter.cpp"

Expand Down Expand Up @@ -52,7 +53,7 @@ void QgsLayoutLocatorFilter::fetchResults( const QString &string, const QgsLocat
continue;
}

result.score = fuzzyScore( result.displayString, string );
result.score = fuzzyScore( QgsStringUtils::unaccent( result.displayString ), QgsStringUtils::unaccent( string ) );

if ( result.score > 0 )
emit resultFetched( result );
Expand Down
3 changes: 2 additions & 1 deletion src/app/locator/qgssettingslocatorfilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "qgssettingslocatorfilter.h"

#include "qgisapp.h"
#include "qgsstringutils.h"

#include "moc_qgssettingslocatorfilter.cpp"

Expand Down Expand Up @@ -70,7 +71,7 @@ void QgsSettingsLocatorFilter::fetchResults( const QString &string, const QgsLoc
continue;
}

result.score = fuzzyScore( result.displayString, string );
result.score = fuzzyScore( QgsStringUtils::unaccent( result.displayString ), QgsStringUtils::unaccent( string ) );

if ( result.score > 0 )
emit resultFetched( result );
Expand Down
7 changes: 5 additions & 2 deletions src/gui/processing/qgsprocessingtoolboxmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "qgsprocessingfavoritealgorithmmanager.h"
#include "qgsprocessingrecentalgorithmlog.h"
#include "qgsprocessingregistry.h"
#include "qgsstringutils.h"
#include "qgsvectorlayer.h"

#include <QMimeData>
Expand Down Expand Up @@ -899,9 +900,10 @@ bool QgsProcessingToolboxProxyModel::filterAcceptsRow( int sourceRow, const QMod
for ( const QString &part : partsToMatch )
{
bool found = false;
const QString unaccentedPart = QgsStringUtils::unaccent( part );
for ( const QString &partToSearch : std::as_const( partsToSearch ) )
{
if ( partToSearch.contains( part, Qt::CaseInsensitive ) )
if ( QgsStringUtils::unaccent( partToSearch ).contains( unaccentedPart, Qt::CaseInsensitive ) )
{
found = true;
break;
Expand Down Expand Up @@ -954,9 +956,10 @@ bool QgsProcessingToolboxProxyModel::filterAcceptsRow( int sourceRow, const QMod
for ( const QString &part : partsToMatch )
{
bool found = false;
const QString unaccentedPart = QgsStringUtils::unaccent( part );
for ( const QString &partToSearch : std::as_const( partsToSearch ) )
{
if ( partToSearch.contains( part, Qt::CaseInsensitive ) )
if ( QgsStringUtils::unaccent( partToSearch ).contains( unaccentedPart, Qt::CaseInsensitive ) )
{
found = true;
break;
Expand Down