Added icon; minor changes

.gitignore

@@ -1,4 +1,5 @@
 
 Project1.identcache
 __history/*
-*.bin
+*.bin
+*.png

Generic.dfm

@@ -10,6 +10,77 @@ object Form1: TForm1
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
+  Icon.Data = {
+    0000010001002020000000000000A80800001600000028000000200000004000
+    0000010008000000000080040000000000000000000000000000000000000000
+    0000FFFFFF00FF575700AC343400CE573400FF74740000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    0000000000000003030303030303000000000000000000000000000000000000
+    0000000003030303030303030303030300000000000000000000000000000000
+    0000000303030303030303030303030303030000000000000000000000000000
+    0000030303030303030303030303030303030303000000000000000000000000
+    0003030303030303030304030303040303030303030000000000000000000000
+    0003030303030303030403040304030403040303030300000000000000000000
+    0303030303030304040304040404040304030403030303000000000000000000
+    0303030303030304040404040404040404040304030404030000000000000000
+    0303030303030404040404040404040404040404040303040300000000000000
+    0303030303040304040404040404040404040404040403040300000000000000
+    0003030303030404040404040404040404040404040404040403000000000000
+    0003030303040304040404040404040404040404040404040404030000000000
+    0003030304030404040404040404040504040404040404040404030000000000
+    0000030303040304040404040404040505050404040404040404040300000000
+    0000030303030404040404040404040404050504040404040404040300000000
+    0000000303040304040404040404040404040505040404040404040300000000
+    0000000303040304040404040404040404040405050502040404040403000000
+    0000000003040304040404040404040404040205010105020404040403000000
+    0000000003030404040404040404040404040501010101050404040403000000
+    0000000000030404040404040404040404040501010101050404040403000000
+    0000000000000304040404040404040404040205010105050504040300000000
+    0000000000000003040404040404040404040402050505050504040300000000
+    0000000000000000030404040404040404040404040405050504040300000000
+    0000000000000000000303040404040404040404040505050504030000000000
+    0000000000000000000000030404040404040404050505050503000000000000
+    0000000000000000000000000303030404050505050505030300000000000000
+    0000000000000000000000000000000303030303030303000000000000000000
+    0000000000000000000000000000000000000000000000000000000000000000
+    000000000000000000000000000000000000000000000000000000000000FFFF
+    FFFFFFFFFFFFFFFFFFFFFF80FFFFFC003FFFF8000FFFF00003FFE00001FFE000
+    00FFC000007FC000003FC000001FC000001FE000000FE0000007E0000007F000
+    0003F0000003F8000003F8000001FC000001FC000001FE000001FF000003FF80
+    0003FFC00003FFE00007FFF8000FFFFC001FFFFF807FFFFFFFFFFFFFFFFF}
   OldCreateOrder = False
   OnCreate = FormCreate
   PixelsPerInch = 96
@@ -223,6 +294,8 @@ object Form1: TForm1
     Top = 544
   end
   object dlgSave: TSaveDialog
+    Filter = 'PNG images|*.png'
+    Options = [ofOverwritePrompt, ofHideReadOnly, ofEnableSizing]
     Left = 64
     Top = 544
   end

Generic.pas

@@ -331,7 +331,7 @@ procedure TForm1.btnViewClick(Sender: TObject);
   editPal3loc.Text := FixLoc(editPal3loc.Text);
   editPal4loc.Text := FixLoc(editPal4loc.Text);
   // Graphics (no DPLC)
-  if editDPLC.Text = '' then
+  if (editDPLC.Text = '') or (chkDPLC.Enabled = false) then
     begin
     SetLength(gfxarray2,Length(gfxarray)-StrtoInt(editROMloc.Text));
     Move(gfxarray[StrtoInt(editROMloc.Text)],gfxarray2[0],Length(gfxarray2));
@@ -365,7 +365,7 @@ procedure TForm1.btnViewClick(Sender: TObject);
   for i := 0 to mapcount-1 do mapindex[i] := GetM(maploc+(i*2),2,$FFFF)+maploc; // Populate index.
   for i := 0 to mapcount-1 do
     begin
-    if editDPLC.Text <> '' then // Load graphics if DPLC is used.
+    if (editDPLC.Text <> '') and (chkDPLC.Enabled = true) then // Load graphics if DPLC is used.
       begin
       dplcloc := StrtoInt(editDPLCloc.Text);
       dplcloc := dplcloc+GetD(dplcloc+(i*2),2,$FFFF)+dplccount_size; // Jump to relevant DPLC entry.
@@ -568,8 +568,14 @@ function TForm1.BitShift(i: integer): integer; // Find lowest bit which is set.
 end;
 
 procedure TForm1.btnSaveClick(Sender: TObject);
+var mypng: string;
 begin
-  if dlgSave.Execute then PNG.SaveToFile(dlgSave.FileName); // Save PNG.
+  if dlgSave.Execute then
+    begin
+    if ExtractFileExt(dlgSave.FileName) = '.png' then mypng := dlgSave.FileName
+    else mypng := dlgSave.FileName+'.png'; // Add extension if needed.
+    PNG.SaveToFile(mypng); // Save PNG.
+    end;
 end;
 
 end.

Project1.dproj

@@ -58,13 +58,13 @@
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
-        <Icon_MainIcon>Project1_Icon.ico</Icon_MainIcon>
+        <Icon_MainIcon>icon.ico</Icon_MainIcon>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
@@ -83,6 +83,9 @@
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -92,6 +95,9 @@
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -120,6 +126,10 @@
                 <Source>
                     <Source Name="MainSource">Project1.dpr</Source>
                 </Source>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
                 <Platform value="Win32">True</Platform>