From 3a5d86acb0ccd33c3ea631ca56c260cbe38ef069 Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Wed, 25 Feb 2015 15:25:05 +0100 Subject: [PATCH 1/3] Slightly modified version of Custom Commands Dialog fix from David Chandler --- terminatorlib/plugins/custom_commands.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/terminatorlib/plugins/custom_commands.py b/terminatorlib/plugins/custom_commands.py index 7cfb0579..2af276ae 100755 --- a/terminatorlib/plugins/custom_commands.py +++ b/terminatorlib/plugins/custom_commands.py @@ -157,8 +157,13 @@ class CustomCommandsMenu(plugin.MenuItem): column = gtk.TreeViewColumn("Command", renderer, text=CC_COL_COMMAND) treeview.append_column(column) + scroll_window = gtk.ScrolledWindow() + scroll_window.set_size_request(500, 250) + scroll_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + scroll_window.add_with_viewport(treeview) + hbox = gtk.HBox() - hbox.pack_start(treeview) + hbox.pack_start(scroll_window, True, True) dbox.vbox.pack_start(hbox) button_box = gtk.VBox() @@ -206,7 +211,7 @@ class CustomCommandsMenu(plugin.MenuItem): - hbox.pack_start(button_box) + hbox.pack_start(button_box, False, True) dbox.show_all() res = dbox.run() if res == gtk.RESPONSE_ACCEPT: From 66b14afb9e6d1ae00109478a7d46cbc0bd56009d Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Wed, 25 Feb 2015 17:30:25 +0100 Subject: [PATCH 2/3] Fixes LP#1414332 custom commands broadcast to grouped terminals from Mauro S M Rodrigues --- terminatorlib/plugins/custom_commands.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/terminatorlib/plugins/custom_commands.py b/terminatorlib/plugins/custom_commands.py index 2af276ae..eff7c6e7 100755 --- a/terminatorlib/plugins/custom_commands.py +++ b/terminatorlib/plugins/custom_commands.py @@ -84,7 +84,8 @@ class CustomCommandsMenu(plugin.MenuItem): menuitem.set_image(image) else: menuitem = gtk.MenuItem(command["name"]) - menuitem.connect("activate", self._execute, {'terminal' : terminal, 'command' : command['command'] }) + terminals = terminal.terminator.get_target_terms(terminal) + menuitem.connect("activate", self._execute, {'terminals' : terminals, 'command' : command['command'] }) submenu.append(menuitem) def _save_config(self): @@ -108,9 +109,10 @@ class CustomCommandsMenu(plugin.MenuItem): def _execute(self, widget, data): command = data['command'] - if command[len(command)-1] != '\n': + if command[-1] != '\n': command = command + '\n' - data['terminal'].vte.feed_child(command) + for terminal in data['terminals']: + terminal.vte.feed_child(command) def configure(self, widget, data = None): ui = {} From 968da814144fd5147950ba7a3ea77cb9a9f0b019 Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Wed, 25 Feb 2015 18:47:26 +0100 Subject: [PATCH 3/3] Remove pointless horizontal scrollbar from Layout Launcher --- terminatorlib/layoutlauncher.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terminatorlib/layoutlauncher.glade b/terminatorlib/layoutlauncher.glade index 6b0a24dd..210a0389 100644 --- a/terminatorlib/layoutlauncher.glade +++ b/terminatorlib/layoutlauncher.glade @@ -23,7 +23,7 @@ True True - automatic + never automatic