Skip to content

Commit

Permalink
Ver.3.3.0
Browse files Browse the repository at this point in the history 
Updated Copyright
Feature Request #43: delete all selected icons into editor
  • Loading branch information
@carloBarazzetta
carloBarazzetta committed Feb 28, 2023
1 parent 030fedb commit ea24aba
Show file tree
Hide file tree
Showing 22 changed files with 169 additions and 153 deletions.
2 changes: 1 addition & 1 deletion Demo/Source/DImages.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{ Icon Fonts ImageList: An extended ImageList for Delphi/VCL }
{ to simplify use of Icons (resize, colors and more...) }
{ }
{ Copyright (c) 2019-2022 (Ethea S.r.l.) }
{ Copyright (c) 2019-2023 (Ethea S.r.l.) }
{ Author: Carlo Barazzetta }
{ Contributors: }
{ Nicola Tambascia }
Expand Down
2 changes: 1 addition & 1 deletion Demo/Source/UMain.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{ Icon Fonts ImageList: An extended ImageList for Delphi/VCL }
{ to simplify use of Icons (resize, colors and more...) }
{ }
{ Copyright (c) 2019-2022 (Ethea S.r.l.) }
{ Copyright (c) 2019-2023 (Ethea S.r.l.) }
{ Author: Carlo Barazzetta }
{ Contributors: }
{ Nicola Tambascia }
Expand Down
2 changes: 1 addition & 1 deletion Demo/Source/UMainNew.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{ Icon Fonts ImageList: An extended ImageList for Delphi/VCL }
{ to simplify use of Icons (resize, colors and more...) }
{ }
{ Copyright (c) 2019-2022 (Ethea S.r.l.) }
{ Copyright (c) 2019-2023 (Ethea S.r.l.) }
{ Author: Carlo Barazzetta }
{ Contributors: }
{ Nicola Tambascia }
Expand Down
242 changes: 121 additions & 121 deletions Packages/D11/dclIconFontsImageListFMX.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,127 @@
<Operation>0</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXDebug"/>
<DeployClass Name="ProjectOSXEntitlements"/>
<DeployClass Name="ProjectOSXInfoPList"/>
<DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="OSX64">
<RemoteDir>Contents\Resources</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>Contents\Resources</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Required="true" Name="ProjectOutput">
<Platform Name="Android">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\arm64-v8a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimARM64">
<Operation>1</Operation>
</Platform>
<Platform Name="Linux64">
<Operation>1</Operation>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
</Platform>
<Platform Name="OSX64">
<Operation>1</Operation>
</Platform>
<Platform Name="OSXARM64">
<Operation>1</Operation>
</Platform>
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOutput_Android32">
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectUWPManifest">
<Platform Name="Win32">
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceDebug">
<Platform Name="iOSDevice32">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimARM64">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSEntitlements"/>
<DeployClass Name="ProjectiOSInfoPList"/>
<DeployClass Name="ProjectiOSLaunchScreen"/>
<DeployClass Name="ProjectiOSResource">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimARM64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="UWP_DelphiLogo150">
<Platform Name="Win32">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="UWP_DelphiLogo44">
<Platform Name="Win32">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iOS_AppStore1024">
<Platform Name="iOSDevice64">
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
Expand Down Expand Up @@ -810,127 +931,6 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceDebug">
<Platform Name="iOSDevice32">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimARM64">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSEntitlements"/>
<DeployClass Name="ProjectiOSInfoPList"/>
<DeployClass Name="ProjectiOSLaunchScreen"/>
<DeployClass Name="ProjectiOSResource">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimARM64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXDebug"/>
<DeployClass Name="ProjectOSXEntitlements"/>
<DeployClass Name="ProjectOSXInfoPList"/>
<DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="OSX64">
<RemoteDir>Contents\Resources</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>Contents\Resources</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Required="true" Name="ProjectOutput">
<Platform Name="Android">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\arm64-v8a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimARM64">
<Operation>1</Operation>
</Platform>
<Platform Name="Linux64">
<Operation>1</Operation>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
</Platform>
<Platform Name="OSX64">
<Operation>1</Operation>
</Platform>
<Platform Name="OSXARM64">
<Operation>1</Operation>
</Platform>
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOutput_Android32">
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectUWPManifest">
<Platform Name="Win32">
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="UWP_DelphiLogo150">
<Platform Name="Win32">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="UWP_DelphiLogo44">
<Platform Name="Win32">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
Expand Down
2 changes: 1 addition & 1 deletion Packages/FMX.IconFontsImageListEditor.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{ Icon Fonts ImageList: An extended ImageList for Delphi }
{ to simplify use of Icons (resize, colors and more...) }
{ }
{ Copyright (c) 2019-2022 (Ethea S.r.l.) }
{ Copyright (c) 2019-2023 (Ethea S.r.l.) }
{ Contributors: }
{ Carlo Barazzetta }
{ }
Expand Down
2 changes: 1 addition & 1 deletion Packages/FMX.IconFontsImageListEditorUnit.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{ Icon Fonts ImageList: An extended ImageList for Delphi/VLC+FMX }
{ to simplify use of Icons (resize, colors and more...) }
{ }
{ Copyright (c) 2019-2022 (Ethea S.r.l.) }
{ Copyright (c) 2019-2023 (Ethea S.r.l.) }
{ Author: Carlo Barazzetta }
{ Contributors: }
{ Nicola Tambascia }
Expand Down
2 changes: 1 addition & 1 deletion Packages/FMX.RegisterIconFontsImageList.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{ Icon Fonts ImageList: An extended ImageList for Delphi }
{ to simplify use of Icons (resize, colors and more...) }
{ }
{ Copyright (c) 2019-2022 (Ethea S.r.l.) }
{ Copyright (c) 2019-2023 (Ethea S.r.l.) }
{ Contributors: }
{ Carlo Barazzetta }
{ }
Expand Down
2 changes: 1 addition & 1 deletion Packages/IconFontsImageListEditor.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{ Icon Fonts ImageList: An extended ImageList for Delphi }
{ to simplify use of Icons (resize, colors and more...) }
{ }
{ Copyright (c) 2019-2022 (Ethea S.r.l.) }
{ Copyright (c) 2019-2023 (Ethea S.r.l.) }
{ Contributors: }
{ Carlo Barazzetta }
{ }
Expand Down
32 changes: 22 additions & 10 deletions Packages/IconFontsImageListEditorUnit.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{ Icon Fonts ImageList: An extended ImageList for Delphi }
{ to simplify use of Icons (resize, colors and more...) }
{ }
{ Copyright (c) 2019-2022 (Ethea S.r.l.) }
{ Copyright (c) 2019-2023 (Ethea S.r.l.) }
{ Contributors: }
{ Carlo Barazzetta }
{ Nicola Tambascia }
Expand Down Expand Up @@ -178,7 +178,7 @@ TIconFontsImageListEditor = class(TForm)
procedure UpdateCategories;
procedure UpdateSizeGUI;
procedure AddNewItem;
procedure DeleteSelectedItem;
procedure DeleteSelectedItems;
procedure Apply;
procedure UpdateGUI;
procedure UpdateCharsToBuild;
Expand Down Expand Up @@ -649,15 +649,27 @@ procedure TIconFontsImageListEditor.ImageViewDragOver(Sender, Source: TObject; X
Accept := Source = Sender;
end;

procedure TIconFontsImageListEditor.DeleteSelectedItem;
procedure TIconFontsImageListEditor.DeleteSelectedItems;
var
LIndex: Integer;
LSelectedImageIndex: Integer;
begin
LSelectedImageIndex := ImageView.Items[ImageView.Selected.Index].ImageIndex;
FEditingList.Delete(ImageView.Selected.Index);
FChanged := True;
BuildList(LSelectedImageIndex);
FChanged := True;
Screen.Cursor := crHourGlass;
try
LSelectedImageIndex := ImageView.Items[ImageView.ItemIndex].ImageIndex;
FEditingList.BeginUpdate;
try
for LIndex := ImageView.Items.Count - 1 downto 0 do
if ImageView.Items[LIndex].Selected then
FEditingList.Delete(ImageView.Items[LIndex].ImageIndex);
finally
FEditingList.EndUpdate;
end;
FChanged := True;
BuildList(LSelectedImageIndex);
finally
Screen.Cursor := crDefault;
end;
end;

destructor TIconFontsImageListEditor.Destroy;
Expand Down Expand Up @@ -741,7 +753,7 @@ procedure TIconFontsImageListEditor.ImageViewKeyDown(Sender: TObject;
if (Key = VK_INSERT) and (Shift = []) then
AddNewItem
else if (Key = VK_DELETE) and (Shift = []) then
DeleteSelectedItem;
DeleteSelectedItems;
end;

function TIconFontsImageListEditor.SelectedIcon: TIconFontItem;
Expand Down Expand Up @@ -869,7 +881,7 @@ procedure TIconFontsImageListEditor.DefaultMaskColorColorBoxChange(

procedure TIconFontsImageListEditor.DeleteButtonClick(Sender: TObject);
begin
DeleteSelectedItem;
DeleteSelectedItems;
end;

procedure TIconFontsImageListEditor.MaskColorChange(Sender: TObject);
Expand Down
Loading

0 comments on commit ea24aba

Please sign in to comment.