IDE: Rename some controls in Toolbar config dialog to make it consistent.

git-svn-id: trunk@54430 -
This commit is contained in:
juha 2017-03-17 10:08:23 +00:00
parent 6452487d49
commit 2ac4d4f57b
2 changed files with 34 additions and 34 deletions

View File

@ -11,14 +11,14 @@ object ToolBarConfig: TToolBarConfig
OnCreate = FormCreate
OnDestroy = FormDestroy
Position = poScreenCenter
LCLVersion = '1.5'
LCLVersion = '1.7'
object lblMenuTree: TLabel
AnchorSideLeft.Control = TV
AnchorSideLeft.Side = asrCenter
Left = 145
Height = 17
Left = 150
Height = 14
Top = 14
Width = 83
Width = 73
Caption = 'lblMenuTree'
ParentColor = False
end
@ -26,10 +26,10 @@ object ToolBarConfig: TToolBarConfig
AnchorSideLeft.Control = lvToolbar
AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = lblMenuTree
Left = 507
Height = 17
Left = 512
Height = 14
Top = 14
Width = 69
Width = 58
Caption = 'lblToolbar'
ParentColor = False
end
@ -39,7 +39,7 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Side = asrBottom
Left = 375
Height = 26
Top = 122
Top = 123
Width = 22
BorderSpacing.Top = 1
Enabled = False
@ -53,7 +53,7 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Control = TV
Left = 375
Height = 26
Top = 95
Top = 96
Width = 22
BorderSpacing.Left = 6
BorderSpacing.Top = 25
@ -68,7 +68,7 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Side = asrBottom
Left = 375
Height = 26
Top = 173
Top = 174
Width = 22
BorderSpacing.Top = 25
Enabled = False
@ -82,7 +82,7 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Side = asrBottom
Left = 375
Height = 26
Top = 200
Top = 201
Width = 22
BorderSpacing.Top = 1
Enabled = False
@ -96,13 +96,14 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Splitter1
Left = 16
Height = 339
Top = 70
Height = 338
Top = 71
Width = 341
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 6
BorderSpacing.Right = 3
BorderSpacing.Bottom = 6
DefaultItemHeight = 16
ReadOnly = True
ScrollBars = ssAutoBoth
TabOrder = 1
@ -112,10 +113,9 @@ object ToolBarConfig: TToolBarConfig
object FilterEdit: TTreeFilterEdit
AnchorSideTop.Side = asrBottom
Left = 16
Height = 27
Height = 28
Top = 37
Width = 192
UseFormActivate = True
ButtonWidth = 23
NumGlyphs = 1
BorderSpacing.Top = 6
@ -132,8 +132,8 @@ object ToolBarConfig: TToolBarConfig
AnchorSideBottom.Control = TV
AnchorSideBottom.Side = asrBottom
Left = 360
Height = 339
Top = 70
Height = 338
Top = 71
Width = 9
Align = alNone
Anchors = [akTop, akBottom]
@ -143,8 +143,8 @@ object ToolBarConfig: TToolBarConfig
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = TV
Left = 403
Height = 339
Top = 70
Height = 338
Top = 71
Width = 277
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Left = 6
@ -153,7 +153,7 @@ object ToolBarConfig: TToolBarConfig
item
AutoSize = True
Caption = 'Name'
Width = 275
Width = 100
end>
HideSelection = False
ReadOnly = True
@ -164,7 +164,7 @@ object ToolBarConfig: TToolBarConfig
OnDrawItem = lvToolbarDrawItem
OnSelectItem = lvToolbarSelectItem
end
object sbAddDivider: TSpeedButton
object btnAddDivider: TSpeedButton
AnchorSideLeft.Control = btnAdd
AnchorSideTop.Control = btnMoveDown
AnchorSideTop.Side = asrBottom
@ -178,17 +178,17 @@ object ToolBarConfig: TToolBarConfig
ShowHint = True
ParentShowHint = False
end
object lbSelect: TLabel
object lblSelect: TLabel
AnchorSideLeft.Control = lvToolbar
AnchorSideTop.Control = FilterEdit
AnchorSideRight.Control = lvToolbar
AnchorSideRight.Side = asrBottom
Left = 626
Height = 17
Left = 628
Height = 14
Top = 37
Width = 54
Width = 52
Anchors = [akTop, akRight]
Caption = 'lbSelect'
Caption = 'lblSelect'
ParentColor = False
Visible = False
end
@ -208,8 +208,8 @@ object ToolBarConfig: TToolBarConfig
end
object pnlButtons: TButtonPanel
Left = 6
Height = 37
Top = 414
Height = 35
Top = 416
Width = 684
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True

View File

@ -49,6 +49,7 @@ type
TToolBarConfig = class(TForm)
btnAdd: TSpeedButton;
btnAddDivider: TSpeedButton;
btnCancel: TButton;
btnClear: TSpeedButton;
btnHelp: TBitBtn;
@ -59,7 +60,7 @@ type
FilterEdit: TTreeFilterEdit;
lblMenuTree: TLabel;
lblToolbar: TLabel;
lbSelect: TLabel;
lblSelect: TLabel;
lvToolbar: TListView;
miAll: TMenuItem;
miCustom: TMenuItem;
@ -67,7 +68,6 @@ type
miDesign: TMenuItem;
miHTML: TMenuItem;
pnlButtons: TButtonPanel;
sbAddDivider: TSpeedButton;
Splitter1: TSplitter;
TV: TTreeView;
procedure btnClearClick(Sender: TObject);
@ -189,13 +189,13 @@ begin
btnMoveUp.LoadGlyphFromResourceName(HInstance, 'arrow_up');
btnMoveDown.LoadGlyphFromResourceName(HInstance, 'arrow_down');
btnClear.LoadGlyphFromResourceName(HINSTANCE,'menu_close');
sbAddDivider.LoadGlyphFromResourceName(HINSTANCE, 'menu_divider16');
btnAddDivider.LoadGlyphFromResourceName(HINSTANCE, 'menu_divider16');
btnAdd.Hint := lisCoolBarAddSelected;
btnRemove.Hint := lisCoolBarRemoveSelected;
btnMoveUp.Hint := lisCoolBarMoveSelectedUp;
btnMoveDown.Hint := lisCoolBarMoveSelectedDown;
sbAddDivider.Hint:= lisCoolBarAddDivider;
btnAddDivider.Hint:= lisCoolBarAddDivider;
btnClear.Hint := lisCoolBarClearSelection;
TV.Images := IDEImages.Images_16;
@ -203,7 +203,7 @@ begin
// default image to be used when none is available
defImageIndex := IDEImages.LoadImage(16, 'execute');
// Image for divider
divImageIndex := IDEImages.Images_16.Add(sbAddDivider.Glyph,nil);
divImageIndex := IDEImages.Images_16.Add(btnAddDivider.Glyph,nil);
MainList := TStringList.Create;
MainList.OwnsObjects:= True; // it should be the default, but just to make sure...
@ -421,7 +421,7 @@ procedure TToolBarConfig.lvToolbarSelectItem(Sender: TObject;
Item: TListItem; Selected: Boolean);
begin
lbToolbarSelectionChange(Sender);
lbSelect.Caption:= IntToStr(lvToolbar.ItemIndex)+ ' / ' + IntToStr(lvToolbar.Items.Count);
lblSelect.Caption:= IntToStr(lvToolbar.ItemIndex)+ ' / ' + IntToStr(lvToolbar.Items.Count);
btnClear.Enabled:= lvToolbar.Selected <> nil;
btnRemove.Enabled:= btnClear.Enabled;
end;