git.iko.soy/unity8
on xenial help sign in
Refactor the greeter to enable dynamic loading of backend plugins.
2a1ddfeJosh Arenson
debian/unity8-private.install+1−1
compare with xenial
unifiedsplit
@@ -3,7 +3,7 @@ usr/lib/*/unity8/libUbuntuGestures*
3usr/lib/*/unity8/qml/AccountsService
3usr/lib/*/unity8/qml/AccountsService
4usr/lib/*/unity8/qml/Dash
4usr/lib/*/unity8/qml/Dash
5usr/lib/*/unity8/qml/Greeter
5usr/lib/*/unity8/qml/Greeter
6−usr/lib/*/unity8/qml/LightDM
6+usr/lib/*/unity8/qml/IntegratedLightDM
7usr/lib/*/unity8/qml/Lights
7usr/lib/*/unity8/qml/Lights
8usr/lib/*/unity8/qml/Powerd
8usr/lib/*/unity8/qml/Powerd
9usr/lib/*/unity8/qml/ScreenGrabber
9usr/lib/*/unity8/qml/ScreenGrabber
plugins/CMakeLists.txt+1−1
@@ -13,7 +13,7 @@ endmacro()
13
13
14add_subdirectory(AccountsService)
14add_subdirectory(AccountsService)
15add_subdirectory(Greeter)
15add_subdirectory(Greeter)
16−add_subdirectory(LightDM)
16+add_subdirectory(IntegratedLightDM)
17add_subdirectory(Lights)
17add_subdirectory(Lights)
18add_subdirectory(Dash)
18add_subdirectory(Dash)
19add_subdirectory(Powerd)
19add_subdirectory(Powerd)
plugins/LightDM/CMakeLists.txt → plugins/IntegratedLightDM/CMakeLists.txtrenamed+5−5
@@ -8,7 +8,7 @@ include_directories(
8 ${CMAKE_CURRENT_SOURCE_DIR}
8 ${CMAKE_CURRENT_SOURCE_DIR}
9 ${CMAKE_CURRENT_BINARY_DIR}
9 ${CMAKE_CURRENT_BINARY_DIR}
10 ${CMAKE_SOURCE_DIR}/plugins/Utils
10 ${CMAKE_SOURCE_DIR}/plugins/Utils
11− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
11+ ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
12 #${LIBLIGHTDM_INCLUDE_DIRS}
12 #${LIBLIGHTDM_INCLUDE_DIRS}
13 ${libunity8-private_SOURCE_DIR}
13 ${libunity8-private_SOURCE_DIR}
14 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
14 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
@@ -23,11 +23,11 @@ set(QMLPLUGIN_SRC
23 UsersModel.cpp
23 UsersModel.cpp
24 )
24 )
25
25
26−add_library(LightDM-qml MODULE
26+add_library(IntegratedLightDM-qml MODULE
27 ${QMLPLUGIN_SRC}
27 ${QMLPLUGIN_SRC}
28 )
28 )
29
29
30−target_link_libraries(LightDM-qml
30+target_link_libraries(IntegratedLightDM-qml
31 integratedLightDM
31 integratedLightDM
32 unity8-private
32 unity8-private
33# TODO: Once we split out a separate greeter process, uncomment these lines
33# TODO: Once we split out a separate greeter process, uncomment these lines
@@ -35,6 +35,6 @@ target_link_libraries(LightDM-qml
35 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
35 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
36 )
36 )
37
37
38−qt5_use_modules(LightDM-qml DBus Gui Qml)
38+qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
39
39
40−add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
40+add_unity8_plugin(IntegratedLightDM 0.1 IntegratedLightDM TARGETS IntegratedLightDM-qml)
plugins/LightDM/DBusGreeter.cpp → plugins/IntegratedLightDM/DBusGreeter.cpprenamed

The content is the same.

plugins/LightDM/DBusGreeter.h → plugins/IntegratedLightDM/DBusGreeter.hrenamed

The content is the same.

plugins/LightDM/DBusGreeterList.cpp → plugins/IntegratedLightDM/DBusGreeterList.cpprenamed

The content is the same.

plugins/LightDM/DBusGreeterList.h → plugins/IntegratedLightDM/DBusGreeterList.hrenamed

The content is the same.

plugins/LightDM/Greeter.cpp → plugins/IntegratedLightDM/Greeter.cpprenamed

The content is the same.

plugins/LightDM/Greeter.h → plugins/IntegratedLightDM/Greeter.hrenamed

The content is the same.

plugins/LightDM/GreeterPrivate.h → plugins/IntegratedLightDM/GreeterPrivate.hrenamed

The content is the same.

plugins/LightDM/LightDM.qmltypes → plugins/IntegratedLightDM/IntegratedLightDM.qmltypesrenamed

The content is the same.

plugins/LightDM/UsersModel.cpp → plugins/IntegratedLightDM/UsersModel.cpprenamed

The content is the same.

plugins/LightDM/UsersModel.h → plugins/IntegratedLightDM/UsersModel.hrenamed

The content is the same.

plugins/LightDM/liblightdm/CMakeLists.txt → plugins/IntegratedLightDM/liblightdm/CMakeLists.txtrenamed

The content is the same.

plugins/LightDM/liblightdm/Greeter.cpp → plugins/IntegratedLightDM/liblightdm/Greeter.cpprenamed

The content is the same.

plugins/LightDM/liblightdm/Greeter.h → plugins/IntegratedLightDM/liblightdm/Greeter.hrenamed

The content is the same.

plugins/LightDM/liblightdm/GreeterPrivate.cpp → plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed

The content is the same.

plugins/LightDM/liblightdm/GreeterPrivate.h → plugins/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed

The content is the same.

plugins/LightDM/liblightdm/UsersModel.cpp → plugins/IntegratedLightDM/liblightdm/UsersModel.cpprenamed

The content is the same.

plugins/LightDM/liblightdm/UsersModel.h → plugins/IntegratedLightDM/liblightdm/UsersModel.hrenamed

The content is the same.

plugins/LightDM/liblightdm/UsersModelPrivate.cpp → plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpprenamed

The content is the same.

plugins/LightDM/liblightdm/UsersModelPrivate.h → plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed

The content is the same.

plugins/LightDM/plugin.cpp → plugins/IntegratedLightDM/plugin.cpprenamed+3−5
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2012,2013 Canonical, Ltd.
2+ * Copyright (C) 2012,2013, 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -13,8 +13,6 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
15 *
16− * Authors: Gerry Boland <gerry.boland@canonical.com>
17− * Michael Terry <michael.terry@canonical.com>
18 */
16 */
19
17
20#include "plugin.h"
18#include "plugin.h"
@@ -56,12 +54,12 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine
56 return UserMetricsOutput::UserMetrics::getInstance();
54 return UserMetricsOutput::UserMetrics::getInstance();
57}
55}
58
56
59−void LightDMPlugin::registerTypes(const char *uri)
57+void IntegratedLightDMPlugin::registerTypes(const char *uri)
60{
58{
61 qmlRegisterType<QAbstractItemModel>();
59 qmlRegisterType<QAbstractItemModel>();
62 qmlRegisterType<UserMetricsOutput::ColorTheme>();
60 qmlRegisterType<UserMetricsOutput::ColorTheme>();
63
61
64− Q_ASSERT(uri == QLatin1String("LightDM"));
62+ Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
65 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
63 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
66 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
64 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
67 qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
65 qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
plugins/LightDM/plugin.h → plugins/IntegratedLightDM/plugin.hrenamed+5−7
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2012,2013 Canonical, Ltd.
2+ * Copyright (C) 2012,2013, 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -13,17 +13,15 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
15 *
16− * Authors: Gerry Boland <gerry.boland@canonical.com>
17− * Michael Terry <michael.terry@canonical.com>
18 */
16 */
19
17
20−#ifndef LIGHTDM_PLUGIN_H
18+#ifndef INTEGRATED_LIGHTDM_PLUGIN_H
21−#define LIGHTDM_PLUGIN_H
19+#define INTEGRATED_LIGHTDM_PLUGIN_H
22
20
23#include <QtQml/QQmlEngine>
21#include <QtQml/QQmlEngine>
24#include <QtQml/QQmlExtensionPlugin>
22#include <QtQml/QQmlExtensionPlugin>
25
23
26−class LightDMPlugin : public QQmlExtensionPlugin
24+class IntegratedLightDMPlugin : public QQmlExtensionPlugin
27{
25{
28 Q_OBJECT
26 Q_OBJECT
29 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
27 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -32,4 +30,4 @@ public:
32 void registerTypes(const char *uri) override;
30 void registerTypes(const char *uri) override;
33};
31};
34
32
35−#endif
33+#endif /* INTEGRATED_LIGHTDM_PLUGIN_H */
plugins/IntegratedLightDM/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module IntegratedLightDM
2+plugin IntegratedLightDM-qml
3+typeinfo IntegratedLightDM.qmltypes
plugins/LightDM/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module LightDM
2−plugin LightDM-qml
3−typeinfo LightDM.qmltypes
qml/Components/Dialogs.qml+3−2
@@ -19,7 +19,7 @@ import QtQuick 2.0
19import Unity.Application 0.1
19import Unity.Application 0.1
20import Unity.Session 0.1
20import Unity.Session 0.1
21import Ubuntu.Components 1.1
21import Ubuntu.Components 1.1
22−import LightDM 0.1 as LightDM
22+import "../Greeter"
23
23
24Item {
24Item {
25 id: root
25 id: root
@@ -62,6 +62,7 @@ Item {
62 active: false
62 active: false
63 }
63 }
64
64
65+ LightDM{id: lightDM} // Provide backend access
65 Component {
66 Component {
66 id: logoutDialogComponent
67 id: logoutDialogComponent
67 ShellDialog {
68 ShellDialog {
@@ -71,7 +72,7 @@ Item {
71 Button {
72 Button {
72 text: i18n.ctr("Button: Lock the system", "Lock")
73 text: i18n.ctr("Button: Lock the system", "Lock")
73 onClicked: {
74 onClicked: {
74− LightDM.Greeter.showGreeter()
75+ lightDM.greeter.showGreeter()
75 logoutDialog.hide();
76 logoutDialog.hide();
76 }
77 }
77 }
78 }
qml/Greeter/Greeter.qml+24−24
@@ -16,7 +16,6 @@
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18import AccountsService 0.1
18import AccountsService 0.1
19−import LightDM 0.1 as LightDM
20import Ubuntu.Components 1.1
19import Ubuntu.Components 1.1
21import Ubuntu.SystemImage 0.1
20import Ubuntu.SystemImage 0.1
22import Unity.Launcher 0.1
21import Unity.Launcher 0.1
@@ -43,7 +42,7 @@ Showable {
43 readonly property bool hasLockedApp: lockedApp !== ""
42 readonly property bool hasLockedApp: lockedApp !== ""
44
43
45 property bool forcedUnlock
44 property bool forcedUnlock
46− readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
45+ readonly property bool locked: lightDM.greeter.active && !lightDM.greeter.authenticated && !forcedUnlock
47
46
48 property bool tabletMode
47 property bool tabletMode
49 property url viewSource // only used for testing
48 property url viewSource // only used for testing
@@ -106,10 +105,11 @@ Showable {
106 return d.startUnlock(true /* toTheRight */);
105 return d.startUnlock(true /* toTheRight */);
107 }
106 }
108
107
108+ LightDM{id:lightDM} // Provide backend access
109 QtObject {
109 QtObject {
110 id: d
110 id: d
111
111
112− readonly property bool multiUser: LightDM.Users.count > 1
112+ readonly property bool multiUser: lightDM.users.count > 1
113 property int currentIndex
113 property int currentIndex
114 property bool waiting
114 property bool waiting
115
115
@@ -133,15 +133,15 @@ Showable {
133 loader.item.reset();
133 loader.item.reset();
134 }
134 }
135 currentIndex = uid;
135 currentIndex = uid;
136− var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
136+ var user = lightDM.users.data(uid, lightDM.userRoles.NameRole);
137 AccountsService.user = user;
137 AccountsService.user = user;
138 LauncherModel.setUser(user);
138 LauncherModel.setUser(user);
139− LightDM.Greeter.authenticate(user); // always resets auth state
139+ lightDM.greeter.authenticate(user); // always resets auth state
140 }
140 }
141
141
142 function login() {
142 function login() {
143 enabled = false;
143 enabled = false;
144− if (LightDM.Greeter.startSessionSync()) {
144+ if (lightDM.greeter.startSessionSync()) {
145 sessionStarted();
145 sessionStarted();
146 if (loader.item) {
146 if (loader.item) {
147 loader.item.notifyAuthenticationSucceeded();
147 loader.item.notifyAuthenticationSucceeded();
@@ -228,7 +228,7 @@ Showable {
228 root.lockedApp = "";
228 root.lockedApp = "";
229 root.forceActiveFocus();
229 root.forceActiveFocus();
230 d.selectUser(d.currentIndex, true);
230 d.selectUser(d.currentIndex, true);
231− LightDM.Infographic.readyForDataChange();
231+ lightDM.infographic.readyForDataChange();
232 }
232 }
233
233
234 Connections {
234 Connections {
@@ -238,9 +238,9 @@ Showable {
238 }
238 }
239 onResponded: {
239 onResponded: {
240 if (root.locked) {
240 if (root.locked) {
241− LightDM.Greeter.respond(response);
241+ lightDM.greeter.respond(response);
242 } else {
242 } else {
243− if (LightDM.Greeter.active && !LightDM.Greeter.authenticated) { // could happen if forcedUnlock
243+ if (lightDM.greeter.active && !lightDM.greeter.authenticated) { // could happen if forcedUnlock
244 d.login();
244 d.login();
245 }
245 }
246 loader.item.hide();
246 loader.item.hide();
@@ -306,18 +306,18 @@ Showable {
306 Binding {
306 Binding {
307 target: loader.item
307 target: loader.item
308 property: "userModel"
308 property: "userModel"
309− value: LightDM.Users
309+ value: lightDM.users
310 }
310 }
311
311
312 Binding {
312 Binding {
313 target: loader.item
313 target: loader.item
314 property: "infographicModel"
314 property: "infographicModel"
315− value: LightDM.Infographic
315+ value: lightDM.infographic
316 }
316 }
317 }
317 }
318
318
319 Connections {
319 Connections {
320− target: LightDM.Greeter
320+ target: lightDM.greeter
321
321
322 onShowGreeter: root.forceShow()
322 onShowGreeter: root.forceShow()
323
323
@@ -327,7 +327,7 @@ Showable {
327 }
327 }
328
328
329 onShowMessage: {
329 onShowMessage: {
330− if (!LightDM.Greeter.active) {
330+ if (!lightDM.greeter.active) {
331 return; // could happen if hideGreeter() comes in before we prompt
331 return; // could happen if hideGreeter() comes in before we prompt
332 }
332 }
333
333
@@ -346,7 +346,7 @@ Showable {
346 onShowPrompt: {
346 onShowPrompt: {
347 d.waiting = false;
347 d.waiting = false;
348
348
349− if (!LightDM.Greeter.active) {
349+ if (!lightDM.greeter.active) {
350 return; // could happen if hideGreeter() comes in before we prompt
350 return; // could happen if hideGreeter() comes in before we prompt
351 }
351 }
352
352
@@ -356,14 +356,14 @@ Showable {
356 onAuthenticationComplete: {
356 onAuthenticationComplete: {
357 d.waiting = false;
357 d.waiting = false;
358
358
359− if (LightDM.Greeter.authenticated) {
359+ if (lightDM.greeter.authenticated) {
360 AccountsService.failedLogins = 0;
360 AccountsService.failedLogins = 0;
361 d.login();
361 d.login();
362− if (!LightDM.Greeter.promptless) {
362+ if (!lightDM.greeter.promptless) {
363 loader.item.hide();
363 loader.item.hide();
364 }
364 }
365 } else {
365 } else {
366− if (!LightDM.Greeter.promptless) {
366+ if (!lightDM.greeter.promptless) {
367 AccountsService.failedLogins++;
367 AccountsService.failedLogins++;
368 }
368 }
369
369
@@ -384,7 +384,7 @@ Showable {
384 }
384 }
385
385
386 loader.item.notifyAuthenticationFailed();
386 loader.item.notifyAuthenticationFailed();
387− if (!LightDM.Greeter.promptless) {
387+ if (!lightDM.greeter.promptless) {
388 d.selectUser(d.currentIndex, false);
388 d.selectUser(d.currentIndex, false);
389 }
389 }
390 }
390 }
@@ -392,8 +392,8 @@ Showable {
392
392
393 onRequestAuthenticationUser: {
393 onRequestAuthenticationUser: {
394 // Find index for requested user, if it exists
394 // Find index for requested user, if it exists
395− for (var i = 0; i < LightDM.Users.count; i++) {
395+ for (var i = 0; i < lightDM.users.count; i++) {
396− if (user === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
396+ if (user === lightDM.users.data(i, lightDM.userRoles.NameRole)) {
397 d.selectUser(i, true);
397 d.selectUser(i, true);
398 return;
398 return;
399 }
399 }
@@ -402,19 +402,19 @@ Showable {
402 }
402 }
403
403
404 Binding {
404 Binding {
405− target: LightDM.Greeter
405+ target: lightDM.greeter
406 property: "active"
406 property: "active"
407 value: root.active
407 value: root.active
408 }
408 }
409
409
410 Binding {
410 Binding {
411− target: LightDM.Infographic
411+ target: lightDM.infographic
412 property: "username"
412 property: "username"
413− value: AccountsService.statsWelcomeScreen ? LightDM.Users.data(d.currentIndex, LightDM.UserRoles.NameRole) : ""
413+ value: AccountsService.statsWelcomeScreen ? lightDM.users.data(d.currentIndex, lightDM.userRoles.NameRole) : ""
414 }
414 }
415
415
416 Connections {
416 Connections {
417 target: i18n
417 target: i18n
418− onLanguageChanged: LightDM.Infographic.readyForDataChange()
418+ onLanguageChanged: lightDM.infographic.readyForDataChange()
419 }
419 }
420}
420}
qml/Greeter/IntegratedLightDMImpl.qmlnew file+28
@@ -0,0 +1,28 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.3
18+import IntegratedLightDM 0.1 as LightDM
19+
20+Item{
21+ id: implementation
22+
23+ property var greeter: LightDM.Greeter
24+ property var infographic: LightDM.Infographic
25+ property var users: LightDM.Users
26+ property var userRoles: LightDM.UserRoles
27+
28+}
qml/Greeter/LightDM.qmlnew file+41
@@ -0,0 +1,41 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+/**
18+ * Lightweight wrapper that allows for loading integrated/real LightDM
19+ * plugin
20+ */
21+
22+import QtQuick 2.3
23+
24+Loader {
25+ id: loader
26+
27+ property var greeter: d.valid ? loader.item.greeter : null
28+ property var infographic: d.valid ? loader.item.infographic : null
29+ property var users: d.valid ? loader.item.users : null
30+ property var userRoles: d.valid ? loader.item.userRoles : null
31+
32+ // TODO: Conditionally load RealLightDMImpl if shellMode dictates it
33+ source: "./IntegratedLightDMImpl.qml"
34+
35+ QtObject {
36+ id: d
37+
38+ property bool valid: loader.item !== null
39+ }
40+
41+}
qml/Shell.qml+7−4
@@ -26,7 +26,6 @@ import Ubuntu.Telephony 0.1 as Telephony
26import Unity.Connectivity 0.1
26import Unity.Connectivity 0.1
27import Unity.Launcher 0.1
27import Unity.Launcher 0.1
28import Utils 0.1
28import Utils 0.1
29−import LightDM 0.1 as LightDM
30import Powerd 0.1
29import Powerd 0.1
31import SessionBroadcast 0.1
30import SessionBroadcast 0.1
32import "Greeter"
31import "Greeter"
@@ -167,6 +166,7 @@ Item {
167 finishStartUpTimer.start();
166 finishStartUpTimer.start();
168 }
167 }
169
168
169+ LightDM{id: lightDM} // Provide backend access
170 VolumeControl {
170 VolumeControl {
171 id: volumeControl
171 id: volumeControl
172 indicators: panel.indicators
172 indicators: panel.indicators
@@ -503,7 +503,7 @@ Item {
503
503
504 greeter.notifyAboutToFocusApp("unity8-dash");
504 greeter.notifyAboutToFocusApp("unity8-dash");
505
505
506− var animate = !LightDM.Greeter.active && !stages.shown
506+ var animate = !lightDM.greeter.active && !stages.shown
507 dash.setCurrentScope(0, animate, false)
507 dash.setCurrentScope(0, animate, false)
508 ApplicationManager.requestFocusApplication("unity8-dash")
508 ApplicationManager.requestFocusApplication("unity8-dash")
509 }
509 }
@@ -551,8 +551,11 @@ Item {
551 greeterShown: greeter.shown
551 greeterShown: greeter.shown
552 }
552 }
553
553
554− property bool mainAppIsFullscreen: shell.mainApp && shell.mainApp.fullscreen
554+ property bool topmostApplicationIsFullscreen:
555+ ApplicationManager.focusedApplicationId &&
556+ ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
557+
555− fullscreenMode: (mainAppIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)
558+ fullscreenMode: (topmostApplicationIsFullscreen && !lightDM.greeter.active && launcher.progress == 0)
556 || greeter.hasLockedApp
559 || greeter.hasLockedApp
557 }
560 }
558
561
tests/mocks/CMakeLists.txt+1−1
@@ -32,7 +32,7 @@ add_subdirectory(AccountsService)
32add_subdirectory(GSettings.1.0)
32add_subdirectory(GSettings.1.0)
33add_subdirectory(indicator-service)
33add_subdirectory(indicator-service)
34add_subdirectory(libusermetrics)
34add_subdirectory(libusermetrics)
35−add_subdirectory(LightDM)
35+add_subdirectory(IntegratedLightDM)
36add_subdirectory(Lights)
36add_subdirectory(Lights)
37add_subdirectory(MeeGo)
37add_subdirectory(MeeGo)
38add_subdirectory(Powerd)
38add_subdirectory(Powerd)
tests/mocks/LightDM/CMakeLists.txt → tests/mocks/IntegratedLightDM/CMakeLists.txtrenamed+6−6
@@ -10,16 +10,16 @@ include_directories(
10 ${CMAKE_CURRENT_SOURCE_DIR}
10 ${CMAKE_CURRENT_SOURCE_DIR}
11 ${CMAKE_CURRENT_BINARY_DIR}
11 ${CMAKE_CURRENT_BINARY_DIR}
12 ${CMAKE_SOURCE_DIR}/plugins/Utils
12 ${CMAKE_SOURCE_DIR}/plugins/Utils
13− ${CMAKE_SOURCE_DIR}/plugins/LightDM
13+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
14 ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
14 ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
15 ${libunity8-private_SOURCE_DIR}
15 ${libunity8-private_SOURCE_DIR}
16)
16)
17
17
18set(QMLPLUGIN_SRC
18set(QMLPLUGIN_SRC
19− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
19+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/DBusGreeter.cpp
20− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
20+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/DBusGreeterList.cpp
21− ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
21+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
22− ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
22+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
23 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
23 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
24 MockGreeter.cpp
24 MockGreeter.cpp
25 MockUsersModel.cpp
25 MockUsersModel.cpp
@@ -42,7 +42,7 @@ target_link_libraries(MockLightDM-qml
42
42
43qt5_use_modules(MockLightDM-qml DBus Gui Qml)
43qt5_use_modules(MockLightDM-qml DBus Gui Qml)
44
44
45−add_unity8_mock(LightDM 0.1 LightDM
45+add_unity8_mock(IntegratedLightDM 0.1 IntegratedLightDM
46 PREFIX mocks
46 PREFIX mocks
47 TARGETS MockLightDM-qml
47 TARGETS MockLightDM-qml
48 ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"
48 ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"
tests/mocks/LightDM/LightDM.qmltypes → tests/mocks/IntegratedLightDM/IntegratedLightDM.qmltypesrenamed+6−8
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable LightDM 0.1 tests/mocks'
7+// 'qmlplugindump -notrelocatable IntegratedLightDM 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
@@ -61,7 +61,7 @@ Module {
61 Component {
61 Component {
62 name: "MockGreeter"
62 name: "MockGreeter"
63 prototype: "Greeter"
63 prototype: "Greeter"
64− exports: ["LightDM/Greeter 0.1"]
64+ exports: ["IntegratedLightDM/Greeter 0.1"]
65 isCreatable: false
65 isCreatable: false
66 isSingleton: true
66 isSingleton: true
67 exportMetaObjectRevisions: [0]
67 exportMetaObjectRevisions: [0]
@@ -74,7 +74,7 @@ Module {
74 Component {
74 Component {
75 name: "MockUsersModel"
75 name: "MockUsersModel"
76 prototype: "UsersModel"
76 prototype: "UsersModel"
77− exports: ["LightDM/Users 0.1"]
77+ exports: ["IntegratedLightDM/Users 0.1"]
78 isCreatable: false
78 isCreatable: false
79 isSingleton: true
79 isSingleton: true
80 exportMetaObjectRevisions: [0]
80 exportMetaObjectRevisions: [0]
@@ -92,7 +92,7 @@ Module {
92 Component {
92 Component {
93 name: "QLightDM::UsersModel"
93 name: "QLightDM::UsersModel"
94 prototype: "QAbstractListModel"
94 prototype: "QAbstractListModel"
95− exports: ["LightDM/UserRoles 0.1"]
95+ exports: ["IntegratedLightDM/UserRoles 0.1"]
96 isCreatable: false
96 isCreatable: false
97 exportMetaObjectRevisions: [0]
97 exportMetaObjectRevisions: [0]
98 Enum {
98 Enum {
@@ -207,7 +207,7 @@ Module {
207 Component {
207 Component {
208 name: "UserMetricsOutput::UserMetrics"
208 name: "UserMetricsOutput::UserMetrics"
209 prototype: "QObject"
209 prototype: "QObject"
210− exports: ["LightDM/Infographic 0.1"]
210+ exports: ["IntegratedLightDM/Infographic 0.1"]
211 isCreatable: false
211 isCreatable: false
212 isSingleton: true
212 isSingleton: true
213 exportMetaObjectRevisions: [0]
213 exportMetaObjectRevisions: [0]
@@ -246,7 +246,7 @@ Module {
246 }
246 }
247 Signal {
247 Signal {
248 name: "currentDayChanged"
248 name: "currentDayChanged"
249− Parameter { name: "currentDay"; type: "int" }
249+ Parameter { name: "length"; type: "int" }
250 }
250 }
251 Signal {
251 Signal {
252 name: "secondColorChanged"
252 name: "secondColorChanged"
@@ -264,8 +264,6 @@ Module {
264 Signal { name: "dataChanged" }
264 Signal { name: "dataChanged" }
265 Signal { name: "dataAboutToDisappear" }
265 Signal { name: "dataAboutToDisappear" }
266 Signal { name: "dataDisappeared" }
266 Signal { name: "dataDisappeared" }
267− Method { name: "nextDataSourceSlot" }
268− Method { name: "readyForDataChangeSlot" }
269 }
267 }
270 Component { name: "UsersModel"; prototype: "UnitySortFilterProxyModelQML" }
268 Component { name: "UsersModel"; prototype: "UnitySortFilterProxyModelQML" }
271}
269}
tests/mocks/LightDM/MockGreeter.cpp → tests/mocks/IntegratedLightDM/MockGreeter.cpprenamed

The content is the same.

tests/mocks/LightDM/MockGreeter.h → tests/mocks/IntegratedLightDM/MockGreeter.hrenamed

The content is the same.

tests/mocks/LightDM/MockUsersModel.cpp → tests/mocks/IntegratedLightDM/MockUsersModel.cpprenamed

The content is the same.

tests/mocks/LightDM/MockUsersModel.h → tests/mocks/IntegratedLightDM/MockUsersModel.hrenamed

The content is the same.

tests/mocks/LightDM/QLightDM/Greeter → tests/mocks/IntegratedLightDM/QLightDM/Greeterrenamed

The content is the same.

tests/mocks/LightDM/QLightDM/UsersModel → tests/mocks/IntegratedLightDM/QLightDM/UsersModelrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/CMakeLists.txt → tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txtrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/Greeter.cpp → tests/mocks/IntegratedLightDM/liblightdm/Greeter.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/Greeter.h → tests/mocks/IntegratedLightDM/liblightdm/Greeter.hrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp → tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/GreeterPrivate.h → tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModel.cpp → tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModel.h → tests/mocks/IntegratedLightDM/liblightdm/UsersModel.hrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp → tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModelPrivate.h → tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed

The content is the same.

tests/mocks/LightDM/plugin.cpp → tests/mocks/IntegratedLightDM/plugin.cpprenamed+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -53,12 +53,12 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine
53 return UserMetricsOutput::UserMetrics::getInstance();
53 return UserMetricsOutput::UserMetrics::getInstance();
54}
54}
55
55
56−void LightDMPlugin::registerTypes(const char *uri)
56+void IntegratedLightDMPlugin::registerTypes(const char *uri)
57{
57{
58 qmlRegisterType<QAbstractItemModel>();
58 qmlRegisterType<QAbstractItemModel>();
59 qmlRegisterType<UserMetricsOutput::ColorTheme>();
59 qmlRegisterType<UserMetricsOutput::ColorTheme>();
60
60
61− Q_ASSERT(uri == QLatin1String("LightDM"));
61+ Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
62 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
62 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
63 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
63 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
64 qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
64 qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
tests/mocks/LightDM/plugin.h → tests/mocks/IntegratedLightDM/plugin.hrenamed+2−2
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
20#include <QtQml/QQmlEngine>
20#include <QtQml/QQmlEngine>
21#include <QtQml/QQmlExtensionPlugin>
21#include <QtQml/QQmlExtensionPlugin>
22
22
23−class LightDMPlugin : public QQmlExtensionPlugin
23+class IntegratedLightDMPlugin : public QQmlExtensionPlugin
24{
24{
25 Q_OBJECT
25 Q_OBJECT
26 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
26 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
tests/mocks/IntegratedLightDM/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module IntegratedLightDM
2+plugin MockLightDM-qml
3+typeinfo IntegratedLightDM.qmltypes
tests/mocks/LightDM/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module LightDM
2−plugin MockLightDM-qml
3−typeinfo LightDM.qmltypes
tests/plugins/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
1add_subdirectory(AccountsService)
1add_subdirectory(AccountsService)
2add_subdirectory(Greeter)
2add_subdirectory(Greeter)
3−add_subdirectory(LightDM)
3+add_subdirectory(IntegratedLightDM)
4add_subdirectory(Dash)
4add_subdirectory(Dash)
5add_subdirectory(ScreenGrabber)
5add_subdirectory(ScreenGrabber)
6add_subdirectory(Ubuntu)
6add_subdirectory(Ubuntu)
tests/plugins/LightDM/CMakeLists.txt → tests/plugins/IntegratedLightDM/CMakeLists.txtrenamed+11−11
@@ -7,19 +7,19 @@ include_directories(
7
7
8add_executable(GreeterDBusTestExec
8add_executable(GreeterDBusTestExec
9 dbus.cpp
9 dbus.cpp
10− ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
10+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
11 )
11 )
12# This add_dependencies is needed since we're linking with with -L and -l below
12# This add_dependencies is needed since we're linking with with -L and -l below
13# make seems to work but ninja breaks without it
13# make seems to work but ninja breaks without it
14add_dependencies(GreeterDBusTestExec MockLightDM)
14add_dependencies(GreeterDBusTestExec MockLightDM)
15qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
15qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
16target_link_libraries(GreeterDBusTestExec
16target_link_libraries(GreeterDBusTestExec
17− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
17+ -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
18 -llightdm-qt5-2
18 -llightdm-qt5-2
19 )
19 )
20target_include_directories(GreeterDBusTestExec PUBLIC
20target_include_directories(GreeterDBusTestExec PUBLIC
21− ${CMAKE_SOURCE_DIR}/plugins/LightDM
21+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
22− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
22+ ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
23 )
23 )
24add_unity8_uitest(GreeterDBus dbus-test-runner
24add_unity8_uitest(GreeterDBus dbus-test-runner
25 ARG_PREFIX "--parameter"
25 ARG_PREFIX "--parameter"
@@ -31,20 +31,20 @@ add_unity8_uitest(GreeterDBus dbus-test-runner
31
31
32add_executable(GreeterPamTestExec
32add_executable(GreeterPamTestExec
33 pam.cpp
33 pam.cpp
34− ${CMAKE_SOURCE_DIR}/plugins/LightDM/liblightdm/GreeterPrivate.cpp
34+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp
35 )
35 )
36qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
36qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
37target_link_libraries(GreeterPamTestExec
37target_link_libraries(GreeterPamTestExec
38 integratedLightDM
38 integratedLightDM
39 )
39 )
40target_include_directories(GreeterPamTestExec PUBLIC
40target_include_directories(GreeterPamTestExec PUBLIC
41− ${CMAKE_SOURCE_DIR}/plugins/LightDM/liblightdm
41+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/liblightdm
42 )
42 )
43add_qmltest_target(testGreeterPam GreeterPamTestExec COMMAND $<TARGET_FILE:GreeterPamTestExec>)
43add_qmltest_target(testGreeterPam GreeterPamTestExec COMMAND $<TARGET_FILE:GreeterPamTestExec>)
44
44
45add_executable(GreeterUsersModelTestExec
45add_executable(GreeterUsersModelTestExec
46 usersmodel.cpp
46 usersmodel.cpp
47− ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
47+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
48 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
48 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
49 )
49 )
50# This add_dependencies is needed since we're linking with with -L and -l below
50# This add_dependencies is needed since we're linking with with -L and -l below
@@ -52,16 +52,16 @@ add_executable(GreeterUsersModelTestExec
52add_dependencies(GreeterUsersModelTestExec MockLightDM)
52add_dependencies(GreeterUsersModelTestExec MockLightDM)
53qt5_use_modules(GreeterUsersModelTestExec Core Test)
53qt5_use_modules(GreeterUsersModelTestExec Core Test)
54target_link_libraries(GreeterUsersModelTestExec
54target_link_libraries(GreeterUsersModelTestExec
55− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
55+ -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
56 -llightdm-qt5-2
56 -llightdm-qt5-2
57 )
57 )
58target_include_directories(GreeterUsersModelTestExec PUBLIC
58target_include_directories(GreeterUsersModelTestExec PUBLIC
59− ${CMAKE_SOURCE_DIR}/plugins/LightDM
59+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
60 ${CMAKE_SOURCE_DIR}/plugins/Utils
60 ${CMAKE_SOURCE_DIR}/plugins/Utils
61− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
61+ ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
62 )
62 )
63add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
63add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
64 ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
64 ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
65 DEPENDS MockLightDM
65 DEPENDS MockLightDM
66 LIGHTDM
66 LIGHTDM
67− )
67+ )
tests/plugins/LightDM/dbus.cpp → tests/plugins/IntegratedLightDM/dbus.cpprenamed

The content is the same.

tests/plugins/LightDM/greeter.qml → tests/plugins/IntegratedLightDM/greeter.qmlrenamed+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import LightDM 0.1 as LightDM
18+import IntegratedLightDM 0.1 as LightDM
19
19
20Item {
20Item {
21 property var greeter: LightDM.Greeter
21 property var greeter: LightDM.Greeter
tests/plugins/LightDM/pam.cpp → tests/plugins/IntegratedLightDM/pam.cpprenamed

The content is the same.

tests/plugins/LightDM/usersmodel.cpp → tests/plugins/IntegratedLightDM/usersmodel.cpprenamed

The content is the same.

tests/qmltests/Greeter/tst_Greeter.qml+1−1
@@ -20,7 +20,7 @@ import ".."
20import "../../../qml/Greeter"
20import "../../../qml/Greeter"
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import AccountsService 0.1
22import AccountsService 0.1
23−import LightDM 0.1 as LightDM
23+import IntegratedLightDM 0.1 as LightDM
24import Unity.Test 0.1 as UT
24import Unity.Test 0.1 as UT
25
25
26Item {
26Item {
tests/qmltests/Greeter/tst_Infographics.qml+1−1
@@ -20,7 +20,7 @@ import ".."
20import "../../../qml/Greeter"
20import "../../../qml/Greeter"
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Unity.Test 0.1 as UT
22import Unity.Test 0.1 as UT
23−import LightDM 0.1 as LightDM
23+import IntegratedLightDM 0.1 as LightDM
24
24
25Item {
25Item {
26 Binding {
26 Binding {
tests/qmltests/Greeter/tst_NarrowView.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import ".."
19import ".."
20import "../../../qml/Greeter"
20import "../../../qml/Greeter"
21−import LightDM 0.1 as LightDM
21+import IntegratedLightDM 0.1 as LightDM
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23import Unity.Test 0.1 as UT
23import Unity.Test 0.1 as UT
24
24
tests/qmltests/Greeter/tst_WideView.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import ".."
19import ".."
20import "../../../qml/Greeter"
20import "../../../qml/Greeter"
21−import LightDM 0.1 as LightDM
21+import IntegratedLightDM 0.1 as LightDM
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23import Unity.Test 0.1 as UT
23import Unity.Test 0.1 as UT
24
24
tests/qmltests/Tutorial/tst_Tutorial.qml+1−1
@@ -17,7 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import AccountsService 0.1
19import AccountsService 0.1
20−import LightDM 0.1 as LightDM
20+import IntegratedLightDM 0.1 as LightDM
21import Ubuntu.Components 1.1
21import Ubuntu.Components 1.1
22import Unity.Application 0.1
22import Unity.Application 0.1
23import Unity.Test 0.1 as UT
23import Unity.Test 0.1 as UT
tests/qmltests/tst_OrientedShell.qml+1−1
@@ -21,7 +21,7 @@ import Ubuntu.Components 1.1
21import Ubuntu.Components.ListItems 1.0 as ListItem
21import Ubuntu.Components.ListItems 1.0 as ListItem
22import Unity.Application 0.1
22import Unity.Application 0.1
23import Unity.Test 0.1
23import Unity.Test 0.1
24−import LightDM 0.1 as LightDM
24+import IntegratedLightDM 0.1 as LightDM
25import Powerd 0.1
25import Powerd 0.1
26import Unity.InputInfo 0.1
26import Unity.InputInfo 0.1
27
27
tests/qmltests/tst_Shell.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import AccountsService 0.1
19import AccountsService 0.1
20import GSettings 1.0
20import GSettings 1.0
21−import LightDM 0.1 as LightDM
21+import IntegratedLightDM 0.1 as LightDM
22import Ubuntu.Components 1.1
22import Ubuntu.Components 1.1
23import Ubuntu.Components.ListItems 1.0 as ListItem
23import Ubuntu.Components.ListItems 1.0 as ListItem
24import Ubuntu.Telephony 0.1 as Telephony
24import Ubuntu.Telephony 0.1 as Telephony
tests/qmltests/tst_ShellWithPin.qml+1−1
@@ -19,7 +19,7 @@ import Ubuntu.Components 1.0
19import QtTest 1.0
19import QtTest 1.0
20import AccountsService 0.1
20import AccountsService 0.1
21import GSettings 1.0
21import GSettings 1.0
22−import LightDM 0.1 as LightDM
22+import IntegratedLightDM 0.1 as LightDM
23import Ubuntu.SystemImage 0.1
23import Ubuntu.SystemImage 0.1
24import Ubuntu.Telephony 0.1 as Telephony
24import Ubuntu.Telephony 0.1 as Telephony
25import Unity.Application 0.1
25import Unity.Application 0.1