Rename Toolbar_options -> IdeCoolbar_options.

git-svn-id: trunk@49393 -

.gitattributes

@@ -5737,6 +5737,8 @@ ide/frames/fpdoc_options.lfm svneol=native#text/plain
 ide/frames/fpdoc_options.pas svneol=native#text/pascal
 ide/frames/help_general_options.lfm svneol=native#text/plain
 ide/frames/help_general_options.pas svneol=native#text/plain
+ide/frames/idecoolbar_options.lfm svneol=native#text/plain
+ide/frames/idecoolbar_options.pas svneol=native#text/pascal
 ide/frames/modematrixctrl.pas svneol=native#text/plain
 ide/frames/msgwnd_options.lfm svneol=native#text/plain
 ide/frames/msgwnd_options.pas svneol=native#text/plain
@@ -5760,8 +5762,6 @@ ide/frames/project_save_options.lfm svneol=native#text/plain
 ide/frames/project_save_options.pas svneol=native#text/plain
 ide/frames/project_versioninfo_options.lfm svneol=native#text/plain
 ide/frames/project_versioninfo_options.pas svneol=native#text/plain
-ide/frames/toolbar_options.lfm svneol=native#text/plain
-ide/frames/toolbar_options.pas svneol=native#text/pascal
 ide/frames/window_options.lfm svneol=native#text/plain
 ide/frames/window_options.pas svneol=native#text/pascal
 ide/frmcustomapplicationoptions.lfm svneol=native#text/plain

ide/frames/idecoolbar_options.lfm

@@ -1,4 +1,4 @@
-object ToolbarOptionsFrame: TToolbarOptionsFrame
+object IdeCoolbarOptionsFrame: TIdeCoolbarOptionsFrame
   Left = 0
   Height = 451
   Top = 0
@@ -17,13 +17,13 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 264
-    Top = 187
+    Height = 251
+    Top = 200
     Width = 520
     Align = alClient
     BorderSpacing.Top = 6
     BevelOuter = bvNone
-    ClientHeight = 264
+    ClientHeight = 251
     ClientWidth = 520
     Constraints.MinHeight = 115
     TabOrder = 1
@@ -34,7 +34,7 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
       AnchorSideBottom.Side = asrBottom
       Left = 0
       Height = 35
-      Top = 229
+      Top = 216
       Width = 520
       Align = alBottom
       AutoSize = True
@@ -48,9 +48,9 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
         AnchorSideBottom.Control = pnButtons
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 23
-        Top = 6
-        Width = 45
+        Height = 27
+        Top = 2
+        Width = 36
         Anchors = [akLeft, akBottom]
         AutoSize = True
         BorderSpacing.Left = 6
@@ -64,10 +64,10 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
         AnchorSideLeft.Side = asrBottom
         AnchorSideBottom.Control = pnButtons
         AnchorSideBottom.Side = asrBottom
-        Left = 120
-        Height = 23
-        Top = 6
-        Width = 57
+        Left = 105
+        Height = 27
+        Top = 2
+        Width = 50
         Anchors = [akLeft, akBottom]
         AutoSize = True
         BorderSpacing.Left = 6
@@ -81,10 +81,10 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
         AnchorSideLeft.Side = asrBottom
         AnchorSideBottom.Control = pnButtons
         AnchorSideBottom.Side = asrBottom
-        Left = 57
-        Height = 23
-        Top = 6
-        Width = 57
+        Left = 48
+        Height = 27
+        Top = 2
+        Width = 51
         Anchors = [akLeft, akBottom]
         AutoSize = True
         BorderSpacing.Left = 6
@@ -98,10 +98,10 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pnButtons
         AnchorSideBottom.Side = asrBottom
-        Left = 453
-        Height = 23
-        Top = 6
-        Width = 61
+        Left = 459
+        Height = 27
+        Top = 2
+        Width = 55
         Anchors = [akRight, akBottom]
         AutoSize = True
         BorderSpacing.Right = 6
@@ -113,14 +113,14 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
     end
     object sbCoolBar: TScrollBox
       Left = 0
-      Height = 201
+      Height = 188
       Top = 0
       Width = 520
       HorzScrollBar.Page = 75
-      VertScrollBar.Page = 25
+      VertScrollBar.Page = 22
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderStyle = bsNone
-      ClientHeight = 201
+      ClientHeight = 188
       ClientWidth = 520
       Constraints.MinHeight = 75
       TabOrder = 0
@@ -149,19 +149,19 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
   end
   object pnTop: TPanel
     Left = 0
-    Height = 168
+    Height = 179
     Top = 0
     Width = 520
     Align = alTop
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 168
+    ClientHeight = 179
     ClientWidth = 520
     Constraints.MinWidth = 350
     TabOrder = 0
     object dbGeneralSettings: TDividerBevel
       Left = 0
