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

IDE: Cleanup for coolbar_options code. Split EnableDisableButtons into 2 methods.

Browse Source 
git-svn-id: trunk@50095 -
This commit is contained in:
juha 2015-10-17 14:31:11 +00:00
parent 44a6127f25
commit d19afdab40
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
ide/frames/idecoolbar_options.pas
View File

@ -81,11 +81,12 @@ type
FTempCoolBarOptions: TIDECoolBarOptions; FTempCoolBarOptions: TIDECoolBarOptions;
// Used for assigning and testing the default configuration. // Used for assigning and testing the default configuration.
FDefaultOptions: TDefaultCoolBarOptions; FDefaultOptions: TDefaultCoolBarOptions;
procedure EnableDisableGeneralButtons;
procedure EnableDisableToolbarButtons;
procedure SelectBand(const ID: integer); procedure SelectBand(const ID: integer);
function GetSelectedBand: Integer; function GetSelectedBand: Integer;
procedure ToolBarClick(Sender: TObject); procedure ToolBarClick(Sender: TObject);
procedure PopulateToolBar; procedure PopulateToolBar;
procedure EnableDisableButtons(const bType: Integer);
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
@ -159,7 +160,7 @@ begin
Opts.BorderStyle := 1; Opts.BorderStyle := 1;
cbBorderStyle.ItemIndex := Opts.BorderStyle; cbBorderStyle.ItemIndex := Opts.BorderStyle;
Coolbar.BandBorderStyle := TBorderStyle(Opts.BorderStyle); Coolbar.BandBorderStyle := TBorderStyle(Opts.BorderStyle);
EnableDisableButtons(0); EnableDisableGeneralButtons;
// ToDo: More tests? // ToDo: More tests?
if Opts.ToolBars.Count = 0 then if Opts.ToolBars.Count = 0 then
@ -214,7 +215,7 @@ end;
procedure TIdeCoolbarOptionsFrame.spCoolBarWidthChange(Sender: TObject); procedure TIdeCoolbarOptionsFrame.spCoolBarWidthChange(Sender: TObject);
begin begin
FTempCoolBar.Width := spCoolBarWidth.Value; FTempCoolBar.Width := spCoolBarWidth.Value;
EnableDisableButtons(0); EnableDisableGeneralButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.tmWaitTimer(Sender: TObject); procedure TIdeCoolbarOptionsFrame.tmWaitTimer(Sender: TObject);
@ -227,32 +228,32 @@ procedure TIdeCoolbarOptionsFrame.spGrabWidthChange(Sender: TObject);
begin begin
CoolBar.GrabWidth := TSpinEdit(Sender).Value; CoolBar.GrabWidth := TSpinEdit(Sender).Value;
CoolBar.AutosizeBands; CoolBar.AutosizeBands;
EnableDisableButtons(0); EnableDisableGeneralButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.cbGrabStyleChange(Sender: TObject); procedure TIdeCoolbarOptionsFrame.cbGrabStyleChange(Sender: TObject);
begin begin
CoolBar.GrabStyle := TGrabStyle(TComboBox(Sender).ItemIndex); CoolBar.GrabStyle := TGrabStyle(TComboBox(Sender).ItemIndex);
CoolBar.AutosizeBands; CoolBar.AutosizeBands;
EnableDisableButtons(0); EnableDisableGeneralButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.cbCoolBarVisibleClick(Sender: TObject); procedure TIdeCoolbarOptionsFrame.cbCoolBarVisibleClick(Sender: TObject);
begin begin
FTempCoolBar.IsVisible := cbCoolBarVisible.Checked; FTempCoolBar.IsVisible := cbCoolBarVisible.Checked;
EnableDisableButtons(0); EnableDisableGeneralButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.CoolbarChange(Sender: TObject); procedure TIdeCoolbarOptionsFrame.CoolbarChange(Sender: TObject);
begin begin
EnableDisableButtons(1); EnableDisableToolbarButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.cbBorderStyleChange(Sender: TObject); procedure TIdeCoolbarOptionsFrame.cbBorderStyleChange(Sender: TObject);
begin begin
Coolbar.BandBorderStyle := TBorderStyle(TComboBox(Sender).ItemIndex); Coolbar.BandBorderStyle := TBorderStyle(TComboBox(Sender).ItemIndex);
Coolbar.AutosizeBands; Coolbar.AutosizeBands;
EnableDisableButtons(0); EnableDisableGeneralButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.SelectBand(const ID: integer); procedure TIdeCoolbarOptionsFrame.SelectBand(const ID: integer);
@ -301,32 +302,28 @@ begin
SelectBand(CoolBand.Index); SelectBand(CoolBand.Index);
end; end;
procedure TIdeCoolbarOptionsFrame.EnableDisableButtons(const bType: Integer); procedure TIdeCoolbarOptionsFrame.EnableDisableGeneralButtons;
begin
bDefaultGeneral.Enabled := not FTempCoolBar.IsDefaultCoolbar;
end;
procedure TIdeCoolbarOptionsFrame.EnableDisableToolbarButtons;
var var
I: Integer; I: Integer;
Selected: Boolean; Selected: Boolean;
begin begin
case bType of Selected := False;
0: for I := 0 to Coolbar.Bands.Count - 1 do
begin
if Coolbar.Bands[I].Color = clHighlight then
begin begin
bDefaultGeneral.Enabled := not FTempCoolBar.IsDefaultCoolbar; Selected := True;
end; Break;
1:
begin
Selected := False;
for I := 0 to Coolbar.Bands.Count - 1 do
begin
if Coolbar.Bands[I].Color = clHighlight then
begin
Selected := True;
Break;
end;
end;
bConfig.Enabled := Selected;
bDelete.Enabled := Selected;
bDefaultToolbar.Enabled := not FTempCoolBar.IsDefaultToolbar;
end; end;
end; end;
bConfig.Enabled := Selected;
bDelete.Enabled := Selected;
bDefaultToolbar.Enabled := not FTempCoolBar.IsDefaultToolbar;
end; end;
procedure TIdeCoolbarOptionsFrame.PopulateToolBar; procedure TIdeCoolbarOptionsFrame.PopulateToolBar;
@ -350,7 +347,7 @@ begin
if CoolBar.Bands.Count > 0 then if CoolBar.Bands.Count > 0 then
SelectBand(0); SelectBand(0);
Coolbar.AutosizeBands; Coolbar.AutosizeBands;
EnableDisableButtons(1); EnableDisableToolbarButtons;
end; end;
constructor TIdeCoolbarOptionsFrame.Create(AOwner: TComponent); constructor TIdeCoolbarOptionsFrame.Create(AOwner: TComponent);
@ -387,7 +384,7 @@ begin
CoolBand.MinHeight := 22; CoolBand.MinHeight := 22;
CoolBand.FixedSize := True; CoolBand.FixedSize := True;
SelectBand(CoolBand.Index); SelectBand(CoolBand.Index);
EnableDisableButtons(1); EnableDisableToolbarButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.bConfigClick(Sender: TObject); procedure TIdeCoolbarOptionsFrame.bConfigClick(Sender: TObject);
@ -411,7 +408,7 @@ begin
FTempCoolBar.ToolBars[ToConfig].UseCurrentOptions; FTempCoolBar.ToolBars[ToConfig].UseCurrentOptions;
end; end;
Coolbar.AutosizeBands; Coolbar.AutosizeBands;
EnableDisableButtons(1); EnableDisableToolbarButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.bDeleteClick(Sender: TObject); procedure TIdeCoolbarOptionsFrame.bDeleteClick(Sender: TObject);
@ -439,7 +436,7 @@ begin
CoolBar.Bands.Delete(ToDelete); CoolBar.Bands.Delete(ToDelete);
end; end;
end; end;
EnableDisableButtons(1); EnableDisableToolbarButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.bDefaultGeneralClick(Sender: TObject); procedure TIdeCoolbarOptionsFrame.bDefaultGeneralClick(Sender: TObject);
@ -453,7 +450,7 @@ begin
BiDiMode := bdLeftToRight; BiDiMode := bdLeftToRight;
cbBorderStyle.ItemIndex := 1; cbBorderStyle.ItemIndex := 1;
FTempCoolBar.SetCoolBarDefaults; FTempCoolBar.SetCoolBarDefaults;
EnableDisableButtons(0); EnableDisableGeneralButtons;
end; end;
procedure TIdeCoolbarOptionsFrame.bDefaultToolbarClick(Sender: TObject); procedure TIdeCoolbarOptionsFrame.bDefaultToolbarClick(Sender: TObject);