OnGuard: Fix error in About box due to unknown Font.Color=clText. Rework form design for anchoring and autosizing. Open hyperlinks with OpenURL rather than windows-specific ShellExecute.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8715 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2023-02-19 21:52:50 +00:00
parent 0d61deccb6
commit 1db7476596
4 changed files with 744 additions and 661 deletions
--- a/components/onguard/packages/tponguard.lpk
+++ b/components/onguard/packages/tponguard.lpk
@ -4,7 +4,7 @@
    <Name Value="tponguard"/>
    <Type Value="RunAndDesignTime"/>
    <AddToProjectUsesSection Value="True"/>
-    <Author Value="Turbo Power Software Company ,Colorado Springs"/>
+    <Author Value="Turbo Power Software Company, Colorado Springs"/>
    <CompilerOptions>
      <Version Value="11"/>
      <SearchPaths>
--- a/components/onguard/source/qogabout0.lfm
+++ b/components/onguard/source/qogabout0.lfm
@ -1,174 +1,231 @@
 object OgAboutForm: TOgAboutForm
  Left = 526
-  Height = 271
+  Height = 363
  Top = 236
-  Width = 365
+  Width = 434
  ActiveControl = btnOK
+  AutoSize = True
  BorderIcons = [biSystemMenu, biMinimize]
  Caption = 'About TurboPower OnGuard'
-  ClientHeight = 271
-  ClientWidth = 365
+  ClientHeight = 363
+  ClientWidth = 434
  Color = clForm
-  Font.Color = clText
-  Font.Height = 11
-  Font.Name = 'MS Sans Serif'
-  Font.Pitch = fpVariable
  OnCreate = FormCreate
  OnMouseMove = FormMouseMove
  Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
  object b0: TBevel
-    Left = 4
-    Height = 13
-    Top = 191
-    Width = 301
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Panel1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 6
+    Top = 261
+    Width = 422
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
    Shape = bsTopLine
  end
  object l1: TLabel
-    Left = 110
-    Height = 14
-    Top = 6
-    Width = 52
+    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = Panel1
+    Left = 147
+    Height = 21
+    Top = 4
+    Width = 68
    Caption = 'OnGuard'
-    Font.Color = clText
-    Font.Height = 9
-    Font.Name = 'MS Sans Serif'
-    Font.Pitch = fpVariable
+    Font.Height = -16
    Font.Style = [fsBold]
    ParentColor = False
    ParentFont = False
  end
  object lblVersion: TLabel
-    Left = 110
-    Height = 14
-    Top = 24
-    Width = 60
+    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = l1
+    AnchorSideTop.Side = asrBottom
+    Left = 147
+    Height = 15
+    Top = 25
+    Width = 62
    Caption = 'Version 1.20'
-    Font.Color = clText
-    Font.Height = 8
-    Font.Name = 'MS Sans Serif'
-    Font.Pitch = fpVariable
    ParentColor = False
    ParentFont = False
  end
  object l2: TLabel
-    Left = 111
-    Height = 14
-    Top = 72
-    Width = 103
+    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = l4
+    AnchorSideTop.Side = asrBottom
+    Left = 147
+    Height = 15
+    Top = 71
+    Width = 118
+    BorderSpacing.Top = 8
    Caption = 'OnGuard home page:'
+    Font.Style = [fsBold]
    ParentColor = False
+    ParentFont = False
  end
  object WebLbl: TLabel
+    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = l2
+    AnchorSideTop.Side = asrBottom
    Cursor = crHandPoint
-    Left = 120
-    Height = 14
-    Top = 88
-    Width = 201
+    Left = 155
+    Height = 15
+    Top = 86
+    Width = 226
+    BorderSpacing.Left = 12
    Caption = 'http://sourceforge.net/projects/tponguard'
    Font.Color = clNavy
-    Font.Height = 8
-    Font.Name = 'MS Sans Serif'
-    Font.Pitch = fpVariable
    ParentColor = False
    ParentFont = False
    OnClick = WebLblClick
    OnMouseMove = WebLblMouseMove
  end
  object l3: TLabel
-    Left = 110
-    Height = 14
+    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = lblVersion
+    AnchorSideTop.Side = asrBottom
+    Left = 147
+    Height = 15
    Top = 48
