Skip to content

Commit 5bd075c

Browse files
galfargalfar
committed
Project updates for LCL 3.4, updated GUI about dialog
1 parent 8bb99df commit 5bd075c

8 files changed

+115
-87
lines changed

‎Gui/aboutform.lfm

+65-28
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
object FormAbout: TFormAbout
22
Left = 752
3-
Height = 209
3+
Height = 223
44
Top = 476
5-
Width = 378
5+
Width = 390
66
BorderIcons = [biSystemMenu]
77
BorderStyle = bsDialog
88
Caption = 'About'
9-
ClientHeight = 209
10-
ClientWidth = 378
9+
ClientHeight = 223
10+
ClientWidth = 390
1111
OnCreate = FormCreate
1212
Position = poMainFormCenter
1313
object ImageIcon: TImage
@@ -17,33 +17,70 @@ object FormAbout: TFormAbout
1717
Width = 128
1818
AntialiasingMode = amOff
1919
Center = True
20+
Picture.Data = {
21+
1754506F727461626C654E6574776F726B477261706869639004000089504E47
22+
0D0A1A0A0000000D494844520000008000000080040300000031107CF8000000
23+
0774494D4507E80718010D2499216084000000097048597300001EC100001EC1
24+
01C36954530000000467414D410000B18F0BFC610500000030504C5445FEFEFE
25+
F00049E8E8E8B9B9B9747474272727363636C8C8C8929292000000A8A8A8D7D7
26+
D7464646171717656565555555016AF8FB000003E34944415478DAEDD8BF6B13
27+
611807F0976BA125118BFFC1815A4B150905C12242401C82BA6432A00EC5C14E
28+
7670D0A19045A4A893A6E60DB96B1104AD4B50701023224A298E2A696C874E62
29+
5142462B14CC25F7DCFBFBB9CBEB56F34ECD5DDFCFDDFBBEDFF77DEF8E904119
30+
14433990B00C80BD0D184B8A5E79CC5DA47F608CD2D219F71F803AED946B73F6
31+
C04200D0CDBBD6C05A17A08BAE2530D2EC014BB67730DCAB4F2BB6C0E110C8DB
32+
02CF42206B0B6C8740C6124837D9205801A3E10D9489253016020D5B603E04DE
33+
D9020B2150B4049CD95E7DAF66090C5116642B800FB215C007391E38FAB4D5FA
34+
F15C38C407390E18397FB9DB5D1FA6B8833B5C906380C9DDF07F69E98F0B0785
35+
20E3C0E41A65E5220842905120CDD767C23E3EC812206A4FA858567B87852063
36+
C0A1A60478CBDDE3393EC80820352028EBC17131C808704CA94FBDE0A2A9F087
37+
4F70C0D95601FAAD7362BF106433705C539F7A1939C86620A703E87BB6186471
38+
60B4A9052A72908DC03C77DF975AAD8FE1DF551776B54517051C3686D53B9D7F
39+
754E86839791826C0286A3FA4B53C2BCD81A17836C024E43FDD2329C9B2C74FB
40+
7E3A3CD146817401804F6C6ABC097E3F90826C00A216F82E039CA0FFFD821864
41+
0350E7C69D9557DC78FA0405202CA51A0F0C71D9A8A080035DF0990865810179
42+
148009C77AAA57C61990450158B4AAAE08A418904101484143ACCF9AC682AC07
43+
B695FB0C4BB446940906C085BC9A0C44BDD8400171F7E5CB2D00DA280013AEA2
44+
0051C08A28008330A300B09CF18DD30075F53212E0131480ED3BA300754DE334
45+
40385825D708E47160CD34080456932C0A400CCA2A90D334CE0C3C5201EE4505
46+
01E0096443A90F67847B538111630C20610D1C8049DB568071DD1933B0651C84
47+
A2ED1DE474B3D40C287D00C3E3131C804ECCCB00C89518C0388C635AD90C3C90
48+
01582AB3090125CA3BDA599A7C32C1C62404199BCE9EB41E40174877862C2852
49+
100CBB05B2A4893B233CA1CAAE0680C88B8D8599242F95C8B22ECE86FB9A15D9
50+
00445BE043EE16A2275731C8FABD31DAC156A33369088166BB513558FEA9770E
51+
CE9C80439A754605524D59B8111D51B76C5D7BD893B6F7FB854B8EDC63F5BDB9
52+
2400FFACFFF5FAAF02F7B34A92008EFABA03A59C08E83D956ACB463240FBC2A3
53+
0BB23114134DB1DE2234AA981090DF3A7F8641D26CD906207D81AFBF0E2F2A3E
54+
490A90F46D56FF4BCDFCDC64048813C5E76A2D9AE2337D0084BCFEDE21BCCDE0
55+
E3E97492206BBE05BC5C5939D59DFFB04ECEF50944CD2924093202282F7BFD02
56+
B0A46FD802F022DBB605DE16920419FB2233B19B20C8F8279D205631418EF92A
57+
7573362EC871DFC50E9E9D4902242903606F0383F2DF97BFEB502DB8BAF619A5
58+
0000000049454E44AE426082
59+
}
2060
Proportional = True
21-
Stretch = True
2261
end
2362
object BtnClose: TButton
2463
AnchorSideLeft.Control = Owner
2564
AnchorSideLeft.Side = asrCenter
26-
AnchorSideRight.Control = Owner
2765
AnchorSideRight.Side = asrCenter
2866
AnchorSideBottom.Control = Owner
2967
AnchorSideBottom.Side = asrBottom
30-
Left = 158
31-
Height = 20
32-
Top = 179
33-
Width = 63
34-
Anchors = [akLeft, akBottom]
35-
AutoSize = True
68+
Left = 19
69+
Height = 33
70+
Top = 180
71+
Width = 352
72+
Anchors = [akLeft, akRight, akBottom]
3673
BorderSpacing.Bottom = 10
3774
Caption = 'Close'
3875
Default = True
39-
OnClick = BtnCloseClick
4076
TabOrder = 0
77+
OnClick = BtnCloseClick
4178
end
4279
object LabTitle: TLabel
4380
Left = 160
44-
Height = 35
81+
Height = 42
4582
Top = 24
46-
Width = 121
83+
Width = 133
4784
Caption = 'App Title'
4885
Font.Color = 11428096
4986
Font.Height = 30
@@ -59,45 +96,45 @@ object FormAbout: TFormAbout
5996
AnchorSideBottom.Control = LabTitle
6097
AnchorSideBottom.Side = asrBottom
6198
Left = 160
62-
Height = 16
63-
Top = 59
64-
Width = 24
99+
Height = 19
100+
Top = 66
101+
Width = 27
65102
Caption = 'v1.0'
66103
Layout = tlBottom
67104
ParentColor = False
68105
end
69106
object Label1: TLabel
70107
Left = 160
71-
Height = 16
108+
Height = 19
72109
Top = 104
73-
Width = 105
110+
Width = 109
74111
Caption = 'by Marek Mauder'
75112
ParentColor = False
76113
end
77114
object LabWeb: TLabel
78115
Cursor = crHandPoint
79116
Left = 160
80-
Height = 16
81-
Top = 121
82-
Width = 183
117+
Height = 19
118+
Top = 137
119+
Width = 188
83120
Caption = 'https://galfar.vevb.net/deskew'
84121
Font.Color = 16744448
85122
Font.Style = [fsUnderline]
86123
ParentColor = False
87124
ParentFont = False
88125
OnClick = LabWebClick
89126
end
90-
object LabGh: TLabel
127+
object LabGitHub: TLabel
91128
Cursor = crHandPoint
92129
Left = 160
93-
Height = 16
94-
Top = 137
95-
Width = 201
130+
Height = 19
131+
Top = 121
132+
Width = 208
96133
Caption = 'https://github.com/galfar/deskew'
97134
Font.Color = 16744448
98135
Font.Style = [fsUnderline]
99136
ParentColor = False
100137
ParentFont = False
101-
OnClick = LabGhClick
138+
OnClick = LabGitHubClick
102139
end
103140
end

