From b63e95189f028ad3b577832d7c95013da68236cd Mon Sep 17 00:00:00 2001 From: juha Date: Wed, 3 Oct 2018 17:24:24 +0000 Subject: [PATCH] IDE: Add initial directory for loading project icon in App options. Use IconImage.Picture.Icon everywhere. git-svn-id: trunk@59245 - --- ide/frames/project_application_options.pas | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ide/frames/project_application_options.pas b/ide/frames/project_application_options.pas index 5fd4d917a3..b436b7493b 100644 --- a/ide/frames/project_application_options.pas +++ b/ide/frames/project_application_options.pas @@ -153,8 +153,8 @@ end; procedure TProjectApplicationOptionsFrame.ClearIconButtonClick(Sender: TObject); begin - fIconChanged:=true; IconImage.Picture.Clear; + fIconChanged:=true; end; procedure TProjectApplicationOptionsFrame.CreateAppBundleButtonClick(Sender: TObject); @@ -170,9 +170,11 @@ end; procedure TProjectApplicationOptionsFrame.LoadIconButtonClick(Sender: TObject); begin + if OpenPictureDialog1.InitialDir='' then + OpenPictureDialog1.InitialDir:=FProject.Directory; if not OpenPictureDialog1.Execute then exit; try - IconImage.Picture.LoadFromFile(OpenPictureDialog1.FileName); + IconImage.Picture.Icon.LoadFromFile(OpenPictureDialog1.FileName); fIconChanged:=true; except on E: Exception do @@ -183,7 +185,7 @@ end; procedure TProjectApplicationOptionsFrame.SaveIconButtonClick(Sender: TObject); begin if SavePictureDialog1.Execute then - IconImage.Picture.SaveToFile(SavePictureDialog1.FileName); + IconImage.Picture.Icon.SaveToFile(SavePictureDialog1.FileName); end; procedure TProjectApplicationOptionsFrame.EnableManifest(aEnable: Boolean);