diff --git a/applications/fpbrowser/browserconstants.pas b/applications/fpbrowser/browserconstants.pas new file mode 100644 index 000000000..b9fe77be1 --- /dev/null +++ b/applications/fpbrowser/browserconstants.pas @@ -0,0 +1,13 @@ +unit browserconstants; + +{$mode delphi} + +interface + +const + BrowserVersion = '0.5'; + +implementation + +end. + diff --git a/applications/fpbrowser/browserviewer.pas b/applications/fpbrowser/browserviewer.pas index a4ee54a57..915657110 100644 --- a/applications/fpbrowser/browserviewer.pas +++ b/applications/fpbrowser/browserviewer.pas @@ -19,6 +19,7 @@ type MyPageLoaderThread: TPageLoaderThread; MyPageLoader: TPageLoader; CurrentTab: Integer; + ViewerName: string; constructor Create; virtual; destructor Destroy; override; procedure CreateViewer(AParent, AOwner: TWinControl); virtual; abstract; diff --git a/applications/fpbrowser/dlgabout.lfm b/applications/fpbrowser/dlgabout.lfm new file mode 100644 index 000000000..88bcaa4d8 --- /dev/null +++ b/applications/fpbrowser/dlgabout.lfm @@ -0,0 +1,68 @@ +object AboutBox: TAboutBox + Left = 286 + Height = 185 + Top = 214 + Width = 312 + BorderIcons = [biSystemMenu] + Caption = 'About' + ClientHeight = 185 + ClientWidth = 312 + Color = clBtnFace + Font.Color = clWindowText + Font.Height = -13 + Font.Name = 'Arial' + Position = poScreenCenter + LCLVersion = '0.9.31' + object BitBtn1: TBitBtn + Left = 114 + Height = 30 + Top = 144 + Width = 77 + Caption = 'Close' + Kind = bkOK + ModalResult = 1 + TabOrder = 0 + end + object labelTitle: TLabel + AnchorSideTop.Control = Owner + Left = 0 + Height = 30 + Top = 10 + Width = 312 + Align = alTop + Alignment = taCenter + BorderSpacing.Top = 10 + Caption = 'FPBrowser' + Font.Color = clWindowText + Font.Height = -25 + Font.Name = 'Arial' + ParentColor = False + ParentFont = False + end + object Label2: TLabel + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom + Left = 0 + Height = 40 + Top = 48 + Width = 312 + Anchors = [akTop, akLeft, akRight] + AutoSize = False + Caption = ' A browser complely written in Free Pascal and Lazarus.' + ParentColor = False + WordWrap = True + end + object labelEngine: TLabel + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom + Left = 0 + Height = 32 + Top = 88 + Width = 312 + Anchors = [akTop, akLeft, akRight] + AutoSize = False + Caption = ' Rendering Engine:' + ParentColor = False + WordWrap = True + end +end diff --git a/applications/fpbrowser/dlgabout.pas b/applications/fpbrowser/dlgabout.pas new file mode 100644 index 000000000..d1866eafa --- /dev/null +++ b/applications/fpbrowser/dlgabout.pas @@ -0,0 +1,43 @@ +unit dlgabout; + +interface + +uses + LclIntf, LMessages, LclType, LResources, LCLVersion, + SysUtils, Classes, Graphics, Controls, + Forms, Dialogs, StdCtrls, Buttons, ExtCtrls, + // + browserviewer, browserconstants; + +type + + { TAboutBox } + + TAboutBox = class(TForm) + BitBtn1: TBitBtn; + labelTitle: TLabel; + Label2: TLabel; + labelEngine: TLabel; + private + { Private declarations } + public + { Public declarations } + constructor CreateIt(Owner: TComponent; const ProgName, CompName: string); + end; + +var + AboutBox: TAboutBox; + +implementation + +{$R *.lfm} + +constructor TAboutBox.CreateIt(Owner: TComponent; const ProgName, CompName: string); +begin + inherited Create(Owner); + + labelTitle.Caption := 'FPBrowser ' + BrowserVersion; + labelEngine.Caption := ' Rendering Engine: ' + GetCurrentBrowserViewer().ViewerName; +end; + +end. diff --git a/applications/fpbrowser/fpbrowser.dpr b/applications/fpbrowser/fpbrowser.dpr index 5775f817f..a92cb74d1 100644 --- a/applications/fpbrowser/fpbrowser.dpr +++ b/applications/fpbrowser/fpbrowser.dpr @@ -12,7 +12,7 @@ uses printer4lazarus, turbopoweripro, customdrawn, laz_synapse, mainform {Form1}, Submit in 'Submit.pas' {SubmitForm}, - Htmlabt in 'Htmlabt.pas' {AboutBox}, + dlgabout in 'Htmlabt.pas' {AboutBox}, (* Fontdlg in 'Fontdlg.pas' {FontForm}, PreviewForm in 'PreviewForm.pas' {PreviewForm}, Gopage in 'Gopage.pas' {GoPageForm}, @@ -25,7 +25,7 @@ uses {$ifdef FPBROWSER_TURBOPOWERIPRO} viewer_ipro, {$endif} - browserviewer, mod_braille; + browserviewer, mod_braille, browserconstants; begin Application.Initialize; diff --git a/applications/fpbrowser/fpbrowser.lpi b/applications/fpbrowser/fpbrowser.lpi index 75b9cbe0b..51905374c 100644 --- a/applications/fpbrowser/fpbrowser.lpi +++ b/applications/fpbrowser/fpbrowser.lpi @@ -47,7 +47,7 @@ - + @@ -74,10 +74,12 @@ - + + - + + @@ -109,6 +111,11 @@ + + + + + diff --git a/applications/fpbrowser/htmlabt.dfm b/applications/fpbrowser/htmlabt.dfm deleted file mode 100644 index dff22719d..000000000 --- a/applications/fpbrowser/htmlabt.dfm +++ /dev/null @@ -1,61 +0,0 @@ -object AboutBox: TAboutBox - Left = 286 - Top = 214 - BorderIcons = [biSystemMenu] - BorderStyle = bsDialog - Caption = 'About' - ClientHeight = 184 - ClientWidth = 306 - Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -13 - Font.Name = 'System' - Font.Style = [] - OldCreateOrder = True - Position = poScreenCenter - PixelsPerInch = 96 - TextHeight = 16 - object BitBtn1: TBitBtn - Left = 114 - Top = 146 - Width = 77 - Height = 30 - TabOrder = 0 - Kind = bkOK - end - object Panel1: TPanel - Left = 0 - Top = 0 - Width = 306 - Height = 137 - Align = alTop - BevelInner = bvLowered - BevelOuter = bvNone - Caption = 'Panel1' - TabOrder = 1 - object Viewer: THTMLViewer - Left = 1 - Top = 1 - Width = 304 - Height = 135 - ViewImages = False - Enabled = False - TabOrder = 0 - Align = alClient - BorderStyle = htSingle - HistoryMaxCount = 0 - DefFontName = 'Times New Roman' - DefPreFontName = 'Courier New' - NoSelect = True - ScrollBars = ssNone - CharSet = DEFAULT_CHARSET - PrintMarginLeft = 2.000000000000000000 - PrintMarginRight = 2.000000000000000000 - PrintMarginTop = 2.000000000000000000 - PrintMarginBottom = 2.000000000000000000 - PrintScale = 1.000000000000000000 - htOptions = [] - end - end -end diff --git a/applications/fpbrowser/htmlabt.lfm b/applications/fpbrowser/htmlabt.lfm deleted file mode 100644 index 1ebf2ab0f..000000000 --- a/applications/fpbrowser/htmlabt.lfm +++ /dev/null @@ -1,61 +0,0 @@ -object AboutBox: TAboutBox - Left = 286 - Top = 214 - BorderIcons = [biSystemMenu] - BorderStyle = bsDialog - Caption = 'About' - ClientHeight = 184 - Height = 184 - ClientWidth = 306 - Width = 306 - Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -13 - Font.Name = 'Arial' - Font.Style = [] - Position = poScreenCenter - PixelsPerInch = 96 - object BitBtn1: TBitBtn - Left = 114 - Top = 146 - Width = 77 - Height = 30 - TabOrder = 0 - Kind = bkOK - end - object Panel1: TPanel - Left = 0 - Top = 0 - Width = 306 - Height = 137 - Align = alTop - BevelInner = bvLowered - BevelOuter = bvNone - Caption = 'Panel1' - TabOrder = 1 - object Viewer: THTMLViewer - Left = 1 - Top = 1 - Width = 304 - Height = 135 - ViewImages = False - Enabled = False - TabOrder = 0 - Align = alClient - BorderStyle = htSingle - HistoryMaxCount = 0 - DefFontName = 'Times New Roman' - DefPreFontName = 'Courier New' - NoSelect = True - ScrollBars = ssNone - CharSet = DEFAULT_CHARSET - PrintMarginLeft = 2.000000000000000000 - PrintMarginRight = 2.000000000000000000 - PrintMarginTop = 2.000000000000000000 - PrintMarginBottom = 2.000000000000000000 - PrintScale = 1.000000000000000000 - htOptions = [] - end - end -end diff --git a/applications/fpbrowser/htmlabt.lrs b/applications/fpbrowser/htmlabt.lrs deleted file mode 100644 index 9902682f5..000000000 --- a/applications/fpbrowser/htmlabt.lrs +++ /dev/null @@ -1,20 +0,0 @@ -LazarusResources.Add('TAboutBox','FORMDATA',[ - 'TPF0'#9'TAboutBox'#8'AboutBox'#4'Left'#3#30#1#3'Top'#3#214#0#11'BorderIcons' - +#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#5'About'#12 - +'ClientHeight'#3#184#0#6'Height'#3#184#0#11'ClientWidth'#3'2'#1#5'Width'#3'2' - +#1#5'Color'#7#9'clBtnFace'#12'Font.Charset'#7#15'DEFAULT_CHARSET'#10'Font.Co' - +'lor'#7#12'clWindowText'#11'Font.Height'#2#243#9'Font.Name'#6#5'Arial'#10'Fo' - +'nt.Style'#11#0#8'Position'#7#14'poScreenCenter'#13'PixelsPerInch'#2'`'#0#7 - +'TBitBtn'#7'BitBtn1'#4'Left'#2'r'#3'Top'#3#146#0#5'Width'#2'M'#6'Height'#2#30 - +#8'TabOrder'#2#0#4'Kind'#7#4'bkOK'#0#0#6'TPanel'#6'Panel1'#4'Left'#2#0#3'Top' - +#2#0#5'Width'#3'2'#1#6'Height'#3#137#0#5'Align'#7#5'alTop'#10'BevelInner'#7#9 - +'bvLowered'#10'BevelOuter'#7#6'bvNone'#7'Caption'#6#6'Panel1'#8'TabOrder'#2#1 - +#0#11'THTMLViewer'#6'Viewer'#4'Left'#2#1#3'Top'#2#1#5'Width'#3'0'#1#6'Height' - +#3#135#0#10'ViewImages'#8#7'Enabled'#8#8'TabOrder'#2#0#5'Align'#7#8'alClient' - +#11'BorderStyle'#7#8'htSingle'#15'HistoryMaxCount'#2#0#11'DefFontName'#6#15 - +'Times New Roman'#14'DefPreFontName'#6#11'Courier New'#8'NoSelect'#9#10'Scro' - +'llBars'#7#6'ssNone'#7'CharSet'#7#15'DEFAULT_CHARSET'#15'PrintMarginLeft'#5#0 - +#0#0#0#0#0#0#128#0'@'#16'PrintMarginRight'#5#0#0#0#0#0#0#0#128#0'@'#14'Print' - +'MarginTop'#5#0#0#0#0#0#0#0#128#0'@'#17'PrintMarginBottom'#5#0#0#0#0#0#0#0 - +#128#0'@'#10'PrintScale'#5#0#0#0#0#0#0#0#128#255'?'#9'htOptions'#11#0#0#0#0#0 -]); diff --git a/applications/fpbrowser/htmlabt.pas b/applications/fpbrowser/htmlabt.pas deleted file mode 100755 index fc28f140a..000000000 --- a/applications/fpbrowser/htmlabt.pas +++ /dev/null @@ -1,91 +0,0 @@ -unit HTMLAbt; - -interface - -uses - LclIntf, LMessages, LclType, LResources, LCLVersion, - SysUtils, Classes, Graphics, Controls, - Forms, Dialogs, StdCtrls, Buttons, ExtCtrls; - -const - Version = '9.45'; - -type - TAboutBox = class(TForm) - BitBtn1: TBitBtn; - Panel1: TPanel; - private - { Private declarations } - public - { Public declarations } - constructor CreateIt(Owner: TComponent; const ProgName, CompName: string); - end; - -var - AboutBox: TAboutBox; - -implementation - -{$IFNDEF LCL} -{$R *.DFM} -{$ENDIF} - -constructor TAboutBox.CreateIt(Owner: TComponent; const ProgName, CompName: string); -var - S: string[210]; -begin -inherited Create(Owner); -(*//Viewer.DefFontName := 'MS Sans Serif'; //Windows-only font -Viewer.DefFontName := 'Arial'; -Viewer.DefFontSize := 9; -Viewer.DefFontColor := clNavy; -S :=''+ - '
'+ - '

