Merge lp:~lukas-kde/unity8/terminal-shortcut-lp1673500 into lp:unity8

[Lukáš Tinkl]

Implement Ctrl+Alt+T to launch the terminal app

Implement Ctrl+Alt+T to launch the terminal app

If the app is already running (in background), it's just raised and focused.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2869
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3453/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4547
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2738
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2738
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4575
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4402
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4402/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4402
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4402/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4402
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4402/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4402
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4402/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4402
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4402/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4402
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4402/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3453/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

On Unity 7 a new terminal application is always launched when Ctrl+Alt+T is pressed. And that's how I expect it to behave. If we are looking for feature parity unity8 should work like that as well.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

ubuntu-terminal-app UI is still pretty touch-oriented still. Any ideas on how to have Ctrl+Alt+T configurable like in unity 7? There I believe it uses /usr/bin/x-terminal-emulator or /etc/alternatives/x-terminal-emulator. But I don't know how this configuration point translates into the brave new world.

[Daniel d'Andrada (dandrader)]

> On Unity 7 a new terminal application is always launched when Ctrl+Alt+T is
> pressed. And that's how I expect it to behave. If we are looking for feature
> parity unity8 should work like that as well.

But we don't have support for multiple app instances yet, so nevermind.

review: Abstain

[Michael Terry (mterry)]

I tested this and it didn't launch the app for me.

+ text: i18n.tr("Starts the terminal application.")

I might capitalize the Terminal there?

+ const termAppName = "ubuntu-terminal-app";

Shouldn't we try to launch the snap as a fallback?

[Michael Terry (mterry)]

@Daniel, I *think* unity7 uses a gnome-provided gsettings to make it configurable. Not sure if we want to rely on that key.

[Michael Terry (mterry)]

> Shouldn't we try to launch the snap as a fallback?

Or actually, maybe we should try snap first, and fall back to deb.

[lp:~lukas-kde/unity8/terminal-shortcut-lp1673500]

2870. By Lukáš Tinkl on 2017-03-20

capitalize Terminal

[Lukáš Tinkl (lukas-kde)]

> I tested this and it didn't launch the app for me.

Oh, anything relevant in the log?

> + text: i18n.tr("Starts the terminal application.")
>
> I might capitalize the Terminal there?

Fixed

> + const termAppName = "ubuntu-terminal-app";
>
> Shouldn't we try to launch the snap as a fallback?

Yeah maybe, any idea how? :)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2870
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3464/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4570
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2753
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2753
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4598
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4425
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4425/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4425
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4425/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4425
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4425/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4425
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4425/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4425
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4425/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4425
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4425/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3464/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

> Yeah maybe, any idea how? :)

Maybe. Does this current MP work for you? What about something like this (untested):

function launchApp(appId) {
    if (root.applicationManager.findApplication(appId)) {
        root.applicationManager.requestFocusApplication(appId);
        return true;
    }
    return root.applicationManager.startApplication(appId) != null;
}

function launchTerminal() {
    // Try snap first, then deb package
    if (!launchApp("ubuntu-terminal-app_ubuntu-terminal-app")) {
        launchApp("com.ubuntu.terminal");
    }
}

(That launchApp function is basically a copy of Shell.qml's startApp. Maybe some re-use could happen there.)

review: Needs Information

[lp:~lukas-kde/unity8/terminal-shortcut-lp1673500]

2871. By Lukáš Tinkl on 2017-03-23

fix review comments; try a snap pkg first

[Lukáš Tinkl (lukas-kde)]

> > Yeah maybe, any idea how? :)
>
> Maybe. Does this current MP work for you? What about something like this
> (untested):

Yup, here it's really called "ubuntu-terminal-app", not "com.ubuntu.terminal", maybe that's why it doesn't start for you?

Fixed the code to try the snap pkg first, as you suggested.

[Lukáš Tinkl (lukas-kde)]

Just tried "com.ubuntu.terminal", doesn't work here on x+o

$ apt-cache policy ubuntu-terminal-app

*** 0.7.218+16.04.20170321.1-0ubuntu1 500
        500 http://ppa.launchpad.net/ci-train-ppa-service/2533/ubuntu xenial/main amd64 Packages
        100 /var/lib/dpkg/status

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2871
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3506/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4635/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4663
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4490/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4490
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4490/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4490/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4490
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4490/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4490/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4490
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4490/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3506/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

@mterry unity 7 does use the x-terminal-emulator link from update-alternatives

[Michał Sawicz (saviq)]

Can't use ↑ unless we resolve it back into an app id.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2871
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3514/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4648
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2810
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2810
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4676
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4502
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4502/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4502
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4502/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4502
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4502/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4502
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4502/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4502
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4502/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4502
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4502/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3514/rebuild

review: Needs Fixing (continuous-integration)

[lp:~lukas-kde/unity8/terminal-shortcut-lp1673500]

