git.iko.soy/unity8
on xenial help sign in
Merge from split
7b7ed20Michael Terry
debian/control−1
compare with xenial
unifiedsplit
@@ -20,7 +20,6 @@ Build-Depends: cmake,
20 libqt5xmlpatterns5-dev,
20 libqt5xmlpatterns5-dev,
21 libunity-api-dev (>= 7.80.6),
21 libunity-api-dev (>= 7.80.6),
22 libunity-mir-dev,
22 libunity-mir-dev,
23− libupstart-app-launch2-dev,
24 libusermetricsoutput1-dev,
23 libusermetricsoutput1-dev,
25 libxcb1-dev,
24 libxcb1-dev,
26 pkg-config,
25 pkg-config,
plugins/Unity/Launcher/CMakeLists.txt+1−2
@@ -3,7 +3,6 @@ pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
3pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
3pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
4pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
4pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
5pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
5pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
6−pkg_check_modules(UPSTART_APP_LAUNCH REQUIRED upstart-app-launch-2)
7
6
8add_definitions(-DSM_BUSNAME=systemBus)
7add_definitions(-DSM_BUSNAME=systemBus)
9
8
@@ -12,7 +11,6 @@ include_directories(
12 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
11 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
13 ${GLIB_INCLUDE_DIRS}
12 ${GLIB_INCLUDE_DIRS}
14 ${GSETTINGS_QT_INCLUDE_DIRS}
13 ${GSETTINGS_QT_INCLUDE_DIRS}
15− ${UPSTART_APP_LAUNCH_INCLUDE_DIRS}
16)
14)
17
15
18set(QMLLAUNCHERPLUGIN_SRC
16set(QMLLAUNCHERPLUGIN_SRC
@@ -37,6 +35,7 @@ target_link_libraries(UnityLauncher-qml
37 ${GSETTINGS_QT_LDFLAGS}
35 ${GSETTINGS_QT_LDFLAGS}
38 ${UPSTART_APP_LAUNCH_LDFLAGS}
36 ${UPSTART_APP_LAUNCH_LDFLAGS}
39)
37)
38+
40qt5_use_modules(UnityLauncher-qml DBus Qml)
39qt5_use_modules(UnityLauncher-qml DBus Qml)
41
40
42add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
41add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
plugins/Unity/Launcher/launchermodel.cpp−1
@@ -22,7 +22,6 @@
22#include "backend/launcherbackend.h"
22#include "backend/launcherbackend.h"
23
23
24#include <unity/shell/application/ApplicationInfoInterface.h>
24#include <unity/shell/application/ApplicationInfoInterface.h>
25−#include <upstart-app-launch.h>
26
25
27using namespace unity::shell::application;
26using namespace unity::shell::application;
28
27
plugins/Unity/Launcher/launchermodel.h−1
@@ -51,7 +51,6 @@ public:
51 Q_INVOKABLE void requestRemove(const QString &appId);
51 Q_INVOKABLE void requestRemove(const QString &appId);
52 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
52 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
53 Q_INVOKABLE void setUser(const QString &username);
53 Q_INVOKABLE void setUser(const QString &username);
54− Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
55
54
56 unity::shell::application::ApplicationManagerInterface* applicationManager() const;
55 unity::shell::application::ApplicationManagerInterface* applicationManager() const;
57 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
56 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
qml/GreeterShell.qml+2−2
@@ -75,7 +75,6 @@ BasicShell {
75 target: LightDM.Greeter
75 target: LightDM.Greeter
76
76
77 onIdle: {
77 onIdle: {
78− greeter.enabled = true
79 greeter.showNow()
78 greeter.showNow()
80 }
79 }
81
80
@@ -143,6 +142,7 @@ BasicShell {
143 function login() {
142 function login() {
144 enabled = false;
143 enabled = false;
145 LightDM.Greeter.startSessionSync();
144 LightDM.Greeter.startSessionSync();
145+ enabled = true;
146 }
146 }
147
147
148 onShownChanged: {
148 onShownChanged: {
@@ -201,7 +201,7 @@ BasicShell {
201 dragAreaWidth: shell.edgeSize
201 dragAreaWidth: shell.edgeSize
202 available: !edgeDemo.active
202 available: !edgeDemo.active
203 onLauncherApplicationSelected: {
203 onLauncherApplicationSelected: {
204− shell.activateApplication(LauncherModel.getUrlForAppId(appId))
204+ shell.activateApplication("application:///" + appId + ".desktop")
205 }
205 }
206 onShownChanged: {
206 onShownChanged: {
207 if (shown) {
207 if (shown) {
tests/mocks/Unity/Launcher/MockLauncherModel.h−1
@@ -44,7 +44,6 @@ public:
44 Q_INVOKABLE void requestRemove(const QString &appId);
44 Q_INVOKABLE void requestRemove(const QString &appId);
45 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
45 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
46 Q_INVOKABLE void setUser(const QString &username);
46 Q_INVOKABLE void setUser(const QString &username);
47− Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
48
47
49 unity::shell::application::ApplicationManagerInterface *applicationManager() const;
48 unity::shell::application::ApplicationManagerInterface *applicationManager() const;
50 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);
49 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);