Working on Deskew GUI:

- misc fixes before first release
- app icon

Gui/aboutform.lfm

@@ -8,17 +8,19 @@ object FormAbout: TFormAbout
   Caption = 'About Deskew GUI'
   ClientHeight = 231
   ClientWidth = 390
-  Color = clWindow
+  Color = clWhite
   OnCreate = FormCreate
   Position = poMainFormCenter
   LCLVersion = '1.8.4.0'
-  object Image1: TImage
+  object ImageIcon: TImage
     Left = 14
     Height = 150
     Top = 24
     Width = 150
     AntialiasingMode = amOn
+    Center = True
     Proportional = True
+    Stretch = True
     Transparent = True
   end
   object BtnClose: TButton
@@ -45,7 +47,6 @@ object FormAbout: TFormAbout
     Height = 30
     Top = 24
     Width = 118
-    AutoSize = False
     Caption = 'Deskew GUI'
     Font.Color = 11428096
     Font.Height = 30

Gui/aboutform.pas

@@ -12,7 +12,7 @@ interface
 
   TFormAbout = class(TForm)
     BtnClose: TButton;
-    Image1: TImage;
+    ImageIcon: TImage;
     Label1: TLabel;
     LabWeb: TLabel;
     LabTitle: TLabel;
@@ -44,8 +44,18 @@ procedure TFormAbout.BtnCloseClick(Sender: TObject);
 end;
 
 procedure TFormAbout.FormCreate(Sender: TObject);
+var
+  Icon: TIcon;
 begin
   LabVersion.Caption := 'v' + Module.VersionString;
+
+  Icon := TIcon.Create;
+  try
+    Icon.LoadFromResourceName(HInstance, 'MAINICON');
+    ImageIcon.Picture.Assign(Icon);
+  finally
+    Icon.Free;
+  end;
 end;
 
 procedure TFormAbout.LabWebClick(Sender: TObject);

Gui/deskewgui.lpi

@@ -9,12 +9,16 @@
       <Title Value="Deskew GUI"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <TextName Value="GalfarsLair.DeskewGui"/>
+        <TextDesc Value="Deskew GUI"/>
+      </XPManifest>
       <Icon Value="0"/>
     </General>
     <VersionInfo>
       <UseVersionInfo Value="True"/>
-      <MinorVersionNr Value="80"/>
-      <StringTable CompanyName="Galfar's Lair" FileDescription="Deskew GUI" ProductName="Deskew GUI" ProductVersion="0.72.0.0"/>
+      <MinorVersionNr Value="88"/>
+      <StringTable CompanyName="Galfar's Lair" FileDescription="Deskew GUI" ProductName="Deskew GUI" ProductVersion=""/>
     </VersionInfo>
     <BuildModes Count="2">
       <Item1 Name="Debug" Default="True"/>
@@ -124,6 +128,7 @@
         <Filename Value="aboutform.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormAbout"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="AboutForm"/>
       </Unit8>

Gui/mainform.lfm

@@ -270,13 +270,12 @@ object FormMain: TFormMain
     object PageOut: TPage
       object Panel2: TPanel
         Left = 0
-        Height = 90
+        Height = 102
         Top = 0
         Width = 505
         Align = alTop
-        AutoSize = True
         BevelOuter = bvNone
-        ClientHeight = 90
+        ClientHeight = 102
         ClientWidth = 505
         TabOrder = 0
         object LabDeskewProgressTitle: TLabel
@@ -297,7 +296,7 @@ object FormMain: TFormMain
         object ProgressBar: TProgressBar
           Left = 8
           Height = 20
-          Top = 60
+          Top = 72
           Width = 489
           Align = alBottom
           BorderSpacing.Left = 8
@@ -310,66 +309,46 @@ object FormMain: TFormMain
           Smooth = True
           TabOrder = 0
         end
-        object FlowPanel1: TFlowPanel
-          Left = 0
-          Height = 21
-          Top = 31
-          Width = 505
-          Align = alClient
-          AutoSize = True
-          BevelOuter = bvNone
-          ControlList = <          
-            item
-              Control = LabProgressTitle
-              WrapAfter = waAuto
-              Index = 0
-            end          
-            item
-              Control = LabCurrentFile
-              WrapAfter = waAuto
-              Index = 1
-            end>
-          FlowLayout = tlBottom
-          FlowStyle = fsLeftRightTopBottom
-          TabOrder = 1
-          object LabProgressTitle: TLabel
-            Left = 8
-            Height = 15
-            Top = 6
-            Width = 62
-            BorderSpacing.Left = 8
-            BorderSpacing.Right = 4
-            Caption = 'Current file:'
-            Layout = tlBottom
-            ParentColor = False
-          end
-          object LabCurrentFile: TLabel
-            AnchorSideTop.Control = LabProgressTitle
-            AnchorSideTop.Side = asrBottom
-            Left = 74
-            Height = 21
-            Top = 0
-            Width = 424
-            Anchors = [akTop]
-            AutoSize = False
-            Caption = 'FileName.ext [22/152]'
-            Font.Height = 20
-            Font.Style = [fsBold]
-            Layout = tlBottom
-            ParentColor = False
-            ParentFont = False
-          end
+        object LabProgressTitle: TLabel
+          Left = 8
+          Height = 15
+          Top = 44
+          Width = 62
+          BorderSpacing.Left = 8
+          BorderSpacing.Right = 4
+          Caption = 'Current file:'
+          Layout = tlBottom
+          ParentColor = False
+        end
+        object LabCurrentFile: TLabel
+          AnchorSideLeft.Control = LabProgressTitle
+          AnchorSideLeft.Side = asrBottom
+          AnchorSideTop.Side = asrBottom
+          AnchorSideBottom.Control = LabProgressTitle
+          AnchorSideBottom.Side = asrBottom
+          Left = 75
+          Height = 20
+          Top = 39
+          Width = 160
+          Anchors = [akLeft, akBottom]
+          BorderSpacing.Left = 5
+          Caption = 'FileName.ext [22/152]'
+          Font.Height = 20
+          Font.Style = [fsBold]
+          Layout = tlBottom
+          ParentColor = False
+          ParentFont = False
         end
       end
       object Panel3: TPanel
         Left = 0
