From 595f0b5847f88470769668a0fb01d05d414b1843 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Thu, 14 Sep 2017 14:02:00 +0300
Subject: [PATCH] additional fix #292

---
 dub.json                      |  2 +-
 src/dlangide/ui/newfile.d     | 21 +++++++++------------
 src/dlangide/ui/searchPanel.d | 12 ++++--------
 views/VERSION                 |  2 +-
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/dub.json b/dub.json
index b8d80f3..6afc7e6 100644
--- a/dub.json
+++ b/dub.json
@@ -12,7 +12,7 @@
     "stringImportPaths": ["views"],
 
     "dependencies": {
-        "dlangui": "==0.9.132",
+        "dlangui": "==0.9.134",
         "dsymbol": "~>0.2.9",
         "dcd": "~>0.9.1"
     },
diff --git a/src/dlangide/ui/newfile.d b/src/dlangide/ui/newfile.d
index 40bb2a4..edbb98b 100644
--- a/src/dlangide/ui/newfile.d
+++ b/src/dlangide/ui/newfile.d
@@ -122,10 +122,10 @@ class NewFileDlg : Dialog {
         _edLocation.addFilter(FileFilterEntry(UIString.fromId("IDE_FILES"c), "*.dlangidews;*.d;*.dd;*.di;*.ddoc;*.dh;*.json;*.xml;*.ini;*.dt"));
         _edLocation.caption = "Select directory"d;
 
-        _edFileName.editorAction.connect(&onEditorAction);
-        _edFilePath.editorAction.connect(&onEditorAction);
-        _edModuleName.editorAction.connect(&onEditorAction);
-        _edLocation.editorAction.connect(&onEditorAction);
+        _edFileName.enterKey.connect(&onEnterKey);
+        _edFilePath.enterKey.connect(&onEnterKey);
+        _edModuleName.enterKey.connect(&onEnterKey);
+        _edLocation.enterKey.connect(&onEnterKey);
 
         // fill templates
         dstring[] names;
@@ -168,14 +168,11 @@ class NewFileDlg : Dialog {
         _edFileName.setFocus();
     }
 
-    protected bool onEditorAction(const Action action) {
-        if (action.id == EditorActions.InsertNewLine) {
-            if (!validate())
-                return false;
-            close(_buttonActions[0]);
-            return true;
-        }
-        return false;
+    protected bool onEnterKey(EditWidgetBase editor) {
+        if (!validate())
+            return false;
+        close(_buttonActions[0]);
+        return true;
     }
 
     StringListWidget _projectTemplateList;
diff --git a/src/dlangide/ui/searchPanel.d b/src/dlangide/ui/searchPanel.d
index 1ef7042..8c0ba9c 100644
--- a/src/dlangide/ui/searchPanel.d
+++ b/src/dlangide/ui/searchPanel.d
@@ -176,13 +176,6 @@ class SearchWidget : TabWidget {
         _findText.text = txt;
     }
 
-    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;
@@ -199,7 +192,10 @@ class SearchWidget : TabWidget {
         _findText = new EditLine();
         _findText.padding(Rect(5,4,50,4));
         _findText.layoutWidth = FILL_PARENT;
-        _findText.editorAction = &onEditorAction; // to handle Enter key press in editor
+        // to handle Enter key press in editor
+        _findText.enterKey = delegate (EditWidgetBase editor) {
+            return onFindButtonPressed(this);
+        };
         _layout.addChild(_findText);
         
         auto goButton = new ImageButton("findTextButton", "edit-find");
diff --git a/views/VERSION b/views/VERSION
index 26731c8..b4ba96d 100644
--- a/views/VERSION
+++ b/views/VERSION
@@ -1 +1 @@
-v0.7.79
\ No newline at end of file
+v0.7.80
\ No newline at end of file