-      Height = 13
+      Height = 15
       Top = 5
       Width = 520
       Caption = 'General Coolbars Settings'
@@ -178,25 +178,25 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = pnTopCenterLabel
       Left = 0
-      Height = 78
-      Top = 55
+      Height = 80
+      Top = 60
       Width = 257
       Anchors = [akTop, akLeft, akRight]
       AutoSize = True
       BorderSpacing.Top = 6
       BorderSpacing.Right = 3
       Caption = 'Grab Style'
-      ClientHeight = 60
-      ClientWidth = 253
+      ClientHeight = 64
+      ClientWidth = 255
       TabOrder = 1
       object lbGrabWidth: TLabel
         AnchorSideTop.Control = spGrabWidth
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = spGrabWidth
-        Left = 107
-        Height = 13
-        Top = 37
-        Width = 58
+        Left = 94
+        Height = 15
+        Top = 40
+        Width = 73
         Anchors = [akTop, akRight]
         BorderSpacing.Around = 6
         Caption = 'Grab Width:'
@@ -207,9 +207,9 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = gbGrabStyle
         AnchorSideRight.Side = asrBottom
-        Left = 171
+        Left = 173
         Height = 21
-        Top = 33
+        Top = 37
         Width = 76
         Anchors = [akTop, akRight]
         BorderSpacing.Around = 6
@@ -225,12 +225,12 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
         AnchorSideRight.Control = gbGrabStyle
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 21
+        Height = 25
         Top = 6
