From de5605d213ca6df52da13e2444b7ea8f888b40d3 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Tue, 10 Mar 2015 14:42:54 +0300 Subject: [PATCH] search panel improvements --- src/dlangide/ui/commands.d | 2 +- src/dlangide/ui/searchPanel.d | 24 ++++++++++++++++++------ views/res/mdpi/edit-find.png | Bin 0 -> 666 bytes views/resources.list | 1 + 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 views/res/mdpi/edit-find.png diff --git a/src/dlangide/ui/commands.d b/src/dlangide/ui/commands.d index 72979e1..fda7548 100644 --- a/src/dlangide/ui/commands.d +++ b/src/dlangide/ui/commands.d @@ -102,4 +102,4 @@ const Action ACTION_ADD_TO_CURRENT_WORKSPACE = new Action(IDEActions.AddToCurren const Action ACTION_GO_TO_DEFINITION = (new Action(IDEActions.GoToDefinition, "GO_TO_DEFINITION"c, ""c, KeyCode.KEY_G, KeyFlag.Control)).addAccelerator(KeyCode.F12, 0).disableByDefault(); const Action ACTION_GET_COMPLETIONS = (new Action(IDEActions.GetCompletionSuggestions, "SHOW_COMPLETIONS"c, ""c, KeyCode.KEY_G, KeyFlag.Control|KeyFlag.Shift)).addAccelerator(KeyCode.SPACE, KeyFlag.Control).disableByDefault(); -const Action ACTION_FIND_TEXT = (new Action(IDEActions.FindText, "FIND_TEXT"c, ""c, KeyCode.KEY_F, KeyFlag.Control)); +const Action ACTION_FIND_TEXT = (new Action(IDEActions.FindText, "FIND_TEXT"c, "edit-find"c, KeyCode.KEY_F, KeyFlag.Control)); diff --git a/src/dlangide/ui/searchPanel.d b/src/dlangide/ui/searchPanel.d index b3445e9..f2e90fc 100644 --- a/src/dlangide/ui/searchPanel.d +++ b/src/dlangide/ui/searchPanel.d @@ -113,7 +113,21 @@ class SearchWidget : TabWidget { string filename; SearchMatch[] matches; } - + + bool onFindButtonPressed(Widget source) { + dstring txt = _findText.text; + if (txt.length > 0) + findText(txt); + return true; + } + + protected bool onEditorAction(const Action action) { + if (action.id == EditorActions.InsertNewLine) { + return onFindButtonPressed(this); + } + return false; + } + this(string ID, IDEFrame frame) { super(ID); _frame = frame; @@ -129,13 +143,11 @@ class SearchWidget : TabWidget { _findText = new EditLine(); _findText.padding(Rect(5,4,50,4)); _findText.layoutWidth(400); + _findText.editorActionListener = &onEditorAction; // to handle Enter key press in editor _layout.addChild(_findText); - auto goButton = new ImageButton("findTextButton", "edit-redo"); - goButton.addOnClickListener( delegate(Widget) { - findText(_findText.text); - return true; - }); + auto goButton = new ImageButton("findTextButton", "edit-find"); + goButton.onClickListener = &onFindButtonPressed; _layout.addChild(goButton); _searchScope = new ComboBox("searchScope", ["File"d, "Project"d, "Dependencies"d, "Everywhere"d]); diff --git a/views/res/mdpi/edit-find.png b/views/res/mdpi/edit-find.png new file mode 100644 index 0000000000000000000000000000000000000000..4ecdd9a49b11697946b740aedbfe24c800e346cf GIT binary patch literal 666 zcmV;L0%iS)P)TY>NAmyx0w+mC zK~y-)&5}P%6LA=ZpWo4fcUS&2_GoJZhw(I)lp1O^F-%RGFyN$;CX9?-o4B)@IJw}! z;;6!e2`)ODh%p3H+Qd|gwbWX$mi8zd{ke3gEIJwA>C2n<`KAZ{$1DPGfu){qsoO37 z2@aa3>7>(XX<3#8!oU^FvSd1)mZoVsK(H4OJ@+i|AQFj0g%DIK6&%O00bDMZY8VDW z2)4Jkw}AV=O8}({TcJ>BJ(I~qrId_~jUj{}l}f3}WKtDEV45aUN-~*DG!zQ00~SDE z_rarZIDD<$ZZkDCMJ|_Pa&nT5jSV(8H%TNCl*?siW@ac93Mh)Alu9KZu;v104Z~Q7 z#bN|U4ea9+>h(I!W)rvDjoks4#UI41PmYLZ&eC~!a}uLeIkHY^LOtgK4-U3 zIwxG57$1azrz^ zU`5yU!+303j*N^nfaNaxn^e9ta-GfJZ2ob60q}{=3+1XVaR2}S07*qoM6N<$g6