Project updates for LCL 3.4, updated GUI about dialog

galfar · Jul 24, 2024 · 5bd075c · 5bd075c
1 parent 8bb99df
commit 5bd075c
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 87 deletions.
diff --git a/Gui/aboutform.lfm b/Gui/aboutform.lfm
@@ -1,13 +1,13 @@
 object FormAbout: TFormAbout
   Left = 752
-  Height = 209
+  Height = 223
   Top = 476
-  Width = 378
+  Width = 390
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'About'
-  ClientHeight = 209
-  ClientWidth = 378
+  ClientHeight = 223
+  ClientWidth = 390
   OnCreate = FormCreate
   Position = poMainFormCenter
   object ImageIcon: TImage
@@ -17,33 +17,70 @@ object FormAbout: TFormAbout
     Width = 128
     AntialiasingMode = amOff
     Center = True
+    Picture.Data = {
+      1754506F727461626C654E6574776F726B477261706869639004000089504E47
+      0D0A1A0A0000000D494844520000008000000080040300000031107CF8000000
+      0774494D4507E80718010D2499216084000000097048597300001EC100001EC1
+      01C36954530000000467414D410000B18F0BFC610500000030504C5445FEFEFE
+      F00049E8E8E8B9B9B9747474272727363636C8C8C8929292000000A8A8A8D7D7
+      D7464646171717656565555555016AF8FB000003E34944415478DAEDD8BF6B13
+      611807F0976BA125118BFFC1815A4B150905C12242401C82BA6432A00EC5C14E
+      7670D0A19045A4A893A6E60DB96B1104AD4B50701023224A298E2A696C874E62
+      5142462B14CC25F7DCFBFBB9CBEB56F34ECD5DDFCFDDFBBEDFF77DEF8E904119
+      14433990B00C80BD0D184B8A5E79CC5DA47F608CD2D219F71F803AED946B73F6
+      C04200D0CDBBD6C05A17A08BAE2530D2EC014BB67730DCAB4F2BB6C0E110C8DB
+      02CF42206B0B6C8740C6124837D9205801A3E10D9489253016020D5B603E04DE
+      D9020B2150B4049CD95E7DAF66090C5116642B800FB215C007391E38FAB4D5FA
+      F15C38C407390E18397FB9DB5D1FA6B8833B5C906380C9DDF07F69E98F0B0785
+      20E3C0E41A65E5220842905120CDD767C23E3EC812206A4FA858567B87852063
+      C0A1A60478CBDDE3393EC80820352028EBC17131C808704CA94FBDE0A2A9F087
+      4F70C0D95601FAAD7362BF106433705C539F7A1939C86620A703E87BB6186471
+      60B4A9052A72908DC03C77DF975AAD8FE1DF551776B54517051C3686D53B9D7F
+      754E86839791826C0286A3FA4B53C2BCD81A17836C024E43FDD2329C9B2C74FB
+      7E3A3CD146817401804F6C6ABC097E3F90826C00A216F82E039CA0FFFD821864
+      0350E7C69D9557DC78FA0405202CA51A0F0C71D9A8A080035DF0990865810179
+      148009C77AAA57C61990450158B4AAAE08A418904101484143ACCF9AC682AC07
+      B695FB0C4BB446940906C085BC9A0C44BDD8400171F7E5CB2D00DA280013AEA2
+      0051C08A28008330A300B09CF18DD30075F53212E0131480ED3BA300754DE334
+      40385825D708E47160CD34080456932C0A400CCA2A90D334CE0C3C5201EE4505
+      01E0096443A90F67847B538111630C20610D1C8049DB568071DD1933B0651C84
+      A2ED1DE474B3D40C287D00C3E3131C804ECCCB00C89518C0388C635AD90C3C90
+      01582AB3090125CA3BDA599A7C32C1C62404199BCE9EB41E40174877862C2852
+      100CBB05B2A4893B233CA1CAAE0680C88B8D8599242F95C8B22ECE86FB9A15D9
+      00445BE043EE16A2275731C8FABD31DAC156A33369088166BB513558FEA9770E
+      CE9C80439A754605524D59B8111D51B76C5D7BD893B6F7FB854B8EDC63F5BDB9
+      2400FFACFFF5FAAF02F7B34A92008EFABA03A59C08E83D956ACB463240FBC2A3
+      0BB23114134DB1DE2234AA981090DF3A7F8641D26CD906207D81AFBF0E2F2A3E
+      490A90F46D56FF4BCDFCDC64048813C5E76A2D9AE2337D0084BCFEDE21BCCDE0
+      E3E97492206BBE05BC5C5939D59DFFB04ECEF50944CD2924093202282F7BFD02
+      B0A46FD802F022DBB605DE16920419FB2233B19B20C8F8279D205631418EF92A
+      7573362EC871DFC50E9E9D4902242903606F0383F2DF97BFEB502DB8BAF619A5
+      0000000049454E44AE426082
+    }
     Proportional = True
-    Stretch = True
   end
   object BtnClose: TButton
     AnchorSideLeft.Control = Owner
     AnchorSideLeft.Side = asrCenter
-    AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrCenter
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 158
-    Height = 20
-    Top = 179
-    Width = 63
-    Anchors = [akLeft, akBottom]
-    AutoSize = True
+    Left = 19
+    Height = 33
+    Top = 180
+    Width = 352
+    Anchors = [akLeft, akRight, akBottom]
     BorderSpacing.Bottom = 10
     Caption = 'Close'
     Default = True
-    OnClick = BtnCloseClick
     TabOrder = 0
