Merge lp:~hdaniel/terminator/terminator into lp:terminator/trunk

[Haim Daniel]

Add support for terminal edit title key binding.

Currently the only way of changing either: terminal title and tab title is by mouse clicking on either on them.

The suggested fix adds support for keybinding for each action and has a potential productivity increase.

The suggested default key layouts are:
* edit terminal title '<Alt>F2'.
* edit tab title '<Alt><Shift>F2'

This fixes issue: https://bugs.launchpad.net/terminator/+bug/1417747

[Haim Daniel (hdaniel)]

bump. anyone ?

[Stephen Boddy (stephen-j-boddy)]

Hi, I'm aware. I just haven't gotten around to merging it. A couple of minor comments/nitpicks.

1) I'm not sure about the suggested shortcuts. We use Alt+T to change the window title, and to use F2 now for titlebars and tabs feels a bit "ad-hoc" :-) I need to have a think whether I should move the window shortcut so that they are gathered together. (I don't think we can move yours to the T key, as that is already quite busy with shortcuts.

2) From a simple eyeball, the patch looks good, but I notice that nothing was added to the documents (man pages, manual etc.) It's not a huge deal, and I can add it myself, but it would be nice if these non-code items are updated too.

Thanks for the contribution, and I will test and merge it soon.

[Haim Daniel (hdaniel)]

Hi,

Regarding 1)
perfectly understood and agreed - the suggested key combination was just a temp placeholder :)

regarding 2) will add the shortcuts to the relevant documentation, but IMHO "1)" should be decided upon ? or I can simply add current patch's keys and later on modify them ?

Thank you for you time and a great SW piece!

[lp:~hdaniel/terminator/terminator]

1675. By Haim Daniel <email address hidden> on 2015-10-26

Add support for terminal and tab edit title key binding.

Currently the only way of changing either active terminal title or active tab
title is by mouse clicking on them.

The suggested fix adds support for keybinding for each action, thus providing
a potential productivity increase from user's perspective.

The suggested default key layouts are:
* edit terminal title '<Alt>F2'.
* edit tab title '<Alt><Shift>F2'

This fixes issue: https://bugs.launchpad.net/terminator/+bug/1417747

[Haim Daniel (hdaniel)]

bump.

I'm sorry for being so pesky, but is there an issue with the patch which I can resolve ?

[Stephen Boddy (stephen-j-boddy)]

Nope. The only problem is my free time, and what I'm doing with it. I had a bit of a push when getting the 0.98 release out, so my foot has been off the gas. Don't worry, I'm just a cyclical maintainer. I'll have a burst of activity at some point soon, and it'll get merged.

[Stephen Boddy (stephen-j-boddy)]

So it is now merged as rev 1683. Thanks for the contribution.

I did adjust the shortcuts in the end. I don't know about you, but on my desktop <Alt>+F2 gives me the "Run Application" dialog. So they are now
<Ctrl>W for /W/indow
<Ctrl>A for t/A/b
<Ctrl>X for terminal (/X/ marks the spot :-)

I updated the man pages and the html manual too.

review: Approve

[Haim Daniel (hdaniel)]

Great. My 5 cents are: <Ctrl>W is bound to remove word on bash (which is kinda popular shell), IMHO it will cause some users tear their hairs ...

[Haim Daniel (hdaniel)]

I wasn't able to edit prev comment, but <Ctrl>A is home in bash as well:
http://ss64.com/bash/syntax-keyboard.html

[Stephen Boddy (stephen-j-boddy)]

Yeah, someone raised a bug about this:
https://bugs.launchpad.net/terminator/+bug/1514089

Let's continue discussion of appropriate shortcuts there.

=== modified file 'doc/terminator.1'
--- doc/terminator.1	2015-10-01 18:51:28 +0000
+++ doc/terminator.1	2015-10-26 13:47:38 +0000
@@ -224,6 +224,12 @@
 .B Alt+T
 Rename titlebar.
 .TP
+.B Alt+F2
+Rename terminal title.
+.TP
+.B Alt+Shift+F2
+Rename tab title.
+.TP
 .B Super+1
 Insert terminal number, i.e. 1 to 12.
 .TP

=== modified file 'doc/terminator_config.5'
--- doc/terminator_config.5	2015-10-01 18:53:15 +0000
+++ doc/terminator_config.5	2015-10-26 13:47:38 +0000
@@ -286,6 +286,14 @@
 depending on your keyboard layout.
 Default value: \fBUnbound\fR
 .TP
+.B edit_tab_title
+Edit the currently active tab's title
+Default value: \fB<Alt><Shift>F2\fR
+.TP
+.B edit_terminal_title
+Edit the currently active terminal's title
+Default value: \fB<Alt>F2\fR
+.TP
 .B full_screen
 Toggle the window to a fullscreen window.
 Default value: \fBF11\fR