2872. By Lukáš Tinkl on 2017-03-24

merge trunk

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2872
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3524/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4666
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2824
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2824
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4694
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4517/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3524/rebuild

review: Approve (continuous-integration)

[lp:~lukas-kde/unity8/terminal-shortcut-lp1673500]

2873. By Lukáš Tinkl on 2017-03-27

try with a list of candidate app names

2874. By Lukáš Tinkl on 2017-03-27

explain the candidates order with a comment

[Michael Terry (mterry)]

Tested, looks good to me. Thanks!

It would be nice if we can investigate options for not hardcoding this in the future, but that shouldn't block this improvement. And this MP doesn't paint us into a corner around hardcoding in the future.

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2873
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3555/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4715
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2867
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2867/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4743
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4566/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3555/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

The ^^ zesty failure is due to https://bileto.ubuntu.com/#/ticket/2605 being stuck in proposed

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2873
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3568/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4729
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2883
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2883
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4757
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4582/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3568/rebuild

review: Approve (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2874
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3579/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4743
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2891
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2891
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4771
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4594
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4594/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4594
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4594/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4594
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4594/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4594
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4594/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4594
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4594/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4594
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4594/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3579/rebuild

review: Approve (continuous-integration)

=== modified file 'qml/Components/KeyboardShortcutsOverlay.qml'
--- qml/Components/KeyboardShortcutsOverlay.qml	2017-02-06 15:40:57 +0000
+++ qml/Components/KeyboardShortcutsOverlay.qml	2017-03-27 15:21:20 +0000
@@ -110,6 +110,19 @@
                     Layout.maximumWidth: maxTextSize
                 }
 
+                Label {
+                    text: i18n.tr("Ctrl + Alt + T")
+                    fontSize: "small"
+                    font.weight: Font.Medium
+                }
+                Label {
+                    text: i18n.tr("Starts the Terminal application.")
+                    fontSize: "small"
+                    font.weight: Font.Light
+                    wrapMode: Text.Wrap
+                    Layout.maximumWidth: maxTextSize
+                }
+
 
                 // Launcher section
                 Item { Layout.columnSpan: 2; height: units.gu(2) }

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2017-03-21 10:54:23 +0000
+++ qml/Stage/Stage.qml	2017-03-27 15:21:20 +0000
@@ -224,10 +224,30 @@
         active: priv.focusedAppDelegate !== null
     }
 
+    GlobalShortcut {
+        shortcut: Qt.ControlModifier|Qt.AltModifier|Qt.Key_T
+        onTriggered: {
+            // try in this order: snap pkg, new deb name, old deb name
+            var candidates = ["ubuntu-terminal-app_ubuntu-terminal-app", "ubuntu-terminal-app", "com.ubuntu.terminal"];
+            for (var i = 0; i < candidates.length; i++) {
+                if (priv.startApp(candidates[i]))
+                    break;
+            }
+        }
+    }
+
     QtObject {
         id: priv
         objectName: "DesktopStagePrivate"
 
+        function startApp(appId) {
+            if (root.applicationManager.findApplication(appId)) {
+                return root.applicationManager.requestFocusApplication(appId);
+            } else {
+                return root.applicationManager.startApplication(appId) !== null;
+            }
+        }
+
         property var focusedAppDelegate: null
         property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel
 

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2017-02-24 15:43:46 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2017-03-27 15:21:20 +0000
@@ -477,6 +477,11 @@
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
+    application->setAppId("ubuntu-terminal-app");
+    application->setName("Terminal");
+    m_availableApplications.append(application);
+
+    application = new ApplicationInfo(this);
     application->setAppId("primary-oriented-app");
     application->setName("Primary Oriented");
     application->setSupportedOrientations(Qt::PrimaryOrientation);

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2017-03-21 10:55:52 +0000
+++ tests/qmltests/tst_Shell.qml	2017-03-27 15:21:20 +0000
@@ -1460,6 +1460,25 @@
             confirmLoggedIn(true);
         }
 
+        function test_terminalShortcut() {
+            loadShell("desktop");
+            shell.usageScenario = "desktop";
+            waitForRendering(shell);
+            swipeAwayGreeter();
+
+            // not running, should start
+            keyClick(Qt.Key_T, Qt.ControlModifier|Qt.AltModifier);
+            tryCompare(ApplicationManager, "focusedApplicationId", "ubuntu-terminal-app");
+
+            // start something else
+            ApplicationManager.startApplication("dialer-app");
+            tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
+
+            // terminal running in background, should get focused
+            keyClick(Qt.Key_T, Qt.ControlModifier|Qt.AltModifier);
+            tryCompare(ApplicationManager, "focusedApplicationId", "ubuntu-terminal-app");
+        }
+
         function test_launcherInverted_data() {
             return [
                 {tag: "phone", formFactor: "phone", usageScenario: "phone", launcherInverted: true},