paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-17 04:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Remove items from View menu for toggling Palette, Coolbar and EditorToolbar.

Browse Source 
git-svn-id: trunk@50071 -
This commit is contained in:
juha 2015-10-15 12:43:46 +00:00
parent b4c0a18792
commit 7633eaaa74
5 changed files with 4 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ide/editortoolbarstatic.pas
View File

@ -25,7 +25,7 @@ interface
uses
SysUtils, Classes, fgl, ComCtrls, Controls, LCLProc,
MenuIntf, IDEImagesIntf, SrcEditorIntf, BaseIDEIntf,
IDEImagesIntf, SrcEditorIntf, BaseIDEIntf,
LazarusIDEStrConsts, LazConfigStorage, Laz2_XMLCfg, ToolbarConfig;
type
@ -92,7 +92,6 @@ procedure CreateEditorToolBar(aConfigEvent: TNotifyEvent);
var
uAllEditorToolbars: TAllEditorToolbars;
EditorMenuCommand: TIDEMenuCommand;
implementation
@ -103,16 +102,6 @@ const
cSettingsFile = 'editortoolbar.xml';
procedure ToggleToolbar (Sender:TObject);
var
ToolBarVisible: Boolean;
begin
ToolBarVisible := not EnvironmentOptions.Desktop.EditorToolBarOptions.Visible;
EditorMenuCommand.Checked := ToolBarVisible;
EnvironmentOptions.Desktop.EditorToolBarOptions.Visible := ToolBarVisible;
uAllEditorToolbars.ReloadAll;
end;
{ TEditorToolBarOptions }
constructor TEditorToolBarOptions.Create;
@ -295,18 +284,9 @@ begin
end;
procedure CreateEditorToolBar(aConfigEvent: TNotifyEvent);
var
MenuIcon: string;
begin
uAllEditorToolbars := TAllEditorToolbars.Create;
uAllEditorToolbars.FConfigEvent := aConfigEvent;
EditorMenuCommand := RegisterIDEMenuCommand(itmViewSecondaryWindows,'EditorToolBar',
lisEditorToolbar,nil,@ToggleToolbar);
EditorMenuCommand.Checked := True;
EditorMenuCommand.Enabled := True;
MenuIcon:= 'menu_editor_options';
//MenuIcon:= 'menu_editor_toolbar'; TODO!
EditorMenuCommand.ImageIndex := IDEImages.LoadImage(16, MenuIcon);
end;
{ TAllEditorToolbars }
@ -343,7 +323,6 @@ begin
Opts := EnvironmentOptions.Desktop.EditorToolBarOptions;
ETB.CopyFromOptions(Opts);
ETB.FToolBar.Visible := Opts.Visible;
EditorMenuCommand.Checked := Opts.Visible;
end;
procedure TAllEditorToolbars.SourceWindowDestroyed(Sender: TObject);
@ -384,13 +363,12 @@ begin
Opts := EnvironmentOptions.Desktop.EditorToolBarOptions;
aBar.CopyFromOptions(Opts);
aBar.FToolBar.Visible := Opts.Visible;
EditorMenuCommand.Checked := Opts.Visible;
end;
end;
initialization
//CreateEditorToolBar;
;
finalization
uAllEditorToolbars.Free;

1
ide/lazarusidestrconsts.pas
View File

@ -441,7 +441,6 @@ resourcestring
lisMenuViewTabOrder = 'Tab Order';
lisKMToggleViewComponentPalette = 'Toggle View Component Palette';
lisMenuViewComponentPalette = 'Component Palette';
lisMenuViewIDESpeedButtons = 'IDE Speed Buttons';
lisMenuDebugWindows = 'Debug Windows';
lisMenuViewWatches = 'Watches';
lisMenuViewBreakPoints = 'BreakPoints';

14
ide/main.pp
View File

@ -253,8 +253,6 @@ type
procedure mnuToggleFormUnitClicked(Sender: TObject);
procedure mnuViewAnchorEditorClicked(Sender: TObject);
procedure mnuViewTabOrderClicked(Sender: TObject);
procedure mnuViewComponentPaletteClicked(Sender: TObject);
procedure mnuViewIDESpeedButtonsClicked(Sender: TObject);
procedure mnuViewFPCInfoClicked(Sender: TObject);
procedure mnuViewIDEInfoClicked(Sender: TObject);
procedure mnuViewNeedBuildClicked(Sender: TObject);
@ -2573,8 +2571,6 @@ begin
itmViewSearchResults.OnClick := @mnuViewSearchResultsClick;
itmViewAnchorEditor.OnClick := @mnuViewAnchorEditorClicked;
itmViewTabOrder.OnClick := @mnuViewTabOrderClicked;
itmViewComponentPalette.OnClick := @mnuViewComponentPaletteClicked;
itmViewIDESpeedButtons.OnClick := @mnuViewIDESpeedButtonsClicked;
itmViewFPCInfo.OnClick:=@mnuViewFPCInfoClicked;
itmViewIDEInfo.OnClick:=@mnuViewIDEInfoClicked;
@ -2772,16 +2768,6 @@ begin
DoViewTabOrderEditor;
end;
procedure TMainIDE.mnuViewComponentPaletteClicked(Sender: TObject);
begin
MainIDEBar.DoToggleViewComponentPalette;
end;
procedure TMainIDE.mnuViewIDESpeedButtonsClicked(Sender: TObject);
begin
MainIDEBar.DoToggleViewIDESpeedButtons;
end;
procedure TMainIDE.mnuViewFPCInfoClicked(Sender: TObject);
begin
ShowFPCInfo;

