From a8ed414562c0c90c1511400d330c499216a2b398 Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 19 Aug 2017 08:40:55 +0000 Subject: [PATCH] ideintf: Fix "new action" button dropdown arrow git-svn-id: branches/fixes_1_8@55690 - --- components/ideintf/actionseditor.lfm | 22 ++++++++-------------- components/ideintf/actionseditor.pas | 22 +++++++++------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/components/ideintf/actionseditor.lfm b/components/ideintf/actionseditor.lfm index 2dade48d7a..f627cd759d 100644 --- a/components/ideintf/actionseditor.lfm +++ b/components/ideintf/actionseditor.lfm @@ -16,7 +16,7 @@ object ActionListEditor: TActionListEditor OnKeyPress = ActionListEditorKeyPress OnShow = FormShow Position = poScreenCenter - LCLVersion = '1.7' + LCLVersion = '1.9.0.0' object PanelDescr: TPanel Left = 0 Height = 26 @@ -33,7 +33,7 @@ object ActionListEditor: TActionListEditor Left = 6 Height = 15 Top = 6 - Width = 67 + Width = 59 Caption = 'Categories:' ParentColor = False end @@ -41,7 +41,7 @@ object ActionListEditor: TActionListEditor Left = 162 Height = 15 Top = 6 - Width = 48 + Width = 43 Caption = 'Actions:' ParentColor = False end @@ -101,34 +101,28 @@ object ActionListEditor: TActionListEditor Left = 1 Top = 0 Action = ActNew - end - object btnAddMore: TToolButton - Left = 27 - Top = 0 - Caption = 'btnAddMore' DropdownMenu = PopMenuToolBarActions - ImageIndex = 0 + Style = tbsDropDown end object btnDelete: TToolButton - Left = 53 + Left = 39 Top = 0 Action = ActDelete end object ToolButton4: TToolButton - Left = 79 + Left = 65 Height = 26 Top = 0 - Width = 5 Caption = 'ToolButton4' Style = tbsDivider end object btnUp: TToolButton - Left = 84 + Left = 70 Top = 0 Action = ActMoveUp end object btnDown: TToolButton - Left = 110 + Left = 96 Top = 0 Action = ActMoveDown end diff --git a/components/ideintf/actionseditor.pas b/components/ideintf/actionseditor.pas index bd9eba7692..812b6f61a7 100644 --- a/components/ideintf/actionseditor.pas +++ b/components/ideintf/actionseditor.pas @@ -106,7 +106,6 @@ type Splitter: TSplitter; ToolBar1: TToolBar; btnAdd: TToolButton; - btnAddMore: TToolButton; btnDelete: TToolButton; ToolButton4: TToolButton; btnUp: TToolButton; @@ -391,7 +390,7 @@ begin ActMoveDown.Hint := cActionListEditorMoveDownAction; ActPanelDescr.Caption := cActionListEditorPanelDescrriptions; ActPanelToolBar.Caption := cActionListEditorPanelToolBar; - btnAddMore.Hint := cActionListEditorNewAction; + btnAdd.Hint := cActionListEditorNewAction; mItemToolBarNewAction.Caption := cActionListEditorNewAction; mItemToolBarNewStdAction.Caption := cActionListEditorNewStdAction; mItemActListNewAction.Caption := cActionListEditorNewAction; @@ -413,21 +412,18 @@ end; procedure TActionListEditor.FormCreate(Sender: TObject); var ImageSize: Integer; - Details: TThemedElementDetails; begin ImageSize := TIDEImages.ScaledSize; ImageList1.Width := ImageSize; ImageList1.Height := ImageSize; - TIDEImages.AddImageToImageList(ImageList1, 'btn_downarrow'); //imageindex 0 - TIDEImages.AddImageToImageList(ImageList1, 'laz_add'); //imageindex 1 - TIDEImages.AddImageToImageList(ImageList1, 'laz_delete'); //imageindex 2 - TIDEImages.AddImageToImageList(ImageList1, 'arrow_up'); //imadeindex 3 - TIDEImages.AddImageToImageList(ImageList1, 'arrow_down'); //imageindex 4 - btnAddMore.ImageIndex := 0; - btnAdd.ImageIndex := 1; - btnDelete.ImageIndex := 2; - btnUp.ImageIndex := 3; - btnDown.ImageIndex := 4; + TIDEImages.AddImageToImageList(ImageList1, 'laz_add'); //imageindex 0 + TIDEImages.AddImageToImageList(ImageList1, 'laz_delete'); //imageindex 1 + TIDEImages.AddImageToImageList(ImageList1, 'arrow_up'); //imadeindex 2 + TIDEImages.AddImageToImageList(ImageList1, 'arrow_down'); //imageindex 3 + btnAdd.ImageIndex := 0; + btnDelete.ImageIndex := 1; + btnUp.ImageIndex := 2; + btnDown.ImageIndex := 3; end; procedure TActionListEditor.FormShow(Sender: TObject);