Skip to content

Commit 5b75b89

Browse files
committed
Remove OMultiPanel to fix issue #10. Use a simpler Layout component instead.
1 parent 14e5765 commit 5b75b89

File tree

14 files changed

+461
-1676
lines changed

14 files changed

+461
-1676
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ Tested on Windows 32bit/64 bit and Linux 64 bit, but it should work also on othe
1919

2020
## Acknowledgements
2121

22-
Besides the Lazarus LCL, the application uses the following third-party components
22+
Besides the Lazarus LCL, the application uses the following third-party component
2323

24-
* OMultiPanel: http://www.kluug.net/omultipanel.php
2524
* MPHexEditor: https://github.com/michalgw/mphexeditor/blob/master/hexeditor.html
2625

2726
Most of the icons are taken from https://icons8.com, style "Office" (https://icons8.com/icons/office) and style "Simple small" (https://icons8.com/icons/small).

source/Hex.lpi

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<VersionInfo>
2222
<UseVersionInfo Value="True"/>
2323
<MajorVersionNr Value="1"/>
24-
<MinorVersionNr Value="2"/>
25-
<StringTable LegalCopyright="(c) 2021-2024, Werner Pamler" OriginalFilename="hex" ProductName="Hex" ProductVersion="1.2.0.0"/>
24+
<MinorVersionNr Value="3"/>
25+
<StringTable LegalCopyright="(c) 2021-2024, Werner Pamler" OriginalFilename="hex" ProductName="Hex" ProductVersion="1.3.0.0"/>
2626
</VersionInfo>
2727
<BuildModes Count="3">
2828
<Item1 Name="Default" Default="True"/>
@@ -112,7 +112,7 @@
112112
<PackageName Value="LCL"/>
113113
</Item2>
114114
</RequiredPackages>
115-
<Units Count="25">
115+
<Units Count="26">
116116
<Unit0>
117117
<Filename Value="Hex.lpr"/>
118118
<IsPartOfProject Value="True"/>
@@ -278,6 +278,11 @@
278278
<IsPartOfProject Value="True"/>
279279
<UnitName Value="hxUtils_NonGui"/>
280280
</Unit24>
281+
<Unit25>
282+
<Filename Value="units\hxlayout.pas"/>
283+
<IsPartOfProject Value="True"/>
284+
<UnitName Value="hxLayout"/>
285+
</Unit25>
281286
</Units>
282287
</ProjectOptions>
283288
<CompilerOptions>

source/Hex.lpr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
hxDataModule, hxViewerItems, hxViewerGrids, hxBasicViewerFrame,
1212
hxDataViewerFrame, hxRecordViewerFrame, hxObjectViewerFrame, hxSettingsDlg,
1313
hxGotoDlg, hxRecordEditorForm, hxGridViewerFrame, hxAbout, hxPascalRecordForm,
14-
hxSearchReplaceDlg, hxHexEditor, hxUtils_NonGui;
14+
hxSearchReplaceDlg, hxHexEditor, hxUtils_NonGui, hxLayout;
1515

1616
{$R *.res}
1717

source/Hex.res

0 Bytes
Binary file not shown.

