paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 20:30:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: renaming of the SaveOpenDialog delegate class. update the use of file filtering

Browse Source 
git-svn-id: trunk@62203 -
This commit is contained in:
dmitry 2019-11-06 02:39:52 +00:00
parent 0f9f6cb8b1
commit 2616af5061
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lcl/interfaces/cocoa/cocoawsdialogs.pas
View File

@ -153,12 +153,13 @@ end;
type
{ TCocoaPanelDialog }
{ TOpenSaveDelegate }
TCocoaPanelDialog = objcclass(NSObject, NSOpenSavePanelDelegateProtocol)
TOpenSaveDelegate = objcclass(NSObject, NSOpenSavePanelDelegateProtocol)
FileDialog: TFileDialog;
OpenDialog: TOpenDialog;
selUrl: NSURL;
filter: NSOpenSavePanelDelegateProtocol;
procedure dealloc; override;
function panel_shouldEnableURL(sender: id; url: NSURL): Boolean;
function panel_validateURL_error(sender: id; url: NSURL; outError: NSErrorPointer): Boolean;
@ -168,44 +169,47 @@ type
procedure panelSelectionDidChange(sender: id);
end;
{ TCocoaPanelDialog }
{ TOpenSaveDelegate }
procedure TCocoaPanelDialog.dealloc;
procedure TOpenSaveDelegate.dealloc;
begin
if Assigned(selUrl) then selURL.release;
inherited dealloc;
end;
function TCocoaPanelDialog.panel_shouldEnableURL(sender: id; url: NSURL
function TOpenSaveDelegate.panel_shouldEnableURL(sender: id; url: NSURL
): Boolean;
begin
Result := true;
if Assigned(filter) then
Result := filter.panel_shouldEnableURL(sender, url)
else
Result := false;
end;
function TCocoaPanelDialog.panel_validateURL_error(sender: id; url: NSURL;
function TOpenSaveDelegate.panel_validateURL_error(sender: id; url: NSURL;
outError: NSErrorPointer): Boolean;
begin
Result := true;
end;
procedure TCocoaPanelDialog.panel_didChangeToDirectoryURL(sender: id; url: NSURL);
procedure TOpenSaveDelegate.panel_didChangeToDirectoryURL(sender: id; url: NSURL);
begin
if Assigned(OpenDialog) then
OpenDialog.DoFolderChange;
end;
function TCocoaPanelDialog.panel_userEnteredFilename_confirmed(sender: id;
function TOpenSaveDelegate.panel_userEnteredFilename_confirmed(sender: id;
filename: NSString; okFlag: Boolean): NSString;
begin
Result := filename;
end;
procedure TCocoaPanelDialog.panel_willExpand(sender: id; expanding: Boolean);
procedure TOpenSaveDelegate.panel_willExpand(sender: id; expanding: Boolean);
begin
end;
procedure TCocoaPanelDialog.panelSelectionDidChange(sender: id);
procedure TOpenSaveDelegate.panelSelectionDidChange(sender: id);
var
sp : NSSavePanel;
ch : Boolean; // set to true, if actually getting a new file name
@ -261,7 +265,7 @@ var
// filter accessory view
accessoryView: NSView;
lFilter: TCocoaFilterComboBox;
callback: TCocoaPanelDialog;
callback: TOpenSaveDelegate;
// setup panel and its accessory view
procedure CreateAccessoryView(AOpenOwner: NSOpenPanel; ASaveOwner: NSSavePanel);
@ -415,13 +419,13 @@ begin
openDlg := nil;
end;
callback:=TCocoaPanelDialog.alloc;
callback:=TOpenSaveDelegate.alloc;
callback.autorelease;
callback.FileDialog := FileDialog;
if FileDialog is TOpenDialog then
callback.OpenDialog := TOpenDialog(FileDialog);
callback.filter := lFilter;
saveDlg.setDelegate(callback);
saveDlg.setTitle(NSStringUtf8(FileDialog.Title));
saveDlg.setDirectoryURL(NSURL.fileURLWithPath(NSStringUtf8(InitDir)));
UpdateOptions(FileDialog, saveDlg);