‎Gui/aboutform.pas

+4-25
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ TFormAbout = class(TForm)
2727
LabWeb: TLabel;
2828
LabTitle: TLabel;
2929
LabVersion: TLabel;
30-
LabGh: TLabel;
30+
LabGitHub: TLabel;
3131
procedure BtnCloseClick(Sender: TObject);
3232
procedure FormCreate(Sender: TObject);
33-
procedure LabGhClick(Sender: TObject);
33+
procedure LabGitHubClick(Sender: TObject);
3434
procedure LabWebClick(Sender: TObject);
3535
end;
3636

@@ -52,38 +52,17 @@ procedure TFormAbout.BtnCloseClick(Sender: TObject);
5252
end;
5353

5454
procedure TFormAbout.FormCreate(Sender: TObject);
55-
var
56-
Icon: TIcon;
5755
begin
5856
{$IFDEF MSWINDOWS}Color := clWhite;{$ENDIF}
5957

6058
LabTitle.Caption := Application.Title;
6159
LabVersion.Caption := 'v' + Module.VersionString;
6260
LabWeb.Caption := Config.WebLink;
63-
64-
if Config.LogoImageResName = '' then
65-
begin
66-
Icon := TIcon.Create;
67-
try
68-
Icon.LoadFromResourceName(HInstance, 'MAINICON');
69-
ImageIcon.Picture.Assign(Icon);
70-
{$IF Defined(DARWIN)}
71-
ImageIcon.Stretch := False; // Currently broken in Cocoa WS
72-
{$ENDIF}
73-
finally
74-
Icon.Free;
75-
end;
76-
end
77-
else
78-
begin
79-
ImageIcon.Stretch := False;
80-
ImageIcon.Picture.LoadFromResourceName(HInstance, Config.LogoImageResName);
81-
end;
8261
end;
8362