source/forms/hxabout.lfm

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ object AboutForm: TAboutForm
6969
AnchorSideTop.Control = lblAcknowledgements
7070
AnchorSideTop.Side = asrBottom
7171
Left = 12
72-
Height = 110
72+
Height = 95
7373
Top = 183
7474
Width = 346
7575
AutoSize = True
7676
BorderSpacing.Top = 4
7777
BorderSpacing.Right = 12
7878
BevelOuter = bvNone
7979
BorderStyle = bsSingle
80-
ClientHeight = 106
80+
ClientHeight = 91
8181
ClientWidth = 342
8282
Color = clWindow
8383
ParentBackground = False
@@ -186,59 +186,28 @@ object AboutForm: TAboutForm
186186
OnMouseEnter = lblURLMouseEnter
187187
OnMouseLeave = lblURLMouseLeave
188188
end
189-
object lblOMultiPanelComponent: TLabel
190-
AnchorSideTop.Control = lblMichal
191-
AnchorSideTop.Side = asrBottom
192-
AnchorSideRight.Control = lblMPHexEditor
193-
AnchorSideRight.Side = asrBottom
194-
Left = 16
195-
Height = 15
196-
Top = 68
197-
Width = 134
198-
Anchors = [akTop, akRight]
199-
Caption = 'OMultiPanel component:'
200-
ParentColor = False
201-
end
202-
object lblOndrej: TLabel
203-
AnchorSideLeft.Control = lblMarkus
204-
AnchorSideTop.Control = lblMichal
205-
AnchorSideTop.Side = asrBottom
206-
Cursor = crHandPoint
207-
Left = 166
208-
Height = 15
209-
Hint = 'http://www.kluug.net/omultipanel.php'
210-
Top = 68
211-
Width = 80
212-
Caption = 'www.kluug.net'
213-
Font.Color = clBlue
214-
ParentColor = False
215-
ParentFont = False
216-
OnClick = lblURLClick
217-
OnMouseEnter = lblURLMouseEnter
218-
OnMouseLeave = lblURLMouseLeave
219-
end
220189
object lblIcons: TLabel
221-
AnchorSideTop.Control = lblOMultiPanelComponent
222-
AnchorSideTop.Side = asrBottom
190+
AnchorSideTop.Control = lblIcons8
191+
AnchorSideTop.Side = asrCenter
223192
AnchorSideRight.Control = lblMPHexEditor
224193
AnchorSideRight.Side = asrBottom
225194
Left = 77
226195
Height = 15
227-
Top = 83
196+
Top = 68
228197
Width = 73
229198
Anchors = [akTop, akRight]
230199
Caption = 'Toolbar icons:'
231200
ParentColor = False
232201
end
233202
object lblIcons8: TLabel
234203
AnchorSideLeft.Control = lblMarkus
235-
AnchorSideTop.Control = lblOndrej
204+
AnchorSideTop.Control = lblMichal
236205
AnchorSideTop.Side = asrBottom
237206
Cursor = crHandPoint
238207
Left = 166
239208
Height = 15
240209
Hint = 'https://icons8.com'
241-
Top = 83
210+
Top = 68
242211
Width = 61
243212
BorderSpacing.Bottom = 8
244213
Caption = 'icons8.com'
@@ -257,7 +226,7 @@ object AboutForm: TAboutForm
257226
AnchorSideRight.Side = asrBottom
258227
Left = 283
259228
Height = 26
260-
Top = 301
229+
Top = 286
261230
Width = 75
262231
Anchors = [akTop, akRight]
263232
AutoSize = True

source/forms/hxabout.pas

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ TAboutForm = class(TForm)
1818
Image1: TImage;
1919
lblVersion: TLabel;
2020
lblCopyright: TLabel;
21-
lblOMultiPanelComponent: TLabel;
2221
lblIcons: TLabel;
2322
lblMarkus: TLabel;
2423
lblMPHexEditor: TLabel;
@@ -30,7 +29,6 @@ TAboutForm = class(TForm)
3029
lblIDE: TLabel;
3130
lblHex: TLabel;
3231
lblMichal: TLabel;
33-
lblOndrej: TLabel;
3432
lblIcons8: TLabel;
3533
Panel1: TPanel;
3634
procedure FormCreate(Sender: TObject);
@@ -69,7 +67,6 @@ procedure TAboutForm.FormCreate(Sender: TObject);
6967
lblFPC.Font.Color := LINK_COLOR[mode];
7068
lblLazarus.Font.Color := LINK_COLOR[mode];
7169
lblMichal.Font.Color := LINK_COLOR[mode];
72-
lblOndrej.Font.Color := LINK_COLOR[mode];
7370
lblIcons8.Font.Color := LINK_COLOR[mode];
7471
end;
7572

source/frames/hxbasicviewerframe.lfm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ object BasicViewerFrame: TBasicViewerFrame
55
Width = 320
66
ClientHeight = 240
77
ClientWidth = 320
8+
LCLVersion = '4.99.0.0'
89
TabOrder = 0
910
DesignLeft = 340
1011
DesignTop = 128

source/frames/hxbasicviewerframe.pas

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
interface
66

77
uses
8-
Classes, SysUtils, Forms, Controls, StdCtrls,
8+
Classes, SysUtils, IniFiles, Forms, Controls, StdCtrls,
99
HxHexEditor;
1010

1111
type
@@ -21,12 +21,10 @@ TBasicViewerFrame = class(TFrame)
2121
end;
2222

2323

24-
2524
implementation
2625

2726
{$R *.lfm}
2827

29-
3028
{ TBasicViewerFrame }
3129

3230
constructor TBasicViewerFrame.Create(AOwner: TComponent);

0 commit comments

Comments
 (0)