-    Width = 187
+    Width = 201
+    BorderSpacing.Top = 8
    Caption = 'Released under the Mozilla License 1.1'
    ParentColor = False
  end
  object l4: TLabel
-    Left = 304
-    Height = 14
+    AnchorSideLeft.Control = l3
+    AnchorSideLeft.Side = asrBottom
+    Left = 356
+    Height = 15
    Top = 48
-    Width = 47
+    Width = 50
+    BorderSpacing.Left = 8
+    BorderSpacing.Right = 8
    Caption = '(MPL 1.1)'
    ParentColor = False
  end
  object l5: TLabel
-    Left = 5
-    Height = 14
-    Top = 197
-    Width = 274
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = b0
+    AnchorSideTop.Side = asrBottom
+    Left = 6
+    Height = 15
+    Top = 267
+    Width = 305
+    BorderSpacing.Left = 6
    Caption = 'Copyright (C) 1997-2002, TurboPower Software Company.'
    ParentColor = False
  end
  object l6: TLabel
-    Left = 5
-    Height = 14
-    Top = 217
-    Width = 87
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = l5
+    AnchorSideTop.Side = asrBottom
+    Left = 6
+    Height = 15
+    Top = 284
+    Width = 97
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 2
    Caption = 'All rights reserved.'
    ParentColor = False
  end
  object l7: TLabel
-    Left = 110
-    Height = 14
-    Top = 152
-    Width = 91
+    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = WebLbl1
+    AnchorSideTop.Side = asrBottom
+    Left = 147
+    Height = 15
+    Top = 147
+    Width = 106
+    BorderSpacing.Top = 8
    Caption = 'Online newsgroups'
+    Font.Style = [fsBold]
    ParentColor = False
+    ParentFont = False
  end
  object NewsLbl: TLabel
+    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = l7
+    AnchorSideTop.Side = asrBottom
    Cursor = crHandPoint
-    Left = 120
-    Height = 14
-    Top = 168
-    Width = 230
+    Left = 155
+    Height = 15
+    Top = 162
+    Width = 256
+    BorderSpacing.Left = 12
+    BorderSpacing.Right = 8
    Caption = 'https://sourceforge.net/forum/?group_id=71010'
    Font.Color = clNavy
-    Font.Height = 8
-    Font.Name = 'MS Sans Serif'
-    Font.Pitch = fpVariable
    ParentColor = False
    ParentFont = False
    OnClick = NewsLblClick
    OnMouseMove = NewsLblMouseMove
  end
  object l8: TLabel
-    Left = 111
-    Height = 14
-    Top = 112
-    Width = 62
+    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = WebLbl
+    AnchorSideTop.Side = asrBottom
+    Left = 147
+    Height = 15
+    Top = 109
+    Width = 71
+    BorderSpacing.Top = 8
    Caption = 'Lazarus port:'
+    Font.Style = [fsBold]
    ParentColor = False
+    ParentFont = False
  end
  object WebLbl1: TLabel
+    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = l8
+    AnchorSideTop.Side = asrBottom
    Cursor = crHandPoint
-    Left = 120
-    Height = 14
-    Top = 128
-    Width = 204
+    Left = 155
+    Height = 15
+    Top = 124
+    Width = 225
+    BorderSpacing.Left = 12
    Caption = 'http://wiki.lazarus.freepascal.org/OnGuard'
    Font.Color = clNavy
-    Font.Height = 8
-    Font.Name = 'MS Sans Serif'
-    Font.Pitch = fpVariable
    ParentColor = False
    ParentFont = False
    OnClick = WebLbl1Click
    OnMouseMove = WebLbl1MouseMove
  end
  object Panel1: TPanel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
    Left = 4
-    Height = 182
+    Height = 251
    Top = 4
-    Width = 101
+    Width = 139
+    AutoSize = True
+    BorderSpacing.Around = 4
    BevelOuter = bvLowered
-    ClientHeight = 182
-    ClientWidth = 101
+    ClientHeight = 251
+    ClientWidth = 139
+    ParentBackground = False
    TabOrder = 0
    object Image1: TImage
      Left = 1
-      Height = 180
+      Height = 249
      Top = 1
