From 1be398ed4730d27d5401b4205ae1946760950702 Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Mon, 2 Aug 2010 11:54:45 +0200 Subject: DocView: Improved the toolbar look. * Changed buttons to flat look. * Added divider lines between button groups. * Debug Menu item is now checked or unchecked. * Moved INF Header Info menu item to Help menu. --- docview/src/docview.lpi | 8 +++-- docview/src/frm_main.pas | 77 +++++++++++++++++++++++++++++------------------- 2 files changed, 52 insertions(+), 33 deletions(-) (limited to 'docview') diff --git a/docview/src/docview.lpi b/docview/src/docview.lpi index a362ed8d..47544ba7 100644 --- a/docview/src/docview.lpi +++ b/docview/src/docview.lpi @@ -1,7 +1,7 @@ - + @@ -12,6 +12,9 @@ <UseAppBundle Value="False"/> </General> + <VersionInfo> + <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="0.0.0.0" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion="0.0.0.0"/> + </VersionInfo> <PublishOptions> <Version Value="2"/> <IgnoreBinaries Value="False"/> @@ -175,7 +178,7 @@ </Units> </ProjectOptions> <CompilerOptions> - <Version Value="8"/> + <Version Value="9"/> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)/"/> <OtherUnitFiles Value="../components/richtext/"/> @@ -187,6 +190,7 @@ <IncludeAssertionCode Value="True"/> <AllowLabel Value="False"/> <CPPInline Value="False"/> + <UseAnsiStrings Value="False"/> </SyntaxOptions> </Parsing> <CodeGeneration> diff --git a/docview/src/frm_main.pas b/docview/src/frm_main.pas index c00b9a94..bc3ccece 100644 --- a/docview/src/frm_main.pas +++ b/docview/src/frm_main.pas @@ -61,15 +61,17 @@ TMainForm = class(TfpgForm) miDebug: TfpgPopupMenu; ToolBar: TfpgBevel; btnOpen: TfpgButton; - btnPanel: TfpgButton; btnBack: TfpgButton; btnFwd: TfpgButton; btnPrev: TfpgButton; btnNext: TfpgButton; btnHelp: TfpgButton; btnQuit: TfpgButton; + Bevel1: TfpgBevel; + Bevel2: TfpgBevel; {@VFD_HEAD_END: MainForm} miOpenRecentMenu: TfpgPopupMenu; + miDebugHexInfo: TfpgMenuItem; // Files: TList; // current open help files. Debug: boolean; FFileOpenRecent: TfpgMenuItem; @@ -440,6 +442,7 @@ procedure TMainForm.miDebugHeader(Sender: TObject); procedure TMainForm.miDebugHex(Sender: TObject); begin Debug := not Debug; + miDebugHexInfo.Checked := Debug; DisplayTopic(nil); end; @@ -2244,6 +2247,8 @@ procedure TMainForm.AfterCreate; AddMenuItem('Help using help', '', nil); AddMenuItem('Command line parameters', '', @miHelpCmdLineParams); AddMenuItem('-', '', nil); + AddMenuItem('Show help file header info', '', @miDebugHeader); + AddMenuItem('-', '', nil); AddMenuItem('About fpGUI Toolkit...', '', @miHelpAboutFPGui); AddMenuItem('Product Information...', '', @miHelpProdInfoClicked); end; @@ -2253,8 +2258,7 @@ procedure TMainForm.AfterCreate; begin Name := 'miDebug'; SetPosition(292, 192, 132, 20); - AddMenuItem('Debug: Header', '', @miDebugHeader); - AddMenuItem('Toggle Hex INF Values in Contents', '', @miDebugHex); + miDebugHexInfo := AddMenuItem('Toggle Hex INF Values in Contents', '', @miDebugHex); end; ToolBar := TfpgBevel.Create(self); @@ -2274,7 +2278,7 @@ procedure TMainForm.AfterCreate; Name := 'btnOpen'; SetPosition(30, 1, 24, 24); Text := ''; - Embedded := True; + Flat := True; FontDesc := '#Label1'; Hint := 'Open a new help file.'; ImageMargin := -1; @@ -2282,37 +2286,23 @@ procedure TMainForm.AfterCreate; ImageSpacing := 0; TabOrder := 0; OnClick := @miFileOpenClicked; - end; - - btnPanel := TfpgButton.Create(ToolBar); - with btnPanel do - begin - Name := 'btnPanel'; - SetPosition(64, 1, 32, 24); - Text := 'pnl'; - AllowAllUp := True; - Embedded := True; - FontDesc := '#Label1'; - GroupIndex := 1; - Hint := 'Display or hide tabs'; - ImageName := ''; - TabOrder := 1; - Enabled := False; + Focusable := False; end; btnBack := TfpgButton.Create(ToolBar); with btnBack do begin Name := 'btnBack'; - SetPosition(102, 1, 32, 24); + SetPosition(70, 1, 32, 24); Text := '<'; - Embedded := True; + Flat := True; FontDesc := '#Label1'; Hint := 'Previous history item.'; ImageMargin := -1; ImageName := 'dv.arrowleft'; ImageSpacing := 0; TabOrder := 2; + Focusable := False; OnClick := @btnBackHistClick; end; @@ -2320,15 +2310,16 @@ procedure TMainForm.AfterCreate; with btnFwd do begin Name := 'btnFwd'; - SetPosition(136, 1, 32, 24); + SetPosition(104, 1, 32, 24); Text := '>'; - Embedded := True; + Flat := True; FontDesc := '#Label1'; Hint := 'Next history item.'; ImageMargin := -1; ImageName := 'dv.arrowright'; ImageSpacing := 0; TabOrder := 3; + Focusable := False; OnClick := @btnFwdHistClick; end; @@ -2336,15 +2327,16 @@ procedure TMainForm.AfterCreate; with btnPrev do begin Name := 'btnPrev'; - SetPosition(174, 1, 32, 24); + SetPosition(138, 1, 32, 24); Text := 'prev'; - Embedded := True; + Flat := True; FontDesc := '#Label1'; Hint := 'Previous Topic.'; ImageMargin := -1; ImageName := 'dv.arrowup'; ImageSpacing := 0; TabOrder := 4; + Focusable := False; OnClick := @btnPrevClick; end; @@ -2352,15 +2344,16 @@ procedure TMainForm.AfterCreate; with btnNext do begin Name := 'btnNext'; - SetPosition(208, 1, 32, 24); + SetPosition(172, 1, 32, 24); Text := 'next'; - Embedded := True; + Flat := True; FontDesc := '#Label1'; Hint := 'Next Topic.'; ImageMargin := -1; ImageName := 'dv.arrowdown'; ImageSpacing := 0; TabOrder := 5; + Focusable := False; OnClick :=@btnNextClick; end; @@ -2368,15 +2361,16 @@ procedure TMainForm.AfterCreate; with btnHelp do begin Name := 'btnHelp'; - SetPosition(246, 1, 24, 24); + SetPosition(218, 1, 24, 24); Text := ''; - Embedded := True; + Flat := True; FontDesc := '#Label1'; Hint := 'Display Product Information.'; ImageMargin := -1; ImageName := 'stdimg.help'; ImageSpacing := 0; TabOrder := 6; + Focusable := False; OnClick := @miHelpProdInfoClicked; end; @@ -2386,7 +2380,7 @@ procedure TMainForm.AfterCreate; Name := 'btnQuit'; SetPosition(4, 1, 24, 24); Text := ''; - Embedded := True; + Flat := True; FontDesc := '#Label1'; Hint := ''; ImageMargin := -1; @@ -2394,6 +2388,27 @@ procedure TMainForm.AfterCreate; ImageSpacing := 0; TabOrder := 8; OnClick := @miFileQuitClicked; + Focusable := False; + end; + + Bevel1 := TfpgBevel.Create(ToolBar); + with Bevel1 do + begin + Name := 'Bevel1'; + SetPosition(61, 0, 6, 24); + Hint := ''; + Style := bsLowered; + Shape := bsLeftLine; + end; + + Bevel2 := TfpgBevel.Create(ToolBar); + with Bevel2 do + begin + Name := 'Bevel2'; + SetPosition(210, 0, 6, 24); + Hint := ''; + Style := bsLowered; + Shape := bsLeftLine; end; {@VFD_BODY_END: MainForm} -- cgit v1.2.3-54-g00ecf