From e4ef5b8eec26373c5c195131ebbf4e1dea038ad8 Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Wed, 2 Dec 2015 23:40:20 +0100 Subject: [PATCH] Fix title edit shortcuts to hopefully not clash with console programs so much --- ChangeLog | 2 ++ .../_build/html/_sources/gettingstarted.txt | 18 +++++++++--------- doc/manual/_build/html/gettingstarted.html | 10 +++++----- doc/manual/source/gettingstarted.rst | 18 +++++++++--------- doc/terminator.1 | 6 +++--- doc/terminator_config.5 | 6 +++--- terminatorlib/config.py | 6 +++--- 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b538102..a3b2a0d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,8 @@ terminator trunk: LP#1520705) * Fix scrollbar position on current terminals when changed in 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: * Features diff --git a/doc/manual/_build/html/_sources/gettingstarted.txt b/doc/manual/_build/html/_sources/gettingstarted.txt index c27afd45..47bf8f19 100644 --- a/doc/manual/_build/html/_sources/gettingstarted.txt +++ b/doc/manual/_build/html/_sources/gettingstarted.txt @@ -501,15 +501,15 @@ Or maybe for you it is with tabs. In Terminator you can rename three things: -+----------------+---------------------------+--------------------+ -| Edit | Mouse | Default Shortcut | -+================+===========================+====================+ -| Window title | N/A | ``Ctrl``\ +\ ``W`` | -+----------------+---------------------------+--------------------+ -| Tab title | ``double-click`` tab | ``Ctrl``\ +\ ``A`` | -+----------------+---------------------------+--------------------+ -| Terminal title | ``double-click`` titlebar | ``Ctrl``\ +\ ``X`` | -+----------------+---------------------------+--------------------+ ++----------------+---------------------------+--------------------------------+ +| Edit | Mouse | Default Shortcut | ++================+===========================+================================+ +| Window title | N/A | ``Ctrl``\ +\ ``Alt``\ +\ ``W`` | ++----------------+---------------------------+--------------------------------+ +| Tab title | ``double-click`` tab | ``Ctrl``\ +\ ``Alt``\ +\ ``A`` | ++----------------+---------------------------+--------------------------------+ +| Terminal title | ``double-click`` titlebar | ``Ctrl``\ +\ ``Alt``\ +\ ``X`` | ++----------------+---------------------------+--------------------------------+ Additionally all three can be saved/loaded from a :ref:`layout `, or the window title can be set using a diff --git a/doc/manual/_build/html/gettingstarted.html b/doc/manual/_build/html/gettingstarted.html index e1016054..277ab42e 100644 --- a/doc/manual/_build/html/gettingstarted.html +++ b/doc/manual/_build/html/gettingstarted.html @@ -907,9 +907,9 @@ Or maybe for you it is with tabs.

In Terminator you can rename three things:

-++- @@ -920,15 +920,15 @@ Or maybe for you it is with tabs.

- + - + - +
Edit
Window title N/ACtrl+WCtrl+Alt+W
Tab title double-click tabCtrl+ACtrl+Alt+A
Terminal title double-click titlebarCtrl+XCtrl+Alt+X
diff --git a/doc/manual/source/gettingstarted.rst b/doc/manual/source/gettingstarted.rst index c27afd45..47bf8f19 100644 --- a/doc/manual/source/gettingstarted.rst +++ b/doc/manual/source/gettingstarted.rst @@ -501,15 +501,15 @@ Or maybe for you it is with tabs. In Terminator you can rename three things: -+----------------+---------------------------+--------------------+ -| Edit | Mouse | Default Shortcut | -+================+===========================+====================+ -| Window title | N/A | ``Ctrl``\ +\ ``W`` | -+----------------+---------------------------+--------------------+ -| Tab title | ``double-click`` tab | ``Ctrl``\ +\ ``A`` | -+----------------+---------------------------+--------------------+ -| Terminal title | ``double-click`` titlebar | ``Ctrl``\ +\ ``X`` | -+----------------+---------------------------+--------------------+ ++----------------+---------------------------+--------------------------------+ +| Edit | Mouse | Default Shortcut | ++================+===========================+================================+ +| Window title | N/A | ``Ctrl``\ +\ ``Alt``\ +\ ``W`` | ++----------------+---------------------------+--------------------------------+ +| Tab title | ``double-click`` tab | ``Ctrl``\ +\ ``Alt``\ +\ ``A`` | ++----------------+---------------------------+--------------------------------+ +| Terminal title | ``double-click`` titlebar | ``Ctrl``\ +\ ``Alt``\ +\ ``X`` | ++----------------+---------------------------+--------------------------------+ Additionally all three can be saved/loaded from a :ref:`layout `, or the window title can be set using a diff --git a/doc/terminator.1 b/doc/terminator.1 index fbc066fb..2cb4251d 100644 --- a/doc/terminator.1 +++ b/doc/terminator.1 @@ -221,13 +221,13 @@ Decrease font size. \fBNote:\fP This may require you to press shift, depending o .B Ctrl+Zero (0) Restore font size to original setting. .TP -.B Ctrl+W +.B Ctrl+Alt+W Rename window title. .TP -.B Ctrl+A +.B Ctrl+Alt+A Rename tab title. .TP -.B Ctrl+X +.B Ctrl+Alt+X Rename terminal title. .TP .B Super+1 diff --git a/doc/terminator_config.5 b/doc/terminator_config.5 index 560273fe..1e4df46b 100644 --- a/doc/terminator_config.5 +++ b/doc/terminator_config.5 @@ -288,15 +288,15 @@ Default value: \fBUnbound\fR .TP .B edit_window_title Edit the current active window's title -Default value: \fBW\fR +Default value: \fBW\fR .TP .B edit_tab_title Edit the currently active tab's title -Default value: \fBA\fR +Default value: \fBA\fR .TP .B edit_terminal_title Edit the currently active terminal's title -Default value: \fBX\fR +Default value: \fBX\fR .TP .B full_screen Toggle the window to a fullscreen window. diff --git a/terminatorlib/config.py b/terminatorlib/config.py index 21ff3124..8c794f32 100755 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -190,9 +190,9 @@ DEFAULTS = { 'broadcast_all' : 'a', 'insert_number' : '1', 'insert_padded' : '0', - 'edit_window_title': 'w', - 'edit_tab_title' : 'a', - 'edit_terminal_title': 'x', + 'edit_window_title': 'w', + 'edit_tab_title' : 'a', + 'edit_terminal_title': 'x', 'layout_launcher' : 'l', 'next_profile' : '', 'previous_profile' : '',