-      Width = 99
+      Width = 137
      Align = alClient
      Picture.Data = {
        07545069786D6170CF8C00002F2A2058504D202A2F0A73746174696320636861
@ -1299,17 +1356,29 @@ object OgAboutForm: TOgAboutForm
        2A2C2A6A2D2A2C752D2A2C2A2C712A2C5A2C2C712C2A2C752C2A2D2C716A2C2C
        2C2D6A2C2C2D2C6A2D2C702C2D6A2D2C2C692D2C692C702C227D0A
      }
+      Proportional = True
      Stretch = True
    end
  end
  object btnOK: TButton
-    Left = 280
-    Height = 22
-    Top = 232
-    Width = 64
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = l6
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 343
+    Height = 25
+    Top = 301
+    Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Top = 2
+    BorderSpacing.Right = 16
+    BorderSpacing.Bottom = 16
    BorderSpacing.InnerBorder = 4
    Cancel = True
    Caption = 'OK'
+    Default = True
    ModalResult = 2
    OnClick = btnOKClick
    TabOrder = 1
--- a/components/onguard/source/qogabout0.lrs
+++ b/components/onguard/source/qogabout0.lrs
--- a/components/onguard/source/qogabout0.pas
+++ b/components/onguard/source/qogabout0.pas
@ -40,14 +40,12 @@ unit qogabout0;                                                     {AH.01}
 interface

 uses
-  {$IFDEF MSWINDOWS} Windows, {$ENDIF}                             {AH.01}
+  LCLIntf,
  SysUtils, Classes,
  Graphics, Controls,Buttons, Forms, Dialogs, StdCtrls, ExtCtrls,
  ogutil,
-  {$IFDEF MSWINDOWS} ShellAPI, {$ENDIF}                            {AH.01}
  ComponentEditors,
  PropEdits;
-//  LazarusPackageIntf;



@ -103,8 +101,9 @@ type
  end;

 implementation
+
 uses
- LResources;
+  LResources;



@ -144,20 +143,14 @@ end;

 procedure TOgAboutForm.WebLbl1Click(Sender: TObject);
 begin
-  {$IFDEF MSWINDOWS}
-  if ShellExecute(0, 'open', PChar('http://wiki.lazarus.freepascal.org/OnGuard'),
-                  '', '', SW_SHOWNORMAL) <= 32 then
-    ShowMessage('Unable to start web browser');
-{$ELSE}
-  ShowMessage('Unable to start web browser');
-{$ENDIF}
+  OpenURL('http://wiki.lazarus.freepascal.org/OnGuard');
  WebLbl.Font.Color := clNavy;
 end;

 procedure TOgAboutForm.WebLbl1MouseMove(Sender: TObject; Shift: TShiftState; X,
  Y: Integer);
 begin
-    WebLbl1.Font.Color := clRed;
+  WebLbl1.Font.Color := clRed;
 end;

 procedure TOgAboutForm.WebLblMouseMove(Sender: TObject; Shift: TShiftState;
@ -188,25 +181,13 @@ end;

 procedure TOgAboutForm.WebLblClick(Sender: TObject);
 begin
-{$IFDEF MSWINDOWS}
-  if ShellExecute(0, 'open', PChar('http://sourceforge.net/projects/tponguard'),
-                  '', '', SW_SHOWNORMAL) <= 32 then
-    ShowMessage('Unable to start web browser');
-{$ELSE}
-  ShowMessage('Unable to start web browser');
-{$ENDIF}
+  OpenURL('http://sourceforge.net/projects/tponguard');
  WebLbl.Font.Color := clNavy;
 end;

 procedure TOgAboutForm.NewsLblClick(Sender: TObject);
 begin
-{$IFDEF MSWINDOWS}
-  if ShellExecute(0, 'open', PChar('https://sourceforge.net/forum/?group_id=71010'),
-                  '', '', SW_SHOWNORMAL) <= 32 then
-    ShowMessage('Unable to start news reader');
-{$ELSE}
-  ShowMessage('Unable to start news reader');
-{$ENDIF}
+  OpenURL('https://sourceforge.net/forum/?group_id=71010');
  NewsLbl.Font.Color := clNavy;
 end;