Merge pull request #5 from komsit37/popup-close-shortcut-escape

add escape shortcut to close popup
komsit37 · Apr 7, 2016 · bf2cb30 · bf2cb30
2 parents 438385d + f6571a8
commit bf2cb30
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/q_out_popup.py b/q_out_popup.py
@@ -85,3 +85,8 @@ def do(self, edit, input=None):
 		input = sublime.decode_value(input)
 		return super().do(edit, input)
 
+class QOutPopupCloseCommand(QOutPopupBaseCommand):
+    def do(self, edit=None, input=None):
+        print('force close popup')
+        QOutPopupBaseCommand.TO_CLOSE = False
+        self.view.hide_popup()
diff --git a/sublime/Default (OSX).sublime-keymap b/sublime/Default (OSX).sublime-keymap
@@ -5,6 +5,8 @@
 	{ "keys": ["super+j"],			"command": "q_chain", "args": {"chain": ["q_select_text", "q_send_json", 	"q_out_popup_json", "q_update_completions"]}},
 	{ "keys": ["super+shift+enter"],"command": "q_chain", "args": {"chain": ["q_select_text", "q_send_json", 	"q_out_panel", "q_update_completions"]}},
 
+    { "keys": ["escape"],           "command": "q_chain", "args": {"chain": ["q_out_popup_close"]}},
+
 	//connection
 	{ "keys": ["super+alt+q"], 	"command": "show_connection_list"},
 
@@ -20,11 +22,11 @@
 	{ "keys": ["shift+f5"], "command": "q_chain", "args": {"chain": ["q_send_mem", "q_out_panel"]}},
 
 	//test
-	{ "keys": ["super+alt+t","7"], 	"command": "q_send", "args": {"input": "til 10"}},
-	{ "keys": ["super+alt+t","2"], 	"command": "q_send", "args": {"input": "til 10", "chain": ["q_out_panel"]}},
-	{ "keys": ["super+alt+t","3"], 	"command": "q_select_text"},
-	{ "keys": ["super+alt+t","4"], 	"command": "q_select_word"},
-	{ "keys": ["super+alt+t","5"], 	"command": "q_out_panel", "args": {"input": "hello man"}},
-	{ "keys": ["super+alt+t","6"], 	"command": "q_chain", "args": {"input": "til 10", "chain": ["q_send", "q_out_panel"]}},
-	{ "keys": ["super+alt+t","1"], 	"command": "q_update_completions"}
+	// { "keys": ["super+alt+t","7"], 	"command": "q_send", "args": {"input": "til 10"}},
+	// { "keys": ["super+alt+t","2"], 	"command": "q_send", "args": {"input": "til 10", "chain": ["q_out_panel"]}},
+	// { "keys": ["super+alt+t","3"], 	"command": "q_select_text"},
+	// { "keys": ["super+alt+t","4"], 	"command": "q_select_word"},
+	// { "keys": ["super+alt+t","5"], 	"command": "q_out_panel", "args": {"input": "hello man"}},
+	// { "keys": ["super+alt+t","6"], 	"command": "q_chain", "args": {"input": "til 10", "chain": ["q_send", "q_out_panel"]}},
+	// { "keys": ["super+alt+t","1"], 	"command": "q_update_completions"}
 ]
diff --git a/sublime/Default (Windows).sublime-keymap b/sublime/Default (Windows).sublime-keymap
@@ -5,6 +5,8 @@
 	{ "keys": ["ctrl+j"],			"command": "q_chain", "args": {"chain": ["q_select_text", "q_send_json", 	"q_out_popup_json", "q_update_completions"]}},
 	{ "keys": ["ctrl+shift+enter"],"command": "q_chain", "args": {"chain": ["q_select_text", "q_send_json", 	"q_out_panel", "q_update_completions"]}},
 
+    { "keys": ["escape"],           "command": "q_chain", "args": {"chain": ["q_out_popup_close"]}},
+
 	//connection
 	{ "keys": ["ctrl+alt+q"], 	"command": "show_connection_list"},
 
@@ -20,11 +22,11 @@
 	{ "keys": ["shift+f5"], "command": "q_chain", "args": {"chain": ["q_send_mem", "q_out_panel"]}},
 
 	//test
-	{ "keys": ["ctrl+alt+t","7"], 	"command": "q_send", "args": {"input": "til 10"}},
-	{ "keys": ["ctrl+alt+t","2"], 	"command": "q_send", "args": {"input": "til 10", "chain": ["q_out_panel"]}},
-	{ "keys": ["ctrl+alt+t","3"], 	"command": "q_select_text"},
-	{ "keys": ["ctrl+alt+t","4"], 	"command": "q_select_word"},
-	{ "keys": ["ctrl+alt+t","5"], 	"command": "q_out_panel", "args": {"input": "hello man"}},
-	{ "keys": ["ctrl+alt+t","6"], 	"command": "q_chain", "args": {"input": "til 10", "chain": ["q_send", "q_out_panel"]}},
-	{ "keys": ["ctrl+alt+t","1"], 	"command": "q_update_completions"}
+	// { "keys": ["ctrl+alt+t","7"], 	"command": "q_send", "args": {"input": "til 10"}},
+	// { "keys": ["ctrl+alt+t","2"], 	"command": "q_send", "args": {"input": "til 10", "chain": ["q_out_panel"]}},
+	// { "keys": ["ctrl+alt+t","3"], 	"command": "q_select_text"},
+	// { "keys": ["ctrl+alt+t","4"], 	"command": "q_select_word"},
+	// { "keys": ["ctrl+alt+t","5"], 	"command": "q_out_panel", "args": {"input": "hello man"}},
+	// { "keys": ["ctrl+alt+t","6"], 	"command": "q_chain", "args": {"input": "til 10", "chain": ["q_send", "q_out_panel"]}},
+	// { "keys": ["ctrl+alt+t","1"], 	"command": "q_update_completions"}
 ]