mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: GetCustomIcon() supports combined tags in TFinderSearchResultFileSource() on macOS

Browse source
This commit is contained in:
rich2014 2026-01-23 23:13:22 +08:00
commit fd0d3f161d
2 changed files with 55 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/platform/unix/darwin/udarwinfileview.pas
View file

@ -31,7 +31,6 @@ type
const activeFrameFunc: TActiveFrameFunc );
class procedure addFinderSearchResult(
const fs: ISearchResultFileSource;
const searchName: String;
const files: TStringArray;
const newPage: Boolean );
class procedure addiCloudDrivePage;
@ -40,8 +39,8 @@ type
{ TDarwinSearchResultHandler }
TDarwinSearchResultHandler = class
procedure onSearchFinderTagComplete( const searchName: String; const files: TStringArray );
procedure onSearchSavedSearchComplete( const searchName: String; const files: TStringArray );
procedure onSearchFinderTagComplete( const info: NSObject; const files: TStringArray );
procedure onSearchSavedSearchComplete( const info: NSObject; const files: TStringArray );
end;
TDarwinFileViewDrawHandler = class
@ -65,7 +64,7 @@ type
_searchName: String;
_icon: TBitmap;
public
constructor Create( searchName: String );
constructor Create( tagNames: NSArray );
destructor Destroy; override;
function GetRootDir(sPath: String): String; override;
function GetCustomIcon(const path: String; const iconSize: Integer
@ -86,14 +85,29 @@ type
{ TFinderTagSearchResultFileSource }
constructor TFinderTagSearchResultFileSource.Create(searchName: String);
constructor TFinderTagSearchResultFileSource.Create(tagNames: NSArray);
function toString: NSString;
var
tagName: NSString;
name: NSMutableString;
begin
name:= NSMutableString.new;
for tagName in tagNames do begin
name.appendString( tagName );
name.appendString( NSSTR('|') );
end;
Result:= name.substringToIndex( name.length-1 );
name.release;
end;
var
tag: TFinderTag;
image: NSImage;
begin
Inherited Create;
_searchName:= searchName;
tag:= TFinderTags.getTagOfName( StringToNSString(_searchName) );
_searchName:= toString.UTF8String;
tag:= TFinderTags.getTagOfName( NSString(tagNames.firstObject) );
if NOT Assigned(tag) then
Exit;
@ -156,23 +170,23 @@ end;
{ TDarwinSearchResultHandler }
procedure TDarwinSearchResultHandler.onSearchFinderTagComplete(
const searchName: String;
const info: NSObject;
const files: TStringArray );
var
fs: ISearchResultFileSource;
begin
fs:= TFinderTagSearchResultFileSource.Create( searchName );
TDarwinFileViewUtil.addFinderSearchResult( fs, searchName, files, True );
fs:= TFinderTagSearchResultFileSource.Create( NSArray(info) );
TDarwinFileViewUtil.addFinderSearchResult( fs, files, True );
end;
procedure TDarwinSearchResultHandler.onSearchSavedSearchComplete(
const searchName: String;
const info: NSObject;
const files: TStringArray );
var
fs: ISearchResultFileSource;
begin
fs:= TSmartFolderSearchResultFileSource.Create( searchName );
TDarwinFileViewUtil.addFinderSearchResult( fs, searchName, files, False );
fs:= TSmartFolderSearchResultFileSource.Create( NSString(info).UTF8String );
TDarwinFileViewUtil.addFinderSearchResult( fs, files, False );
end;
{ TDarwinFileViewDrawHandler }
@ -232,7 +246,6 @@ end;
class procedure TDarwinFileViewUtil.addFinderSearchResult(
const fs: ISearchResultFileSource;
const searchName: String;
const files: TStringArray;
const newPage: Boolean );
var

72
src/platform/unix/darwin/udarwinfindermodel.pas
View file

@ -53,7 +53,7 @@ type
TFinderTagNSColors = Array of NSColor;
TMacOSSearchResultHandler = procedure ( const searchName: String; const files: TStringArray ) of object;
TDarwinSearchResultHandler = procedure ( const info: NSObject; const files: TStringArray ) of object;
TFinderFavoriteTagMenuItemState = ( selectionAll, selectionNone, selectionMixed );
@ -74,8 +74,8 @@ type
class function getTagsDataFromDatabase: TBytes;
class procedure initFinderTagNSColors;
class procedure doSearchFiles(
const searchName: NSString;
const handler: TMacOSSearchResultHandler;
const info: NSObject;
const handler: TDarwinSearchResultHandler;
const predicate: NSPredicate;
const scopes: NSArray );
public
@ -92,10 +92,10 @@ type
class procedure removeTagForFile( const url: NSURL; const tagName: NSString );
class procedure removeTagForFiles( const urls: NSArray; const tagName: NSString );
public
class procedure searchFilesForTagName( const tagName: NSString; const handler: TMacOSSearchResultHandler );
class procedure searchFilesForTagNames( const tagNames: NSArray; const handler: TMacOSSearchResultHandler );
class procedure searchFilesBySavedSearch( const path: NSString; const handler: TMacOSSearchResultHandler );
class procedure searchFilesBySavedSearch( const path: String; const handler: TMacOSSearchResultHandler );
class procedure searchFilesForTagName( const tagName: NSString; const handler: TDarwinSearchResultHandler );
class procedure searchFilesForTagNames( const tagNames: NSArray; const handler: TDarwinSearchResultHandler );
class procedure searchFilesBySavedSearch( const path: NSString; const handler: TDarwinSearchResultHandler );
class procedure searchFilesBySavedSearch( const path: String; const handler: TDarwinSearchResultHandler );
public
class property editorFinderTagNSColors: TFinderTagNSColors read _editorFinderTagNSColors;
class property menuFinderTagNSColors: TFinderTagNSColors read _menuFinderTagNSColors;
@ -209,21 +209,21 @@ begin
end;
end;
{ TMacOSQueryHandler }
{ TDarwinQueryHandler }
type
TMacOSQueryHandler = objcclass( NSObject )
TDarwinQueryHandler = objcclass( NSObject )
private
_queryName: NSString;
_queryInfo: NSObject;
_query: NSMetadataQuery;
_handler: TMacOSSearchResultHandler;
_handler: TDarwinSearchResultHandler;
procedure initalGatherComplete( sender: id ); message 'initalGatherComplete:';
public
function initWithName( name: NSString ): id; message 'doublecmd_initWithName:';
function initWithInfo( info: NSObject ): id; message 'doublecmd_initWithInfo:';
procedure dealloc; override;
end;
procedure TMacOSQueryHandler.initalGatherComplete(sender: id);
procedure TDarwinQueryHandler.initalGatherComplete(sender: id);
var
item: NSMetadataItem;
path: NSString;
@ -248,21 +248,21 @@ begin
end;
end;
_handler( _queryName.UTF8String, files );
_handler( _queryInfo, files );
self.release;
end;
function TMacOSQueryHandler.initWithName(name: NSString): id;
function TDarwinQueryHandler.initWithInfo(info: NSObject): id;
begin
_queryName:= name;
_queryName.retain;
_queryInfo:= info;
_queryInfo.retain;
Result:= self;
end;
procedure TMacOSQueryHandler.dealloc;
procedure TDarwinQueryHandler.dealloc;
begin
_queryName.release;
_queryInfo.release;
_query.release;
end;
@ -355,18 +355,18 @@ begin
end;
class procedure TDarwinFinderModelUtil.doSearchFiles(
const searchName: NSString;
const handler: TMacOSSearchResultHandler;
const info: NSObject;
const handler: TDarwinSearchResultHandler;
const predicate: NSPredicate;
const scopes: NSArray);
var
queryHandler: TMacOSQueryHandler;
queryHandler: TDarwinQueryHandler;
query: NSMetadataQuery;
begin
// release in initalGatherComplete()
query:= NSMetadataQuery.new;
// release in initalGatherComplete()
queryHandler:= TMacOSQueryHandler.alloc.initWithName( searchName );
queryHandler:= TDarwinQueryHandler.alloc.initWithInfo( info );
queryHandler._query:= query;
queryHandler._handler:= handler;
NSNotificationCenter.defaultCenter.addObserver_selector_name_object(
@ -382,7 +382,7 @@ begin
end;
class procedure TDarwinFinderModelUtil.searchFilesBySavedSearch(
const path: NSString; const handler: TMacOSSearchResultHandler);
const path: NSString; const handler: TDarwinSearchResultHandler);
var
searchName: NSString;
predicate: NSPredicate;
@ -425,27 +425,13 @@ begin
end;
class procedure TDarwinFinderModelUtil.searchFilesBySavedSearch(
const path: String; const handler: TMacOSSearchResultHandler);
const path: String; const handler: TDarwinSearchResultHandler);
begin
TDarwinFinderModelUtil.searchFilesBySavedSearch( StringToNSString(path), handler );
end;
class procedure TDarwinFinderModelUtil.searchFilesForTagNames(
const tagNames: NSArray; const handler: TMacOSSearchResultHandler );
function toString: NSString;
var
tagName: NSString;
name: NSMutableString;
begin
name:= NSMutableString.new;
for tagName in tagNames do begin
name.appendString( tagName );
name.appendString( NSSTR('|') );
end;
Result:= name.substringToIndex( name.length-1 );
name.release;
end;
const tagNames: NSArray; const handler: TDarwinSearchResultHandler );
function formatString: NSString;
var
@ -463,19 +449,17 @@ class procedure TDarwinFinderModelUtil.searchFilesForTagNames(
end;
var
searchName: NSString;
predicate: NSPredicate;
begin
if tagNames.count = 0 then
Exit;
searchName:= toString();
predicate:= NSPredicate.predicateWithFormat_argumentArray( formatString(), tagNames );
self.doSearchFiles( searchName, handler, predicate, nil );
self.doSearchFiles( tagNames, handler, predicate, nil );
end;
class procedure TDarwinFinderModelUtil.searchFilesForTagName(
const tagName: NSString; const handler: TMacOSSearchResultHandler);
const tagName: NSString; const handler: TDarwinSearchResultHandler);
var
tagNames: NSArray;
begin