From e1b84e31df1df9dd8bd3aefe1fcc62e0a5cf627d Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 21 Mar 2005 09:14:17 +0000 Subject: [PATCH] added OpenDialog Filters from Salvatore Coppola git-svn-id: trunk@7003 - --- ideintf/imagelisteditor.pp | 4 ++-- lcl/extdlgs.pas | 4 ++-- packager/addtopackagedlg.pas | 11 ++++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ideintf/imagelisteditor.pp b/ideintf/imagelisteditor.pp index 6b2d7a45f7..127c49e5cf 100644 --- a/ideintf/imagelisteditor.pp +++ b/ideintf/imagelisteditor.pp @@ -134,8 +134,8 @@ begin Opendlg := TOpenDialog.Create(Self); Try Opendlg.Options:=[ofextensiondifferent, ofpathmustexist, offilemustexist, ofenablesizing]; - Opendlg.DefaultExt:='.xpm'; - Opendlg.Filter:='*.xpm'; + Opendlg.Filter:='All supported files (*.xpm;*.bmp)|*.xpm;*.bmp|'+ + 'Pixmap (*.xpm)|*.xpm|Bitmap (*.bmp)|*.bmp'; OpenDlg.InitialDir:=fDirName; //last rirectory If OpenDlg.Execute then diff --git a/lcl/extdlgs.pas b/lcl/extdlgs.pas index f8d01dc46c..15e29ec899 100644 --- a/lcl/extdlgs.pas +++ b/lcl/extdlgs.pas @@ -360,8 +360,8 @@ end; constructor TOpenPictureDialog.Create(TheOwner: TComponent); begin inherited Create(TheOwner); - FDefaultFilter := Format(rsAllFiles, [GetAllFilesMask, GetAllFilesMask, - GraphicFilter(TGraphic)]); + FDefaultFilter := GraphicFilter(TGraphic)+'|'+Format(rsAllFiles, + [GetAllFilesMask, GetAllFilesMask,'']); Filter:=FDefaultFilter; FPictureGroupBox:=TGroupBox.Create(Self); diff --git a/packager/addtopackagedlg.pas b/packager/addtopackagedlg.pas index 6e9bd143cf..4da3ac8606 100644 --- a/packager/addtopackagedlg.pas +++ b/packager/addtopackagedlg.pas @@ -138,7 +138,6 @@ type procedure AddFileButtonClick(Sender: TObject); procedure AddFilePageResize(Sender: TObject); procedure AddFileShortenButtonClick(Sender: TObject); - procedure AddFilesPageResize(Sender: TObject); procedure AddToPackageDlgClose(Sender: TObject; var CloseAction: TCloseAction); procedure AddUnitButtonClick(Sender: TObject); @@ -155,6 +154,7 @@ type procedure ClassNameEditChange(Sender: TObject); procedure ComponentUnitFileBrowseButtonClick(Sender: TObject); procedure ComponentUnitFileShortenButtonClick(Sender: TObject); + procedure AddFilesPageResize(Sender: TObject); procedure FilesAddButtonClick(Sender: TObject); procedure FilesBrowseButtonClick(Sender: TObject); procedure FilesDeleteButtonClick(Sender: TObject); @@ -546,6 +546,11 @@ begin LazPackage.GetFileDialogInitialDir(OpenDialog.InitialDir); OpenDialog.Title:=lisOpenFile; OpenDialog.Options:=OpenDialog.Options+[ofFileMustExist,ofPathMustExist]; + OpenDialog.Filter:='Lazarus File (*.pas;*.pp;*.inc;*.lfm;*.lrs)|*.pas;*.pp;*.inc;*.lfm;*.lrs' + +'|Pascal unit (*.pp;*.pas)|*.pp;*.pas' + +'|Pascal source file (*.pas)|*.pas' + +'|FreePascal source file (*.pp)|*.pp' + +'|All files ('+GetAllFilesMask+')|'+GetAllFilesMask; if OpenDialog.Execute then begin AFilename:=CleanAndExpandFilename(OpenDialog.Filename); if FileExists(AFilename) then begin @@ -615,6 +620,10 @@ begin LazPackage.GetFileDialogInitialDir(OpenDialog.InitialDir); OpenDialog.Title:=lisOpenFile; OpenDialog.Options:=OpenDialog.Options+[ofFileMustExist,ofPathMustExist]; + OpenDialog.Filter:='Pascal unit (*.pp;*.pas)|*.pp;*.pas' + +'|Pascal source file (*.pas)|*.pas' + +'|FreePascal source file (*.pp)|*.pp' + +'|All files ('+GetAllFilesMask+')|'+GetAllFilesMask; if OpenDialog.Execute then begin AFilename:=CleanAndExpandFilename(OpenDialog.Filename); if FileExists(AFilename) then begin