27
ide/mainbar.pas
View File

@ -176,8 +176,6 @@ type
//itmViewSecondaryWindows: TIDEMenuSection;
itmViewAnchorEditor: TIDEMenuCommand;
itmViewTabOrder: TIDEMenuCommand;
itmViewComponentPalette: TIDEMenuCommand;
itmViewIDESpeedButtons: TIDEMenuCommand;
itmViewMessage: TIDEMenuCommand;
itmViewSearchResults: TIDEMenuCommand;
//itmViewDebugWindows: TIDEMenuSection;
@ -388,8 +386,6 @@ type
procedure SetMainIDEHeight;
procedure DoSetMainIDEHeight(const AIDEIsMaximized: Boolean; ANewHeight: Integer = 0);
procedure DoSetViewComponentPalette(aVisible: Boolean);
procedure DoToggleViewComponentPalette;
procedure DoToggleViewIDESpeedButtons;
procedure AllowCompilation(aAllow: Boolean);
end;
@ -704,7 +700,6 @@ begin
CoolBar.AutosizeBands;
CoolBar.Visible := CoolBarOpts.Visible;
itmViewIDESpeedButtons.Checked := CoolBar.Visible;
MainSplitter.Align := alLeft;
MainSplitter.Visible := Coolbar.Visible and ComponentPageControl.Visible;
end;
@ -786,7 +781,6 @@ procedure TMainIDEBar.DoSetViewComponentPalette(aVisible: Boolean);
begin
if aVisible = ComponentPageControl.Visible then Exit;
ComponentPageControl.Visible := aVisible;
itmViewComponentPalette.Checked := aVisible;
EnvironmentOptions.Desktop.ComponentPaletteOptions.Visible := aVisible;
if aVisible then
begin
@ -804,25 +798,8 @@ begin
MainSplitter.Visible := Coolbar.Visible and aVisible;
if aVisible then//when showing component palette, it must be visible to calculate it correctly
DoSetMainIDEHeight(WindowState = wsMaximized, 55);//it will cause the IDE to flicker, but it's better than to have wrongly calculated IDE height
SetMainIDEHeight;
end;
procedure TMainIDEBar.DoToggleViewComponentPalette;
begin
DoSetViewComponentPalette(not ComponentPageControl.Visible);
end;
procedure TMainIDEBar.DoToggleViewIDESpeedButtons;
var
SpeedButtonsVisible: boolean;
begin
SpeedButtonsVisible := not CoolBar.Visible;
itmViewIDESpeedButtons.Checked := SpeedButtonsVisible;
CoolBar.Visible := SpeedButtonsVisible;
MainSplitter.Visible := SpeedButtonsVisible;
EnvironmentOptions.Desktop.IDECoolBarOptions.Visible := SpeedButtonsVisible;
MainSplitter.Visible := Coolbar.Visible and ComponentPageControl.Visible;
//this will cause the IDE to flicker, but it's better than to have wrongly calculated IDE height
DoSetMainIDEHeight(WindowState = wsMaximized, 55);
SetMainIDEHeight;
end;

6
ide/mainbase.pas
View File

@ -1155,10 +1155,6 @@ begin
CreateMenuItem(itmViewIDEInternalsWindows, itmSearchInFPDocFiles,'itmSearchInFPDocFiles','Search in FPDoc files');
{$ENDIF}
end;
CreateMenuItem(ParentMI,itmViewComponentPalette,'itmViewComponentPalette',lisMenuViewComponentPalette, '',
true, EnvironmentOptions.Desktop.ComponentPaletteOptions.Visible);
CreateMenuItem(ParentMI,itmViewIDESpeedButtons,'itmViewIDESpeedButtons',lisMenuViewIDESpeedButtons, '',
true, EnvironmentOptions.Desktop.IDECoolBarOptions.Visible);
end;
end;
@ -1580,8 +1576,6 @@ begin
itmViewSearchResults.Command:=GetCommand(ecToggleSearchResults);
itmViewAnchorEditor.Command:=GetCommand(ecViewAnchorEditor);
itmViewTabOrder.Command:=GetCommand(ecViewTabOrder);
itmViewComponentPalette.Command:=GetCommand(ecToggleCompPalette);
itmViewIDESpeedButtons.Command:=GetCommand(ecToggleIDESpeedBtns);
//itmPkgPackageLinks.Command:=GetCommand(ec?);
// source menu