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

IDE: Remove unnecessary label from ToolbarConfig.

Browse Source 
git-svn-id: trunk@59333 -
This commit is contained in:
wp 2018-10-21 20:29:59 +00:00
parent 5a23656f23
commit aabcf7e1d1
2 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ide/toolbarconfig.lfm
View File

@ -12,15 +12,15 @@ object ToolBarConfig: TToolBarConfig
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
object lblMenuTree: TLabel object lblMenuTree: TLabel
AnchorSideLeft.Control = TV AnchorSideLeft.Control = TV
AnchorSideLeft.Side = asrCenter AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
Left = 140 Left = 147
Height = 15 Height = 15
Top = 6 Top = 6
Width = 84 Width = 70
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Bottom = 6 BorderSpacing.Bottom = 6
Caption = 'lblMenuTree' Caption = 'lblMenuTree'
@ -32,10 +32,10 @@ object ToolBarConfig: TToolBarConfig
AnchorSideLeft.Control = lvToolbar AnchorSideLeft.Control = lvToolbar
AnchorSideLeft.Side = asrCenter AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = lblMenuTree AnchorSideTop.Control = lblMenuTree
Left = 517 Left = 523
Height = 15 Height = 15
Top = 6 Top = 6
Width = 67 Width = 54
BorderSpacing.Bottom = 6 BorderSpacing.Bottom = 6
Caption = 'lblToolbar' Caption = 'lblToolbar'
Font.Style = [fsBold] Font.Style = [fsBold]
@ -48,7 +48,7 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 372 Left = 372
Height = 26 Height = 26
Top = 121 Top = 115
Width = 26 Width = 26
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Enabled = False Enabled = False
@ -62,7 +62,7 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Control = TV AnchorSideTop.Control = TV
Left = 372 Left = 372
Height = 26 Height = 26
Top = 92 Top = 86
Width = 26 Width = 26
BorderSpacing.Left = 3 BorderSpacing.Left = 3
BorderSpacing.Top = 30 BorderSpacing.Top = 30
@ -77,7 +77,7 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 372 Left = 372
Height = 26 Height = 26
Top = 172 Top = 166
Width = 26 Width = 26
BorderSpacing.Top = 25 BorderSpacing.Top = 25
Enabled = False Enabled = False
@ -91,7 +91,7 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 372 Left = 372
Height = 26 Height = 26
Top = 201 Top = 195
Width = 26 Width = 26
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Enabled = False Enabled = False
@ -105,8 +105,8 @@ object ToolBarConfig: TToolBarConfig
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Splitter1 AnchorSideRight.Control = Splitter1
Left = 8 Left = 8
Height = 347 Height = 353
Top = 62 Top = 56
Width = 349 Width = 349
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
@ -127,12 +127,12 @@ object ToolBarConfig: TToolBarConfig
AnchorSideRight.Control = TV AnchorSideRight.Control = TV
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 8
Height = 29 Height = 23
Top = 27 Top = 27
Width = 349 Width = 349
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
NumGlyphs = 1
MaxLength = 0 MaxLength = 0
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
@ -146,8 +146,8 @@ object ToolBarConfig: TToolBarConfig
AnchorSideBottom.Control = TV AnchorSideBottom.Control = TV
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 360 Left = 360
Height = 347 Height = 353
Top = 62 Top = 56
Width = 9 Width = 9
Align = alNone Align = alNone
Anchors = [akTop, akBottom] Anchors = [akTop, akBottom]
@ -161,8 +161,8 @@ object ToolBarConfig: TToolBarConfig
AnchorSideBottom.Control = TV AnchorSideBottom.Control = TV
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 413 Left = 413
Height = 347 Height = 353
Top = 62 Top = 56
Width = 275 Width = 275
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Left = 15 BorderSpacing.Left = 15
@ -171,7 +171,7 @@ object ToolBarConfig: TToolBarConfig
item item
AutoSize = True AutoSize = True
Caption = 'Name' Caption = 'Name'
Width = 100 Width = 47
end> end>
HideSelection = False HideSelection = False
ReadOnly = True ReadOnly = True
@ -200,26 +200,10 @@ object ToolBarConfig: TToolBarConfig
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
end end
object lblSelect: TLabel
AnchorSideRight.Control = lvToolbar
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = FilterEdit
AnchorSideBottom.Side = asrCenter
Left = 636
Height = 15
Top = 33
Width = 52
Anchors = [akRight, akBottom]
BorderSpacing.Bottom = 6
Caption = 'lblSelect'
Color = clDefault
ParentColor = False
Transparent = False
end
object pnlButtons: TButtonPanel object pnlButtons: TButtonPanel
Left = 6 Left = 6
Height = 35 Height = 34
Top = 416 Top = 417
Width = 684 Width = 684
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True OKButton.DefaultCaption = True

10
ide/toolbarconfig.pas
View File

@ -54,7 +54,6 @@ type
FilterEdit: TTreeFilterEdit; FilterEdit: TTreeFilterEdit;
lblMenuTree: TLabel; lblMenuTree: TLabel;
lblToolbar: TLabel; lblToolbar: TLabel;
lblSelect: TLabel;
lvToolbar: TListView; lvToolbar: TListView;
miAll: TMenuItem; miAll: TMenuItem;
miCustom: TMenuItem; miCustom: TMenuItem;
@ -171,7 +170,6 @@ procedure TToolBarConfig.FormCreate(Sender: TObject);
begin begin
inherited; inherited;
pnlButtons.Color := clBtnFace; pnlButtons.Color := clBtnFace;
lblSelect.Caption := '';
// load button images // load button images
IDEImages.AssignImage(btnAdd, 'arrow__darkgreen_right'); IDEImages.AssignImage(btnAdd, 'arrow__darkgreen_right');
IDEImages.AssignImage(btnRemove, 'arrow__darkred_left'); IDEImages.AssignImage(btnRemove, 'arrow__darkred_left');
@ -338,16 +336,8 @@ end;
procedure TToolBarConfig.lvToolbarSelectItem(Sender: TObject; procedure TToolBarConfig.lvToolbarSelectItem(Sender: TObject;
Item: TListItem; Selected: Boolean); Item: TListItem; Selected: Boolean);
var
RealCount: integer;
begin begin
UpdateButtonsState; UpdateButtonsState;
// Update selection status label.
RealCount := lvToolbar.Items.Count-1;
if lvToolbar.ItemIndex < RealCount then
lblSelect.Caption := Format('%d / %d', [lvToolbar.ItemIndex+1, RealCount])
else
lblSelect.Caption := Format('%d+ / %d', [lvToolbar.ItemIndex, RealCount])
end; end;
procedure TToolBarConfig.MoveUpDown(aOffset: integer); procedure TToolBarConfig.MoveUpDown(aOffset: integer);