-        Width = 241
+        Width = 243
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Around = 6
-        ItemHeight = 13
+        ItemHeight = 0
         ItemIndex = 1
         Items.Strings = (
           'gsSimple'
@@ -253,10 +253,10 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = pnTop
       AnchorSideBottom.Side = asrBottom
-      Left = 453
-      Height = 23
-      Top = 139
-      Width = 61
+      Left = 459
+      Height = 27
+      Top = 146
+      Width = 55
       Anchors = [akTop, akRight]
       AutoSize = True
       BorderSpacing.Around = 6
@@ -269,9 +269,9 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
       AnchorSideTop.Control = dbGeneralSettings
       AnchorSideTop.Side = asrBottom
       Left = 0
-      Height = 17
-      Top = 30
-      Width = 97
+      Height = 22
+      Top = 32
+      Width = 123
       BorderSpacing.Top = 12
       Caption = 'Coolbar is visible'
       OnClick = cbCoolBarVisibleClick
@@ -286,15 +286,15 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
       AnchorSideBottom.Control = gbGrabStyle
       AnchorSideBottom.Side = asrBottom
       Left = 263
-      Height = 78
-      Top = 55
+      Height = 80
+      Top = 60
       Width = 257
       Anchors = [akTop, akLeft, akRight, akBottom]
       AutoSize = True
       BorderSpacing.Left = 6
       Caption = 'Band Border Style'
-      ClientHeight = 60
-      ClientWidth = 253
+      ClientHeight = 64
+      ClientWidth = 255
       TabOrder = 2
       object cbBorderStyle: TComboBox
         AnchorSideLeft.Control = gbBorderStyle
@@ -302,12 +302,12 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
         AnchorSideRight.Control = gbBorderStyle
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 21
+        Height = 25
         Top = 6
-        Width = 241
+        Width = 243
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Around = 6
-        ItemHeight = 13
+        ItemHeight = 0
         ItemIndex = 1
         Items.Strings = (
           'None'
@@ -324,10 +324,10 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbCoolBarVisible
       AnchorSideTop.Side = asrCenter
-      Left = 129
-      Height = 13
-      Top = 32
-      Width = 66
+      Left = 155
+      Height = 15
+      Top = 36
+      Width = 83
       Alignment = taRightJustify
       BorderSpacing.Left = 32
       Caption = 'Coolbar width'
@@ -338,9 +338,9 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = lbCoolBarWidth
       AnchorSideTop.Side = asrCenter
-      Left = 201
+      Left = 244
       Height = 21
-      Top = 28
+      Top = 33
       Width = 64
       BorderSpacing.Left = 6
       MaxValue = 5000
@@ -366,8 +366,8 @@ object ToolbarOptionsFrame: TToolbarOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 13
-    Top = 168
+    Height = 15
+    Top = 179
     Width = 520
     Caption = 'Add/Config/Delete Toolbar(s)'
     Align = alTop

ide/frames/idecoolbar_options.pas

@@ -19,9 +19,9 @@
  ***************************************************************************
  Author: Balázs Székely
  Abstract:
-   Frame for toolbar options.
+   Frame for IDE Coolbar options.
 }
-unit toolbar_options;
+unit idecoolbar_options;
 
 {$mode objfpc}{$H+}
 
@@ -34,9 +34,9 @@ uses
 
 type
 
-  { TToolbarOptionsFrame }
+  { TIdeCoolbarOptionsFrame }
 
-  TToolbarOptionsFrame = class(TAbstractIDEOptionsEditor)
+  TIdeCoolbarOptionsFrame = class(TAbstractIDEOptionsEditor)
     bAdd: TBitBtn;
     bDefaultGeneral: TBitBtn;
     bConfig: TBitBtn;
@@ -103,14 +103,14 @@ uses MainBar, ToolbarConfig;
 
 {$R *.lfm}
 
-{ TToolbarOptionsFrame }
+{ TIdeCoolbarOptionsFrame }
 
-function TToolbarOptionsFrame.GetTitle: string;
+function TIdeCoolbarOptionsFrame.GetTitle: string;
 begin
   Result := lisCoolbarOptions;
 end;
 
-procedure TToolbarOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
+procedure TIdeCoolbarOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
 begin
   dbAddConfigDelete.Caption := lisCoolbarAddConfigDelete;
   dbGeneralSettings.Caption := lisCoolbarGeneralSettings;
@@ -134,7 +134,7 @@ begin
   bDefaultGeneral.Caption := lisCoolbarRestoreDefaults;
 end;
 
-procedure TToolbarOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
+procedure TIdeCoolbarOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
 var
   Opts: TIDECoolBarOptions;
 begin
@@ -170,7 +170,7 @@ begin
   PopulateToolBar;
 end;
 
-procedure TToolbarOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
+procedure TIdeCoolbarOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
 var
   I, J: integer;
   ToolBar: TToolBar;
@@ -200,12 +200,12 @@ begin
   MainIDEBar.SetMainIDEHeight;
 end;
 
-class function TToolbarOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;
+class function TIdeCoolbarOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;
 begin
   Result := TEnvironmentOptions;
 end;
 
-procedure TToolbarOptionsFrame.CoolBarMouseDown(Sender: TObject;
+procedure TIdeCoolbarOptionsFrame.CoolBarMouseDown(Sender: TObject;
   Button: TMouseButton; Shift: TShiftState; X, Y: integer);
 var
   ABand: integer;
@@ -218,58 +218,58 @@ begin
     SelectBand(ABand);
 end;
 
-procedure TToolbarOptionsFrame.CoolbarResize(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.CoolbarResize(Sender: TObject);
 begin
   if tmWait.Enabled then
     Exit;
   tmWait.Enabled := True;
 end;
 
-procedure TToolbarOptionsFrame.spCoolBarWidthChange(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.spCoolBarWidthChange(Sender: TObject);
 begin
   FTempCoolBar.Width := spCoolBarWidth.Value;
   EnableDisableButtons(0);
 end;
 
-procedure TToolbarOptionsFrame.tmWaitTimer(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.tmWaitTimer(Sender: TObject);
 begin
   Coolbar.AutosizeBands;
   tmWait.Enabled := False;
 end;
 
-procedure TToolbarOptionsFrame.spGrabWidthChange(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.spGrabWidthChange(Sender: TObject);
 begin
   CoolBar.GrabWidth := TSpinEdit(Sender).Value;
   CoolBar.AutosizeBands;
   EnableDisableButtons(0);
 end;
 
-procedure TToolbarOptionsFrame.cbGrabStyleChange(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.cbGrabStyleChange(Sender: TObject);
 begin
   CoolBar.GrabStyle := TGrabStyle(TComboBox(Sender).ItemIndex);
   CoolBar.AutosizeBands;
   EnableDisableButtons(0);
 end;
 
-procedure TToolbarOptionsFrame.cbCoolBarVisibleClick(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.cbCoolBarVisibleClick(Sender: TObject);
 begin
   FTempCoolBar.IsVisible := cbCoolBarVisible.Checked;
   EnableDisableButtons(0);
 end;
 
-procedure TToolbarOptionsFrame.CoolbarChange(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.CoolbarChange(Sender: TObject);
 begin
   EnableDisableButtons(1);
 end;
 
-procedure TToolbarOptionsFrame.cbBorderStyleChange(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.cbBorderStyleChange(Sender: TObject);
 begin
   Coolbar.BandBorderStyle := TBorderStyle(TComboBox(Sender).ItemIndex);
   Coolbar.AutosizeBands;
   EnableDisableButtons(0);
 end;
 
-procedure TToolbarOptionsFrame.SelectBand(const ID: integer);
+procedure TIdeCoolbarOptionsFrame.SelectBand(const ID: integer);
 var
   I: integer;
 begin
@@ -289,7 +289,7 @@ begin
   end;
 end;
 
-function TToolbarOptionsFrame.GetSelectedBand: Integer;
+function TIdeCoolbarOptionsFrame.GetSelectedBand: Integer;
 var
   I: Integer;
 begin
@@ -306,7 +306,7 @@ begin
   end;
 end;
 
-procedure TToolbarOptionsFrame.ToolBarClick(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.ToolBarClick(Sender: TObject);
 var
   CoolBand: TCoolBand;
 begin
@@ -315,7 +315,7 @@ begin
     SelectBand(CoolBand.Index);
 end;
 
-procedure TToolbarOptionsFrame.EnableDisableButtons(const bType: Integer);
+procedure TIdeCoolbarOptionsFrame.EnableDisableButtons(const bType: Integer);
 var
   I: Integer;
   Selected: Boolean;
@@ -343,7 +343,7 @@ begin
   end;
 end;
 
-procedure TToolbarOptionsFrame.PopulateToolBar;
+procedure TIdeCoolbarOptionsFrame.PopulateToolBar;
 var
   CoolBand: TCoolBand;
   I, J: Integer;
@@ -369,7 +369,7 @@ begin
   EnableDisableButtons(1);
 end;
 
-constructor TToolbarOptionsFrame.Create(AOwner: TComponent);
+constructor TIdeCoolbarOptionsFrame.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
   FTempCoolBar := TIDEcoolBar.Create(Coolbar);
@@ -377,7 +377,7 @@ begin
   FDefaultOptions := TDefaultCoolBarOptions.Create;
 end;
 
-destructor TToolbarOptionsFrame.Destroy;
+destructor TIdeCoolbarOptionsFrame.Destroy;
 begin
   FreeAndNil(FDefaultOptions);
   FreeAndNil(FTempCoolBarOptions);
@@ -385,7 +385,7 @@ begin
   inherited Destroy;
 end;
 
-procedure TToolbarOptionsFrame.bAddClick(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.bAddClick(Sender: TObject);
 var
   CoolBand: TCoolBand;
   IDEToolbar: TIDEToolBar;
@@ -406,7 +406,7 @@ begin
   EnableDisableButtons(1);
 end;
 
-procedure TToolbarOptionsFrame.bConfigClick(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.bConfigClick(Sender: TObject);
 var
   ToConfig: Integer;
   ToolBar: TToolBar;
@@ -436,7 +436,7 @@ begin
   EnableDisableButtons(1);
 end;
 
-procedure TToolbarOptionsFrame.bDeleteClick(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.bDeleteClick(Sender: TObject);
 var
   I: integer;
   ToDelete: integer;
@@ -464,7 +464,7 @@ begin
   EnableDisableButtons(1);
 end;
 
-procedure TToolbarOptionsFrame.bDefaultGeneralClick(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.bDefaultGeneralClick(Sender: TObject);
 begin
   cbCoolBarVisible.Checked := True;
   FTempCoolBar.IsVisible := True;
@@ -478,7 +478,7 @@ begin
   EnableDisableButtons(0);
 end;
 
-procedure TToolbarOptionsFrame.bDefaultToolbarClick(Sender: TObject);
+procedure TIdeCoolbarOptionsFrame.bDefaultToolbarClick(Sender: TObject);
 begin
   FTempCoolBar.SetToolBarDefaults;
   PopulateToolBar;
@@ -486,7 +486,7 @@ end;
 
 
 initialization
-  RegisterIDEOptionsEditor(GroupEnvironment, TToolbarOptionsFrame, EnvOptionsToolbar);
+  RegisterIDEOptionsEditor(GroupEnvironment, TIdeCoolbarOptionsFrame, EnvOptionsToolbar);
 
 end.
 

ide/main.pp

@@ -115,7 +115,7 @@ uses
   // environment option frames
   editor_general_options, componentpalette_options, formed_options, OI_options,
   MsgWnd_Options, files_options, desktop_options, window_options,
-  Backup_Options, naming_options, fpdoc_options, toolbar_options, editortoolbar_options,
+  Backup_Options, naming_options, fpdoc_options, idecoolbar_options, editortoolbar_options,
   editor_display_options, editor_keymapping_options, editor_mouseaction_options,
   editor_mouseaction_options_advanced, editor_color_options, editor_markup_options,
   editor_markup_userdefined, editor_codetools_options, editor_codefolding_options,
@@ -12752,7 +12752,7 @@ end;
 
 procedure TMainIDE.ToolBarOptionsClick(Sender: TObject);
 begin
-  DoOpenIDEOptions(TToolbarOptionsFrame, '', [], []);
+  DoOpenIDEOptions(TIdeCoolbarOptionsFrame, '', [], []);
 end;