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

IDE: Support many picture formats for project icon. It was wrongly changed for Issue #34464

Browse Source 
git-svn-id: branches/fixes_2_0@60205 -
This commit is contained in:
mattias 2019-01-24 09:58:42 +00:00
parent 2f4272b1cb
commit 2b8c5424db
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/frames/project_application_options.pas
View File

@ -174,7 +174,7 @@ begin
OpenPictureDialog1.InitialDir:=FProject.Directory; OpenPictureDialog1.InitialDir:=FProject.Directory;
if not OpenPictureDialog1.Execute then exit; if not OpenPictureDialog1.Execute then exit;
try try
IconImage.Picture.Icon.LoadFromFile(OpenPictureDialog1.FileName); IconImage.Picture.LoadFromFile(OpenPictureDialog1.FileName);
fIconChanged:=true; fIconChanged:=true;
except except
on E: Exception do on E: Exception do
@ -185,7 +185,7 @@ end;
procedure TProjectApplicationOptionsFrame.SaveIconButtonClick(Sender: TObject); procedure TProjectApplicationOptionsFrame.SaveIconButtonClick(Sender: TObject);
begin begin
if SavePictureDialog1.Execute then if SavePictureDialog1.Execute then
IconImage.Picture.Icon.SaveToFile(SavePictureDialog1.FileName); IconImage.Picture.SaveToFile(SavePictureDialog1.FileName);
end; end;
procedure TProjectApplicationOptionsFrame.EnableManifest(aEnable: Boolean); procedure TProjectApplicationOptionsFrame.EnableManifest(aEnable: Boolean);
@ -287,8 +287,6 @@ begin
IconImage.KeepOriginXWhenClipped := True; IconImage.KeepOriginXWhenClipped := True;
IconImage.KeepOriginYWhenClipped := True; IconImage.KeepOriginYWhenClipped := True;
IconImagePictureChanged(nil); IconImagePictureChanged(nil);
OpenPictureDialog1.Filter := GraphicFilter(TIcon)+'|'+
Format(rsAllFiles,[GetAllFilesMask, GetAllFilesMask,'']);
end; end;
procedure TProjectApplicationOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); procedure TProjectApplicationOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);