'+ProgName+'

'+ - 'A demo program for the '+CompName+' component'+ - -{$IFNDEF LCL} - '

Version '+Version+' compiled with Delphi '+ -{$ifdef Windows} - '1

'+ -{$endif} -{$ifdef Ver90} - '2'+ -{$endif} -{$ifdef Ver100} - '3'+ -{$endif} -{$ifdef Ver120} - '4'+ -{$endif} -{$ifdef Ver130} - '5'+ -{$endif} -{$ifdef Ver140} - '6'+ -{$endif} -{$ifdef Ver150} - '7'+ -{$endif} -{$ifdef Ver170} - '2005'+ -{$endif} -{$ifdef Ver180} - '2006'+ -{$endif} - -{$ELSE} - '

Version ' + Version + ' compiled with Lazarus ' + lcl_version + '

' + -{$ENDIF} - - '
'+ - ''; -Viewer.LoadFromBuffer(@S[1], Length(S), '');*) -end; - -initialization -{$IFDEF LCL} -{$I Htmlabt.lrs} {Include form's resource file} -{$ENDIF} - -end. diff --git a/applications/fpbrowser/mainform.pas b/applications/fpbrowser/mainform.pas index eac22ff3f..78ec2fe64 100644 --- a/applications/fpbrowser/mainform.pas +++ b/applications/fpbrowser/mainform.pas @@ -15,7 +15,7 @@ uses // Custom Drawn customdrawnextras, customdrawncontrols, customdrawndrawers, customdrawn_kde, // - HTMLabt, + dlgabout, browserconstants, pageloader, browserviewer, browsermodules; type @@ -262,7 +262,7 @@ begin OpenDialog.InitialDir := ExtractFilePath(ParamStr(0)); {$ENDIF} - Caption := 'fpBrowser, Version '+HTMLAbt.Version; + Caption := 'fpBrowser '+BrowserVersion; (*for I := 0 to MaxHistories-1 do begin {create the MenuItems for the history list} diff --git a/applications/fpbrowser/viewer_ipro.pas b/applications/fpbrowser/viewer_ipro.pas index 7ff013457..c1e175a6a 100644 --- a/applications/fpbrowser/viewer_ipro.pas +++ b/applications/fpbrowser/viewer_ipro.pas @@ -192,6 +192,8 @@ end; procedure TiProViewer.CreateViewer(AParent, AOwner: TWinControl); begin + ViewerName := 'Turbo Power iPro HTML viewer written in Pascal'; + DataProvider1:=TMyIpHtmlDataProvider.Create(AOwner); DataProvider1.Name:='DataProvider1'; DataProvider1.OnCanHandle:=DataProvider1CanHandle; diff --git a/applications/fpbrowser/viewer_thtmlcomp.pas b/applications/fpbrowser/viewer_thtmlcomp.pas index 116c8ed28..859b4e3bd 100644 --- a/applications/fpbrowser/viewer_thtmlcomp.pas +++ b/applications/fpbrowser/viewer_thtmlcomp.pas @@ -312,6 +312,8 @@ end; procedure THtmlCompViewer.CreateViewer(AParent, AOwner: TWinControl); begin + ViewerName := 'THTMLComp written in Pascal'; + Viewer := THTMLViewer.Create(AOwner); Viewer.Left := 1; Viewer.Height := 358;