+    OnClick = BtnCloseClick
   end
   object LabTitle: TLabel
     Left = 160
-    Height = 35
+    Height = 42
     Top = 24
-    Width = 121
+    Width = 133
     Caption = 'App Title'
     Font.Color = 11428096
     Font.Height = 30
@@ -59,45 +96,45 @@ object FormAbout: TFormAbout
     AnchorSideBottom.Control = LabTitle
     AnchorSideBottom.Side = asrBottom
     Left = 160
-    Height = 16
-    Top = 59
-    Width = 24
+    Height = 19
+    Top = 66
+    Width = 27
     Caption = 'v1.0'
     Layout = tlBottom
     ParentColor = False
   end
   object Label1: TLabel
     Left = 160
-    Height = 16
+    Height = 19
     Top = 104
-    Width = 105
+    Width = 109
     Caption = 'by Marek Mauder'
     ParentColor = False
   end
   object LabWeb: TLabel
     Cursor = crHandPoint
     Left = 160
-    Height = 16
-    Top = 121
-    Width = 183
+    Height = 19
+    Top = 137
+    Width = 188
     Caption = 'https://galfar.vevb.net/deskew'
     Font.Color = 16744448
     Font.Style = [fsUnderline]
     ParentColor = False
     ParentFont = False
     OnClick = LabWebClick
   end
-  object LabGh: TLabel
+  object LabGitHub: TLabel
     Cursor = crHandPoint
     Left = 160
-    Height = 16
-    Top = 137
-    Width = 201
+    Height = 19
+    Top = 121
+    Width = 208
     Caption = 'https://github.com/galfar/deskew'
     Font.Color = 16744448
     Font.Style = [fsUnderline]
     ParentColor = False
     ParentFont = False
-    OnClick = LabGhClick
+    OnClick = LabGitHubClick
   end
 end
diff --git a/Gui/aboutform.pas b/Gui/aboutform.pas
@@ -27,10 +27,10 @@   TFormAbout = class(TForm)
     LabWeb: TLabel;
     LabTitle: TLabel;
     LabVersion: TLabel;
-    LabGh: TLabel;
+    LabGitHub: TLabel;
     procedure BtnCloseClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure LabGhClick(Sender: TObject);
+    procedure LabGitHubClick(Sender: TObject);
     procedure LabWebClick(Sender: TObject);
   end;
 
@@ -52,38 +52,17 @@ procedure TFormAbout.BtnCloseClick(Sender: TObject);
 end;
 
 procedure TFormAbout.FormCreate(Sender: TObject);
-var
-  Icon: TIcon;
 begin
   {$IFDEF MSWINDOWS}Color := clWhite;{$ENDIF}
 
   LabTitle.Caption := Application.Title;
   LabVersion.Caption := 'v' + Module.VersionString;
   LabWeb.Caption := Config.WebLink;
-
-  if Config.LogoImageResName = '' then
-  begin
-    Icon := TIcon.Create;
-    try
-      Icon.LoadFromResourceName(HInstance, 'MAINICON');
-      ImageIcon.Picture.Assign(Icon);
-  {$IF Defined(DARWIN)}
-      ImageIcon.Stretch := False; // Currently broken in Cocoa WS
-  {$ENDIF}
-    finally
-      Icon.Free;
-    end;
-  end
-  else
-  begin
-    ImageIcon.Stretch := False;
-    ImageIcon.Picture.LoadFromResourceName(HInstance, Config.LogoImageResName);
-  end;
 end;
 
-procedure TFormAbout.LabGhClick(Sender: TObject);
+procedure TFormAbout.LabGitHubClick(Sender: TObject);
 begin
-  OpenURL(LabGh.Caption);
+  OpenURL(LabGitHub.Caption);
 end;
 
 procedure TFormAbout.LabWebClick(Sender: TObject);

diff --git a/Gui/config.pas b/Gui/config.pas
@@ -9,7 +9,6 @@ interface
 const
   ApplicationTitle = 'Deskew GUI';
   WebLink = 'http://galfar.vevb.net/deskew/';
-  LogoImageResName = '';
   ShowDeskewExeOption = True;
 
 procedure AfterMainFormCreation(MainForm: TFormMain);

diff --git a/Gui/deskewgui.lpi b/Gui/deskewgui.lpi
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="Deskew GUI"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -18,7 +20,7 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MinorVersionNr Value="97"/>
-      <StringTable CompanyName="Galfar's Lair" FileDescription="Deskew GUI" ProductName="Deskew GUI"/>
+      <StringTable CompanyName="Galfar&apos;s Lair" FileDescription="Deskew GUI" ProductName="Deskew GUI"/>
     </VersionInfo>
     <BuildModes Count="4">
       <Item1 Name="Debug" Default="True"/>
@@ -48,6 +50,8 @@
           <Linking>
             <Debugging>
               <GenerateDebugInfo Value="False"/>
+              <RunWithoutDebug Value="True"/>
+              <DebugInfoType Value="dsDwarf3"/>
             </Debugging>
             <LinkSmart Value="True"/>
             <Options>
@@ -149,7 +153,6 @@
     </PublishOptions>
     <RunParams>
       <FormatVersion Value="2"/>
-      <Modes Count="0"/>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -246,8 +249,7 @@
     <Linking>
       <Debugging>
         <DebugInfoType Value="dsDwarf2Set"/>
-        <TrashVariables Value="True"/>
-        <UseExternalDbgSyms Value="True"/>
+        <UseHeaptrc Value="True"/>
       </Debugging>
       <Options>
         <Win32>