Merge lp:~nikwen/ubuntu-terminal-app/keyboard-shortcuts into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Niklas Wenzel]

Added keyboard shortcuts for desktop use.

Available commands:

Open Tab: Shift+Ctrl+T
Close Tab: Shift+Ctrl+W
Close Window: Shift+Ctrl+Q

Previous Tab: Ctrl+PageUp
Next Tab: Ctrl+PageDown

Copy: Shift+Ctrl+C
Paste: Shift+Ctrl+V

Zoom In: Ctrl++
Zoom Out: Ctrl+-
Normal Size: Ctrl+0

Added keyboard shortcuts which are known to users from gnome-terminal.

As this uses a function for tab closing which I introduced in the MP for proper handling of the "exit" command (https://code.launchpad.net/~nikwen/ubuntu-terminal-app/exit-handling/+merge/261770), that one needs to be merged first.

The detailed list:

Open Tab: Shift+Ctrl+T
Close Tab: Shift+Ctrl+W
Close Window: Shift+Ctrl+Q

Previous Tab: Ctrl+PageUp
Next Tab: Ctrl+PageDown

Copy: Shift+Ctrl+C
Paste: Shift+Ctrl+V

Zoom In: Ctrl++
Zoom Out: Ctrl+-
Normal Size: Ctrl+0

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:90
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/152/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2914
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2914/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/73
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/36

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/152/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

For me they all work except CTRL++ which doesn't make any difference when I press it and nothing in the log when I do.

review: Needs Fixing

[Niklas Wenzel (nikwen)]

Thank you for reviewing this, Alan.

Are you using the British keyboard layout? I'll test it with that one.

[Niklas Wenzel (nikwen)]

Ok, I'm able to reproduce this with the British keyboard layout. Let me fix it. ;)

[lp:~nikwen/ubuntu-terminal-app/keyboard-shortcuts]

91. By Niklas Wenzel on 2015-06-13

Fix Ctrl++ shortcut for some keyboard layouts

[Niklas Wenzel (nikwen)]

Here you go. ;)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:91
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/154/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2928
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2928/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/75
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/38

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/154/rebuild

review: Approve (continuous-integration)

[Niklas Wenzel (nikwen)]

Suggestion from David Planella: Another shortcut that I find quite useful is the one to switch between tabs: Ctrl+PgUp or Ctrl+PgDown.

I'll add these.

[lp:~nikwen/ubuntu-terminal-app/keyboard-shortcuts]

92. By Niklas Wenzel on 2015-06-18

Add tab switching shortcuts

93. By Niklas Wenzel on 2015-06-18

Revert po directory

94. By Niklas Wenzel on 2015-06-18

Merge master

[Niklas Wenzel (nikwen)]

Here you go. Should be ready for merging now. :)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:94
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/156/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2954
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2954/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/77
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/40

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/156/rebuild

review: Approve (continuous-integration)

[Filippo Scognamiglio (flscogna)]

Hi Niklas. I approve the work here, but it could use some refactoring. Please move the shortcut logic to a separate component (shortcutManager or something like that) in order to increase readability and maintainability. We should also investigate the use of Actions which in the future will probably support shortcuts natively.

review: Needs Fixing

[lp:~nikwen/ubuntu-terminal-app/keyboard-shortcuts]

95. By Niklas Wenzel on 2015-06-23

Create TerminalKeyboardShortcutHandler component

[Niklas Wenzel (nikwen)]

Hi Filippo,

Thank you very much for reviewing this. :)
I agree that another component increases maintainability, so I added one. ;)
However, I think that we should wait with using Actions until support for keyboard shortcuts is actually there, as right now it will only make the code clumsier in my opinion.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:95
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/158/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2995
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2995/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/79
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/42

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/158/rebuild

review: Approve (continuous-integration)

[Filippo Scognamiglio (flscogna)]

review: Approve

[Niklas Wenzel (nikwen)]

Thanks for approving. Can we merge it yet?

[Niklas Wenzel (nikwen)]

Thanks, Alan. :)

=== modified file 'src/app/qml/SettingsPage.qml'
--- src/app/qml/SettingsPage.qml	2015-04-01 22:50:53 +0000
+++ src/app/qml/SettingsPage.qml	2015-06-23 17:39:11 +0000
@@ -61,14 +61,21 @@
                     bottom: parent.bottom
                     margins: units.gu(2)
                 }
-                minimumValue: 8;
-                maximumValue: 32;
+                minimumValue: settings.minFontSize;
+                maximumValue: settings.maxFontSize;
                 onValueChanged: {
                     settings.fontSize = value;
                 }
                 Component.onCompleted: {
                     value = settings.fontSize;
                 }
