Merge lp:~timo-jyrinki/ubuntu-terminal-app/add_ctrl_D_to_control_keys into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Timo Jyrinki]

Add Ctrl-D to the control menu. (LP: #1446548)

[Timo Jyrinki (timo-jyrinki)]

I've also added Ctrl-P and Ctrl-N for irssi channel switching in my own configuration, but I understand if it feels to become too bloated with those too in the default config.

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

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

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

review: Approve (continuous-integration)

[Filippo Scognamiglio (flscogna)]

Thank you Timo. This is definitely handy. With respect to Ctrl-P and Ctrl-N, I believe we should bundle them into a specific irssi profile.

review: Approve

=== modified file 'src/app/qml/KeyboardRows/Layouts/ControlKeys.json'
--- src/app/qml/KeyboardRows/Layouts/ControlKeys.json	2015-02-03 21:43:38 +0000
+++ src/app/qml/KeyboardRows/Layouts/ControlKeys.json	2015-04-21 09:48:26 +0000
@@ -34,6 +34,14 @@
                 "key" : "Z",
                 "mod" : "Control"
             }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "CTRL+D",
+                "key" : "D",
+                "mod" : "Control"
+            }
         }
     ]
 }