Merge lp:~mzanetti/unity8/open-app-on-quicklist-title into lp:unity8

[Michael Zanetti]

open the application when clicking on the title entry in the quicklist

 * Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

no

 * If you changed the UI, has there been a design review?

design request. see linked bug

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1230
http://jenkins.qa.ubuntu.com/job/unity8-ci/4202/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4324
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5576
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5576/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12475

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4202/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
No, known broken PageHeaderLabelTest::test_popover fixed elsewhere already

review: Approve

=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	2014-08-18 12:45:32 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2014-09-02 11:13:32 +0000
@@ -30,6 +30,6 @@
 
 target_link_libraries(UnityLauncher-qml ${GSETTINGS_QT_LDFLAGS})
 
-qt5_use_modules(UnityLauncher-qml DBus Qml)
+qt5_use_modules(UnityLauncher-qml DBus Qml Gui)
 
 add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)

=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	2014-06-23 10:32:58 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2014-09-02 11:13:32 +0000
@@ -36,6 +36,7 @@
     m_quickList(new QuickListModel(this))
 {
     QuickListEntry nameAction;
+    nameAction.setActionId("launch_item");
     nameAction.setText(m_name);
     m_quickList->appendAction(nameAction);
     QuickListEntry pinningAction;

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2014-07-29 11:35:10 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2014-09-02 11:13:32 +0000
@@ -23,6 +23,7 @@
 
 #include <unity/shell/application/ApplicationInfoInterface.h>
 
+#include <QDesktopServices>
 #include <QDebug>
 
 using namespace unity::shell::application;
@@ -191,6 +192,8 @@
             } else {
                 pin(appId);
             }
+        } else if (actionId == "launch_item") {
+            QDesktopServices::openUrl(getUrlForAppId(appId));
 
         // Nope, we don't know this action, let the backend forward it to the application
         } else {

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-08-28 20:06:18 +0000
+++ qml/Shell.qml	2014-09-02 11:13:32 +0000
@@ -146,6 +146,7 @@
                     lockscreen.show();
                 }
                 greeter.hide();
+                launcher.hide();
             }
 
             onFocusedApplicationIdChanged: {
@@ -164,6 +165,7 @@
                     // for an emergency call or accepted an incoming call.
                     setFakeActiveForApp(appId)
                 }
+                launcher.hide();
             }
         }
 

=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2014-08-18 12:45:32 +0000
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2014-09-02 11:13:32 +0000
@@ -50,7 +50,7 @@
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     )
 target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS})
-qt5_use_modules(launchermodeltestExec Test Core DBus)
+qt5_use_modules(launchermodeltestExec Test Core DBus Gui)
 
 # copy .desktop files into build directory for shadow builds
 file(GLOB DESKTOP_FILES *.desktop)