+
+                Connections {
+                    target: settings
+                    onFontSizeChanged: {
+                        slFont.value = settings.fontSize
+                    }
+                }
             }
         }
 

=== modified file 'src/app/qml/TerminalComponent.qml'
--- src/app/qml/TerminalComponent.qml	2015-06-11 21:33:57 +0000
+++ src/app/qml/TerminalComponent.qml	2015-06-23 17:39:11 +0000
@@ -23,6 +23,14 @@
             onFinished: tabsModel.removeTabWithSession(terminalSession);
         }
 
+        Keys.onPressed: {
+            keyboardShortcutHandler.handle(event)
+        }
+
+        TerminalKeyboardShortcutHandler {
+            id: keyboardShortcutHandler
+        }
+
         QMLTermScrollbar {
             z: parent.z + 2
             terminal: parent

=== added file 'src/app/qml/TerminalKeyboardShortcutHandler.qml'
--- src/app/qml/TerminalKeyboardShortcutHandler.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/TerminalKeyboardShortcutHandler.qml	2015-06-23 17:39:11 +0000
@@ -0,0 +1,66 @@
+import QtQuick 2.0
+
+Item {
+
+    function handle(event) {
+        if (event.modifiers & Qt.ControlModifier) {
+            if (event.modifiers & Qt.ShiftModifier) {
+                event.accepted = true; // That way shortcuts will not be processed by the terminal widget (Ctrl + Shift is always interpreted as a shortcut)
+
+                switch (event.key) {
+                // Window/tab handling
+                case Qt.Key_T: // Open tab
+                    tabsModel.addTab();
+                    tabsModel.selectTab(tabsModel.count - 1);
+                    break;
+                case Qt.Key_W: //Close tab
+                    tabsModel.removeTabWithSession(terminalSession);
+                    break;
+                case Qt.Key_Q: //Close window
+                    for (var i = tabsModel.count - 1; i >= 0; i--) {
+                        tabsModel.removeTab(i); // This will also call Qt.quit()
+                    }
+                    break;
+
+                // Clipboard
+                case Qt.Key_C: // Copy
+                    terminal.copyClipboard();
+                    break;
+                case Qt.Key_V: // Paste
+                    terminal.pasteClipboard();
+                    break;
+                }
+            }
+
+            // The following may not reside in an else to the above if, as some keyboard layouts require
+            // to press the shift key in order to type the plus character (and possibly others).
+            // Do not automatically accept all keys here! Programs like nano may declare their own Ctrl-shortcuts.
+
+            switch (event.key) {
+            // Font size
+            case Qt.Key_Plus: // Zoom in
+                event.accepted = true;
+                settings.fontSize = Math.min(settings.fontSize + 1, settings.maxFontSize);
+                break;
+            case Qt.Key_Minus: // Zoom out
+                event.accepted = true;
+                settings.fontSize = Math.max(settings.fontSize - 1, settings.minFontSize);
+                break;
+            case Qt.Key_0: // Normal size
+                event.accepted = true;
+                settings.fontSize = settings.defaultFontSize;
+                break;
+
+            // Tab switching
+            case Qt.Key_PageUp: // Previous tab
+                event.accepted = true;
+                tabsModel.selectTab((tabsModel.selectedIndex - 1 + tabsModel.count) % tabsModel.count);
+                break;
+            case Qt.Key_PageDown: // Next tab
+                event.accepted = true;
+                tabsModel.selectTab((tabsModel.selectedIndex + 1) % tabsModel.count);
+                break;
+            }
+        }
+    }
+}

=== modified file 'src/app/qml/TerminalSettings.qml'
--- src/app/qml/TerminalSettings.qml	2015-04-02 12:53:43 +0000
+++ src/app/qml/TerminalSettings.qml	2015-06-23 17:39:11 +0000
@@ -10,6 +10,10 @@
     property alias colorScheme: innerSettings.colorScheme
     property alias showKeyboardBar: innerSettings.showKeyboardBar
 
+    readonly property int defaultFontSize: 14
+    readonly property int minFontSize: 8
+    readonly property int maxFontSize: 32
+
     property alias jsonVisibleProfiles: innerSettings.jsonVisibleProfiles
 
     property ListModel profilesList: ListModel {}
@@ -31,7 +35,7 @@
 
     Settings {
         id: innerSettings
-        property int fontSize: 14
+        property int fontSize: defaultFontSize
         property string fontStyle: "Ubuntu Mono"
         property string colorScheme: "Ubuntu"
         property bool showKeyboardBar: true