=== modified file 'terminatorlib/config.py'
--- terminatorlib/config.py	2015-10-01 18:53:15 +0000
+++ terminatorlib/config.py	2015-10-26 13:47:38 +0000
@@ -191,6 +191,8 @@
             'insert_number'    : '<Super>1',
             'insert_padded'    : '<Super>0',
             'edit_window_title': '<Alt>t',
+            'edit_tab_title'   : '<Alt><Shift>F2',
+            'edit_terminal_title': '<Alt>F2',
             'layout_launcher'  : '<Alt>l',
             'next_profile'     : '',
             'previous_profile' : '', 

=== modified file 'terminatorlib/editablelabel.py'
--- terminatorlib/editablelabel.py	2015-07-10 19:36:33 +0000
+++ terminatorlib/editablelabel.py	2015-10-26 13:47:38 +0000
@@ -26,7 +26,8 @@
     # pylint: disable-msg=R0904
     """
     An eventbox that partialy emulate a gtk.Label
-    On double-click, the label is editable, entering an empty will revert back to automatic text
+    On double-click or key binding the label is editable, entering an empty
+    will revert back to automatic text
     """
     _label = None
     _ebox = None
@@ -69,30 +70,34 @@
         """get the text from the label"""
         return(self._label.get_text())
 
+    def edit(self):
+        """ Start editing the widget text """
+        self.remove(self._label)
+        self._entry = gtk.Entry()
+        self._entry.set_text(self._label.get_text())
+        self._entry.show()
+        self.add(self._entry)
+        sig = self._entry.connect("focus-out-event", self._entry_to_label)
+        self._entry_handler_id.append(sig)
+        sig = self._entry.connect("activate", self._on_entry_activated)
+        self._entry_handler_id.append(sig)
+        sig = self._entry.connect("key-press-event",
+                                  self._on_entry_keypress)
+        self._entry_handler_id.append(sig)
+        sig = self._entry.connect("button-press-event",
+                                  self._on_entry_buttonpress)
+        self._entry_handler_id.append(sig)
+        self._entry.grab_focus()
+
     def _on_click_text(self, widget, event):
         # pylint: disable-msg=W0613
         """event handling text edition"""
         if event.button != 1:
             return False
         if event.type == gtk.gdk._2BUTTON_PRESS:
-            self.remove (self._label)
-            self._entry = gtk.Entry ()
-            self._entry.set_text (self._label.get_text ())
-            self._entry.show ()
-            self.add (self._entry)
-            sig = self._entry.connect ("focus-out-event", self._entry_to_label)
-            self._entry_handler_id.append(sig)
-            sig = self._entry.connect ("activate", self._on_entry_activated)
-            self._entry_handler_id.append(sig)
-            sig = self._entry.connect ("key-press-event",
-                                         self._on_entry_keypress)
-            self._entry_handler_id.append(sig)
-            sig = self._entry.connect("button-press-event",
-                                      self._on_entry_buttonpress)
-            self._entry_handler_id.append(sig)
-            self._entry.grab_focus ()
-            return(True)
-        return(False)
+            self.edit()
+            return True
+        return False
 
     def _entry_to_label (self, widget, event):
         # pylint: disable-msg=W0613

=== modified file 'terminatorlib/notebook.py'
--- terminatorlib/notebook.py	2015-09-07 02:03:24 +0000
+++ terminatorlib/notebook.py	2015-10-26 13:47:38 +0000
@@ -536,6 +536,9 @@
         else:
             return(None)
 
+    def edit(self):
+        self.label.edit()
+
     def update_button(self):
         """Update the state of our close button"""
         if not self.config['close_button_on_tab']:

=== modified file 'terminatorlib/prefseditor.py'
--- terminatorlib/prefseditor.py	2015-10-01 18:53:15 +0000
+++ terminatorlib/prefseditor.py	2015-10-26 13:47:38 +0000
@@ -148,6 +148,8 @@
                         'insert_number'    : _('Insert terminal number'),
                         'insert_padded'    : _('Insert padded terminal number'),
                         'edit_window_title': _('Edit window title'),
+                        'edit_terminal_title': _('Edit terminal title'),
+                        'edit_tab_title'   : _('Edit tab title'),
                         'layout_launcher'  : _('Open layout launcher window'),
                         'next_profile'     : _('Switch to next profile'),
                         'previous_profile' : _('Switch to previous profile'), 

=== modified file 'terminatorlib/terminal.py'
--- terminatorlib/terminal.py	2015-10-01 18:53:15 +0000
+++ terminatorlib/terminal.py	2015-10-26 13:47:38 +0000
@@ -1836,6 +1836,20 @@
         dialog.destroy()
         return
 
+    def key_edit_tab_title(self):
+        window = self.get_toplevel()
+        if not window.is_child_notebook():
+            return
+
+        notebook = window.get_children()[0]
+        n_page = notebook.get_current_page()
+        page = notebook.get_nth_page(n_page)
+        label = notebook.get_tab_label(page)
+        label.edit()
+
+    def key_edit_terminal_title(self):
+        self.titlebar.label.edit()
+
     def key_layout_launcher(self):
         LAYOUTLAUNCHER=LayoutLauncher()