git.iko.soy/unity8
on xenial help sign in
Merge from split
commit7b7ed209bb8dbef9e7cf26a20c103750d72de9e6 authorMichael Terry <michael.terry@canonical.com> dateThu 29 May 2014, 16:32 (12 years ago) parentde9fe6dacf0ab7
6 files changed+3−8
compare with xenial
unifiedsplit
debian/control−1 plugins/Unity/Launcher/CMakeLists.txt+1−2 plugins/Unity/Launcher/launchermodel.cpp−1 plugins/Unity/Launcher/launchermodel.h−1 qml/GreeterShell.qml+2−2 tests/mocks/Unity/Launcher/MockLauncherModel.h−1
debian/control−1
@@ -20,7 +20,6 @@ Build-Depends: cmake,
2020 libqt5xmlpatterns5-dev,
2121 libunity-api-dev (>= 7.80.6),
2222 libunity-mir-dev,
23− libupstart-app-launch2-dev,
2423 libusermetricsoutput1-dev,
2524 libxcb1-dev,
2625 pkg-config,
plugins/Unity/Launcher/CMakeLists.txt+1−2
@@ -3,7 +3,6 @@ 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)
76
87add_definitions(-DSM_BUSNAME=systemBus)
98
@@ -12,7 +11,6 @@ include_directories(
1211 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
1312 ${GLIB_INCLUDE_DIRS}
1413 ${GSETTINGS_QT_INCLUDE_DIRS}
15− ${UPSTART_APP_LAUNCH_INCLUDE_DIRS}
1614)
1715
1816set(QMLLAUNCHERPLUGIN_SRC
@@ -37,6 +35,7 @@ target_link_libraries(UnityLauncher-qml
3735 ${GSETTINGS_QT_LDFLAGS}
3836 ${UPSTART_APP_LAUNCH_LDFLAGS}
3937)
38+
4039qt5_use_modules(UnityLauncher-qml DBus Qml)
4140
4241add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
plugins/Unity/Launcher/launchermodel.cpp−1
@@ -22,7 +22,6 @@
2222#include "backend/launcherbackend.h"
2323
2424#include <unity/shell/application/ApplicationInfoInterface.h>
25−#include <upstart-app-launch.h>
2625
2726using namespace unity::shell::application;
2827
plugins/Unity/Launcher/launchermodel.h−1
@@ -51,7 +51,6 @@ 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;
5554
5655 unity::shell::application::ApplicationManagerInterface* applicationManager() const;
5756 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
qml/GreeterShell.qml+2−2
@@ -75,7 +75,6 @@ BasicShell {
7575 target: LightDM.Greeter
7676
7777 onIdle: {
78− greeter.enabled = true
7978 greeter.showNow()
8079 }
8180
@@ -143,6 +142,7 @@ BasicShell {
143142 function login() {
144143 enabled = false;
145144 LightDM.Greeter.startSessionSync();
145+ enabled = true;
146146 }
147147
148148 onShownChanged: {
@@ -201,7 +201,7 @@ BasicShell {
201201 dragAreaWidth: shell.edgeSize
202202 available: !edgeDemo.active
203203 onLauncherApplicationSelected: {
204− shell.activateApplication(LauncherModel.getUrlForAppId(appId))
204+ shell.activateApplication("application:///" + appId + ".desktop")
205205 }
206206 onShownChanged: {
207207 if (shown) {
tests/mocks/Unity/Launcher/MockLauncherModel.h−1
@@ -44,7 +44,6 @@ 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;
4847
4948 unity::shell::application::ApplicationManagerInterface *applicationManager() const;
5049 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);