-        Height = 611
-        Top = 90
+        Height = 599
+        Top = 102
         Width = 505
         Align = alClient
         BorderSpacing.Bottom = 18
         BevelOuter = bvNone
-        ClientHeight = 611
+        ClientHeight = 599
         ClientWidth = 505
         TabOrder = 1
         object Label3: TLabel
@@ -389,7 +368,7 @@ object FormMain: TFormMain
         end
         object MemoOutput: TMemo
           Left = 0
-          Height = 580
+          Height = 568
           Top = 31
           Width = 505
           Align = alClient
@@ -420,12 +399,12 @@ object FormMain: TFormMain
   object ApplicationProperties: TApplicationProperties
     Title = 'Deskew GUI'
     OnIdle = ApplicationPropertiesIdle
-    left = 264
-    top = 96
+    left = 176
+    top = 200
   end
   object ActionList: TActionList
-    left = 264
-    top = 160
+    left = 280
+    top = 200
     object ActDeskew: TAction
       Caption = 'Deskew!'
       OnExecute = ActDeskewExecute

Gui/mainform.pas

@@ -34,7 +34,6 @@   TFormMain = class(TForm)
     ColorBtnBackground: TColorButton;
     ComboFileFormat: TComboBox;
     EdDirOutput: TEdit;
-    FlowPanel1: TFlowPanel;
     Label1: TLabel;
     Label2: TLabel;
     Label3: TLabel;
@@ -219,6 +218,7 @@ procedure TFormMain.ActDeskewExecute(Sender: TObject);
   LabProgressTitle.Caption := 'Current file:';
 
   Notebook.PageIndex := 1;
+  Application.ProcessMessages;
 
   FRunner.Run(Module.Options);
 end;

Gui/options.pas

@@ -195,7 +195,7 @@ procedure TOptions.SaveToIni(Ini: TIniFile);
 
 procedure TOptions.LoadFromIni(Ini: TIniFile);
 begin
-  DefaultOutputFileOptions := Ini.ReadBool(IniSectionOptions, 'DefaultOutputFileOptions', True);
+  DefaultOutputFileOptions := StrToBoolDef(Ini.ReadString(IniSectionOptions, 'DefaultOutputFileOptions', ''), True);
   OutputFolder := Ini.ReadString(IniSectionOptions, 'OutputFolder', '');
   OutputFileFormat := TEnumUtils<TFileFormat>.StrToEnum(Ini.ReadString(IniSectionOptions, 'OutputFileFormat', ''));
   BackgroundColor := StringToColorDef(Ini.ReadString(IniSectionOptions, 'BackgroundColor', ''), DefaultBackgroundColor);
@@ -206,7 +206,7 @@ procedure TOptions.LoadFromIni(Ini: TIniFile);
   SkipAngle := Ini.ReadFloat(IniSectionAdvanced, 'SkipAngle', DefaultSkipAngle);
   JpegCompressionQuality := Ini.ReadInteger(IniSectionAdvanced, 'JpegCompressionQuality', DefaultJpegCompressionQuality);
   TiffCompressionScheme := Ini.ReadInteger(IniSectionAdvanced, 'TiffCompressionScheme', DefaultTiffCompressionScheme);
-  DefaultExecutable := Ini.ReadBool(IniSectionAdvanced, 'DefaultExecutable', True);
+  DefaultExecutable := StrToBoolDef(Ini.ReadString(IniSectionAdvanced, 'DefaultExecutable', ''),  True);
   CustomExecutablePath := Ini.ReadString(IniSectionAdvanced, 'CustomExecutablePath', '');
 end;
 

Gui/utils.pas

@@ -74,7 +74,7 @@ function FindDeskewExePath: string;
 
 function DetermineConfigFolder: string;
 var
-  ExeDir, S: string;
+  ExeDir: string;
 begin
   Result := GetAppConfigDir(False);