Merge lp:~popey/ubuntu-terminal-app/fix-1430660 into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Alan Pope 🍺🐧🐱 🦄]

Seems more people than we thought use nano for editing random text files, and having CTRL+X on the CTRL bar is handy for those people. Longer term we should have a nano specific layout.

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

PASSED: Continuous integration, rev:69
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/143/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2423
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/64
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/27

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Now we have a merge for a full nano profile, it seems less useful to have this.

[Filippo Scognamiglio (flscogna)]

Yes I agree. Personally I can't think of another good reason to have CTRL+X shortcut.

[Evan McIntire (mcintire-evan)]

In the interest of cleaning things up, should this be marked as "Rejected" (I don't see the option to mark it as superseded or any such thing)

Unmerged revisions

69. By Alan Pope 🍺🐧🐱 🦄 on 2015-03-25

fix 1430660

=== 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-03-25 08:56:58 +0000
@@ -30,6 +30,14 @@
         {
             "main_action" : {
                 "type": "key",
+                "text" : "CTRL+X",
+                "key" : "X",
+                "mod" : "Control"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
                 "text" : "CTRL+Z",
                 "key" : "Z",
                 "mod" : "Control"