84-
procedure TFormAbout.LabGhClick(Sender: TObject);
63+
procedure TFormAbout.LabGitHubClick(Sender: TObject);
8564
begin
86-
OpenURL(LabGh.Caption);
65+
OpenURL(LabGitHub.Caption);
8766
end;
8867

8968
procedure TFormAbout.LabWebClick(Sender: TObject);

‎Gui/config.pas

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ interface
99
const
1010
ApplicationTitle = 'Deskew GUI';
1111
WebLink = 'http://galfar.vevb.net/deskew/';
12-
LogoImageResName = '';
1312
ShowDeskewExeOption = True;
1413

1514
procedure AfterMainFormCreation(MainForm: TFormMain);

‎Gui/deskewgui.lpi

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<CONFIG>
33
<ProjectOptions>
4-
<Version Value="11"/>
4+
<Version Value="12"/>
55
<PathDelim Value="\"/>
66
<General>
7+
<Flags>
8+
<CompatibilityMode Value="True"/>
9+
</Flags>
710
<SessionStorage Value="InProjectDir"/>
8-
<MainUnit Value="0"/>
911
<Title Value="Deskew GUI"/>
1012
<ResourceType Value="res"/>
1113
<UseXPManifest Value="True"/>
@@ -18,7 +20,7 @@
1820
<VersionInfo>
1921
<UseVersionInfo Value="True"/>
2022
<MinorVersionNr Value="97"/>
21-
<StringTable CompanyName="Galfar's Lair" FileDescription="Deskew GUI" ProductName="Deskew GUI"/>
23+
<StringTable CompanyName="Galfar&apos;s Lair" FileDescription="Deskew GUI" ProductName="Deskew GUI"/>
2224
</VersionInfo>
2325
<BuildModes Count="4">
2426
<Item1 Name="Debug" Default="True"/>
@@ -48,6 +50,8 @@
4850
<Linking>
4951
<Debugging>
5052
<GenerateDebugInfo Value="False"/>
53+
<RunWithoutDebug Value="True"/>
54+
<DebugInfoType Value="dsDwarf3"/>
5155
</Debugging>
5256
<LinkSmart Value="True"/>
5357
<Options>
@@ -149,7 +153,6 @@
149153
</PublishOptions>
150154
<RunParams>
151155
<FormatVersion Value="2"/>
152-
<Modes Count="0"/>
153156
</RunParams>
154157
<RequiredPackages Count="2">
155158
<Item1>
@@ -246,8 +249,7 @@
246249
<Linking>
247250
<Debugging>
248251
<DebugInfoType Value="dsDwarf2Set"/>
249-
<TrashVariables Value="True"/>
250-
<UseExternalDbgSyms Value="True"/>
252+
<UseHeaptrc Value="True"/>
251253
</Debugging>
252254
<Options>
253255
<Win32>

0 commit comments

Comments
 (0)