Fix title edit shortcuts to hopefully not clash with console programs so much

This commit is contained in:
Stephen Boddy 2015-12-02 23:40:20 +01:00
parent 9cbf3b83d5
commit e4ef5b8eec
7 changed files with 34 additions and 32 deletions

View File

@ -68,6 +68,8 @@ terminator trunk:
LP#1520705) LP#1520705)
* Fix scrollbar position on current terminals when changed in * Fix scrollbar position on current terminals when changed in
prefs (Egmont Koblinger, LP#1520761) prefs (Egmont Koblinger, LP#1520761)
* Fix title edit shortcuts to hopefully not clash with console
programs so much (Seve Boddy, LP#1514089)
terminator 0.98: terminator 0.98:
* Features * Features

View File

@ -501,15 +501,15 @@ Or maybe for you it is with tabs.
In Terminator you can rename three things: In Terminator you can rename three things:
+----------------+---------------------------+--------------------+ +----------------+---------------------------+--------------------------------+
| Edit | Mouse | Default Shortcut | | Edit | Mouse | Default Shortcut |
+================+===========================+====================+ +================+===========================+================================+
| Window title | N/A | ``Ctrl``\ +\ ``W`` | | Window title | N/A | ``Ctrl``\ +\ ``Alt``\ +\ ``W`` |
+----------------+---------------------------+--------------------+ +----------------+---------------------------+--------------------------------+
| Tab title | ``double-click`` tab | ``Ctrl``\ +\ ``A`` | | Tab title | ``double-click`` tab | ``Ctrl``\ +\ ``Alt``\ +\ ``A`` |
+----------------+---------------------------+--------------------+ +----------------+---------------------------+--------------------------------+
| Terminal title | ``double-click`` titlebar | ``Ctrl``\ +\ ``X`` | | Terminal title | ``double-click`` titlebar | ``Ctrl``\ +\ ``Alt``\ +\ ``X`` |
+----------------+---------------------------+--------------------+ +----------------+---------------------------+--------------------------------+
Additionally all three can be saved/loaded from a :ref:`layout <layouts>`, Additionally all three can be saved/loaded from a :ref:`layout <layouts>`,
or the window title can be set using a or the window title can be set using a

View File

@ -907,9 +907,9 @@ Or maybe for you it is with tabs.</p>
<p>In Terminator you can rename three things:</p> <p>In Terminator you can rename three things:</p>
<table border="1" class="docutils"> <table border="1" class="docutils">
<colgroup> <colgroup>
<col width="25%" /> <col width="21%" />
<col width="36%" />
<col width="43%" /> <col width="43%" />
<col width="32%" />
</colgroup> </colgroup>
<thead valign="bottom"> <thead valign="bottom">
<tr class="row-odd"><th class="head">Edit</th> <tr class="row-odd"><th class="head">Edit</th>
@ -920,15 +920,15 @@ Or maybe for you it is with tabs.</p>
<tbody valign="top"> <tbody valign="top">
<tr class="row-even"><td>Window title</td> <tr class="row-even"><td>Window title</td>
<td>N/A</td> <td>N/A</td>
<td><code class="docutils literal"><span class="pre">Ctrl</span></code>+<code class="docutils literal"><span class="pre">W</span></code></td> <td><code class="docutils literal"><span class="pre">Ctrl</span></code>+<code class="docutils literal"><span class="pre">Alt</span></code>+<code class="docutils literal"><span class="pre">W</span></code></td>
</tr> </tr>
<tr class="row-odd"><td>Tab title</td> <tr class="row-odd"><td>Tab title</td>
<td><code class="docutils literal"><span class="pre">double-click</span></code> tab</td> <td><code class="docutils literal"><span class="pre">double-click</span></code> tab</td>
<td><code class="docutils literal"><span class="pre">Ctrl</span></code>+<code class="docutils literal"><span class="pre">A</span></code></td> <td><code class="docutils literal"><span class="pre">Ctrl</span></code>+<code class="docutils literal"><span class="pre">Alt</span></code>+<code class="docutils literal"><span class="pre">A</span></code></td>
</tr> </tr>
<tr class="row-even"><td>Terminal title</td> <tr class="row-even"><td>Terminal title</td>
<td><code class="docutils literal"><span class="pre">double-click</span></code> titlebar</td> <td><code class="docutils literal"><span class="pre">double-click</span></code> titlebar</td>
<td><code class="docutils literal"><span class="pre">Ctrl</span></code>+<code class="docutils literal"><span class="pre">X</span></code></td> <td><code class="docutils literal"><span class="pre">Ctrl</span></code>+<code class="docutils literal"><span class="pre">Alt</span></code>+<code class="docutils literal"><span class="pre">X</span></code></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@ -501,15 +501,15 @@ Or maybe for you it is with tabs.
In Terminator you can rename three things: In Terminator you can rename three things:
+----------------+---------------------------+--------------------+ +----------------+---------------------------+--------------------------------+
| Edit | Mouse | Default Shortcut | | Edit | Mouse | Default Shortcut |
+================+===========================+====================+ +================+===========================+================================+
| Window title | N/A | ``Ctrl``\ +\ ``W`` | | Window title | N/A | ``Ctrl``\ +\ ``Alt``\ +\ ``W`` |
+----------------+---------------------------+--------------------+ +----------------+---------------------------+--------------------------------+
| Tab title | ``double-click`` tab | ``Ctrl``\ +\ ``A`` | | Tab title | ``double-click`` tab | ``Ctrl``\ +\ ``Alt``\ +\ ``A`` |
+----------------+---------------------------+--------------------+ +----------------+---------------------------+--------------------------------+
| Terminal title | ``double-click`` titlebar | ``Ctrl``\ +\ ``X`` | | Terminal title | ``double-click`` titlebar | ``Ctrl``\ +\ ``Alt``\ +\ ``X`` |
+----------------+---------------------------+--------------------+ +----------------+---------------------------+--------------------------------+
Additionally all three can be saved/loaded from a :ref:`layout <layouts>`, Additionally all three can be saved/loaded from a :ref:`layout <layouts>`,
or the window title can be set using a or the window title can be set using a

View File

@ -221,13 +221,13 @@ Decrease font size. \fBNote:\fP This may require you to press shift, depending o
.B Ctrl+Zero (0) .B Ctrl+Zero (0)
Restore font size to original setting. Restore font size to original setting.
.TP .TP
.B Ctrl+W .B Ctrl+Alt+W
Rename window title. Rename window title.
.TP .TP
.B Ctrl+A .B Ctrl+Alt+A
Rename tab title. Rename tab title.
.TP .TP
.B Ctrl+X .B Ctrl+Alt+X
Rename terminal title. Rename terminal title.
.TP .TP
.B Super+1 .B Super+1

View File

@ -288,15 +288,15 @@ Default value: \fBUnbound\fR
.TP .TP
.B edit_window_title .B edit_window_title
Edit the current active window's title Edit the current active window's title
Default value: \fB<Ctrl>W\fR Default value: \fB<Ctrl><Alt>W\fR
.TP .TP
.B edit_tab_title .B edit_tab_title
Edit the currently active tab's title Edit the currently active tab's title
Default value: \fB<Ctrl>A\fR Default value: \fB<Ctrl><Alt>A\fR
.TP .TP
.B edit_terminal_title .B edit_terminal_title
Edit the currently active terminal's title Edit the currently active terminal's title
Default value: \fB<Ctrl>X\fR Default value: \fB<Ctrl><Alt>X\fR
.TP .TP
.B full_screen .B full_screen
Toggle the window to a fullscreen window. Toggle the window to a fullscreen window.

View File

@ -190,9 +190,9 @@ DEFAULTS = {
'broadcast_all' : '<Alt>a', 'broadcast_all' : '<Alt>a',
'insert_number' : '<Super>1', 'insert_number' : '<Super>1',
'insert_padded' : '<Super>0', 'insert_padded' : '<Super>0',
'edit_window_title': '<Control>w', 'edit_window_title': '<Control><Alt>w',
'edit_tab_title' : '<Control>a', 'edit_tab_title' : '<Control><Alt>a',
'edit_terminal_title': '<Control>x', 'edit_terminal_title': '<Control><Alt>x',
'layout_launcher' : '<Alt>l', 'layout_launcher' : '<Alt>l',
'next_profile' : '', 'next_profile' : '',
'previous_profile' : '', 'previous_profile' : '',