git.iko.soy/unity8
on xenial help sign in
Add missing commits
commit0905b5f715201330cce0be691ec0cdae930a96a6 authorMichael Terry <michael.terry@canonical.com> dateThu 29 May 2014, 18:00 (12 years ago) parent7b7ed20
6 files changed+7−1
compare with xenial
unifiedsplit
debian/control+1 plugins/Unity/Launcher/CMakeLists.txt+2 plugins/Unity/Launcher/launchermodel.cpp+1 plugins/Unity/Launcher/launchermodel.h+1 qml/GreeterShell.qml+1−1 tests/mocks/Unity/Launcher/MockLauncherModel.h+1
debian/control+1
@@ -20,6 +20,7 @@ Build-Depends: cmake,
2020 libqt5xmlpatterns5-dev,
2121 libunity-api-dev (>= 7.80.6),
2222 libunity-mir-dev,
23+ libupstart-app-launch2-dev,
2324 libusermetricsoutput1-dev,
2425 libxcb1-dev,
2526 pkg-config,
plugins/Unity/Launcher/CMakeLists.txt+2
@@ -3,6 +3,7 @@ pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
33pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
44pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
55pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
6+pkg_check_modules(UPSTART_APP_LAUNCH REQUIRED upstart-app-launch-2)
67
78add_definitions(-DSM_BUSNAME=systemBus)
89
@@ -11,6 +12,7 @@ include_directories(
1112 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
1213 ${GLIB_INCLUDE_DIRS}
1314 ${GSETTINGS_QT_INCLUDE_DIRS}
15+ ${UPSTART_APP_LAUNCH_INCLUDE_DIRS}
1416)
1517
1618set(QMLLAUNCHERPLUGIN_SRC
plugins/Unity/Launcher/launchermodel.cpp+1
@@ -22,6 +22,7 @@
2222#include "backend/launcherbackend.h"
2323
2424#include <unity/shell/application/ApplicationInfoInterface.h>
25+#include <upstart-app-launch.h>
2526
2627using namespace unity::shell::application;
2728
plugins/Unity/Launcher/launchermodel.h+1
@@ -51,6 +51,7 @@ public:
5151 Q_INVOKABLE void requestRemove(const QString &appId);
5252 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
5353 Q_INVOKABLE void setUser(const QString &username);
54+ Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
5455
5556 unity::shell::application::ApplicationManagerInterface* applicationManager() const;
5657 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
qml/GreeterShell.qml+1−1
@@ -201,7 +201,7 @@ BasicShell {
201201 dragAreaWidth: shell.edgeSize
202202 available: !edgeDemo.active
203203 onLauncherApplicationSelected: {
204− shell.activateApplication("application:///" + appId + ".desktop")
204+ shell.activateApplication(LauncherModel.getUrlForAppId(appId))
205205 }
206206 onShownChanged: {
207207 if (shown) {
tests/mocks/Unity/Launcher/MockLauncherModel.h+1
@@ -44,6 +44,7 @@ public:
4444 Q_INVOKABLE void requestRemove(const QString &appId);
4545 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
4646 Q_INVOKABLE void setUser(const QString &username);
47+ Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
4748
4849 unity::shell::application::ApplicationManagerInterface *applicationManager() const;
4950 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);