1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2014-04-24 14:13:21 +0000
3
+++ CMakeLists.txt	2014-05-29 14:11:15 +0000
4
@@ -96,6 +96,7 @@
5
96
declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
96
declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
6
97
97
7
98
set(SHELL_APP unity8)
98
set(SHELL_APP unity8)
8
99
set(GREETER_APP unity8-greeter)
9
99
set(SCOPE_TOOL unity-scope-tool)
100
set(SCOPE_TOOL unity-scope-tool)
10
100
101
11
101
include_directories(
102
include_directories(
12
102
103
13
=== added file 'data/51-unity8-greeter.conf'
14
--- data/51-unity8-greeter.conf	1970-01-01 00:00:00 +0000
15
+++ data/51-unity8-greeter.conf	2014-05-29 14:11:15 +0000
16
@@ -0,0 +1,2 @@
17
1
[SeatDefaults]
18
2
greeter-session=unity8-greeter
19
0
3
20
=== modified file 'data/CMakeLists.txt'
21
--- data/CMakeLists.txt	2014-04-22 13:17:52 +0000
22
+++ data/CMakeLists.txt	2014-05-29 14:11:15 +0000
23
@@ -1,7 +1,20 @@
24
1
# generate desktop file
1
# generate desktop file
25
2
configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
2
configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
26
3
configure_file(${GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop @ONLY)
27
3
4
28
4
# install desktop files
5
# install desktop files
29
5
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop
6
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop
30
6
    DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
7
    DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
31
7
    )
8
    )
32
9
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop
33
10
    DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
34
11
    )
35
12
install(FILES 51-${GREETER_APP}.conf
36
13
    DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
37
14
    )
38
15
install(FILES ${GREETER_APP}-wrapper
39
16
    DESTINATION ${CMAKE_INSTALL_BINDIR}
40
17
    )
41
18
install(FILES ${GREETER_APP}-init.conf
42
19
    DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions
43
20
    )
44
8
21
45
=== added file 'data/unity8-greeter-init.conf'
46
--- data/unity8-greeter-init.conf	1970-01-01 00:00:00 +0000
47
+++ data/unity8-greeter-init.conf	2014-05-29 14:11:15 +0000
48
@@ -0,0 +1,12 @@
49
1
description "Unity 8 Greeter initialization"
50
2
author "Michael Terry <mterry@ubuntu.com>"
51
3
52
4
start on unity8-greeter-started
53
5
task
54
6
emits indicator-services-start
55
7
56
8
script
57
9
    start --no-wait ofono-setup || true
58
10
    initctl emit --no-wait indicator-services-start || true
59
11
    start --no-wait maliit-server || true
60
12
end script
61
0
13
62
=== added file 'data/unity8-greeter-wrapper'
63
--- data/unity8-greeter-wrapper	1970-01-01 00:00:00 +0000
64
+++ data/unity8-greeter-wrapper	2014-05-29 14:11:15 +0000
65
@@ -0,0 +1,98 @@
66
1
#!/bin/sh
67
2
# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
68
3
#
69
4
# Copyright (C) 2011,2013 Canonical Ltd
70
5
# Author: Michael Terry <michael.terry@canonical.com>
71
6
#
72
7
# This program is free software: you can redistribute it and/or modify it under
73
8
# the terms of the GNU General Public License as published by the Free Software
74
9
# Foundation, version 3 of the License.
75
10
#
76
11
# See http://www.gnu.org/copyleft/gpl.html the full text of the license.
77
12
78
13
# This wrapper merely ensures that init and friends live only as long as this
79
14
# script does.  Otherwise, it's very easy for some processes to not notice that
80
15
# the session died.  We could try to do this in-process, but we want to do this
81
16
# cleanup even if the greeter aborts.
82
17
83
18
trap cleanup TERM EXIT
84
19
85
20
cleanup()
86
21
{
87
22
    trap - TERM EXIT
88
23
    # Kill upstart and indicators
89
24
    if [ -n "$INIT_PID" ]; then
90
25
        kill "$INIT_PID"
91
26
    fi
92
27
    if [ -n "$CMD_PID" ]; then
93
28
        kill "$CMD_PID"
94
29
    fi
95
30
    exit 0
96
31
}
97
32
98
33
set_greeter_var()
99
34
{
100
35
    export "$1=$2"
101
36
    gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "{'$1': '$2'}"
102
37
    if [ -n "$INIT_PID" ]; then
103
38
        initctl set-env --global "$1=$2"
104
39
    fi
105
40
}
106
41
107
42
SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
108
43
rm -f $SUB_SOCKET # clear socket in case we were hard shut down
109
44
110
45
# If touch session script (which sets up grid units and mir variables) is available, use it
111
46
TOUCH_WRAPPER=
112
47
if [ -x /usr/bin/ubuntu-touch-session ]; then
113
48
    TOUCH_WRAPPER=/usr/bin/ubuntu-touch-session
114
49
fi
115
50
116
51
# Pretend that we're in an ubuntu-touch session, so that indicator-network
117
52
# will start.
118
53
export DESKTOP_SESSION=ubuntu-touch
119
54
120
55
# We disable ofono using pulse.  It causes problems with racing with the user's
121
56
# pulse.  We need to come up with a better long-term fix for this, because we
122
57
# eventually need the greeter to play ringtones for users that aren't logged in.
123
58
set_greeter_var PA_DISABLED 1
124
59
125
60
# Normal unity8 sessions are entirely driven by Upstart.  But greeters
126
61
# are special.  They need access to the file descriptors that lightdm
127
62
# creates for them and don't want to start all the services that a normal
128
63
# session would.  So it's inconvenient to live within an upstart session.
129
64
# But... we still want to use Upstart for some services.  So launch here.
130
65
USC_SOCKET=$MIR_SOCKET MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/init --user --no-startup-event &
131
66
INIT_PID=$!
132
67
while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
133
68
export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
134
69
135
70
# Start any pre-greeter tasks if needed (like wizard)
136
71
/sbin/initctl emit unity8-greeter-starting
137
72
138
73
# Define language here for phone if available.  When phone user switches their
139
74
# language, they expect that to affect the greeter too.  But the user doesn't
140
75
# have permission to switch system language, only their own.  So we notice if
141
76
# the phablet user exists and use their language if so.  TODO: talk to design
142
77
# about whether we should switch language on fly as users are selected (this
143
78
# is very hard to do technically).
144
79
#
145
80
# Do this after unity8-greeter-starting, in case a customization upstart job
146
81
# changes language.
147
82
if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then
148
83
    USER_LANG=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)
149
84
    if [ -n "$USER_LANG" ]; then
150
85
        set_greeter_var LANGUAGE "$USER_LANG"
151
86
    fi
152
87
    USER_LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)
153
88
    if [ -n "$USER_LOCALE" ]; then
154
89
        set_greeter_var LANG "$USER_LOCALE"
155
90
        set_greeter_var LC_ALL "$USER_LOCALE"
156
91
    fi
157
92
fi
158
93
159
94
# And finally actually start the greeter
160
95
exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
161
96
CMD_PID=$!
162
97
wait $CMD_PID
163
98
CMD_PID=
164
0
99
165
=== added file 'data/unity8-greeter.desktop.in'
166
--- data/unity8-greeter.desktop.in	1970-01-01 00:00:00 +0000
167
+++ data/unity8-greeter.desktop.in	2014-05-29 14:11:15 +0000
168
@@ -0,0 +1,5 @@
169
1
[Desktop Entry]
170
2
Type=Application
171
3
Name=Unity 8 Greeter
172
4
Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter
173
5
X-LightDM-Session-Type=mir
174
0
6
175
=== modified file 'debian/changelog'
176
--- debian/changelog	2014-05-27 07:47:11 +0000
177
+++ debian/changelog	2014-05-29 14:11:15 +0000
178
@@ -1,3 +1,9 @@
179
1
unity8 (7.87+14.10.20140505-0ubuntu1) UNRELEASED; urgency=medium
180
2
181
3
  * Bump version for Breaks due to unity8-greeter
182
4
183
5
 -- Michael Terry <mterry@ubuntu.com>  Wed, 02 Apr 2014 14:39:45 -0400
184
6
185
1
unity8 (7.86+14.10.20140527-0ubuntu1) utopic; urgency=low
7
unity8 (7.86+14.10.20140527-0ubuntu1) utopic; urgency=low
186
2
8
187
3
  [ Andrea Cimitan ]
9
  [ Andrea Cimitan ]
188
4
10
189
=== modified file 'debian/control'
190
--- debian/control	2014-05-05 12:09:22 +0000
191
+++ debian/control	2014-05-29 14:11:15 +0000
192
@@ -14,6 +14,7 @@
193
14
               libglib2.0-dev,
14
               libglib2.0-dev,
194
15
               libgsettings-qt-dev,
15
               libgsettings-qt-dev,
195
16
               libhud-client2-dev,
16
               libhud-client2-dev,
196
17
               liblightdm-qt5-3-dev (>= 1.11.1),
197
17
               libpulse-dev,
18
               libpulse-dev,
198
18
               libqmenumodel-dev (>= 0.2.7),
19
               libqmenumodel-dev (>= 0.2.7),
199
19
               libqt5xmlpatterns5-dev,
20
               libqt5xmlpatterns5-dev,
200
@@ -79,6 +80,7 @@
201
79
         qml-module-qtquick-xmllistmodel,
80
         qml-module-qtquick-xmllistmodel,
202
80
         qtdeclarative5-gsettings1.0,
81
         qtdeclarative5-gsettings1.0,
203
81
         qtdeclarative5-ubuntu-settings-components,
82
         qtdeclarative5-ubuntu-settings-components,
204
83
         unity-greeter-session-broadcast,
205
82
         unity-launcher-impl-3,
84
         unity-launcher-impl-3,
206
83
         unity8-common (= ${source:Version}),
85
         unity8-common (= ${source:Version}),
207
84
         unity8-private (= ${binary:Version}),
86
         unity8-private (= ${binary:Version}),
208
@@ -94,6 +96,19 @@
209
94
Description: Unity 8 shell
96
Description: Unity 8 shell
210
95
 The Unity 8 shell is the primary user interface for Ubuntu devices.
97
 The Unity 8 shell is the primary user interface for Ubuntu devices.
211
96
98
212
99
Package: unity8-greeter
213
100
Architecture: any
214
101
Depends: dbus-x11,
215
102
         libglib2.0-bin,
216
103
         lightdm,
217
104
         unity8 (= ${source:Version}),
218
105
         ${misc:Depends},
219
106
         ${shlibs:Depends},
220
107
Breaks: unity8 (<< 7.87),
221
108
Replaces: unity8 (<< 7.87),
222
109
Description: Ubuntu QML greeter
223
110
 The Ubuntu QML greeter is the primary greeter for Ubuntu devices.
224
111
225
97
Package: unity8-common
112
Package: unity8-common
226
98
Architecture: all
113
Architecture: all
227
99
Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
114
Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
228
@@ -132,6 +147,7 @@
229
132
         ubuntu-ui-toolkit-autopilot,
147
         ubuntu-ui-toolkit-autopilot,
230
133
         unity8 (= ${source:Version}),
148
         unity8 (= ${source:Version}),
231
134
         unity8-fake-env (= ${source:Version}),
149
         unity8-fake-env (= ${source:Version}),
232
150
         unity8-greeter (= ${source:Version}),
233
135
         url-dispatcher-tools,
151
         url-dispatcher-tools,
234
136
         ${misc:Depends},
152
         ${misc:Depends},
235
137
         ${python3:Depends},
153
         ${python3:Depends},
236
138
154
237
=== modified file 'debian/copyright'
238
--- debian/copyright	2013-06-26 08:16:38 +0000
239
+++ debian/copyright	2014-05-29 14:11:15 +0000
240
@@ -22,7 +22,7 @@
241
22
 On Debian systems, the full text of the GNU General Public License
22
 On Debian systems, the full text of the GNU General Public License
242
23
 version 3 can be found in the file /usr/share/common-licenses/GPL-3.
23
 version 3 can be found in the file /usr/share/common-licenses/GPL-3.
243
24
24
245
25
Files: tests/mocks/LightDM/UsersModel.h tests/mocks/LightDM/Greeter.h
25
Files: tests/mocks/liblightdm/UsersModel.h tests/mocks/liblightdm/Greeter.h
246
26
Copyright: 2013 Canonical Ltd.
26
Copyright: 2013 Canonical Ltd.
247
27
           2010-2011 David Edmundson
27
           2010-2011 David Edmundson
248
28
           2010-2011 Robert Ancell
28
           2010-2011 Robert Ancell
249
29
29
250
=== modified file 'debian/rules'
251
--- debian/rules	2014-05-05 08:50:25 +0000
252
+++ debian/rules	2014-05-29 14:11:15 +0000
253
@@ -34,7 +34,3 @@
254
34
# use private lib directories
34
# use private lib directories
255
35
override_dh_makeshlibs:
35
override_dh_makeshlibs:
256
36
	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
36
	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
257
37
258
38
# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
259
39
override_dh_shlibdeps:
260
40
	dh_shlibdeps -XlibMockLightDM-qml.so
261
41
37
262
=== added file 'debian/unity8-greeter.install'
263
--- debian/unity8-greeter.install	1970-01-01 00:00:00 +0000
264
+++ debian/unity8-greeter.install	2014-05-29 14:11:15 +0000
265
@@ -0,0 +1,6 @@
266
1
usr/bin/unity8-greeter
267
2
usr/bin/unity8-greeter-wrapper
268
3
usr/share/lightdm
269
4
usr/share/unity8/GreeterShell.qml
270
5
usr/share/unity8/Greeter
271
6
usr/share/upstart/sessions/unity8-greeter-*.conf
272
0
7
273
=== modified file 'debian/unity8-private.install'
274
--- debian/unity8-private.install	2014-05-06 08:44:10 +0000
275
+++ debian/unity8-private.install	2014-05-29 14:11:15 +0000
276
@@ -4,6 +4,7 @@
277
4
usr/lib/*/unity8/qml/LightDM
4
usr/lib/*/unity8/qml/LightDM
278
5
usr/lib/*/unity8/qml/Powerd
5
usr/lib/*/unity8/qml/Powerd
279
6
usr/lib/*/unity8/qml/SessionBroadcast
6
usr/lib/*/unity8/qml/SessionBroadcast
280
7
usr/lib/*/unity8/qml/SessionManager
281
7
usr/lib/*/unity8/qml/Ubuntu
8
usr/lib/*/unity8/qml/Ubuntu
282
8
usr/lib/*/unity8/qml/Unity
9
usr/lib/*/unity8/qml/Unity
283
9
usr/lib/*/unity8/qml/Utils
10
usr/lib/*/unity8/qml/Utils
284
10
11
285
=== modified file 'debian/unity8.install'
286
--- debian/unity8.install	2014-05-07 10:30:14 +0000
287
+++ debian/unity8.install	2014-05-29 14:11:15 +0000
288
@@ -1,7 +1,6 @@
289
1
data/unity8.conf usr/share/upstart/sessions/
1
data/unity8.conf usr/share/upstart/sessions/
290
2
usr/bin/unity8
2
usr/bin/unity8
291
3
usr/share/applications/unity8.desktop
3
usr/share/applications/unity8.desktop
292
4
usr/share/unity8/Greeter
293
5
usr/share/unity8/Hud
4
usr/share/unity8/Hud
294
6
usr/share/unity8/Launcher
5
usr/share/unity8/Launcher
295
7
usr/share/unity8/Panel
6
usr/share/unity8/Panel
296
8
7
297
=== modified file 'plugins/AccountsService/AccountsService.cpp'
298
--- plugins/AccountsService/AccountsService.cpp	2013-10-11 13:32:36 +0000
299
+++ plugins/AccountsService/AccountsService.cpp	2014-05-29 14:11:15 +0000
300
@@ -24,7 +24,6 @@
301
24
AccountsService::AccountsService(QObject* parent)
24
AccountsService::AccountsService(QObject* parent)
302
25
  : QObject(parent),
25
  : QObject(parent),
303
26
    m_service(new AccountsServiceDBusAdaptor(this)),
26
    m_service(new AccountsServiceDBusAdaptor(this)),
304
27
    m_user(qgetenv("USER")),
305
28
    m_demoEdges(false),
27
    m_demoEdges(false),
306
29
    m_statsWelcomeScreen(false)
28
    m_statsWelcomeScreen(false)
307
30
{
29
{
308
@@ -32,6 +31,9 @@
309
32
            this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
31
            this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
310
33
    connect(m_service, SIGNAL(maybeChanged(const QString &)),
32
    connect(m_service, SIGNAL(maybeChanged(const QString &)),
311
34
            this, SLOT(maybeChanged(const QString &)));
33
            this, SLOT(maybeChanged(const QString &)));
312
34
313
35
    setUser(qgetenv("USER"));
314
36
    updateDemoEdgesForCurrentUser();
315
35
}
37
}
316
36
38
317
37
QString AccountsService::user() const
39
QString AccountsService::user() const
318
@@ -57,9 +59,22 @@
319
57
void AccountsService::setDemoEdges(bool demoEdges)
59
void AccountsService::setDemoEdges(bool demoEdges)
320
58
{
60
{
321
59
    m_demoEdges = demoEdges;
61
    m_demoEdges = demoEdges;
322
62
    Q_EMIT demoEdgesChanged();
323
60
    m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
63
    m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
324
61
}
64
}
325
62
65
326
66
bool AccountsService::demoEdgesForCurrentUser() const
327
67
{
328
68
    return m_demoEdgesForCurrentUser;
329
69
}
330
70
331
71
void AccountsService::setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser)
332
72
{
333
73
    m_demoEdgesForCurrentUser = demoEdgesForCurrentUser;
334
74
    Q_EMIT demoEdgesForCurrentUserChanged();
335
75
    m_service->setUserProperty(qgetenv("USER"), "com.canonical.unity.AccountsService", "demo-edges", demoEdgesForCurrentUser);
336
76
}
337
77
338
63
QString AccountsService::backgroundFile() const
78
QString AccountsService::backgroundFile() const
339
64
{
79
{
340
65
    return m_backgroundFile;
80
    return m_backgroundFile;
341
@@ -79,6 +94,15 @@
342
79
    }
94
    }
343
80
}
95
}
344
81
96
345
97
void AccountsService::updateDemoEdgesForCurrentUser()
346
98
{
347
99
    auto demoEdgesForCurrentUser = m_service->getUserProperty(qgetenv("USER"), "com.canonical.unity.AccountsService", "demo-edges").toBool();
348
100
    if (m_demoEdgesForCurrentUser != demoEdgesForCurrentUser) {
349
101
        m_demoEdgesForCurrentUser = demoEdgesForCurrentUser;
350
102
        Q_EMIT demoEdgesForCurrentUserChanged();
351
103
    }
352
104
}
353
105
354
82
void AccountsService::updateBackgroundFile()
106
void AccountsService::updateBackgroundFile()
355
83
{
107
{
356
84
    auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
108
    auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
357
@@ -99,13 +123,14 @@
358
99
123
359
100
void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
124
void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
360
101
{
125
{
361
102
    if (m_user != user) {
362
103
        return;
363
104
    }
364
105
365
106
    if (interface == "com.canonical.unity.AccountsService") {
126
    if (interface == "com.canonical.unity.AccountsService") {
366
107
        if (changed.contains("demo-edges")) {
127
        if (changed.contains("demo-edges")) {
368
108
            updateDemoEdges();
128
            if (qgetenv("USER") == user) {
369
129
                updateDemoEdgesForCurrentUser();
370
130
            }
371
131
            if (m_user == user) {
372
132
                updateDemoEdges();
373
133
            }
374
109
        }
134
        }
375
110
    } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
135
    } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
376
111
        if (changed.contains("StatsWelcomeScreen")) {
136
        if (changed.contains("StatsWelcomeScreen")) {
377
@@ -116,10 +141,8 @@
378
116
141
379
117
void AccountsService::maybeChanged(const QString &user)
142
void AccountsService::maybeChanged(const QString &user)
380
118
{
143
{
383
119
    if (m_user != user) {
144
    if (m_user == user) {
384
120
        return;
145
        // Standard properties might have changed
385
146
        updateBackgroundFile();
386
121
    }
147
    }
387
122
388
123
    // Standard properties might have changed
389
124
    updateBackgroundFile();
390
125
}
148
}
391
126
149
392
=== modified file 'plugins/AccountsService/AccountsService.h'
393
--- plugins/AccountsService/AccountsService.h	2013-09-24 18:50:56 +0000
394
+++ plugins/AccountsService/AccountsService.h	2014-05-29 14:11:15 +0000
395
@@ -35,6 +35,10 @@
396
35
                READ demoEdges
35
                READ demoEdges
397
36
                WRITE setDemoEdges
36
                WRITE setDemoEdges
398
37
                NOTIFY demoEdgesChanged)
37
                NOTIFY demoEdgesChanged)
399
38
    Q_PROPERTY (bool demoEdgesForCurrentUser
400
39
                READ demoEdgesForCurrentUser
401
40
                WRITE setDemoEdgesForCurrentUser
402
41
                NOTIFY demoEdgesForCurrentUserChanged)
403
38
    Q_PROPERTY (QString backgroundFile
42
    Q_PROPERTY (QString backgroundFile
404
39
                READ backgroundFile
43
                READ backgroundFile
405
40
                NOTIFY backgroundFileChanged)
44
                NOTIFY backgroundFileChanged)
406
@@ -49,12 +53,15 @@
407
49
    void setUser(const QString &user);
53
    void setUser(const QString &user);
408
50
    bool demoEdges() const;
54
    bool demoEdges() const;
409
51
    void setDemoEdges(bool demoEdges);
55
    void setDemoEdges(bool demoEdges);
410
56
    bool demoEdgesForCurrentUser() const;
411
57
    void setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser);
412
52
    QString backgroundFile() const;
58
    QString backgroundFile() const;
413
53
    bool statsWelcomeScreen() const;
59
    bool statsWelcomeScreen() const;
414
54
60
415
55
Q_SIGNALS:
61
Q_SIGNALS:
416
56
    void userChanged();
62
    void userChanged();
417
57
    void demoEdgesChanged();
63
    void demoEdgesChanged();
418
64
    void demoEdgesForCurrentUserChanged();
419
58
    void backgroundFileChanged();
65
    void backgroundFileChanged();
420
59
    void statsWelcomeScreenChanged();
66
    void statsWelcomeScreenChanged();
421
60
67
422
@@ -64,12 +71,14 @@
423
64
71
424
65
private:
72
private:
425
66
    void updateDemoEdges();
73
    void updateDemoEdges();
426
74
    void updateDemoEdgesForCurrentUser();
427
67
    void updateBackgroundFile();
75
    void updateBackgroundFile();
428
68
    void updateStatsWelcomeScreen();
76
    void updateStatsWelcomeScreen();
429
69
77
430
70
    AccountsServiceDBusAdaptor *m_service;
78
    AccountsServiceDBusAdaptor *m_service;
431
71
    QString m_user;
79
    QString m_user;
432
72
    bool m_demoEdges;
80
    bool m_demoEdges;
433
81
    bool m_demoEdgesForCurrentUser;
434
73
    QString m_backgroundFile;
82
    QString m_backgroundFile;
435
74
    bool m_statsWelcomeScreen;
83
    bool m_statsWelcomeScreen;
436
75
};
84
};
437
76
85
438
=== modified file 'plugins/CMakeLists.txt'
439
--- plugins/CMakeLists.txt	2014-05-14 10:11:14 +0000
440
+++ plugins/CMakeLists.txt	2014-05-29 14:11:15 +0000
441
@@ -17,6 +17,7 @@
442
17
add_subdirectory(Dash)
17
add_subdirectory(Dash)
443
18
add_subdirectory(Powerd)
18
add_subdirectory(Powerd)
444
19
add_subdirectory(SessionBroadcast)
19
add_subdirectory(SessionBroadcast)
445
20
add_subdirectory(SessionManager)
446
20
add_subdirectory(Ubuntu)
21
add_subdirectory(Ubuntu)
447
21
add_subdirectory(Unity)
22
add_subdirectory(Unity)
448
22
add_subdirectory(Utils)
23
add_subdirectory(Utils)
449
23
24
450
=== modified file 'plugins/LightDM/CMakeLists.txt'
451
--- plugins/LightDM/CMakeLists.txt	2014-05-02 22:57:00 +0000
452
+++ plugins/LightDM/CMakeLists.txt	2014-05-29 14:11:15 +0000
453
@@ -1,23 +1,22 @@
454
1
# Dependencies
1
# Dependencies
455
2
include(FindPkgConfig)
2
include(FindPkgConfig)
456
3
pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
457
3
pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
4
pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
458
4
# TODO: Once we split out a separate greeter process, uncomment these lines
459
5
#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
460
6
5
461
7
include_directories(
6
include_directories(
462
8
    ${CMAKE_CURRENT_SOURCE_DIR}
7
    ${CMAKE_CURRENT_SOURCE_DIR}
463
9
    ${CMAKE_CURRENT_BINARY_DIR}
8
    ${CMAKE_CURRENT_BINARY_DIR}
464
10
    ${CMAKE_SOURCE_DIR}/plugins/Utils
9
    ${CMAKE_SOURCE_DIR}/plugins/Utils
467
11
    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
10
    ${LIBLIGHTDM_INCLUDE_DIRS}
466
12
    #${LIBLIGHTDM_INCLUDE_DIRS}
468
13
    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
11
    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
469
14
)
12
)
470
15
13
471
16
set(QMLPLUGIN_SRC
14
set(QMLPLUGIN_SRC
473
17
    ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
15
    ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
474
18
    DBusGreeterList.cpp
16
    DBusGreeterList.cpp
475
19
    Greeter.cpp
17
    Greeter.cpp
476
20
    plugin.cpp
18
    plugin.cpp
477
19
    URLDispatcher.cpp
478
21
    UsersModel.cpp
20
    UsersModel.cpp
479
22
    )
21
    )
480
23
22
481
@@ -26,12 +25,10 @@
482
26
    )
25
    )
483
27
26
484
28
target_link_libraries(LightDM-qml
27
target_link_libraries(LightDM-qml
488
29
    MockLightDM-demo
28
    ${LIBLIGHTDM_LDFLAGS}
486
30
# TODO: Once we split out a separate greeter process, uncomment these lines
487
31
#    ${LIBLIGHTDM_LDFLAGS}
489
32
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
29
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
490
33
    )
30
    )
491
34
31
493
35
qt5_use_modules(LightDM-qml DBus Gui Qml)
32
qt5_use_modules(LightDM-qml DBus Qml)
494
36
33
495
37
add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
34
add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
496
38
35
497
=== modified file 'plugins/LightDM/Greeter.cpp'
498
--- plugins/LightDM/Greeter.cpp	2013-12-03 11:43:15 +0000
499
+++ plugins/LightDM/Greeter.cpp	2014-05-29 14:11:15 +0000
500
@@ -56,7 +56,10 @@
501
56
            this, SLOT(showPromptFilter(QString, QLightDM::Greeter::PromptType)));
56
            this, SLOT(showPromptFilter(QString, QLightDM::Greeter::PromptType)));
502
57
    connect(d->m_greeter, SIGNAL(authenticationComplete()),
57
    connect(d->m_greeter, SIGNAL(authenticationComplete()),
503
58
            this, SLOT(authenticationCompleteFilter()));
58
            this, SLOT(authenticationCompleteFilter()));
504
59
    connect(d->m_greeter, SIGNAL(idle()), this, SIGNAL(idle()));
505
60
    connect(d->m_greeter, SIGNAL(reset()), this, SIGNAL(reset()));
506
59
61
507
62
    d->m_greeter->setResettable(true);
508
60
    d->m_greeter->connectSync();
63
    d->m_greeter->connectSync();
509
61
}
64
}
510
62
65
511
63
66
512
=== modified file 'plugins/LightDM/Greeter.h'
513
--- plugins/LightDM/Greeter.h	2013-12-03 11:43:15 +0000
514
+++ plugins/LightDM/Greeter.h	2014-05-29 14:11:15 +0000
515
@@ -56,6 +56,8 @@
516
56
    void authenticationComplete();
56
    void authenticationComplete();
517
57
    void authenticationUserChanged(const QString &user);
57
    void authenticationUserChanged(const QString &user);
518
58
    void promptlessChanged();
58
    void promptlessChanged();
519
59
    void idle();
520
60
    void reset();
521
59
61
522
60
    // This signal is emitted by external agents like indicators, and the UI
62
    // This signal is emitted by external agents like indicators, and the UI
523
61
    // should switch to this user if possible.
63
    // should switch to this user if possible.
524
62
64
525
=== added file 'plugins/LightDM/URLDispatcher.cpp'
526
--- plugins/LightDM/URLDispatcher.cpp	1970-01-01 00:00:00 +0000
527
+++ plugins/LightDM/URLDispatcher.cpp	2014-05-29 14:11:15 +0000
528
@@ -0,0 +1,55 @@
529
1
/*
530
2
 * Copyright (C) 2013 Canonical, Ltd.
531
3
 *
532
4
 * This program is free software; you can redistribute it and/or modify
533
5
 * it under the terms of the GNU General Public License as published by
534
6
 * the Free Software Foundation; version 3.
535
7
 *
536
8
 * This program is distributed in the hope that it will be useful,
537
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
538
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
539
11
 * GNU General Public License for more details.
540
12
 *
541
13
 * You should have received a copy of the GNU General Public License
542
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
543
15
 */
544
16
545
17
#include "URLDispatcher.h"
546
18
547
19
#include <QDBusConnection>
548
20
549
21
class URLDispatcherInterface : public QObject
550
22
{
551
23
    Q_OBJECT
552
24
    Q_CLASSINFO("D-Bus Interface", "com.canonical.URLDispatcher")
553
25
554
26
public:
555
27
    explicit URLDispatcherInterface(URLDispatcher *parent);
556
28
557
29
    Q_SCRIPTABLE void DispatchURL(const QString &url);
558
30
};
559
31
560
32
URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)
561
33
  : QObject(parent)
562
34
{
563
35
}
564
36
565
37
void URLDispatcherInterface::DispatchURL(const QString &url)
566
38
{
567
39
    Q_EMIT static_cast<URLDispatcher *>(parent())->dispatchURL(url);
568
40
}
569
41
570
42
URLDispatcher::URLDispatcher(QObject *parent)
571
43
  : QObject(parent)
572
44
{
573
45
    // This class also manages our url-dispatcher interception.  We intercept
574
46
    // url-dispatcher because rather than spawning the handler for the URL in
575
47
    // our own session, we want to do notify the user session to do it for us
576
48
    // (and start an unlock in the process).
577
49
    QDBusConnection connection = QDBusConnection::sessionBus();
578
50
    URLDispatcherInterface *dispatcher = new URLDispatcherInterface(this);
579
51
    connection.registerObject("/com/canonical/URLDispatcher", dispatcher, QDBusConnection::ExportScriptableContents);
580
52
    connection.registerService("com.canonical.URLDispatcher");
581
53
}
582
54
583
55
#include "URLDispatcher.moc"
584
0
56
585
=== added file 'plugins/LightDM/URLDispatcher.h'
586
--- plugins/LightDM/URLDispatcher.h	1970-01-01 00:00:00 +0000
587
+++ plugins/LightDM/URLDispatcher.h	2014-05-29 14:11:15 +0000
588
@@ -0,0 +1,34 @@
589
1
/*
590
2
 * Copyright (C) 2013 Canonical, Ltd.
591
3
 *
592
4
 * This program is free software; you can redistribute it and/or modify
593
5
 * it under the terms of the GNU General Public License as published by
594
6
 * the Free Software Foundation; version 3.
595
7
 *
596
8
 * This program is distributed in the hope that it will be useful,
597
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
598
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
599
11
 * GNU General Public License for more details.
600
12
 *
601
13
 * You should have received a copy of the GNU General Public License
602
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
603
15
 */
604
16
605
17
#ifndef UNITY_URLDISPATCHER_H
606
18
#define UNITY_URLDISPATCHER_H
607
19
608
20
#include <QObject>
609
21
#include <QString>
610
22
611
23
class URLDispatcher : public QObject
612
24
{
613
25
    Q_OBJECT
614
26
615
27
public:
616
28
    explicit URLDispatcher(QObject *parent=0);
617
29
618
30
Q_SIGNALS:
619
31
    void dispatchURL(const QString &url);
620
32
};
621
33
622
34
#endif
623
0
35
624
=== modified file 'plugins/LightDM/plugin.cpp'
625
--- plugins/LightDM/plugin.cpp	2013-12-03 16:55:03 +0000
626
+++ plugins/LightDM/plugin.cpp	2014-05-29 14:11:15 +0000
627
@@ -20,6 +20,7 @@
628
20
#include "plugin.h"
20
#include "plugin.h"
629
21
#include "DBusGreeterList.h"
21
#include "DBusGreeterList.h"
630
22
#include "Greeter.h"
22
#include "Greeter.h"
631
23
#include "URLDispatcher.h"
632
23
#include "UsersModel.h"
24
#include "UsersModel.h"
633
24
#include <libusermetricsoutput/ColorTheme.h>
25
#include <libusermetricsoutput/ColorTheme.h>
634
25
#include <libusermetricsoutput/UserMetrics.h>
26
#include <libusermetricsoutput/UserMetrics.h>
635
@@ -46,6 +47,13 @@
636
46
    return greeter;
47
    return greeter;
637
47
}
48
}
638
48
49
639
50
static QObject *dispatcher_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
640
51
{
641
52
    Q_UNUSED(engine)
642
53
    Q_UNUSED(scriptEngine)
643
54
    return new URLDispatcher();
644
55
}
645
56
646
49
static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
57
static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
647
50
{
58
{
648
51
    Q_UNUSED(engine)
59
    Q_UNUSED(engine)
649
@@ -67,6 +75,7 @@
650
67
75
651
68
    Q_ASSERT(uri == QLatin1String("LightDM"));
76
    Q_ASSERT(uri == QLatin1String("LightDM"));
652
69
    qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
77
    qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
653
78
    qmlRegisterSingletonType<URLDispatcher>(uri, 0, 1, "URLDispatcher", dispatcher_provider);
654
70
    qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
79
    qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
655
71
    qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
80
    qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
656
72
    qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
81
    qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
657
73
82
658
=== modified file 'plugins/SessionBroadcast/SessionBroadcast.cpp'
659
--- plugins/SessionBroadcast/SessionBroadcast.cpp	2013-09-12 17:58:21 +0000
660
+++ plugins/SessionBroadcast/SessionBroadcast.cpp	2014-05-29 14:11:15 +0000
661
@@ -18,11 +18,26 @@
662
18
18
663
19
#include "SessionBroadcast.h"
19
#include "SessionBroadcast.h"
664
20
#include <QDBusConnection>
20
#include <QDBusConnection>
665
21
#include <QDBusConnectionInterface>
666
22
#include <QDBusInterface>
667
21
23
668
22
SessionBroadcast::SessionBroadcast(QObject* parent)
24
SessionBroadcast::SessionBroadcast(QObject* parent)
669
23
  : QObject(parent)
25
  : QObject(parent)
670
24
{
26
{
671
25
    auto connection = QDBusConnection::SM_BUSNAME();
27
    auto connection = QDBusConnection::SM_BUSNAME();
672
28
    auto interface = connection.interface();
673
29
    interface->startService("com.canonical.Unity.Greeter.Broadcast");
674
30
    m_broadcaster = new QDBusInterface("com.canonical.Unity.Greeter.Broadcast",
675
31
                                       "/com/canonical/Unity/Greeter/Broadcast",
676
32
                                       "com.canonical.Unity.Greeter.Broadcast",
677
33
                                       connection, this);
678
34
679
35
    connection.connect("com.canonical.Unity.Greeter.Broadcast",
680
36
                       "/com/canonical/Unity/Greeter/Broadcast",
681
37
                       "com.canonical.Unity.Greeter.Broadcast",
682
38
                       "StartUrl",
683
39
                       this,
684
40
                       SLOT(onStartUrl(const QString &, const QString &)));
685
26
41
686
27
    connection.connect("com.canonical.Unity.Greeter.Broadcast",
42
    connection.connect("com.canonical.Unity.Greeter.Broadcast",
687
28
                       "/com/canonical/Unity/Greeter/Broadcast",
43
                       "/com/canonical/Unity/Greeter/Broadcast",
688
@@ -32,6 +47,26 @@
689
32
                       SLOT(onShowHome(const QString &)));
47
                       SLOT(onShowHome(const QString &)));
690
33
}
48
}
691
34
49
692
50
void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
693
51
{
694
52
    m_broadcaster->asyncCall("RequestUrlStart", username, url);
695
53
}
696
54
697
55
void SessionBroadcast::requestHomeShown(const QString &username)
698
56
{
699
57
    m_broadcaster->asyncCall("RequestHomeShown", username);
700
58
}
701
59
702
60
void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
703
61
{
704
62
    // Since this signal is just used for testing, we don't *really* care if
705
63
    // username matches, but just in case we do eventually use the signal, we
706
64
    // should only listen to our own requests.
707
65
    if (username == qgetenv("USER")) {
708
66
        Q_EMIT startUrl(url);
709
67
    }
710
68
}
711
69
712
35
void SessionBroadcast::onShowHome(const QString &username)
70
void SessionBroadcast::onShowHome(const QString &username)
713
36
{
71
{
714
37
    // Only listen to requests meant for us
72
    // Only listen to requests meant for us
715
38
73
716
=== modified file 'plugins/SessionBroadcast/SessionBroadcast.h'
717
--- plugins/SessionBroadcast/SessionBroadcast.h	2013-09-12 17:58:21 +0000
718
+++ plugins/SessionBroadcast/SessionBroadcast.h	2014-05-29 14:11:15 +0000
719
@@ -31,11 +31,22 @@
720
31
public:
31
public:
721
32
    explicit SessionBroadcast(QObject *parent = 0);
32
    explicit SessionBroadcast(QObject *parent = 0);
722
33
33
723
34
    Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
724
35
    Q_INVOKABLE void requestHomeShown(const QString &username);
725
36
726
34
Q_SIGNALS:
37
Q_SIGNALS:
727
38
    // This signal isn't actually used by the shell
728
39
    // (unity-greeter-session-broadcast handles launching an app for us), but
729
40
    // it's useful for testing the plugin.
730
41
    void startUrl(const QString &url);
731
35
    void showHome();
42
    void showHome();
732
36
43
733
37
private Q_SLOTS:
44
private Q_SLOTS:
734
45
    void onStartUrl(const QString &username, const QString &url);
735
38
    void onShowHome(const QString &username);
46
    void onShowHome(const QString &username);
736
47
737
48
private:
738
49
    QDBusInterface *m_broadcaster;
739
39
};
50
};
740
40
51
741
41
#endif
52
#endif
742
42
53
743
=== added directory 'plugins/SessionManager'
744
=== added file 'plugins/SessionManager/CMakeLists.txt'
745
--- plugins/SessionManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
746
+++ plugins/SessionManager/CMakeLists.txt	2014-05-29 14:11:15 +0000
747
@@ -0,0 +1,22 @@
748
1
set(QMLPLUGIN_SRC
749
2
    plugin.cpp
750
3
    SessionManager.cpp
751
4
    )
752
5
753
6
include_directories(
754
7
    ${Qt5DBus_INCLUDE_DIRS}
755
8
    )
756
9
757
10
add_definitions(-DSM_BUSNAME=systemBus)
758
11
759
12
add_library(SessionManager-qml MODULE
760
13
    ${QMLPLUGIN_SRC}
761
14
    )
762
15
763
16
target_link_libraries(SessionManager-qml
764
17
    ${Qt5DBus_LIBRARIES}
765
18
    )
766
19
767
20
qt5_use_modules(SessionManager-qml Qml)
768
21
769
22
add_unity8_plugin(SessionManager 0.1 SessionManager TARGETS SessionManager-qml)
770
0
23
771
=== added file 'plugins/SessionManager/SessionManager.cpp'
772
--- plugins/SessionManager/SessionManager.cpp	1970-01-01 00:00:00 +0000
773
+++ plugins/SessionManager/SessionManager.cpp	2014-05-29 14:11:15 +0000
774
@@ -0,0 +1,124 @@
775
1
/*
776
2
 * Copyright (C) 2013 Canonical, Ltd.
777
3
 *
778
4
 * This program is free software; you can redistribute it and/or modify
779
5
 * it under the terms of the GNU General Public License as published by
780
6
 * the Free Software Foundation; version 3.
781
7
 *
782
8
 * This program is distributed in the hope that it will be useful,
783
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
784
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
785
11
 * GNU General Public License for more details.
786
12
 *
787
13
 * You should have received a copy of the GNU General Public License
788
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
789
15
 *
790
16
 * Author: Michael Terry <michael.terry@canonical.com>
791
17
 */
792
18
793
19
#include "SessionManager.h"
794
20
#include <QtCore/QEvent>
795
21
#include <QtDBus/QDBusPendingReply>
796
22
797
23
SessionManager::SessionManager(QObject* parent)
798
24
  : QObject(parent),
799
25
    l1_manager(NULL),
800
26
    l1_session(NULL),
801
27
    ldm_session(NULL),
802
28
    is_active(true) // assume we're active w/o logind
803
29
{
804
30
    l1_manager = new QDBusInterface("org.freedesktop.login1",
805
31
                                    "/org/freedesktop/login1",
806
32
                                    "org.freedesktop.login1.Manager",
807
33
                                    QDBusConnection::SM_BUSNAME(), this);
808
34
    if (l1_manager->isValid() && QString(qgetenv("XDG_SESSION_ID")) != "") {
809
35
        QDBusPendingCall pcall = l1_manager->asyncCall("GetSession", QString(qgetenv("XDG_SESSION_ID")));
810
36
        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
811
37
        QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
812
38
                         this, SLOT(getSessionSlot(QDBusPendingCallWatcher*)));
813
39
    }
814
40
815
41
    if (QString(qgetenv("XDG_SESSION_PATH")) != "") {
816
42
        ldm_session = new QDBusInterface("org.freedesktop.DisplayManager",
817
43
                                         QString(qgetenv("XDG_SESSION_PATH")),
818
44
                                         "org.freedesktop.DisplayManager.Session",
819
45
                                         QDBusConnection::SM_BUSNAME(), this);
820
46
    }
821
47
}
822
48
823
49
bool SessionManager::active() const
824
50
{
825
51
    // We cache this value for performance reasons, as QDBusInterface does not
826
52
    // cache for us.
827
53
    return is_active;
828
54
}
829
55
830
56
void SessionManager::lock()
831
57
{
832
58
    // We use ldm_session to handle locking rather than l1_session, because
833
59
    // l1_session doesn't have permissions to lock from the user session, but
834
60
    // ldm_session does.  This is what the rest of Ubuntu uses to lock.
835
61
    if (ldm_session != NULL && ldm_session->isValid())
836
62
        ldm_session->asyncCall("Lock");
837
63
}
838
64
839
65
void SessionManager::getSessionSlot(QDBusPendingCallWatcher *watcher)
840
66
{
841
67
    QDBusPendingReply<QDBusObjectPath> reply = *watcher;
842
68
    if (!reply.isError()) {
843
69
        QDBusObjectPath path = reply.argumentAt<0>();
844
70
        l1_session = new QDBusInterface("org.freedesktop.login1",
845
71
                                        path.path(),
846
72
                                        "org.freedesktop.login1.Session",
847
73
                                        l1_manager->connection(), this);
848
74
849
75
        l1_manager->connection().connect("org.freedesktop.login1",
850
76
                                         path.path(),
851
77
                                         "org.freedesktop.DBus.Properties",
852
78
                                         "PropertiesChanged",
853
79
                                         this,
854
80
                                         SLOT(propertiesChanged(QString, QVariantMap, QStringList)));
855
81
856
82
        // Login1 is very odd about emitting PropertiesChanged.  It often does
857
83
        // not do so when active is becoming false.  But it always does when
858
84
        // it becomes true.  So we watch for the "Lock" signal too, which is a
859
85
        // reliably hint that active is false.
860
86
        l1_manager->connection().connect("org.freedesktop.login1",
861
87
                                         path.path(),
862
88
                                         "org.freedesktop.login1.Session",
863
89
                                         "Lock",
864
90
                                         this,
865
91
                                         SLOT(sessionLocked()));
866
92
867
93
        propertiesChanged("", QVariantMap(), QStringList() << "Active");
868
94
    }
869
95
    watcher->deleteLater();
870
96
}
871
97
872
98
void SessionManager::propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
873
99
{
874
100
    Q_UNUSED(interface)
875
101
876
102
    QVariant value = changed.value("Active");
877
103
878
104
    // If Active isn't in changed, check if we were at least notified about it
879
105
    // changing on the server.  Also check if IdleHint was modified, because
880
106
    // sometimes logind does not emit a changed signal for Active becoming
881
107
    // false, but will emit for IdleHint when that does happen.
882
108
    if (!value.isValid() && (invalid.contains("Active") || invalid.contains("IdleHint") || changed.contains("IdleHint")) && l1_session->isValid()) {
883
109
        value = l1_session->property("Active");
884
110
        if (!value.isValid())
885
111
            value = QVariant(false);
886
112
    }
887
113
888
114
    if (value.isValid() && value.toBool() != is_active) {
889
115
        is_active = value.toBool();
890
116
        Q_EMIT activeChanged();
891
117
    }
892
118
}
893
119
894
120
void SessionManager::sessionLocked()
895
121
{
896
122
    is_active = false;
897
123
    Q_EMIT activeChanged();
898
124
}
899
0
125
900
=== added file 'plugins/SessionManager/SessionManager.h'
901
--- plugins/SessionManager/SessionManager.h	1970-01-01 00:00:00 +0000
902
+++ plugins/SessionManager/SessionManager.h	2014-05-29 14:11:15 +0000
903
@@ -0,0 +1,61 @@
904
1
/*
905
2
 * Copyright (C) 2012,2013 Canonical, Ltd.
906
3
 *
907
4
 * This program is free software; you can redistribute it and/or modify
908
5
 * it under the terms of the GNU General Public License as published by
909
6
 * the Free Software Foundation; version 3.
910
7
 *
911
8
 * This program is distributed in the hope that it will be useful,
912
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
913
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
914
11
 * GNU General Public License for more details.
915
12
 *
916
13
 * You should have received a copy of the GNU General Public License
917
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
918
15
 *
919
16
 * Authors: Gerry Boland <gerry.boland@canonical.com>
920
17
 *          Michael Terry <michael.terry@canonical.com>
921
18
 */
922
19
923
20
#ifndef UNITY_SESSIONMANAGER_H
924
21
#define UNITY_SESSIONMANAGER_H
925
22
926
23
#include <QtCore/QObject>
927
24
#include <QtCore/QString>
928
25
#include <QtCore/QStringList>
929
26
#include <QtCore/QVariantMap>
930
27
#include <QtDBus/QDBusInterface>
931
28
#include <QtDBus/QDBusPendingCallWatcher>
932
29
933
30
class SessionManager: public QObject
934
31
{
935
32
    Q_OBJECT
936
33
    Q_PROPERTY(bool active
937
34
               READ active
938
35
               NOTIFY activeChanged
939
36
               FINAL)
940
37
941
38
public:
942
39
    explicit SessionManager(QObject *parent = 0);
943
40
944
41
    bool active() const;
945
42
946
43
public Q_SLOTS:
947
44
    void lock();
948
45
949
46
Q_SIGNALS:
950
47
    void activeChanged();
951
48
952
49
private Q_SLOTS:
953
50
    void getSessionSlot(QDBusPendingCallWatcher *watcher);
954
51
    void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
955
52
    void sessionLocked();
956
53
957
54
private:
958
55
    QDBusInterface *l1_manager;
959
56
    QDBusInterface *l1_session;
960
57
    QDBusInterface *ldm_session;
961
58
    bool is_active;
962
59
};
963
60
964
61
#endif
965
0
62
966
=== added file 'plugins/SessionManager/plugin.cpp'
967
--- plugins/SessionManager/plugin.cpp	1970-01-01 00:00:00 +0000
968
+++ plugins/SessionManager/plugin.cpp	2014-05-29 14:11:15 +0000
969
@@ -0,0 +1,35 @@
970
1
/*
971
2
 * Copyright (C) 2012,2013 Canonical, Ltd.
972
3
 *
973
4
 * This program is free software; you can redistribute it and/or modify
974
5
 * it under the terms of the GNU General Public License as published by
975
6
 * the Free Software Foundation; version 3.
976
7
 *
977
8
 * This program is distributed in the hope that it will be useful,
978
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
979
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
980
11
 * GNU General Public License for more details.
981
12
 *
982
13
 * You should have received a copy of the GNU General Public License
983
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
984
15
 *
985
16
 * Authors: Gerry Boland <gerry.boland@canonical.com>
986
17
 *          Michael Terry <michael.terry@canonical.com>
987
18
 */
988
19
989
20
#include "plugin.h"
990
21
#include "SessionManager.h"
991
22
#include <QtQml/qqml.h>
992
23
993
24
static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
994
25
{
995
26
    Q_UNUSED(engine)
996
27
    Q_UNUSED(scriptEngine)
997
28
    return new SessionManager();
998
29
}
999
30
1000
31
void SessionManagerPlugin::registerTypes(const char *uri)
1001
32
{
1002
33
    Q_ASSERT(uri == QLatin1String("SessionManager"));
1003
34
    qmlRegisterSingletonType<SessionManager>(uri, 0, 1, "SessionManager", sessionmanager_provider);
1004
35
}
1005
0
36
1006
=== added file 'plugins/SessionManager/plugin.h'
1007
--- plugins/SessionManager/plugin.h	1970-01-01 00:00:00 +0000
1008
+++ plugins/SessionManager/plugin.h	2014-05-29 14:11:15 +0000
1009
@@ -0,0 +1,35 @@
1010
1
/*
1011
2
 * Copyright (C) 2012,2013 Canonical, Ltd.
1012
3
 *
1013
4
 * This program is free software; you can redistribute it and/or modify
1014
5
 * it under the terms of the GNU General Public License as published by
1015
6
 * the Free Software Foundation; version 3.
1016
7
 *
1017
8
 * This program is distributed in the hope that it will be useful,
1018
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1019
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1020
11
 * GNU General Public License for more details.
1021
12
 *
1022
13
 * You should have received a copy of the GNU General Public License
1023
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1024
15
 *
1025
16
 * Authors: Gerry Boland <gerry.boland@canonical.com>
1026
17
 *          Michael Terry <michael.terry@canonical.com>
1027
18
 */
1028
19
1029
20
#ifndef SESSIONMANAGER_PLUGIN_H
1030
21
#define SESSIONMANAGER_PLUGIN_H
1031
22
1032
23
#include <QtQml/QQmlEngine>
1033
24
#include <QtQml/QQmlExtensionPlugin>
1034
25
1035
26
class SessionManagerPlugin : public QQmlExtensionPlugin
1036
27
{
1037
28
    Q_OBJECT
1038
29
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
1039
30
1040
31
public:
1041
32
    void registerTypes(const char *uri);
1042
33
};
1043
34
1044
35
#endif
1045
0
36
1046
=== added file 'plugins/SessionManager/qmldir'
1047
--- plugins/SessionManager/qmldir	1970-01-01 00:00:00 +0000
1048
+++ plugins/SessionManager/qmldir	2014-05-29 14:11:15 +0000
1049
@@ -0,0 +1,2 @@
1050
1
module SessionManager
1051
2
plugin SessionManager-qml
1052
0
3
1053
=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
1054
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2014-05-13 11:21:45 +0000
1055
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2014-05-29 14:11:15 +0000
1056
@@ -37,12 +37,15 @@
1057
37
    bool    countVisible;
37
    bool    countVisible;
1058
38
};
38
};
1059
39
39
1061
40
LauncherBackend::LauncherBackend(QObject *parent):
40
LauncherBackend::LauncherBackend(bool greeterMode, QObject *parent):
1062
41
    QDBusVirtualObject(parent),
41
    QDBusVirtualObject(parent),
1063
42
    m_greeterMode(greeterMode),
1064
42
    m_accounts(nullptr)
43
    m_accounts(nullptr)
1065
43
{
44
{
1066
44
#ifndef LAUNCHER_TESTING
45
#ifndef LAUNCHER_TESTING
1067
45
    m_accounts = new AccountsServiceDBusAdaptor(this);
46
    m_accounts = new AccountsServiceDBusAdaptor(this);
1068
47
    connect(m_accounts, SIGNAL(propertiesChanged(QString, QString, QStringList)),
1069
48
            this, SLOT(accountsListChanged(QString, QString, QStringList)));
1070
46
#endif
49
#endif
1071
47
    m_user = qgetenv("USER");
50
    m_user = qgetenv("USER");
1072
48
    syncFromAccounts();
51
    syncFromAccounts();
1073
@@ -225,7 +228,7 @@
1074
225
228
1075
226
void LauncherBackend::setUser(const QString &username)
229
void LauncherBackend::setUser(const QString &username)
1076
227
{
230
{
1078
228
    if (qgetenv("USER") == "lightdm" && m_user != username) {
231
    if (m_greeterMode && m_user != username) {
1079
229
        m_user = username;
232
        m_user = username;
1080
230
        syncFromAccounts();
233
        syncFromAccounts();
1081
231
    }
234
    }
1082
@@ -238,6 +241,15 @@
1083
238
    Q_UNUSED(quickListId)
241
    Q_UNUSED(quickListId)
1084
239
}
242
}
1085
240
243
1086
244
void LauncherBackend::accountsListChanged(const QString &user, const QString &interface, const QStringList &changed)
1087
245
{
1088
246
    if (m_greeterMode && user == m_user &&
1089
247
        interface == "com.canonical.unity.AccountsService" &&
1090
248
        changed.contains("launcher-items")) {
1091
249
        syncFromAccounts();
1092
250
    }
1093
251
}
1094
252
1095
241
void LauncherBackend::syncFromAccounts()
253
void LauncherBackend::syncFromAccounts()
1096
242
{
254
{
1097
243
    QList<QVariantMap> apps;
255
    QList<QVariantMap> apps;
1098
@@ -299,6 +311,8 @@
1099
299
            loadFromVariant(app.toMap());
311
            loadFromVariant(app.toMap());
1100
300
        }
312
        }
1101
301
    }
313
    }
1102
314
1103
315
    Q_EMIT refreshApplications();
1104
302
}
316
}
1105
303
317
1106
304
void LauncherBackend::syncToAccounts()
318
void LauncherBackend::syncToAccounts()
1107
305
319
1108
=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.h'
1109
--- plugins/Unity/Launcher/backend/launcherbackend.h	2014-04-29 19:22:13 +0000
1110
+++ plugins/Unity/Launcher/backend/launcherbackend.h	2014-05-29 14:11:15 +0000
1111
@@ -42,7 +42,7 @@
1112
42
    friend LauncherBackendTest;
42
    friend LauncherBackendTest;
1113
43
43
1114
44
public:
44
public:
1116
45
    LauncherBackend(QObject *parent = 0);
45
    LauncherBackend(bool greeterMode = false, QObject *parent = 0);
1117
46
    virtual ~LauncherBackend();
46
    virtual ~LauncherBackend();
1118
47
47
1119
48
    /**
48
    /**
1120
@@ -162,6 +162,7 @@
1121
162
    virtual QString introspect (const QString &path) const;
162
    virtual QString introspect (const QString &path) const;
1122
163
163
1123
164
Q_SIGNALS:
164
Q_SIGNALS:
1124
165
    void refreshApplications() const;
1125
165
    void quickListChanged(const QString &appId, const QList<QuickListEntry> &quickList) const;
166
    void quickListChanged(const QString &appId, const QList<QuickListEntry> &quickList) const;
1126
166
    void progressChanged(const QString &appId, int progress) const;
167
    void progressChanged(const QString &appId, int progress) const;
1127
167
    void countChanged(const QString &appId, int count) const;
168
    void countChanged(const QString &appId, int count) const;
1128
@@ -178,6 +179,8 @@
1129
178
    void syncFromAccounts();
179
    void syncFromAccounts();
1130
179
    void syncToAccounts();
180
    void syncToAccounts();
1131
180
181
1132
182
    bool m_greeterMode;
1133
183
1134
181
    QList<QString> m_storedApps;
184
    QList<QString> m_storedApps;
1135
182
    mutable QHash<QString, LauncherBackendItem*> m_itemCache;
185
    mutable QHash<QString, LauncherBackendItem*> m_itemCache;
1136
183
186
1137
@@ -186,6 +189,9 @@
1138
186
189
1139
187
    void emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const;
190
    void emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const;
1140
188
191
1141
192
private Q_SLOTS:
1142
193
    void accountsListChanged(const QString &user, const QString &interface, const QStringList &changed);
1143
194
1144
189
protected: /* Protected to allow testing */
195
protected: /* Protected to allow testing */
1145
190
    LauncherBackendItem* getItem(const QString& appId) const;
196
    LauncherBackendItem* getItem(const QString& appId) const;
1146
191
197
1147
192
198
1148
=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
1149
--- plugins/Unity/Launcher/launcheritem.cpp	2013-10-22 11:02:49 +0000
1150
+++ plugins/Unity/Launcher/launcheritem.cpp	2014-05-29 14:11:15 +0000
1151
@@ -22,12 +22,13 @@
1152
22
22
1153
23
#include <libintl.h>
23
#include <libintl.h>
1154
24
24
1156
25
LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent) :
25
LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, bool pinnable, QObject *parent) :
1157
26
    LauncherItemInterface(parent),
26
    LauncherItemInterface(parent),
1158
27
    m_appId(appId),
27
    m_appId(appId),
1159
28
    m_name(name),
28
    m_name(name),
1160
29
    m_icon(icon),
29
    m_icon(icon),
1161
30
    m_pinned(false),
30
    m_pinned(false),
1162
31
    m_pinnable(pinnable),
1163
31
    m_running(false),
32
    m_running(false),
1164
32
    m_recent(false),
33
    m_recent(false),
1165
33
    m_progress(-1),
34
    m_progress(-1),
1166
@@ -38,10 +39,12 @@
1167
38
    QuickListEntry nameAction;
39
    QuickListEntry nameAction;
1168
39
    nameAction.setText(m_name);
40
    nameAction.setText(m_name);
1169
40
    m_quickList->appendAction(nameAction);
41
    m_quickList->appendAction(nameAction);
1174
41
    QuickListEntry pinningAction;
42
    if (m_pinnable) {
1175
42
    pinningAction.setActionId("pin_item");
43
        QuickListEntry pinningAction;
1176
43
    pinningAction.setText(gettext("Lock to Launcher"));
44
        pinningAction.setActionId("pin_item");
1177
44
    m_quickList->appendAction(pinningAction);
45
        pinningAction.setText(gettext("Lock to Launcher"));
1178
46
        m_quickList->appendAction(pinningAction);
1179
47
    }
1180
45
}
48
}
1181
46
49
1182
47
QString LauncherItem::appId() const
50
QString LauncherItem::appId() const
1183
@@ -68,10 +71,12 @@
1184
68
{
71
{
1185
69
    if (m_pinned != pinned) {
72
    if (m_pinned != pinned) {
1186
70
        m_pinned = pinned;
73
        m_pinned = pinned;
1191
71
        QuickListEntry entry;
74
        if (m_pinnable) {
1192
72
        entry.setActionId("pin_item");
75
            QuickListEntry entry;
1193
73
        entry.setText(pinned ? gettext("Unlock from Launcher") : gettext("Lock to Launcher"));
76
            entry.setActionId("pin_item");
1194
74
        m_quickList->updateAction(entry);
77
            entry.setText(pinned ? gettext("Unlock from Launcher") : gettext("Lock to Launcher"));
1195
78
            m_quickList->updateAction(entry);
1196
79
        }
1197
75
        Q_EMIT pinnedChanged(pinned);
80
        Q_EMIT pinnedChanged(pinned);
1198
76
    }
81
    }
1199
77
}
82
}
1200
78
83
1201
=== modified file 'plugins/Unity/Launcher/launcheritem.h'
1202
--- plugins/Unity/Launcher/launcheritem.h	2013-09-11 15:33:02 +0000
1203
+++ plugins/Unity/Launcher/launcheritem.h	2014-05-29 14:11:15 +0000
1204
@@ -32,7 +32,7 @@
1205
32
{
32
{
1206
33
    Q_OBJECT
33
    Q_OBJECT
1207
34
public:
34
public:
1209
35
    LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent = 0);
35
    LauncherItem(const QString &appId, const QString &name, const QString &icon, bool pinnable, QObject *parent = 0);
1210
36
36
1211
37
    QString appId() const;
37
    QString appId() const;
1212
38
    QString name() const;
38
    QString name() const;
1213
@@ -67,6 +67,7 @@
1214
67
    QString m_name;
67
    QString m_name;
1215
68
    QString m_icon;
68
    QString m_icon;
1216
69
    bool m_pinned;
69
    bool m_pinned;
1217
70
    bool m_pinnable;
1218
70
    bool m_running;
71
    bool m_running;
1219
71
    bool m_recent;
72
    bool m_recent;
1220
72
    int m_progress;
73
    int m_progress;
1221
73
74
1222
=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
1223
--- plugins/Unity/Launcher/launchermodel.cpp	2014-05-13 11:24:48 +0000
1224
+++ plugins/Unity/Launcher/launchermodel.cpp	2014-05-29 14:11:15 +0000
1225
@@ -27,20 +27,15 @@
1226
27
27
1227
28
LauncherModel::LauncherModel(QObject *parent):
28
LauncherModel::LauncherModel(QObject *parent):
1228
29
    LauncherModelInterface(parent),
29
    LauncherModelInterface(parent),
1230
30
    m_backend(new LauncherBackend(this)),
30
    m_greeterMode(qgetenv("XDG_SESSION_CLASS") == "greeter"),
1231
31
    m_backend(new LauncherBackend(m_greeterMode, this)),
1232
31
    m_appManager(0)
32
    m_appManager(0)
1233
32
{
33
{
1234
33
    connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));
34
    connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));
1235
34
    connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));
35
    connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));
1236
36
    connect(m_backend, SIGNAL(refreshApplications()), SLOT(refreshStoredApplications()));
1237
35
37
1246
36
    Q_FOREACH (const QString &entry, m_backend->storedApplications()) {
38
    refreshStoredApplications();
1239
37
        LauncherItem *item = new LauncherItem(entry,
1240
38
                                              m_backend->displayName(entry),
1241
39
                                              m_backend->icon(entry),
1242
40
                                              this);
1243
41
        item->setPinned(true);
1244
42
        m_list.append(item);
1245
43
    }
1247
44
}
39
}
1248
45
40
1249
46
LauncherModel::~LauncherModel()
41
LauncherModel::~LauncherModel()
1250
@@ -139,7 +134,8 @@
1251
139
        beginInsertRows(QModelIndex(), index, index);
134
        beginInsertRows(QModelIndex(), index, index);
1252
140
        LauncherItem *item = new LauncherItem(appId,
135
        LauncherItem *item = new LauncherItem(appId,
1253
141
                                              m_backend->displayName(appId),
136
                                              m_backend->displayName(appId),
1255
142
                                              m_backend->icon(appId));
137
                                              m_backend->icon(appId),
1256
138
                                              !m_greeterMode);
1257
143
        item->setPinned(true);
139
        item->setPinned(true);
1258
144
        m_list.insert(index, item);
140
        m_list.insert(index, item);
1259
145
        endInsertRows();
141
        endInsertRows();
1260
@@ -199,6 +195,40 @@
1261
199
    m_backend->setUser(username);
195
    m_backend->setUser(username);
1262
200
}
196
}
1263
201
197
1264
198
void LauncherModel::refreshStoredApplications()
1265
199
{
1266
200
    // First remove any existing ones
1267
201
    QList<int> storedAppIndices;
1268
202
    for (int i = 0; i < m_list.count(); ++i) {
1269
203
        if (!m_list.at(i)->recent()) {
1270
204
            storedAppIndices << i;
1271
205
        }
1272
206
    }
1273
207
    int run = 0;
1274
208
    while (storedAppIndices.count() > 0) {
1275
209
        beginRemoveRows(QModelIndex(), storedAppIndices.first() - run, storedAppIndices.first() - run);
1276
210
        m_list.takeAt(storedAppIndices.first() - run)->deleteLater();
1277
211
        endRemoveRows();
1278
212
        storedAppIndices.takeFirst();
1279
213
        ++run;
1280
214
    }
1281
215
1282
216
    // Now insert all stored apps at beginning of list
1283
217
    QStringList storedApplications = m_backend->storedApplications();
1284
218
    beginInsertRows(QModelIndex(), 0, storedApplications.size() - 1);
1285
219
    run = 0;
1286
220
    Q_FOREACH (const QString &entry, storedApplications) {
1287
221
        LauncherItem *item = new LauncherItem(entry,
1288
222
                                              m_backend->displayName(entry),
1289
223
                                              m_backend->icon(entry),
1290
224
                                              !m_greeterMode,
1291
225
                                              this);
1292
226
        item->setPinned(true);
1293
227
        m_list.insert(run++, item);
1294
228
    }
1295
229
    endInsertRows();
1296
230
}
1297
231
1298
202
ApplicationManagerInterface *LauncherModel::applicationManager() const
232
ApplicationManagerInterface *LauncherModel::applicationManager() const
1299
203
{
233
{
1300
204
    return m_appManager;
234
    return m_appManager;
1301
@@ -302,7 +332,7 @@
1302
302
    if (found) {
332
    if (found) {
1303
303
        // Shall we paint some running/recent app highlight? If yes, do it here.
333
        // Shall we paint some running/recent app highlight? If yes, do it here.
1304
304
    } else {
334
    } else {
1306
305
        LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString());
335
        LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), !m_greeterMode);
1307
306
        item->setRecent(true);
336
        item->setRecent(true);
1308
307
        item->setFocused(app->focused());
337
        item->setFocused(app->focused());
1309
308
338
1310
309
339
1311
=== modified file 'plugins/Unity/Launcher/launchermodel.h'
1312
--- plugins/Unity/Launcher/launchermodel.h	2013-09-11 15:33:02 +0000
1313
+++ plugins/Unity/Launcher/launchermodel.h	2014-05-29 14:11:15 +0000
1314
@@ -62,6 +62,7 @@
1315
62
private Q_SLOTS:
62
private Q_SLOTS:
1316
63
    void progressChanged(const QString &appId, int progress);
63
    void progressChanged(const QString &appId, int progress);
1317
64
    void countChanged(const QString &appId, int count);
64
    void countChanged(const QString &appId, int count);
1318
65
    void refreshStoredApplications();
1319
65
66
1320
66
    void applicationAdded(const QModelIndex &parent, int row);
67
    void applicationAdded(const QModelIndex &parent, int row);
1321
67
    void applicationRemoved(const QModelIndex &parent, int row);
68
    void applicationRemoved(const QModelIndex &parent, int row);
1322
@@ -69,6 +70,7 @@
1323
69
70
1324
70
private:
71
private:
1325
71
    QList<LauncherItem*> m_list;
72
    QList<LauncherItem*> m_list;
1326
73
    bool m_greeterMode;
1327
72
    LauncherBackend *m_backend;
74
    LauncherBackend *m_backend;
1328
73
    ApplicationManagerInterface *m_appManager;
75
    ApplicationManagerInterface *m_appManager;
1329
74
};
76
};
1330
75
77
1331
=== modified file 'po/ug.po'
1332
--- po/ug.po	2014-05-01 06:44:18 +0000
1333
+++ po/ug.po	2014-05-29 14:11:15 +0000
1334
@@ -6,11 +6,12 @@
1335
6
msgid ""
6
msgid ""
1336
7
msgstr ""
7
msgstr ""
1337
8
"Project-Id-Version: unity\n"
8
"Project-Id-Version: unity\n"
1339
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9
"Report-Msgid-Bugs-To: \n"
1340
10
"POT-Creation-Date: 2014-04-10 11:13-0400\n"
10
"POT-Creation-Date: 2014-04-10 11:13-0400\n"
1341
11
"PO-Revision-Date: 2014-04-22 05:46+0000\n"
11
"PO-Revision-Date: 2014-04-22 05:46+0000\n"
1342
12
"Last-Translator: abdurahman <Unknown>\n"
12
"Last-Translator: abdurahman <Unknown>\n"
1343
13
"Language-Team: Uyghur <ug@li.org>\n"
13
"Language-Team: Uyghur <ug@li.org>\n"
1344
14
"Language: \n"
1345
14
"MIME-Version: 1.0\n"
15
"MIME-Version: 1.0\n"
1346
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
1347
16
"Content-Transfer-Encoding: 8bit\n"
17
"Content-Transfer-Encoding: 8bit\n"
1348
17
18
1349
=== added file 'qml/Components/BasicShell.qml'
1350
--- qml/Components/BasicShell.qml	1970-01-01 00:00:00 +0000
1351
+++ qml/Components/BasicShell.qml	2014-05-29 14:11:15 +0000
1352
@@ -0,0 +1,84 @@
1353
1
/*
1354
2
 * Copyright (C) 2013 Canonical, Ltd.
1355
3
 *
1356
4
 * This program is free software; you can redistribute it and/or modify
1357
5
 * it under the terms of the GNU General Public License as published by
1358
6
 * the Free Software Foundation; version 3.
1359
7
 *
1360
8
 * This program is distributed in the hope that it will be useful,
1361
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1362
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1363
11
 * GNU General Public License for more details.
1364
12
 *
1365
13
 * You should have received a copy of the GNU General Public License
1366
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1367
15
 */
1368
16
1369
17
import QtQuick 2.0
1370
18
import Ubuntu.Components 0.1
1371
19
import Unity.Application 0.1
1372
20
import "../Components"
1373
21
1374
22
FocusScope {
1375
23
    id: shell
1376
24
1377
25
    // this is only here to select the width / height of the window if not running fullscreen
1378
26
    property bool tablet: false
1379
27
    width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
1380
28
    height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
1381
29
1382
30
    property real edgeSize: units.gu(2)
1383
31
1384
32
    property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "../graphics/tablet_background.jpg" : "../graphics/phone_background.jpg")
1385
33
    property url background
1386
34
    property url backgroundSource
1387
35
    property url backgroundFallbackSource
1388
36
    property url backgroundFinal: (backgroundSource != undefined && backgroundSource != "") ? backgroundSource : (backgroundFallbackSource != undefined && backgroundFallbackSource != "") ? backgroundFallbackSource : shell.defaultBackground
1389
37
    onBackgroundFinalChanged: shell.background = backgroundFinal
1390
38
1391
39
    // This is a dummy image that is needed to determine if the picture url
1392
40
    // in backgroundSettings points to a valid picture file.
1393
41
    // We can't do this with the real background image because setting a
1394
42
    // new source in onStatusChanged triggers a binding loop detection
1395
43
    // inside Image, which causes it not to render even though a valid source
1396
44
    // would be set. We don't mind about this image staying black and just
1397
45
    // use it for verification to populate the source for the real
1398
46
    // background image.
1399
47
    Image {
1400
48
        source: shell.background
1401
49
        height: 0
1402
50
        width: 0
1403
51
        sourceSize.height: 0
1404
52
        sourceSize.width: 0
1405
53
        onStatusChanged: {
1406
54
            if (status == Image.Error) {
1407
55
                if (source != shell.defaultBackground) {
1408
56
                    shell.background = defaultBackground
1409
57
                } else {
1410
58
                    // In case even our default background fails to load...
1411
59
                    shell.background = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#000'/></svg>"
1412
60
                }
1413
61
            }
1414
62
        }
1415
63
    }
1416
64
1417
65
    VolumeControl {
1418
66
        id: volumeControl
1419
67
    }
1420
68
1421
69
    Keys.onVolumeUpPressed: volumeControl.volumeUp()
1422
70
    Keys.onVolumeDownPressed: volumeControl.volumeDown()
1423
71
1424
72
    function hideIndicatorMenu(delay) {
1425
73
        panel.hideIndicatorMenu(delay);
1426
74
    }
1427
75
1428
76
    focus: true
1429
77
    onFocusChanged: if (!focus) forceActiveFocus();
1430
78
1431
79
    Binding {
1432
80
        target: i18n
1433
81
        property: "domain"
1434
82
        value: "unity8"
1435
83
    }
1436
84
}
1437
0
85
1438
=== modified file 'qml/Components/EdgeDemo.qml'
1439
--- qml/Components/EdgeDemo.qml	2014-01-29 22:19:15 +0000
1440
+++ qml/Components/EdgeDemo.qml	2014-05-29 14:11:15 +0000
1441
@@ -15,13 +15,11 @@
1442
15
 */
15
 */
1443
16
16
1444
17
import AccountsService 0.1
17
import AccountsService 0.1
1445
18
import LightDM 0.1 as LightDM
1446
19
import QtQuick 2.0
18
import QtQuick 2.0
1447
20
19
1448
21
Item {
20
Item {
1449
22
    id: demo
21
    id: demo
1450
23
22
1451
24
    property Item greeter
1452
25
    property Item dash
23
    property Item dash
1453
26
    property Item launcher
24
    property Item launcher
1454
27
    property Item indicators
25
    property Item indicators
1455
@@ -36,7 +34,6 @@
1456
36
    property bool paused: false
34
    property bool paused: false
1457
37
35
1458
38
    onPausedChanged: {
36
    onPausedChanged: {
1459
39
        if (d.rightEdgeDemo)  d.rightEdgeDemo.paused = paused
1460
40
        if (d.topEdgeDemo)    d.topEdgeDemo.paused = paused
37
        if (d.topEdgeDemo)    d.topEdgeDemo.paused = paused
1461
41
        if (d.bottomEdgeDemo) d.bottomEdgeDemo.paused = paused
38
        if (d.bottomEdgeDemo) d.bottomEdgeDemo.paused = paused
1462
42
        if (d.leftEdgeDemo)   d.leftEdgeDemo.paused = paused
39
        if (d.leftEdgeDemo)   d.leftEdgeDemo.paused = paused
1463
@@ -45,16 +42,6 @@
1464
45
42
1465
46
    function hideEdgeDemoInShell() {
43
    function hideEdgeDemoInShell() {
1466
47
        AccountsService.demoEdges = false;
44
        AccountsService.demoEdges = false;
1467
48
        stopDemo();
1468
49
    }
1469
50
1470
51
    function hideEdgeDemoInGreeter() {
1471
52
        // TODO: AccountsService.demoEdges = false as lightdm user
1472
53
    }
1473
54
1474
55
    function hideEdgeDemos() {
1475
56
        hideEdgeDemoInGreeter();
1476
57
        hideEdgeDemoInShell();
1477
58
    }
45
    }
1478
59
46
1479
60
    function stopDemo() {
47
    function stopDemo() {
1480
@@ -62,7 +49,6 @@
1481
62
        dashEnabled = true
49
        dashEnabled = true
1482
63
        panelEnabled = true
50
        panelEnabled = true
1483
64
        panelContentEnabled = true
51
        panelContentEnabled = true
1484
65
        if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy()
1485
66
        if (d.topEdgeDemo)    d.topEdgeDemo.destroy()
52
        if (d.topEdgeDemo)    d.topEdgeDemo.destroy()
1486
67
        if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()
53
        if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()
1487
68
        if (d.leftEdgeDemo)   d.leftEdgeDemo.destroy()
54
        if (d.leftEdgeDemo)   d.leftEdgeDemo.destroy()
1488
@@ -79,24 +65,17 @@
1489
79
        panelEnabled = false;
65
        panelEnabled = false;
1490
80
        panelContentEnabled = false;
66
        panelContentEnabled = false;
1491
81
67
1498
82
        // Begin with either greeter or dash, depending on which is visible
68
        startTopEdgeDemo()
1493
83
        if (greeter && greeter.shown) {
1494
84
            startRightEdgeDemo()
1495
85
        } else {
1496
86
            startTopEdgeDemo()
1497
87
        }
1499
88
    }
69
    }
1500
89
70
1501
90
    QtObject {
71
    QtObject {
1502
91
        id: d
72
        id: d
1503
92
        property Component overlay
73
        property Component overlay
1504
93
        property QtObject rightEdgeDemo
1505
94
        property QtObject topEdgeDemo
74
        property QtObject topEdgeDemo
1506
95
        property QtObject bottomEdgeDemo
75
        property QtObject bottomEdgeDemo
1507
96
        property QtObject leftEdgeDemo
76
        property QtObject leftEdgeDemo
1508
97
        property QtObject finalEdgeDemo
77
        property QtObject finalEdgeDemo
1509
98
        property bool showEdgeDemo: AccountsService.demoEdges
78
        property bool showEdgeDemo: AccountsService.demoEdges
1510
99
        property bool showEdgeDemoInGreeter: AccountsService.demoEdges // TODO: AccountsService.demoEdges as lightdm user
1511
100
79
1512
101
        onShowEdgeDemoChanged: {
80
        onShowEdgeDemoChanged: {
1513
102
            stopDemo()
81
            stopDemo()
1514
@@ -106,37 +85,6 @@
1515
106
        }
85
        }
1516
107
    }
86
    }
1517
108
87
1518
109
    function startRightEdgeDemo() {
1519
110
        if (demo.greeter) {
1520
111
            d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
1521
112
                "edge": "right",
1522
113
                "title": i18n.tr("Right edge"),
1523
114
                "text": i18n.tr("Try swiping from the right edge to unlock the phone"),
1524
115
                "anchors.fill": demo.greeter,
1525
116
            });
1526
117
        }
1527
118
        if (d.rightEdgeDemo) {
1528
119
            d.rightEdgeDemo.onSkip.connect(demo.hideEdgeDemos)
1529
120
        } else {
1530
121
            stopDemo();
1531
122
        }
1532
123
    }
1533
124
1534
125
    Connections {
1535
126
        target: demo.greeter
1536
127
1537
128
        function hide() {
1538
129
            if (d.rightEdgeDemo && d.rightEdgeDemo.available) {
1539
130
                d.rightEdgeDemo.hide()
1540
131
                hideEdgeDemoInGreeter()
1541
132
                startTopEdgeDemo()
1542
133
            }
1543
134
        }
1544
135
1545
136
        onUnlocked: hide()
1546
137
        onShownChanged: if (!greeter.shown) hide()
1547
138
    }
1548
139
1549
140
    function startTopEdgeDemo() {
88
    function startTopEdgeDemo() {
1550
141
        demo.panelEnabled = true;
89
        demo.panelEnabled = true;
1551
142
        if (demo.dash && demo.underlay) {
90
        if (demo.dash && demo.underlay) {
1552
143
91
1553
=== renamed file 'qml/Greeter/Lockscreen.qml' => 'qml/Components/Lockscreen.qml'
1554
--- qml/Greeter/Lockscreen.qml	2014-05-20 13:09:51 +0000
1555
+++ qml/Components/Lockscreen.qml	2014-05-29 14:11:15 +0000
1556
@@ -17,7 +17,6 @@
1557
17
import QtQuick 2.0
17
import QtQuick 2.0
1558
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.0
1559
19
import Ubuntu.Components.Popups 1.0
19
import Ubuntu.Components.Popups 1.0
1560
20
import "../Components"
1561
21
20
1562
22
Showable {
21
Showable {
1563
23
    id: root
22
    id: root
1564
@@ -49,8 +48,6 @@
1565
49
    property int minPinLength: -1
48
    property int minPinLength: -1
1566
50
    property int maxPinLength: -1
49
    property int maxPinLength: -1
1567
51
50
1568
52
    property url background: ""
1569
53
1570
54
    signal entered(string passphrase)
51
    signal entered(string passphrase)
1571
55
    signal cancel()
52
    signal cancel()
1572
56
    signal emergencyCall()
53
    signal emergencyCall()
1573
@@ -76,23 +73,6 @@
1574
76
        PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
73
        PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
1575
77
    }
74
    }
1576
78
75
1577
79
    Rectangle {
1578
80
        // In case background fails to load or is undefined
1579
81
        id: backgroundBackup
1580
82
        anchors.fill: parent
1581
83
        color: "black"
1582
84
    }
1583
85
1584
86
    Image {
1585
87
        id: backgroundImage
1586
88
        objectName: "lockscreenBackground"
1587
89
        anchors {
1588
90
            fill: parent
1589
91
        }
1590
92
        source: root.required ? root.background : ""
1591
93
        fillMode: Image.PreserveAspectCrop
1592
94
    }
1593
95
1594
96
    MouseArea {
76
    MouseArea {
1595
97
        anchors.fill: root
77
        anchors.fill: root
1596
98
    }
78
    }
1597
99
79
1598
=== modified file 'qml/Components/PageHeader.qml'
1599
--- qml/Components/PageHeader.qml	2014-05-19 11:10:58 +0000
1600
+++ qml/Components/PageHeader.qml	2014-05-29 14:11:15 +0000
1601
@@ -18,6 +18,7 @@
1602
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
1603
19
import Ubuntu.Components.Popups 0.1
19
import Ubuntu.Components.Popups 0.1
1604
20
import Ubuntu.Components.ListItems 0.1 as ListItem
20
import Ubuntu.Components.ListItems 0.1 as ListItem
1605
21
import SessionManager 0.1
1606
21
import Unity 0.2
22
import Unity 0.2
1607
22
23
1608
23
Item {
24
Item {
1609
@@ -51,8 +52,8 @@
1610
51
    }
52
    }
1611
52
53
1612
53
    Connections {
54
    Connections {
1615
54
        target: greeter
55
        target: SessionManager
1616
55
        onShownChanged: if (shown) resetSearch()
56
        onActiveChanged: if (!SessionManager.active) resetSearch()
1617
56
    }
57
    }
1618
57
58
1619
58
    Flickable {
59
    Flickable {
1620
59
60
1621
=== renamed file 'qml/Greeter/PassphraseLockscreen.qml' => 'qml/Components/PassphraseLockscreen.qml'
1622
=== renamed file 'qml/Greeter/PinLockscreen.qml' => 'qml/Components/PinLockscreen.qml'
1623
=== modified file 'qml/Dash/ScopeListView.qml'
1624
--- qml/Dash/ScopeListView.qml	2014-04-30 10:06:33 +0000
1625
+++ qml/Dash/ScopeListView.qml	2014-05-29 14:11:15 +0000
1626
@@ -16,13 +16,14 @@
1627
16
16
1628
17
import QtQuick 2.0
17
import QtQuick 2.0
1629
18
import Dash 0.1
18
import Dash 0.1
1630
19
import SessionManager 0.1
1631
19
20
1632
20
ListViewWithPageHeader {
21
ListViewWithPageHeader {
1633
21
    maximumFlickVelocity: height * 10
22
    maximumFlickVelocity: height * 10
1634
22
    flickDeceleration: height * 2
23
    flickDeceleration: height * 2
1635
23
24
1636
24
    Connections {
25
    Connections {
1639
25
        target: greeter
26
        target: SessionManager
1640
26
        onShownChanged: if (greeter.shown) showHeader()
27
        onActiveChanged: if (!SessionManager.active) showHeader()
1641
27
    }
28
    }
1642
28
}
29
}
1643
29
30
1644
=== modified file 'qml/Greeter/Clock.qml'
1645
--- qml/Greeter/Clock.qml	2014-04-18 18:22:56 +0000
1646
+++ qml/Greeter/Clock.qml	2014-05-29 14:11:15 +0000
1647
@@ -39,7 +39,7 @@
1648
39
39
1649
40
        busName: "com.canonical.indicator.datetime"
40
        busName: "com.canonical.indicator.datetime"
1650
41
        actionsObjectPath: "/com/canonical/indicator/datetime"
41
        actionsObjectPath: "/com/canonical/indicator/datetime"
1652
42
        menuObjectPath: clock.visible ? "/com/canonical/indicator/datetime/phone" : ""
42
        menuObjectPath: clock.visible ? "/com/canonical/indicator/datetime/phone_greeter" : ""
1653
43
43
1654
44
        Indicators.RootActionState {
44
        Indicators.RootActionState {
1655
45
            menu: timeModel.model
45
            menu: timeModel.model
1656
46
46
1657
=== modified file 'qml/Greeter/Greeter.qml'
1658
--- qml/Greeter/Greeter.qml	2014-04-16 13:43:13 +0000
1659
+++ qml/Greeter/Greeter.qml	2014-05-29 14:11:15 +0000
1660
@@ -23,9 +23,9 @@
1661
23
Showable {
23
Showable {
1662
24
    id: greeter
24
    id: greeter
1663
25
    enabled: shown
25
    enabled: shown
1665
26
    created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
26
    created: greeterContentLoader.status == Loader.Ready
1666
27
27
1668
28
    property url defaultBackground
28
    property url background
1669
29
29
1670
30
    // 1 when fully shown and 0 when fully hidden
30
    // 1 when fully shown and 0 when fully hidden
1671
31
    property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
31
    property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
1672
@@ -118,6 +118,36 @@
1673
118
        }
118
        }
1674
119
    }
119
    }
1675
120
120
1676
121
    Rectangle {
1677
122
        // To hide lockscreen until background finished fading in
1678
123
        id: backgroundBackup
1679
124
        anchors {
1680
125
            fill: parent
1681
126
            topMargin: -greeter.y
1682
127
        }
1683
128
        color: "black"
1684
129
    }
1685
130
1686
131
    CrossFadeImage {
1687
132
        id: backgroundImage
1688
133
        objectName: "greeterBackground"
1689
134
        anchors {
1690
135
            fill: parent
1691
136
            topMargin: -greeter.y
1692
137
        }
1693
138
        source: greeter.background
1694
139
        fillMode: Image.PreserveAspectCrop
1695
140
1696
141
        StandardAnimation {
1697
142
            running: true
1698
143
            target: backgroundImage
1699
144
            property: "opacity"
1700
145
            from: 0.0
1701
146
            to: 1.0
1702
147
            duration: 800
1703
148
        }
1704
149
    }
1705
150
1706
121
    Loader {
151
    Loader {
1707
122
        id: greeterContentLoader
152
        id: greeterContentLoader
1708
123
        objectName: "greeterContentLoader"
153
        objectName: "greeterContentLoader"
1709
@@ -125,7 +155,6 @@
1710
125
        property var model: LightDM.Users
155
        property var model: LightDM.Users
1711
126
        property int currentIndex: 0
156
        property int currentIndex: 0
1712
127
        property var infographicModel: LightDM.Infographic
157
        property var infographicModel: LightDM.Infographic
1713
128
        readonly property int backgroundTopMargin: -greeter.y
1714
129
158
1715
130
        source: required ? "GreeterContent.qml" : ""
159
        source: required ? "GreeterContent.qml" : ""
1716
131
160
1717
@@ -145,6 +174,10 @@
1718
145
    }
174
    }
1719
146
175
1720
147
    onTease: showLabelAnimation.start()
176
    onTease: showLabelAnimation.start()
1721
177
    onShownChanged: {
1722
178
        showLabelAnimation.stop()
1723
179
        swipeHint.opacity = 0
1724
180
    }
1725
148
181
1726
149
    Label {
182
    Label {
1727
150
        id: swipeHint
183
        id: swipeHint
1728
151
184
1729
=== modified file 'qml/Greeter/GreeterContent.qml'
1730
--- qml/Greeter/GreeterContent.qml	2014-04-17 15:43:16 +0000
1731
+++ qml/Greeter/GreeterContent.qml	2014-05-29 14:11:15 +0000
1732
@@ -24,47 +24,10 @@
1733
24
    id: root
24
    id: root
1734
25
    anchors.fill: parent
25
    anchors.fill: parent
1735
26
26
1736
27
    property bool ready: background.source == "" || background.status == Image.Ready || background.status == Image.Error
1737
28
1738
29
    signal selected(int uid)
27
    signal selected(int uid)
1739
30
    signal unlocked(int uid)
28
    signal unlocked(int uid)
1740
31
29
1741
32
    Rectangle {
30
    Rectangle {
1742
33
        // In case background fails to load
1743
34
        id: backgroundBackup
1744
35
        anchors.fill: parent
1745
36
        color: "black"
1746
37
    }
1747
38
1748
39
    property url backgroundValue: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : greeter.defaultBackground
1749
40
    onBackgroundValueChanged: background.source = backgroundValue
1750
41
1751
42
    CrossFadeImage {
1752
43
        id: background
1753
44
        objectName: "greeterBackground"
1754
45
        anchors {
1755
46
            fill: parent
1756
47
            topMargin: backgroundTopMargin
1757
48
        }
1758
49
        fillMode: Image.PreserveAspectCrop
1759
50
    }
1760
51
1761
52
    // See Shell.qml's backgroundSettings treatment for why we need a separate
1762
53
    // Image, but it boils down to avoiding binding loop detection.
1763
54
    Image {
1764
55
        source: background.source
1765
56
        height: 0
1766
57
        width: 0
1767
58
        sourceSize.height: 0
1768
59
        sourceSize.width: 0
1769
60
        onStatusChanged: {
1770
61
            if (status == Image.Error && source != greeter.defaultBackground) {
1771
62
                background.source = greeter.defaultBackground
1772
63
            }
1773
64
        }
1774
65
    }
1775
66
1776
67
    Rectangle {
1777
68
        anchors.fill: parent
31
        anchors.fill: parent
1778
69
        color: "black"
32
        color: "black"
1779
70
        opacity: 0.4
33
        opacity: 0.4
1780
@@ -145,7 +108,6 @@
1781
145
108
1782
146
    Clock {
109
    Clock {
1783
147
        id: clock
110
        id: clock
1784
148
        visible: narrowMode
1785
149
111
1786
150
        anchors {
112
        anchors {
1787
151
            top: parent.top
113
            top: parent.top
1788
152
114
1789
=== added file 'qml/Greeter/GreeterEdgeDemo.qml'
1790
--- qml/Greeter/GreeterEdgeDemo.qml	1970-01-01 00:00:00 +0000
1791
+++ qml/Greeter/GreeterEdgeDemo.qml	2014-05-29 14:11:15 +0000
1792
@@ -0,0 +1,102 @@
1793
1
/*
1794
2
 * Copyright (C) 2013 Canonical, Ltd.
1795
3
 *
1796
4
 * This program is free software; you can redistribute it and/or modify
1797
5
 * it under the terms of the GNU General Public License as published by
1798
6
 * the Free Software Foundation; version 3.
1799
7
 *
1800
8
 * This program is distributed in the hope that it will be useful,
1801
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1802
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1803
11
 * GNU General Public License for more details.
1804
12
 *
1805
13
 * You should have received a copy of the GNU General Public License
1806
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1807
15
 */
1808
16
1809
17
import AccountsService 0.1
1810
18
import LightDM 0.1 as LightDM
1811
19
import QtQuick 2.0
1812
20
1813
21
Item {
1814
22
    id: demo
1815
23
1816
24
    property Item greeter
1817
25
1818
26
    property bool active: false
1819
27
    property bool paused: false
1820
28
1821
29
    onPausedChanged: {
1822
30
        if (d.rightEdgeDemo)  d.rightEdgeDemo.paused = paused
1823
31
    }
1824
32
1825
33
    function hideEdgeDemoInShell() {
1826
34
        AccountsService.demoEdges = false;
1827
35
    }
1828
36
1829
37
    function hideEdgeDemoInGreeter() {
1830
38
        AccountsService.demoEdgesForCurrentUser = false;
1831
39
    }
1832
40
1833
41
    function hideEdgeDemos() {
1834
42
        hideEdgeDemoInGreeter();
1835
43
        hideEdgeDemoInShell();
1836
44
    }
1837
45
1838
46
    function startDemo() {
1839
47
        if (!d.overlay) {
1840
48
            d.overlay = Qt.createComponent("../Components/EdgeDemoOverlay.qml")
1841
49
        }
1842
50
        startRightEdgeDemo()
1843
51
    }
1844
52
1845
53
    function stopDemo() {
1846
54
        active = false
1847
55
        if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy()
1848
56
    }
1849
57
1850
58
    QtObject {
1851
59
        id: d
1852
60
        property Component overlay
1853
61
        property QtObject rightEdgeDemo
1854
62
        property bool showEdgeDemoInGreeter: AccountsService.demoEdgesForCurrentUser && AccountsService.demoEdges
1855
63
1856
64
        onShowEdgeDemoInGreeterChanged: {
1857
65
            stopDemo()
1858
66
            if (d.showEdgeDemoInGreeter) {
1859
67
                startDemo()
1860
68
            }
1861
69
        }
1862
70
    }
1863
71
1864
72
    function startRightEdgeDemo() {
1865
73
        active = true;
1866
74
        if (demo.greeter) {
1867
75
            d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
1868
76
                "edge": "right",
1869
77
                "title": i18n.tr("Right edge"),
1870
78
                "text": i18n.tr("Try swiping from the right edge to unlock the phone"),
1871
79
                "anchors.fill": demo.greeter,
1872
80
            });
1873
81
        }
1874
82
        if (d.rightEdgeDemo) {
1875
83
            d.rightEdgeDemo.onSkip.connect(demo.hideEdgeDemos)
1876
84
        } else {
1877
85
            stopDemo();
1878
86
        }
1879
87
    }
1880
88
1881
89
    Connections {
1882
90
        target: demo.greeter
1883
91
1884
92
        function hide() {
1885
93
            if (d.rightEdgeDemo && d.rightEdgeDemo.available) {
1886
94
                d.rightEdgeDemo.hide()
1887
95
                hideEdgeDemoInGreeter()
1888
96
            }
1889
97
        }
1890
98
1891
99
        onUnlocked: hide()
1892
100
        onShownChanged: if (!greeter.shown) hide()
1893
101
    }
1894
102
}
1895
0
103
1896
=== modified file 'qml/Greeter/Infographics.qml'
1897
--- qml/Greeter/Infographics.qml	2014-03-21 17:49:22 +0000
1898
+++ qml/Greeter/Infographics.qml	2014-05-29 14:11:15 +0000
1899
@@ -59,8 +59,6 @@
1900
59
59
1901
60
    visible: model.label !== ""
60
    visible: model.label !== ""
1902
61
61
1903
62
    Component.onCompleted: startShowAnimation()
1904
63
1905
64
    Item {
62
    Item {
1906
65
        id: dataCircle
63
        id: dataCircle
1907
66
        objectName: "dataCircle"
64
        objectName: "dataCircle"
1908
67
65
1909
=== added file 'qml/GreeterShell.qml'
1910
--- qml/GreeterShell.qml	1970-01-01 00:00:00 +0000
1911
+++ qml/GreeterShell.qml	2014-05-29 14:11:15 +0000
1912
@@ -0,0 +1,283 @@
1913
1
/*
1914
2
 * Copyright (C) 2013 Canonical, Ltd.
1915
3
 *
1916
4
 * This program is free software; you can redistribute it and/or modify
1917
5
 * it under the terms of the GNU General Public License as published by
1918
6
 * the Free Software Foundation; version 3.
1919
7
 *
1920
8
 * This program is distributed in the hope that it will be useful,
1921
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1922
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1923
11
 * GNU General Public License for more details.
1924
12
 *
1925
13
 * You should have received a copy of the GNU General Public License
1926
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1927
15
 */
1928
16
1929
17
import AccountsService 0.1
1930
18
import GSettings 1.0
1931
19
import LightDM 0.1 as LightDM
1932
20
import Powerd 0.1
1933
21
import QtQuick 2.0
1934
22
import SessionBroadcast 0.1
1935
23
import Ubuntu.Components 0.1
1936
24
import Unity.Application 0.1
1937
25
import Unity.Launcher 0.1
1938
26
import "Components"
1939
27
import "Greeter"
1940
28
import "Launcher"
1941
29
import "Panel"
1942
30
import "Notifications"
1943
31
import Unity.Notifications 1.0 as NotificationBackend
1944
32
1945
33
BasicShell {
1946
34
    id: shell
1947
35
1948
36
    function activateApplication(appId) {
1949
37
        SessionBroadcast.requestUrlStart(LightDM.Greeter.authenticationUser, appId)
1950
38
        greeter.hide()
1951
39
    }
1952
40
1953
41
    GSettings {
1954
42
        id: backgroundSettings
1955
43
        schema.id: "org.gnome.desktop.background"
1956
44
    }
1957
45
    backgroundFallbackSource: backgroundSettings.pictureUri // for ease of customization by system builders
1958
46
    backgroundSource: AccountsService.backgroundFile
1959
47
1960
48
    Lockscreen {
1961
49
        id: lockscreen
1962
50
        objectName: "lockscreen"
1963
51
1964
52
        hides: [launcher, panel.indicators]
1965
53
        shown: false
1966
54
        enabled: true
1967
55
        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
1968
56
        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
1969
57
        y: panel.panelHeight
1970
58
        x: required ? 0 : - width
1971
59
        width: parent.width
1972
60
        height: parent.height - panel.panelHeight
1973
61
        minPinLength: 4
1974
62
        maxPinLength: 4
1975
63
1976
64
        onEntered: LightDM.Greeter.respond(passphrase);
1977
65
        onCancel: greeter.show()
1978
66
1979
67
        Component.onCompleted: {
1980
68
            if (LightDM.Users.count == 1) {
1981
69
                LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
1982
70
            }
1983
71
        }
1984
72
    }
1985
73
1986
74
    Connections {
1987
75
        target: LightDM.Greeter
1988
76
1989
77
        onIdle: {
1990
78
            greeter.showNow()
1991
79
        }
1992
80
1993
81
        onShowPrompt: {
1994
82
            if (LightDM.Users.count == 1) {
1995
83
                // TODO: There's no better way for now to determine if its a PIN or a passphrase.
1996
84
                if (text == "PIN") {
1997
85
                    lockscreen.alphaNumeric = false
1998
86
                } else {
1999
87
                    lockscreen.alphaNumeric = true
2000
88
                }
2001
89
                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
2002
90
                lockscreen.show();
2003
91
            }
2004
92
        }
2005
93
2006
94
        onAuthenticationComplete: {
2007
95
            if (LightDM.Greeter.promptless) {
2008
96
                return;
2009
97
            }
2010
98
            if (LightDM.Greeter.authenticated) {
2011
99
                lockscreen.hide();
2012
100
            } else {
2013
101
                lockscreen.clear(true);
2014
102
            }
2015
103
        }
2016
104
    }
2017
105
2018
106
    Rectangle {
2019
107
        anchors.fill: parent
2020
108
        color: "black"
2021
109
        opacity: greeterWrapper.showProgress * 0.8
2022
110
    }
2023
111
2024
112
    Item {
2025
113
        // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
2026
114
        id: greeterWrapper
2027
115
        x: launcher.progress
2028
116
        width: parent.width
2029
117
        height: parent.height
2030
118
2031
119
        Behavior on x {
2032
120
            enabled: !launcher.dashSwipe
2033
121
            StandardAnimation {}
2034
122
        }
2035
123
2036
124
        readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
2037
125
        onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
2038
126
2039
127
        Greeter {
2040
128
            id: greeter
2041
129
            objectName: "greeter"
2042
130
2043
131
            available: true
2044
132
            hides: [launcher, panel.indicators]
2045
133
            shown: true
2046
134
            background: shell.background
2047
135
2048
136
            y: panel.panelHeight
2049
137
            width: parent.width
2050
138
            height: parent.height - panel.panelHeight
2051
139
2052
140
            dragHandleWidth: shell.edgeSize
2053
141
2054
142
            function login() {
2055
143
                enabled = false;
2056
144
                LightDM.Greeter.startSessionSync();
2057
145
                enabled = true;
2058
146
            }
2059
147
2060
148
            onShownChanged: {
2061
149
                if (shown) {
2062
150
                    lockscreen.reset();
2063
151
                    // If there is only one user, we start authenticating with that one here.
2064
152
                    // If there are more users, the Greeter will handle that
2065
153
                    if (LightDM.Users.count == 1) {
2066
154
                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
2067
155
                    }
2068
156
                    greeter.forceActiveFocus();
2069
157
                }
2070
158
            }
2071
159
2072
160
            onUnlocked: hide()
2073
161
            onSelected: {
2074
162
                // Update launcher items for new user
2075
163
                var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
2076
164
                AccountsService.user = user;
2077
165
                LauncherModel.setUser(user);
2078
166
            }
2079
167
            onTease: launcher.tease()
2080
168
        }
2081
169
    }
2082
170
2083
171
    InputFilterArea {
2084
172
        anchors.fill: parent
2085
173
        blockInput: true
2086
174
    }
2087
175
2088
176
    Item {
2089
177
        id: overlay
2090
178
2091
179
        anchors.fill: parent
2092
180
2093
181
        Panel {
2094
182
            id: panel
2095
183
            anchors.fill: parent //because this draws indicator menus
2096
184
            indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
2097
185
            indicators {
2098
186
                hides: [launcher]
2099
187
                available: !edgeDemo.active
2100
188
            }
2101
189
            fullscreenMode: false
2102
190
            searchVisible: false
2103
191
        }
2104
192
2105
193
        Launcher {
2106
194
            id: launcher
2107
195
2108
196
            readonly property bool dashSwipe: progress > 0
2109
197
2110
198
            anchors.top: parent.top
2111
199
            anchors.bottom: parent.bottom
2112
200
            width: parent.width
2113
201
            dragAreaWidth: shell.edgeSize
2114
202
            available: !edgeDemo.active
2115
203
            onLauncherApplicationSelected: {
2116
204
                shell.activateApplication("application:///" + appId + ".desktop")
2117
205
            }
2118
206
            onShownChanged: {
2119
207
                if (shown) {
2120
208
                    panel.indicators.hide()
2121
209
                }
2122
210
            }
2123
211
            onDash: {
2124
212
                greeter.hideRight()
2125
213
                hide()
2126
214
            }
2127
215
            onShowDashHome: {
2128
216
                SessionBroadcast.requestHomeShown(LightDM.Greeter.authenticationUser)
2129
217
                greeter.hide()
2130
218
            }
2131
219
        }
2132
220
2133
221
        Notifications {
2134
222
            id: notifications
2135
223
2136
224
            model: NotificationBackend.Model
2137
225
            margin: units.gu(1)
2138
226
2139
227
            anchors {
2140
228
                top: parent.top
2141
229
                right: parent.right
2142
230
                bottom: parent.bottom
2143
231
                topMargin: panel.panelHeight
2144
232
            }
2145
233
            states: [
2146
234
                State {
2147
235
                    name: "narrow"
2148
236
                    when: overlay.width <= units.gu(60)
2149
237
                    AnchorChanges { target: notifications; anchors.left: parent.left }
2150
238
                },
2151
239
                State {
2152
240
                    name: "wide"
2153
241
                    when: overlay.width > units.gu(60)
2154
242
                    AnchorChanges { target: notifications; anchors.left: undefined }
2155
243
                    PropertyChanges { target: notifications; width: units.gu(38) }
2156
244
                }
2157
245
            ]
2158
246
2159
247
            InputFilterArea {
2160
248
                anchors { left: parent.left; right: parent.right }
2161
249
                height: parent.contentHeight
2162
250
                blockInput: height > 0
2163
251
            }
2164
252
        }
2165
253
    }
2166
254
2167
255
    OSKController {
2168
256
        anchors.topMargin: panel.panelHeight
2169
257
        anchors.fill: parent // as needs to know the geometry of the shell
2170
258
    }
2171
259
2172
260
    Connections {
2173
261
        id: powerConnection
2174
262
        target: Powerd
2175
263
2176
264
        onDisplayPowerStateChange: {
2177
265
            if (status == Powerd.Off) {
2178
266
                greeter.show();
2179
267
                edgeDemo.paused = true;
2180
268
            } else if (status == Powerd.On) {
2181
269
                edgeDemo.paused = false;
2182
270
            }
2183
271
        }
2184
272
    }
2185
273
2186
274
    Connections {
2187
275
        target: LightDM.URLDispatcher
2188
276
        onDispatchURL: shell.activateApplication(url)
2189
277
    }
2190
278
2191
279
    GreeterEdgeDemo {
2192
280
        id: edgeDemo
2193
281
        greeter: greeter
2194
282
    }
2195
283
}
2196
0
284
2197
=== modified file 'qml/Hud/Hud.qml'
2198
--- qml/Hud/Hud.qml	2014-03-19 17:38:03 +0000
2199
+++ qml/Hud/Hud.qml	2014-05-29 14:11:15 +0000
2200
@@ -227,10 +227,7 @@
2201
227
        width: parent.width
227
        width: parent.width
2202
228
228
2203
229
        onYChanged: {
229
        onYChanged: {
2208
230
            if (greeter.shown) {
230
            if (!showAnimation.running && !hideAnimation.running) {
2205
231
                showAnimation.duration = 0
2206
232
                hideAnimation.duration = 0
2207
233
            } else if (!showAnimation.running && !hideAnimation.running) {
2209
234
                if (parent.height > 0) {
231
                if (parent.height > 0) {
2210
235
                    showAnimation.duration = Math.min(showableAnimationDuration * (1 - (parent.height - y) / parent.height), showableAnimationDuration)
232
                    showAnimation.duration = Math.min(showableAnimationDuration * (1 - (parent.height - y) / parent.height), showableAnimationDuration)
2211
236
                    hideAnimation.duration = showableAnimationDuration - showAnimation.duration
233
                    hideAnimation.duration = showableAnimationDuration - showAnimation.duration
2212
237
234
2213
=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
2214
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-04-10 08:37:13 +0000
2215
+++ qml/Notifications/NotificationMenuItemFactory.qml	2014-05-29 14:11:15 +0000
2216
@@ -20,7 +20,6 @@
2217
20
import QtQuick 2.0
20
import QtQuick 2.0
2218
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
2219
22
import "../Components"
22
import "../Components"
2220
23
import "../Greeter"
2221
24
23
2222
25
Loader {
24
Loader {
2223
26
    id: menuFactory
25
    id: menuFactory
2224
@@ -98,19 +97,36 @@
2225
98
    Component {
97
    Component {
2226
99
        id: pinLock
98
        id: pinLock
2227
100
99
2230
101
        Lockscreen {
100
        Item {
2229
102
            anchors.left: parent.left; anchors.right: parent.right
2231
103
            height: menuFactory.maxHeight
101
            height: menuFactory.maxHeight
2242
104
            placeholderText: i18n.tr("Please enter SIM PIN")
102
            anchors.left: parent.left
2243
105
            background: shell.background
103
            anchors.right: parent.right
2244
106
104
2245
107
            onEntered: {
105
            Rectangle {
2246
108
                menuModel.changeState(menuIndex, passphrase);
106
                // In case background fails to load or is undefined
2247
109
                entryEnabled = false;
107
                anchors.fill: parent
2248
110
            }
108
                color: "black"
2249
111
109
            }
2250
112
            onCancel: {
110
2251
113
                menuModel.activate(menuIndex, false);
111
            Image {
2252
112
                objectName: "lockscreenBackground"
2253
113
                anchors.fill: parent
2254
114
                source: shell.background
2255
115
                fillMode: Image.PreserveAspectCrop
2256
116
            }
2257
117
2258
118
            Lockscreen {
2259
119
                anchors.fill: parent
2260
120
                placeholderText: i18n.tr("Please enter SIM PIN")
2261
121
2262
122
                onEntered: {
2263
123
                    menuModel.changeState(menuIndex, passphrase);
2264
124
                    entryEnabled = false;
2265
125
                }
2266
126
2267
127
                onCancel: {
2268
128
                    menuModel.activate(menuIndex, false);
2269
129
                }
2270
114
            }
130
            }
2271
115
        }
131
        }
2272
116
    }
132
    }
2273
117
133
2274
=== modified file 'qml/Panel/Panel.qml'
2275
--- qml/Panel/Panel.qml	2014-02-04 23:04:52 +0000
2276
+++ qml/Panel/Panel.qml	2014-05-29 14:11:15 +0000
2277
@@ -62,7 +62,7 @@
2278
62
        height: __panelMinusSeparatorLineHeight
62
        height: __panelMinusSeparatorLineHeight
2279
63
        y: 0
63
        y: 0
2280
64
64
2282
65
        Behavior on y { StandardAnimation { duration: UbuntuAnimation.FastDuration } }
65
        Behavior on y { StandardAnimation { duration: 500 } }
2283
66
    }
66
    }
2284
67
67
2285
68
    PanelSeparatorLine {
68
    PanelSeparatorLine {
2286
69
69
2287
=== modified file 'qml/Shell.qml'
2288
--- qml/Shell.qml	2014-05-27 07:46:24 +0000
2289
+++ qml/Shell.qml	2014-05-29 14:11:15 +0000
2290
@@ -21,28 +21,19 @@
2291
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
2292
22
import Ubuntu.Gestures 0.1
22
import Ubuntu.Gestures 0.1
2293
23
import Unity.Launcher 0.1
23
import Unity.Launcher 0.1
2294
24
import LightDM 0.1 as LightDM
2295
25
import Powerd 0.1
24
import Powerd 0.1
2296
26
import SessionBroadcast 0.1
25
import SessionBroadcast 0.1
2297
26
import SessionManager 0.1
2298
27
import "Dash"
27
import "Dash"
2299
28
import "Greeter"
2300
29
import "Launcher"
28
import "Launcher"
2301
30
import "Panel"
29
import "Panel"
2302
31
import "Components"
30
import "Components"
2303
32
import "Notifications"
31
import "Notifications"
2304
33
import Unity.Notifications 1.0 as NotificationBackend
32
import Unity.Notifications 1.0 as NotificationBackend
2305
34
33
2307
35
FocusScope {
34
BasicShell {
2308
36
    id: shell
35
    id: shell
2309
37
36
2310
38
    // this is only here to select the width / height of the window if not running fullscreen
2311
39
    property bool tablet: false
2312
40
    width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
2313
41
    height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
2314
42
2315
43
    property real edgeSize: units.gu(2)
2316
44
    property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg")
2317
45
    property url background
2318
46
    readonly property real panelHeight: panel.panelHeight
37
    readonly property real panelHeight: panel.panelHeight
2319
47
38
2320
48
    property bool dashShown: dash.shown
39
    property bool dashShown: dash.shown
2321
@@ -78,17 +69,7 @@
2322
78
        id: backgroundSettings
69
        id: backgroundSettings
2323
79
        schema.id: "org.gnome.desktop.background"
70
        schema.id: "org.gnome.desktop.background"
2324
80
    }
71
    }
2336
81
    property url gSettingsPicture: backgroundSettings.pictureUri != undefined && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : shell.defaultBackground
72
    backgroundSource: backgroundSettings.pictureUri
2326
82
    onGSettingsPictureChanged: {
2327
83
        shell.background = gSettingsPicture
2328
84
    }
2329
85
2330
86
    VolumeControl {
2331
87
        id: volumeControl
2332
88
    }
2333
89
2334
90
    Keys.onVolumeUpPressed: volumeControl.volumeUp()
2335
91
    Keys.onVolumeDownPressed: volumeControl.volumeDown()
2337
92
73
2338
93
    Item {
74
    Item {
2339
94
        id: underlayClipper
75
        id: underlayClipper
2340
@@ -135,10 +116,9 @@
2341
135
                id: dash
116
                id: dash
2342
136
                objectName: "dash"
117
                objectName: "dash"
2343
137
118
2344
138
                available: !greeter.shown && !lockscreen.shown
2345
139
                hides: [stages, launcher, panel.indicators]
119
                hides: [stages, launcher, panel.indicators]
2348
140
                shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0
120
                shown: disappearingAnimationProgress !== 1.0
2349
141
                enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled
121
                enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
2350
142
122
2351
143
                anchors {
123
                anchors {
2352
144
                    fill: parent
124
                    fill: parent
2353
@@ -226,7 +206,6 @@
2354
226
            shown = true;
206
            shown = true;
2355
227
            panel.indicators.hide();
207
            panel.indicators.hide();
2356
228
            edgeDemo.stopDemo();
208
            edgeDemo.stopDemo();
2357
229
            greeter.hide();
2358
230
            if (!ApplicationManager.focusedApplicationId && ApplicationManager.count > 0 && focusApp) {
209
            if (!ApplicationManager.focusedApplicationId && ApplicationManager.count > 0 && focusApp) {
2359
231
                ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
210
                ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
2360
232
            }
211
            }
2361
@@ -267,6 +246,12 @@
2362
267
            }
246
            }
2363
268
        }
247
        }
2364
269
248
2365
249
        Binding {
2366
250
            target: ApplicationManager
2367
251
            property: "suspended"
2368
252
            value: !SessionManager.active
2369
253
        }
2370
254
2371
270
        Loader {
255
        Loader {
2372
271
            id: applicationsDisplayLoader
256
            id: applicationsDisplayLoader
2373
272
            anchors.fill: parent
257
            anchors.fill: parent
2374
@@ -291,132 +276,9 @@
2375
291
        }
276
        }
2376
292
    }
277
    }
2377
293
278
2378
294
    Lockscreen {
2379
295
        id: lockscreen
2380
296
        objectName: "lockscreen"
2381
297
2382
298
        readonly property int backgroundTopMargin: -panel.panelHeight
2383
299
2384
300
        hides: [launcher, panel.indicators]
2385
301
        shown: false
2386
302
        enabled: true
2387
303
        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
2388
304
        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
2389
305
        y: panel.panelHeight
2390
306
        x: required ? 0 : - width
2391
307
        width: parent.width
2392
308
        height: parent.height - panel.panelHeight
2393
309
        background: shell.background
2394
310
        minPinLength: 4
2395
311
        maxPinLength: 4
2396
312
2397
313
        onEntered: LightDM.Greeter.respond(passphrase);
2398
314
        onCancel: greeter.show()
2399
315
2400
316
        Component.onCompleted: {
2401
317
            if (LightDM.Users.count == 1) {
2402
318
                LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
2403
319
            }
2404
320
        }
2405
321
    }
2406
322
2407
323
    Connections {
2408
324
        target: LightDM.Greeter
2409
325
2410
326
        onShowPrompt: {
2411
327
            if (LightDM.Users.count == 1) {
2412
328
                // TODO: There's no better way for now to determine if its a PIN or a passphrase.
2413
329
                if (text == "PIN") {
2414
330
                    lockscreen.alphaNumeric = false
2415
331
                } else {
2416
332
                    lockscreen.alphaNumeric = true
2417
333
                }
2418
334
                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
2419
335
                lockscreen.show();
2420
336
            }
2421
337
        }
2422
338
2423
339
        onAuthenticationComplete: {
2424
340
            if (LightDM.Greeter.promptless) {
2425
341
                return;
2426
342
            }
2427
343
            if (LightDM.Greeter.authenticated) {
2428
344
                lockscreen.hide();
2429
345
            } else {
2430
346
                lockscreen.clear(true);
2431
347
            }
2432
348
        }
2433
349
    }
2434
350
2435
351
    Rectangle {
2436
352
        anchors.fill: parent
2437
353
        color: "black"
2438
354
        opacity: greeterWrapper.showProgress * 0.8
2439
355
    }
2440
356
2441
357
    Item {
2442
358
        // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
2443
359
        id: greeterWrapper
2444
360
        x: launcher.progress
2445
361
        y: panel.panelHeight
2446
362
        width: parent.width
2447
363
        height: parent.height - panel.panelHeight
2448
364
2449
365
        Behavior on x {
2450
366
            enabled: !launcher.dashSwipe
2451
367
            StandardAnimation {}
2452
368
        }
2453
369
2454
370
        readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
2455
371
2456
372
        Greeter {
2457
373
            id: greeter
2458
374
            objectName: "greeter"
2459
375
2460
376
            available: true
2461
377
            hides: [launcher, panel.indicators]
2462
378
            shown: true
2463
379
2464
380
            defaultBackground: shell.background
2465
381
2466
382
            width: parent.width
2467
383
            height: parent.height
2468
384
2469
385
            dragHandleWidth: shell.edgeSize
2470
386
2471
387
            onShownChanged: {
2472
388
                if (shown) {
2473
389
                    lockscreen.reset();
2474
390
                    // If there is only one user, we start authenticating with that one here.
2475
391
                    // If there are more users, the Greeter will handle that
2476
392
                    if (LightDM.Users.count == 1) {
2477
393
                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
2478
394
                    }
2479
395
                    greeter.forceActiveFocus();
2480
396
                }
2481
397
            }
2482
398
2483
399
            onUnlocked: greeter.hide()
2484
400
            onSelected: {
2485
401
                // Update launcher items for new user
2486
402
                var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
2487
403
                AccountsService.user = user;
2488
404
                LauncherModel.setUser(user);
2489
405
            }
2490
406
2491
407
            onTease: launcher.tease()
2492
408
2493
409
            Binding {
2494
410
                target: ApplicationManager
2495
411
                property: "suspended"
2496
412
                value: greeter.shown && greeterWrapper.showProgress == 1
2497
413
            }
2498
414
        }
2499
415
    }
2500
416
2501
417
    InputFilterArea {
279
    InputFilterArea {
2502
418
        anchors.fill: parent
280
        anchors.fill: parent
2504
419
        blockInput: ApplicationManager.focusedApplicationId.length === 0 || greeter.shown || lockscreen.shown || launcher.shown
281
        blockInput: ApplicationManager.focusedApplicationId.length === 0 || launcher.shown
2505
420
                    || panel.indicators.shown
282
                    || panel.indicators.shown
2506
421
    }
283
    }
2507
422
284
2508
@@ -428,7 +290,7 @@
2509
428
            // We ignore any display-off signals when the proximity sensor
290
            // We ignore any display-off signals when the proximity sensor
2510
429
            // is active.  This usually indicates something like a phone call.
291
            // is active.  This usually indicates something like a phone call.
2511
430
            if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {
292
            if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {
2513
431
                greeter.showNow();
293
                SessionManager.lock();
2514
432
            }
294
            }
2515
433
295
2516
434
            // No reason to chew demo CPU when user isn't watching
296
            // No reason to chew demo CPU when user isn't watching
2517
@@ -440,17 +302,12 @@
2518
440
        }
302
        }
2519
441
    }
303
    }
2520
442
304
2524
443
    function showHome() {
305
    function showHome(fromLauncher) {
2525
444
        var animate = !greeter.shown && !stages.shown
306
        var animate = fromLauncher && !stages.shown
2523
445
        greeter.hide()
2526
446
        dash.setCurrentScope("clickscope", animate, false)
307
        dash.setCurrentScope("clickscope", animate, false)
2527
447
        stages.hide()
308
        stages.hide()
2528
448
    }
309
    }
2529
449
310
2530
450
    function hideIndicatorMenu(delay) {
2531
451
        panel.hideIndicatorMenu(delay);
2532
452
    }
2533
453
2534
454
    Item {
311
    Item {
2535
455
        id: overlay
312
        id: overlay
2536
456
313
2537
@@ -467,8 +324,8 @@
2538
467
            }
324
            }
2539
468
            property string focusedAppId: ApplicationManager.focusedApplicationId
325
            property string focusedAppId: ApplicationManager.focusedApplicationId
2540
469
            property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
326
            property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
2543
470
            fullscreenMode: focusedApplication && stages.fullscreen && !greeter.shown && !lockscreen.shown
327
            fullscreenMode: focusedApplication && stages.fullscreen
2544
471
            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
328
            searchVisible: dash.shown && dash.searchable
2545
472
329
2546
473
            InputFilterArea {
330
            InputFilterArea {
2547
474
                anchors {
331
                anchors {
2548
@@ -506,8 +363,9 @@
2549
506
                if (edgeDemo.running)
363
                if (edgeDemo.running)
2550
507
                    return;
364
                    return;
2551
508
365
2553
509
                showHome()
366
                showHome(true)
2554
510
            }
367
            }
2555
368
2556
511
            onDash: {
369
            onDash: {
2557
512
                if (stages.shown && !stages.overlayMode) {
370
                if (stages.shown && !stages.overlayMode) {
2558
513
                    if (!stages.locked) {
371
                    if (!stages.locked) {
2559
@@ -515,10 +373,6 @@
2560
515
                        launcher.hide();
373
                        launcher.hide();
2561
516
                    }
374
                    }
2562
517
                }
375
                }
2563
518
                if (greeter.shown) {
2564
519
                    greeter.hideRight();
2565
520
                    launcher.hide();
2566
521
                }
2567
522
            }
376
            }
2568
523
            onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
377
            onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
2569
524
            onLauncherApplicationSelected: {
378
            onLauncherApplicationSelected: {
2570
@@ -535,7 +389,7 @@
2571
535
        Rectangle {
389
        Rectangle {
2572
536
            id: modalNotificationBackground
390
            id: modalNotificationBackground
2573
537
391
2575
538
            visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")
392
            visible: notifications.useModal && (notifications.state == "narrow")
2576
539
            color: "#000000"
393
            color: "#000000"
2577
540
            anchors.fill: parent
394
            anchors.fill: parent
2578
541
            opacity: 0.5
395
            opacity: 0.5
2579
@@ -582,11 +436,18 @@
2580
582
                blockInput: height > 0
436
                blockInput: height > 0
2581
583
            }
437
            }
2582
584
        }
438
        }
2583
439
2584
440
        Connections {
2585
441
            target: SessionManager
2586
442
            onActiveChanged: {
2587
443
                if (!SessionManager.active) {
2588
444
                    launcher.hide()
2589
445
                    panel.indicators.hide()
2590
446
                }
2591
447
            }
2592
448
        }
2593
585
    }
449
    }
2594
586
450
2595
587
    focus: true
2596
588
    onFocusChanged: if (!focus) forceActiveFocus();
2597
589
2598
590
    InputFilterArea {
451
    InputFilterArea {
2599
591
        anchors {
452
        anchors {
2600
592
            top: parent.top
453
            top: parent.top
2601
@@ -607,12 +468,6 @@
2602
607
        blockInput: true
468
        blockInput: true
2603
608
    }
469
    }
2604
609
470
2605
610
    Binding {
2606
611
        target: i18n
2607
612
        property: "domain"
2608
613
        value: "unity8"
2609
614
    }
2610
615
2611
616
    OSKController {
471
    OSKController {
2612
617
        anchors.topMargin: panel.panelHeight
472
        anchors.topMargin: panel.panelHeight
2613
618
        anchors.fill: parent // as needs to know the geometry of the shell
473
        anchors.fill: parent // as needs to know the geometry of the shell
2614
@@ -644,7 +499,6 @@
2615
644
499
2616
645
    EdgeDemo {
500
    EdgeDemo {
2617
646
        id: edgeDemo
501
        id: edgeDemo
2618
647
        greeter: greeter
2619
648
        launcher: launcher
502
        launcher: launcher
2620
649
        dash: dash
503
        dash: dash
2621
650
        indicators: panel.indicators
504
        indicators: panel.indicators
2622
@@ -653,6 +507,6 @@
2623
653
507
2624
654
    Connections {
508
    Connections {
2625
655
        target: SessionBroadcast
509
        target: SessionBroadcast
2627
656
        onShowHome: showHome()
510
        onShowHome: showHome(false)
2628
657
    }
511
    }
2629
658
}
512
}
2630
659
513
2631
=== modified file 'run.sh'
2632
--- run.sh	2014-05-13 08:33:21 +0000
2633
+++ run.sh	2014-05-29 14:11:15 +0000
2634
@@ -18,13 +18,14 @@
2635
18
    echo " -p, --pinlock Use a pin protected user." >&2
18
    echo " -p, --pinlock Use a pin protected user." >&2
2636
19
    echo " -k, --keylock Use a passphrase protected user." >&2
19
    echo " -k, --keylock Use a passphrase protected user." >&2
2637
20
    echo " -g, --gdb Run through gdb." >&2
20
    echo " -g, --gdb Run through gdb." >&2
2638
21
    echo " -G, --greeter  Run the greeter instead of the shell." >&2
2639
21
    echo " -h, --help Show this help." >&2
22
    echo " -h, --help Show this help." >&2
2640
22
    echo " -m, --nomousetouch Run without -mousetouch argument." >&2
23
    echo " -m, --nomousetouch Run without -mousetouch argument." >&2
2641
23
    echo >&2
24
    echo >&2
2642
24
    exit 1
25
    exit 1
2643
25
}
26
}
2644
26
27
2646
27
ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,nomousetouch" -o "fpkghm" -- "$@"`
28
ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,greeter,help,nomousetouch" -o "fpkgGhm" -- "$@"`
2647
28
[ $? -ne 0 ] && usage
29
[ $? -ne 0 ] && usage
2648
29
eval set -- "$ARGS"
30
eval set -- "$ARGS"
2649
30
31
2650
@@ -35,6 +36,7 @@
2651
35
       -p|--pinlock)  PINLOCK=true;;
36
       -p|--pinlock)  PINLOCK=true;;
2652
36
       -k|--keylock)  KEYLOCK=true;;
37
       -k|--keylock)  KEYLOCK=true;;
2653
37
       -g|--gdb)   GDB=true;;
38
       -g|--gdb)   GDB=true;;
2654
39
       -G|--greeter)  QML_PHONE_SHELL_PATH=./builddir/src/unity8-greeter;;
2655
38
       -h|--help)  usage;;
40
       -h|--help)  usage;;
2656
39
       -m|--nomousetouch)  MOUSE_TOUCH=false;;
41
       -m|--nomousetouch)  MOUSE_TOUCH=false;;
2657
40
       --)         shift;break;;
42
       --)         shift;break;;
2658
@@ -44,17 +46,17 @@
2659
44
46
2660
45
if $FAKE; then
47
if $FAKE; then
2661
46
  export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
48
  export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
2663
47
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
49
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/liblightdm/single
2664
48
fi
50
fi
2665
49
51
2666
50
if $PINLOCK; then
52
if $PINLOCK; then
2667
51
  export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
53
  export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
2669
52
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin
54
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/liblightdm/single-pin
2670
53
fi
55
fi
2671
54
56
2672
55
if $KEYLOCK; then
57
if $KEYLOCK; then
2673
56
  export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
58
  export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
2675
57
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
59
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/liblightdm/single-passphrase
2676
58
fi
60
fi
2677
59
61
2678
60
# Force icon theme if running on the desktop, otherwise gnome theme (if running
62
# Force icon theme if running on the desktop, otherwise gnome theme (if running
2679
61
63
2680
=== modified file 'src/CMakeLists.txt'
2681
--- src/CMakeLists.txt	2014-01-09 08:59:44 +0000
2682
+++ src/CMakeLists.txt	2014-05-29 14:11:15 +0000
2683
@@ -15,24 +15,36 @@
2684
15
    ${CMAKE_SOURCE_DIR}/tests/*.svg
15
    ${CMAKE_SOURCE_DIR}/tests/*.svg
2685
16
)
16
)
2686
17
17
2688
18
add_executable(${SHELL_APP}
18
set(COMMON_SRCS
2689
19
    ApplicationArguments.h
19
    ApplicationArguments.h
2690
20
    main.cpp
20
    main.cpp
2691
21
    MouseTouchAdaptor.cpp
21
    MouseTouchAdaptor.cpp
2692
22
    ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
22
    ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
2694
23
)
23
    )
2695
24
add_executable(${SHELL_APP} ${COMMON_SRCS})
2696
25
add_executable(${GREETER_APP} ${COMMON_SRCS})
2697
26
2698
27
set_target_properties(${SHELL_APP} PROPERTIES
2699
28
    COMPILE_DEFINITIONS "UNITY8_GREETER=0"
2700
29
    )
2701
30
set_target_properties(${GREETER_APP} PROPERTIES
2702
31
    COMPILE_DEFINITIONS "UNITY8_GREETER=1"
2703
32
    )
2704
24
33
2705
25
qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
34
qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
2706
35
qt5_use_modules(${GREETER_APP} Gui Qml Quick Test)
2707
26
pkg_check_modules(XCB REQUIRED xcb)
36
pkg_check_modules(XCB REQUIRED xcb)
2708
27
37
2709
28
if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
38
if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
2710
29
    set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
39
    set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
2711
40
    set_target_properties(${GREETER_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
2712
30
41
2713
31
    target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
42
    target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
2714
43
    target_link_libraries(${GREETER_APP} ${XCB_LDFLAGS})
2715
32
endif()
44
endif()
2716
33
45
2717
34
# install binaries
46
# install binaries
2719
35
install(TARGETS ${SHELL_APP}
47
install(TARGETS ${SHELL_APP} ${GREETER_APP}
2720
36
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
48
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
2721
37
     )
49
     )
2722
38
50
2723
39
51
2724
=== modified file 'src/main.cpp'
2725
--- src/main.cpp	2014-05-13 08:33:50 +0000
2726
+++ src/main.cpp	2014-05-29 14:11:15 +0000
2727
@@ -26,6 +26,7 @@
2728
26
#include <qpa/qplatformnativeinterface.h>
26
#include <qpa/qplatformnativeinterface.h>
2729
27
#include <QLibrary>
27
#include <QLibrary>
2730
28
#include <QDebug>
28
#include <QDebug>
2731
29
#include <QProcess>
2732
29
#include <libintl.h>
30
#include <libintl.h>
2733
30
#include <dlfcn.h>
31
#include <dlfcn.h>
2734
31
#include <csignal>
32
#include <csignal>
2735
@@ -42,7 +43,7 @@
2736
42
{
43
{
2737
43
    const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
44
    const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
2738
44
45
2740
45
    QGuiApplication::setApplicationName("Unity 8");
46
    QGuiApplication::setApplicationName(UNITY8_GREETER ? "Unity 8 Greeter" : "Unity 8");
2741
46
    QGuiApplication *application;
47
    QGuiApplication *application;
2742
47
48
2743
48
    QCommandLineParser parser;
49
    QCommandLineParser parser;
2744
@@ -93,7 +94,7 @@
2745
93
94
2746
94
    QString indicatorProfile = qgetenv("UNITY_INDICATOR_PROFILE");
95
    QString indicatorProfile = qgetenv("UNITY_INDICATOR_PROFILE");
2747
95
    if (indicatorProfile.isEmpty()) {
96
    if (indicatorProfile.isEmpty()) {
2749
96
        indicatorProfile = "phone";
97
        indicatorProfile = UNITY8_GREETER ? "phone_greeter" : "phone";
2750
97
    }
98
    }
2751
98
99
2752
99
    resolveIconTheme();
100
    resolveIconTheme();
2753
@@ -152,7 +153,7 @@
2754
152
    nativeInterface->setProperty("ubuntuSessionType", 1);
153
    nativeInterface->setProperty("ubuntuSessionType", 1);
2755
153
    view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
154
    view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
2756
154
155
2758
155
    QUrl source(::qmlDirectory()+"Shell.qml");
156
    QUrl source(::qmlDirectory() + (UNITY8_GREETER ? "GreeterShell.qml" : "Shell.qml"));
2759
156
    prependImportPaths(view->engine(), ::overrideImportPaths());
157
    prependImportPaths(view->engine(), ::overrideImportPaths());
2760
157
    if (!isUbuntuMirServer) {
158
    if (!isUbuntuMirServer) {
2761
158
        prependImportPaths(view->engine(), ::nonMirImportPaths());
159
        prependImportPaths(view->engine(), ::nonMirImportPaths());
2762
@@ -160,7 +161,7 @@
2763
160
    appendImportPaths(view->engine(), ::fallbackImportPaths());
161
    appendImportPaths(view->engine(), ::fallbackImportPaths());
2764
161
162
2765
162
    view->setSource(source);
163
    view->setSource(source);
2767
163
    view->setColor("transparent");
164
    view->setColor(Qt::transparent);
2768
164
165
2769
165
    if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || parser.isSet(fullscreenOption)) {
166
    if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || parser.isSet(fullscreenOption)) {
2770
166
        view->showFullScreen();
167
        view->showFullScreen();
2771
@@ -168,6 +169,19 @@
2772
168
        view->show();
169
        view->show();
2773
169
    }
170
    }
2774
170
171
2775
172
#if UNITY8_GREETER
2776
173
    if (isUbuntuMirServer) {
2777
174
        // Add alpha to surface, so that the greeter can bleed through
2778
175
        QSurfaceFormat format;
2779
176
        format.setAlphaBufferSize(8);
2780
177
        view->setFormat(format);
2781
178
    }
2782
179
2783
180
    if (!QProcess::startDetached("/sbin/initctl emit --no-wait unity8-greeter-started")) {
2784
181
        qDebug() << "Unable to send unity8-greeter-started event to Upstart";
2785
182
    }
2786
183
#endif
2787
184
2788
171
    int result = application->exec();
185
    int result = application->exec();
2789
172
186
2790
173
    delete view;
187
    delete view;
2791
174
188
2792
=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/__init__.py'
2793
--- tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2014-04-14 19:45:11 +0000
2794
+++ tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2014-05-29 14:11:15 +0000
2795
@@ -31,8 +31,6 @@
2796
31
        super(ApplicationLifeCycleTestCase, self).setUp()
31
        super(ApplicationLifeCycleTestCase, self).setUp()
2797
32
        self._qml_mock_enabled = False
32
        self._qml_mock_enabled = False
2798
33
        self._data_dirs_mock_enabled = False
33
        self._data_dirs_mock_enabled = False
2799
34
        unity_proxy = self.launch_unity()
2800
35
        process_helpers.unlock_unity(unity_proxy)
2801
36
34
2802
37
    def create_test_application(self):
35
    def create_test_application(self):
2803
38
        desktop_file_dict = fixture_setup.DEFAULT_DESKTOP_FILE_DICT
36
        desktop_file_dict = fixture_setup.DEFAULT_DESKTOP_FILE_DICT
2804
39
37
2805
=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
2806
--- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-04-14 19:45:11 +0000
2807
+++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-05-29 14:11:15 +0000
2808
@@ -24,11 +24,8 @@
2809
24
import logging
24
import logging
2810
25
import os
25
import os
2811
26
26
2812
27
from autopilot.matchers import Eventually
2813
28
from autopilot.platform import model
27
from autopilot.platform import model
2814
29
from testtools.matchers import Equals
2815
30
28
2816
31
from unity8 import process_helpers
2817
32
from unity8.application_lifecycle import tests
29
from unity8.application_lifecycle import tests
2818
33
30
2819
34
31
2820
@@ -41,6 +38,7 @@
2821
41
        if model() == 'Desktop':
38
        if model() == 'Desktop':
2822
42
            self.skipTest('Test cannot be run on the desktop.')
39
            self.skipTest('Test cannot be run on the desktop.')
2823
43
        super(ApplicationLifecycleTests, self).setUp()
40
        super(ApplicationLifecycleTests, self).setUp()
2824
41
        self.launch_unity()
2825
44
42
2826
45
    def swipe_screen_from_right(self):
43
    def swipe_screen_from_right(self):
2827
46
        width = self.main_window.width
44
        width = self.main_window.width
2828
@@ -89,29 +87,3 @@
2829
89
        self.swipe_screen_from_right()
87
        self.swipe_screen_from_right()
2830
90
88
2831
91
        self.assert_current_focused_application(application1_name)
89
        self.assert_current_focused_application(application1_name)
2832
92
2833
93
    def test_greeter_hides_on_app_open(self):
2834
94
        """Greeter should hide when an app is opened"""
2835
95
        process_helpers.lock_unity()
2836
96
        greeter = self.main_window.get_greeter()
2837
97
        self.assertThat(greeter.created, Eventually(Equals(True)))
2838
98
2839
99
        application_name = self.launch_fake_app()
2840
100
        self.assertThat(greeter.created, Eventually(Equals(False)))
2841
101
        self.assert_current_focused_application(application_name)
2842
102
2843
103
    def test_greeter_hides_on_app_focus(self):
2844
104
        """Greeter should hide when an app is re-focused"""
2845
105
        application_name = self.launch_fake_app()
2846
106
        self.assert_current_focused_application(application_name)
2847
107
2848
108
        self.main_window.show_dash_swiping()
2849
109
        self.assert_current_focused_application('')
2850
110
2851
111
        process_helpers.lock_unity()
2852
112
        greeter = self.main_window.get_greeter()
2853
113
        self.assertThat(greeter.created, Eventually(Equals(True)))
2854
114
2855
115
        self.launch_upstart_application(application_name)
2856
116
        self.assertThat(greeter.created, Eventually(Equals(False)))
2857
117
        self.assert_current_focused_application(application_name)
2858
118
90
2859
=== added file 'tests/autopilot/unity8/application_lifecycle/tests/test_greeter.py'
2860
--- tests/autopilot/unity8/application_lifecycle/tests/test_greeter.py	1970-01-01 00:00:00 +0000
2861
+++ tests/autopilot/unity8/application_lifecycle/tests/test_greeter.py	2014-05-29 14:11:15 +0000
2862
@@ -0,0 +1,75 @@
2863
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2864
2
#
2865
3
# Unity Autopilot Test Suite
2866
4
# Copyright (C) 2013, 2014 Canonical
2867
5
#
2868
6
# This program is free software: you can redistribute it and/or modify
2869
7
# it under the terms of the GNU General Public License as published by
2870
8
# the Free Software Foundation, either version 3 of the License, or
2871
9
# (at your option) any later version.
2872
10
#
2873
11
# This program is distributed in the hope that it will be useful,
2874
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
2875
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2876
14
# GNU General Public License for more details.
2877
15
#
2878
16
# You should have received a copy of the GNU General Public License
2879
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
2880
18
#
2881
19
2882
20
"""Tests for the application lifecycle in the greeter."""
2883
21
2884
22
from __future__ import absolute_import
2885
23
2886
24
import logging
2887
25
import os
2888
26
import subprocess
2889
27
2890
28
from autopilot.matchers import Eventually
2891
29
from autopilot.platform import model
2892
30
from testtools.matchers import Equals
2893
31
2894
32
from unity8.application_lifecycle import tests
2895
33
from unity8.shell import with_lightdm_mock
2896
34
2897
35
2898
36
logger = logging.getLogger(__name__)
2899
37
2900
38
2901
39
class GreeterApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):
2902
40
2903
41
    def setUp(self):
2904
42
        if model() == 'Desktop':
2905
43
            self.skipTest('Test cannot be run on the desktop.')
2906
44
        super(GreeterApplicationLifecycleTests, self).setUp()
2907
45
        # Kill user's url-dispatcher daemon, because we want to own its dbus
2908
46
        # name during these tests.
2909
47
        try:
2910
48
            subprocess.check_output(
2911
49
                ["/sbin/initctl", "stop", "url-dispatcher"],
2912
50
                stderr=subprocess.STDOUT
2913
51
            )
2914
52
        except subprocess.CalledProcessError:
2915
53
            logger.warning("Appears url-dispatcher was already stopped!")
2916
54
        self.addCleanup(self._start_dispatcher)
2917
55
        self.launch_greeter()
2918
56
2919
57
    def _start_dispatcher(self):
2920
58
        subprocess.call(
2921
59
            ["/sbin/initctl", "start", "url-dispatcher"],
2922
60
            stderr=subprocess.STDOUT
2923
61
        )
2924
62
2925
63
    @with_lightdm_mock("single")
2926
64
    def test_greeter_hides_on_url_dispatcher(self):
2927
65
        """Greeter should hide when an app is opened"""
2928
66
        greeter = self.main_window.get_greeter()
2929
67
        self.assertThat(greeter.created, Eventually(Equals(True)))
2930
68
2931
69
        _, desktop_file_path = self.create_test_application()
2932
70
        desktop_file_name = os.path.basename(desktop_file_path)
2933
71
        application_name, _ = os.path.splitext(desktop_file_name)
2934
72
2935
73
        subprocess.check_call(
2936
74
            ['url-dispatcher', 'application:///{}'.format(desktop_file_name)])
2937
75
        self.assertThat(greeter.created, Eventually(Equals(False)))
2938
0
76
2939
=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py'
2940
--- tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-04-11 16:01:28 +0000
2941
+++ tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-05-29 14:11:15 +0000
2942
@@ -33,6 +33,7 @@
2943
33
        if platform.model() == 'Desktop':
33
        if platform.model() == 'Desktop':
2944
34
            self.skipTest("URL dispatcher doesn't work on the desktop.")
34
            self.skipTest("URL dispatcher doesn't work on the desktop.")
2945
35
        super(URLDispatcherTestCase, self).setUp()
35
        super(URLDispatcherTestCase, self).setUp()
2946
36
        self.launch_unity()
2947
36
37
2948
37
    def test_swipe_out_application_started_by_url_dispatcher(self):
38
    def test_swipe_out_application_started_by_url_dispatcher(self):
2949
38
        _, desktop_file_path = self.create_test_application()
39
        _, desktop_file_path = self.create_test_application()
2950
39
40
2951
=== modified file 'tests/autopilot/unity8/indicators/tests/test_indicators.py'
2952
--- tests/autopilot/unity8/indicators/tests/test_indicators.py	2014-04-09 15:28:42 +0000
2953
+++ tests/autopilot/unity8/indicators/tests/test_indicators.py	2014-05-29 14:11:15 +0000
2954
@@ -22,7 +22,6 @@
2955
22
22
2956
23
from autopilot import platform
23
from autopilot import platform
2957
24
24
2958
25
from unity8.process_helpers import unlock_unity
2959
26
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
25
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
2960
27
26
2961
28
27
2962
@@ -35,7 +34,6 @@
2963
35
            self.skipTest('Test cannot be run on the desktop.')
34
            self.skipTest('Test cannot be run on the desktop.')
2964
36
        super(IndicatorTestCase, self).setUp()
35
        super(IndicatorTestCase, self).setUp()
2965
37
        self.unity_proxy = self.launch_unity()
36
        self.unity_proxy = self.launch_unity()
2966
38
        unlock_unity(self.unity_proxy)
2967
39
37
2968
40
38
2969
41
class IndicatorExistsTestCase(IndicatorTestCase):
39
class IndicatorExistsTestCase(IndicatorTestCase):
2970
42
40
2971
=== modified file 'tests/autopilot/unity8/process_helpers.py'
2972
--- tests/autopilot/unity8/process_helpers.py	2014-05-14 22:48:45 +0000
2973
+++ tests/autopilot/unity8/process_helpers.py	2014-05-29 14:11:15 +0000
2974
@@ -40,62 +40,6 @@
2975
40
    pass
40
    pass
2976
41
41
2977
42
42
2978
43
def unlock_unity(unity_proxy_obj=None):
2979
44
    """Helper function that attempts to unlock the unity greeter.
2980
45
2981
46
    If unity_proxy_object is None create a proxy object by querying for the
2982
47
    running unity process.
2983
48
    Otherwise re-use the passed proxy object.
2984
49
2985
50
    :raises RuntimeError: if the greeter attempts and fails to be unlocked.
2986
51
2987
52
    :raises RuntimeWarning: when the greeter cannot be found because it is
2988
53
      already unlocked.
2989
54
    :raises CannotAccessUnity: if unity is not introspectable or cannot be
2990
55
      found on dbus.
2991
56
    :raises CannotAccessUnity: if unity's upstart status is not "start" or the
2992
57
      upstart job cannot be found at all.
2993
58
2994
59
    """
2995
60
    if unity_proxy_obj is None:
2996
61
        try:
2997
62
            pid = _get_unity_pid()
2998
63
            unity = _get_unity_proxy_object(pid)
2999
64
            main_window = unity.select_single(main_window_emulator.QQuickView)
3000
65
        except ProcessSearchError as e:
3001
66
            raise CannotAccessUnity(
3002
67
                "Cannot introspect unity, make sure that it has been started "
3003
68
                "with testability. Perhaps use the function "
3004
69
                "'restart_unity_with_testability' this module provides."
3005
70
                "(%s)"
3006
71
                % str(e)
3007
72
            )
3008
73
    else:
3009
74
        main_window = unity_proxy_obj.select_single(
3010
75
            main_window_emulator.QQuickView)
3011
76
3012
77
    greeter = main_window.get_greeter()
3013
78
    if greeter.created == False:
3014
79
        raise RuntimeWarning("Greeter appears to be already unlocked.")
3015
80
3016
81
    # Because of potential input jerkiness under heavy load,
3017
82
    # retry unlocking the greeter two times.
3018
83
    # https://bugs.launchpad.net/ubuntu/+bug/1260113
3019
84
3020
85
    retries = 3
3021
86
    while retries > 0:
3022
87
        try:
3023
88
            greeter.swipe()
3024
89
        except AssertionError:
3025
90
            retries -= 1
3026
91
            if retries == 0:
3027
92
                raise
3028
93
            logger.info("Failed to unlock greeter, trying again...")
3029
94
        else:
3030
95
            logger.info("Greeter unlocked, continuing.")
3031
96
            break
3032
97
3033
98
3034
99
def lock_unity(unity_proxy_obj=None):
43
def lock_unity(unity_proxy_obj=None):
3035
100
    """Helper function that attempts to lock the unity greeter."""
44
    """Helper function that attempts to lock the unity greeter."""
3036
101
    import evdev, time
45
    import evdev, time
3037
102
46
3038
=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
3039
--- tests/autopilot/unity8/shell/tests/__init__.py	2014-03-27 12:37:44 +0000
3040
+++ tests/autopilot/unity8/shell/tests/__init__.py	2014-05-29 14:11:15 +0000
3041
@@ -249,9 +249,9 @@
3042
249
                "%s=%s" % (key, value)
249
                "%s=%s" % (key, value)
3043
250
            ], stderr=subprocess.STDOUT)
250
            ], stderr=subprocess.STDOUT)
3044
251
251
3046
252
    def launch_unity(self, **kwargs):
252
    def _launch(self, executable, ready_func, **kwargs):
3047
253
        """Launch the unity shell, return a proxy object for it."""
253
        """Launch the unity shell, return a proxy object for it."""
3049
254
        binary_path = get_binary_path()
254
        binary_path = get_binary_path(executable)
3050
255
        lib_path = get_lib_path()
255
        lib_path = get_lib_path()
3051
256
256
3052
257
        logger.info(
257
        logger.info(
3053
@@ -293,11 +293,19 @@
3054
293
293
3055
294
        # Ensure that the dash is visible before we return:
294
        # Ensure that the dash is visible before we return:
3056
295
        logger.debug("Unity started, waiting for it to be ready.")
295
        logger.debug("Unity started, waiting for it to be ready.")
3058
296
        self.assertUnityReady()
296
        ready_func()
3059
297
        logger.debug("Unity loaded and ready.")
297
        logger.debug("Unity loaded and ready.")
3060
298
298
3061
299
        return app_proxy
299
        return app_proxy
3062
300
300
3063
301
    def launch_unity(self, **kwargs):
3064
302
        """Launch the unity shell, return a proxy object for it."""
3065
303
        return self._launch("unity8", self.assertUnityReady, **kwargs)
3066
304
3067
305
    def launch_greeter(self, **kwargs):
3068
306
        """Launch the unity shell, return a proxy object for it."""
3069
307
        return self._launch("unity8-greeter", self.assertGreeterReady, **kwargs)
3070
308
3071
301
    def _launch_unity_with_upstart(self, binary_path, args):
309
    def _launch_unity_with_upstart(self, binary_path, args):
3072
302
        logger.info("Starting unity")
310
        logger.info("Starting unity")
3073
303
        self._patch_environment("QT_LOAD_TESTABILITY", 1)
311
        self._patch_environment("QT_LOAD_TESTABILITY", 1)
3074
@@ -344,7 +352,7 @@
3075
344
    def _get_lightdm_mock_path(self, mock_type):
352
    def _get_lightdm_mock_path(self, mock_type):
3076
345
        lib_path = get_mocks_library_path()
353
        lib_path = get_mocks_library_path()
3077
346
        lightdm_mock_path = os.path.abspath(
354
        lightdm_mock_path = os.path.abspath(
3079
347
            os.path.join(lib_path, "LightDM", mock_type)
355
            os.path.join(lib_path, "liblightdm", mock_type)
3080
348
        )
356
        )
3081
349
357
3082
350
        if not os.path.exists(lightdm_mock_path):
358
        if not os.path.exists(lightdm_mock_path):
3083
@@ -386,6 +394,10 @@
3084
386
        )
394
        )
3085
387
        self.assertThat(home_scope.isCurrent, Eventually(Equals(True)))
395
        self.assertThat(home_scope.isCurrent, Eventually(Equals(True)))
3086
388
396
3087
397
    def assertGreeterReady(self):
3088
398
        greeter = self.main_window.get_greeter()
3089
399
        self.assertThat(greeter.created, Eventually(Equals(True)))
3090
400
3091
389
    def get_dash(self):
401
    def get_dash(self):
3092
390
        dash = self._proxy.wait_select_single(Dash)
402
        dash = self._proxy.wait_select_single(Dash)
3093
391
        return dash
403
        return dash
3094
392
404
3095
=== modified file 'tests/autopilot/unity8/shell/tests/disabled_test_hud.py'
3096
--- tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-03-17 11:44:05 +0000
3097
+++ tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-05-29 14:11:15 +0000
3098
@@ -19,8 +19,7 @@
3099
19
19
3100
20
from __future__ import absolute_import
20
from __future__ import absolute_import
3101
21
21
3104
22
from unity8.process_helpers import unlock_unity
22
from unity8.shell import DragMixin
3103
23
from unity8.shell import with_lightdm_mock, DragMixin
3105
24
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
23
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
3106
25
24
3107
26
from testtools.matchers import Equals
25
from testtools.matchers import Equals
3108
@@ -40,7 +39,6 @@
3109
40
39
3110
41
        """
40
        """
3111
42
        unity_proxy = self.launch_unity()
41
        unity_proxy = self.launch_unity()
3112
43
        unlock_unity(unity_proxy)
3113
44
        hud_show_button = self.main_window.get_hud_show_button()
42
        hud_show_button = self.main_window.get_hud_show_button()
3114
45
        edge_drag_area = self.main_window.get_hud_edge_drag_area()
43
        edge_drag_area = self.main_window.get_hud_edge_drag_area()
3115
46
        hud = self.main_window.get_hud()
44
        hud = self.main_window.get_hud()
3116
@@ -81,7 +79,6 @@
3117
81
79
3118
82
        """
80
        """
3119
83
        unity_proxy = self.launch_unity()
81
        unity_proxy = self.launch_unity()
3120
84
        unlock_unity(unity_proxy)
3121
85
        hud_show_button = self.main_window.get_hud_show_button()
82
        hud_show_button = self.main_window.get_hud_show_button()
3122
86
        hud = self.main_window.get_hud()
83
        hud = self.main_window.get_hud()
3123
87
84
3124
@@ -117,7 +114,6 @@
3125
117
    def test_hide_hud_click(self):
114
    def test_hide_hud_click(self):
3126
118
        """Tapping the close button of the Hud must dismiss it."""
115
        """Tapping the close button of the Hud must dismiss it."""
3127
119
        unity_proxy = self.launch_unity()
116
        unity_proxy = self.launch_unity()
3128
120
        unlock_unity(unity_proxy)
3129
121
        hud = self.main_window.get_hud()
117
        hud = self.main_window.get_hud()
3130
122
118
3131
123
        self._launch_test_app_from_app_screen()
119
        self._launch_test_app_from_app_screen()
3132
@@ -134,7 +130,6 @@
3133
134
130
3134
135
        """
131
        """
3135
136
        unity_proxy = self.launch_unity()
132
        unity_proxy = self.launch_unity()
3136
137
        unlock_unity(unity_proxy)
3137
138
        hud = self.main_window.get_hud()
133
        hud = self.main_window.get_hud()
3138
139
134
3139
140
        self._launch_test_app_from_app_screen()
135
        self._launch_test_app_from_app_screen()
3140
@@ -151,7 +146,6 @@
3141
151
    def test_launcher_hides_hud(self):
146
    def test_launcher_hides_hud(self):
3142
152
        """Opening the Launcher while the Hud is active must close the Hud."""
147
        """Opening the Launcher while the Hud is active must close the Hud."""
3143
153
        unity_proxy = self.launch_unity()
148
        unity_proxy = self.launch_unity()
3144
154
        unlock_unity(unity_proxy)
3145
155
        hud = self.main_window.get_hud()
149
        hud = self.main_window.get_hud()
3146
156
        launcher = self.main_window.get_launcher()
150
        launcher = self.main_window.get_launcher()
3147
157
151
3148
158
152
3149
=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
3150
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-04-17 08:17:09 +0000
3151
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-05-29 14:11:15 +0000
3152
@@ -34,7 +34,6 @@
3153
34
34
3154
35
from testtools.matchers import Contains, HasLength
35
from testtools.matchers import Contains, HasLength
3155
36
36
3156
37
from unity8 import process_helpers
3157
38
from unity8.shell import emulators, fixture_setup, tests
37
from unity8.shell import emulators, fixture_setup, tests
3158
39
from unity8.shell.emulators import dash as dash_emulators
38
from unity8.shell.emulators import dash as dash_emulators
3159
40
39
3160
@@ -46,7 +45,6 @@
3161
46
    def setUp(self):
45
    def setUp(self):
3162
47
        super(MainWindowTestCase, self).setUp()
46
        super(MainWindowTestCase, self).setUp()
3163
48
        unity_proxy = self.launch_unity()
47
        unity_proxy = self.launch_unity()
3164
49
        process_helpers.unlock_unity(unity_proxy)
3165
50
48
3166
51
    def test_search(self):
49
    def test_search(self):
3167
52
        self.main_window.search('Test')
50
        self.main_window.search('Test')
3168
@@ -62,7 +60,6 @@
3169
62
    def setUp(self):
60
    def setUp(self):
3170
63
        super(DashBaseTestCase, self).setUp()
61
        super(DashBaseTestCase, self).setUp()
3171
64
        unity_proxy = self.launch_unity()
62
        unity_proxy = self.launch_unity()
3172
65
        process_helpers.unlock_unity(unity_proxy)
3173
66
        self.dash = self.main_window.get_dash()
63
        self.dash = self.main_window.get_dash()
3174
67
64
3175
68
65
3176
69
66
3177
=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
3178
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-02-22 00:12:49 +0000
3179
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-05-29 14:11:15 +0000
3180
@@ -20,7 +20,6 @@
3181
20
20
3182
21
from __future__ import absolute_import
21
from __future__ import absolute_import
3183
22
22
3184
23
from unity8.process_helpers import unlock_unity
3185
24
from unity8.shell import with_lightdm_mock
23
from unity8.shell import with_lightdm_mock
3186
25
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
24
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
3187
26
25
3188
@@ -47,41 +46,41 @@
3189
47
    @with_lightdm_mock("single-pin")
46
    @with_lightdm_mock("single-pin")
3190
48
    def test_can_unlock_pin_screen(self):
47
    def test_can_unlock_pin_screen(self):
3191
49
        """Must be able to unlock the PIN entry lock screen."""
48
        """Must be able to unlock the PIN entry lock screen."""
3193
50
        unity_proxy = self.launch_unity()
49
        self.launch_greeter()
3194
51
        greeter = self.main_window.get_greeter()
50
        greeter = self.main_window.get_greeter()
3195
52
51
3196
53
        if greeter.narrowMode:
52
        if greeter.narrowMode:
3198
54
            unlock_unity(unity_proxy)
53
            greeter.swipe()
3199
55
            lockscreen = self._wait_for_lockscreen()
54
            lockscreen = self._wait_for_lockscreen()
3200
56
            self._enter_pincode("1234")
55
            self._enter_pincode("1234")
3201
57
            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
56
            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
3202
58
        else:
57
        else:
3203
59
            self._enter_prompt_passphrase("1234")
58
            self._enter_prompt_passphrase("1234")
3205
60
            self.assertThat(greeter.shown, Eventually(Equals(False)))
59
            self.assertThat(greeter.enabled, Eventually(Equals(False)))
3206
61
60
3207
62
    @with_lightdm_mock("single-passphrase")
61
    @with_lightdm_mock("single-passphrase")
3208
63
    def test_can_unlock_passphrase_screen(self):
62
    def test_can_unlock_passphrase_screen(self):
3209
64
        """Must be able to unlock the passphrase entry screen."""
63
        """Must be able to unlock the passphrase entry screen."""
3211
65
        unity_proxy = self.launch_unity()
64
        self.launch_greeter()
3212
66
        greeter = self.main_window.get_greeter()
65
        greeter = self.main_window.get_greeter()
3213
67
66
3214
68
        if greeter.narrowMode:
67
        if greeter.narrowMode:
3216
69
            unlock_unity(unity_proxy)
68
            greeter.swipe()
3217
70
            lockscreen = self._wait_for_lockscreen()
69
            lockscreen = self._wait_for_lockscreen()
3218
71
            self._enter_pin_passphrase("password")
70
            self._enter_pin_passphrase("password")
3219
72
            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
71
            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
3220
73
        else:
72
        else:
3221
74
            self._enter_prompt_passphrase("password")
73
            self._enter_prompt_passphrase("password")
3223
75
            self.assertThat(greeter.shown, Eventually(Equals(False)))
74
            self.assertThat(greeter.enabled, Eventually(Equals(False)))
3224
76
75
3225
77
    @with_lightdm_mock("single-pin")
76
    @with_lightdm_mock("single-pin")
3226
78
    def test_pin_screen_wrong_code(self):
77
    def test_pin_screen_wrong_code(self):
3227
79
        """Entering the wrong pin code must not dismiss the lock screen."""
78
        """Entering the wrong pin code must not dismiss the lock screen."""
3229
80
        unity_proxy = self.launch_unity()
79
        self.launch_greeter()
3230
81
        greeter = self.main_window.get_greeter()
80
        greeter = self.main_window.get_greeter()
3231
82
81
3232
83
        if greeter.narrowMode:
82
        if greeter.narrowMode:
3234
84
            unlock_unity(unity_proxy)
83
            greeter.swipe()
3235
85
            lockscreen = self._wait_for_lockscreen()
84
            lockscreen = self._wait_for_lockscreen()
3236
86
            self._enter_pincode("4321")
85
            self._enter_pincode("4321")
3237
87
            pinentryField = self.main_window.get_pinentryField()
86
            pinentryField = self.main_window.get_pinentryField()
3238
@@ -91,16 +90,16 @@
3239
91
            self._enter_prompt_passphrase("4231")
90
            self._enter_prompt_passphrase("4231")
3240
92
            prompt = self.main_window.get_greeter().get_prompt()
91
            prompt = self.main_window.get_greeter().get_prompt()
3241
93
            self.assertThat(prompt.text, Eventually(Equals("")))
92
            self.assertThat(prompt.text, Eventually(Equals("")))
3243
94
            self.assertThat(greeter.shown, Eventually(Equals(True)))
93
            self.assertThat(greeter.enabled, Eventually(Equals(True)))
3244
95
94
3245
96
    @with_lightdm_mock("single-passphrase")
95
    @with_lightdm_mock("single-passphrase")
3246
97
    def test_passphrase_screen_wrong_password(self):
96
    def test_passphrase_screen_wrong_password(self):
3247
98
        """Entering the wrong password must not dismiss the lock screen."""
97
        """Entering the wrong password must not dismiss the lock screen."""
3249
99
        unity_proxy = self.launch_unity()
98
        self.launch_greeter()
3250
100
        greeter = self.main_window.get_greeter()
99
        greeter = self.main_window.get_greeter()
3251
101
100
3252
102
        if greeter.narrowMode:
101
        if greeter.narrowMode:
3254
103
            unlock_unity(unity_proxy)
102
            greeter.swipe()
3255
104
            lockscreen = self._wait_for_lockscreen()
103
            lockscreen = self._wait_for_lockscreen()
3256
105
            self._enter_pin_passphrase("foobar")
104
            self._enter_pin_passphrase("foobar")
3257
106
            pinentryField = self.main_window.get_pinentryField()
105
            pinentryField = self.main_window.get_pinentryField()
3258
@@ -110,7 +109,7 @@
3259
110
            self._enter_prompt_passphrase("foobar")
109
            self._enter_prompt_passphrase("foobar")
3260
111
            prompt = self.main_window.get_greeter().get_prompt()
110
            prompt = self.main_window.get_greeter().get_prompt()
3261
112
            self.assertThat(prompt.text, Eventually(Equals("")))
111
            self.assertThat(prompt.text, Eventually(Equals("")))
3263
113
            self.assertThat(greeter.shown, Eventually(Equals(True)))
112
            self.assertThat(greeter.enabled, Eventually(Equals(True)))
3264
114
113
3265
115
    def _wait_for_lockscreen(self):
114
    def _wait_for_lockscreen(self):
3266
116
        """Wait for the lock screen to load, and return it."""
115
        """Wait for the lock screen to load, and return it."""
3267
117
116
3268
=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
3269
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-04-30 08:42:12 +0000
3270
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-05-29 14:11:15 +0000
3271
@@ -22,7 +22,6 @@
3272
22
from __future__ import absolute_import
22
from __future__ import absolute_import
3273
23
23
3274
24
from unity8 import shell
24
from unity8 import shell
3275
25
from unity8.process_helpers import unlock_unity
3276
26
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
25
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
3277
27
26
3278
28
from testtools.matchers import Equals, NotEquals
27
from testtools.matchers import Equals, NotEquals
3279
@@ -125,7 +124,6 @@
3280
125
    def test_interactive(self):
124
    def test_interactive(self):
3281
126
        """Interactive notification must react upon click on itself."""
125
        """Interactive notification must react upon click on itself."""
3282
127
        unity_proxy = self.launch_unity()
126
        unity_proxy = self.launch_unity()
3283
128
        unlock_unity(unity_proxy)
3284
129
127
3285
130
        notify_list = self._get_notifications_list()
128
        notify_list = self._get_notifications_list()
3286
131
129
3287
@@ -164,7 +162,6 @@
3288
164
        """Rejecting a call should make notification expand and
162
        """Rejecting a call should make notification expand and
3289
165
            offer more options."""
163
            offer more options."""
3290
166
        unity_proxy = self.launch_unity()
164
        unity_proxy = self.launch_unity()
3291
167
        unlock_unity(unity_proxy)
3292
168
165
3293
169
        summary = "Incoming call"
166
        summary = "Incoming call"
3294
170
        body = "Frank Zappa\n+44 (0)7736 027340"
167
        body = "Frank Zappa\n+44 (0)7736 027340"
3295
@@ -214,7 +211,6 @@
3296
214
    def test_modal_sd_without_greeter (self):
211
    def test_modal_sd_without_greeter (self):
3297
215
        """A snap-decision on a phone should block input to shell beneath it when there's no greeter."""
212
        """A snap-decision on a phone should block input to shell beneath it when there's no greeter."""
3298
216
        unity_proxy = self.launch_unity()
213
        unity_proxy = self.launch_unity()
3299
217
        unlock_unity(unity_proxy)
3300
218
214
3301
219
        summary = "Incoming file"
215
        summary = "Incoming file"
3302
220
        body = "Frank would like to send you the file: essay.pdf"
216
        body = "Frank would like to send you the file: essay.pdf"
3303
@@ -255,7 +251,7 @@
3304
255
251
3305
256
    def test_modal_sd_with_greeter (self):
252
    def test_modal_sd_with_greeter (self):
3306
257
        """A snap-decision on a phone should not block input to the greeter beneath it."""
253
        """A snap-decision on a phone should not block input to the greeter beneath it."""
3308
258
        unity_proxy = self.launch_unity()
254
        unity_proxy = self.launch_greeter()
3309
259
255
3310
260
        summary = "Incoming file"
256
        summary = "Incoming file"
3311
261
        body = "Frank would like to send you the file: essay.pdf"
257
        body = "Frank would like to send you the file: essay.pdf"
3312
@@ -281,8 +277,8 @@
3313
281
277
3314
282
        # verify that we can swipe away the greeter (interact with the "shell")
278
        # verify that we can swipe away the greeter (interact with the "shell")
3315
283
        time.sleep(1)
279
        time.sleep(1)
3316
284
        self.main_window.show_dash_swiping()
3317
285
        greeter = self.main_window.get_greeter()
280
        greeter = self.main_window.get_greeter()
3318
281
        greeter.swipe()
3319
286
        self.assertThat(greeter.shown, Eventually(Equals(False)))
282
        self.assertThat(greeter.shown, Eventually(Equals(False)))
3320
287
283
3321
288
        # verify and interact with the triggered snap-decision notification
284
        # verify and interact with the triggered snap-decision notification
3322
@@ -424,7 +420,6 @@
3323
424
    def test_icon_summary_body(self):
420
    def test_icon_summary_body(self):
3324
425
        """Notification must display the expected summary and body text."""
421
        """Notification must display the expected summary and body text."""
3325
426
        unity_proxy = self.launch_unity()
422
        unity_proxy = self.launch_unity()
3326
427
        unlock_unity(unity_proxy)
3327
428
423
3328
429
        notify_list = self._get_notifications_list()
424
        notify_list = self._get_notifications_list()
3329
430
425
3330
@@ -464,7 +459,6 @@
3331
464
        """Notification must display the expected summary and secondary
459
        """Notification must display the expected summary and secondary
3332
465
        icon."""
460
        icon."""
3333
466
        unity_proxy = self.launch_unity()
461
        unity_proxy = self.launch_unity()
3334
467
        unlock_unity(unity_proxy)
3335
468
462
3336
469
        notify_list = self._get_notifications_list()
463
        notify_list = self._get_notifications_list()
3337
470
464
3338
@@ -501,7 +495,6 @@
3339
501
        """Notifications must be displayed in order according to their
495
        """Notifications must be displayed in order according to their
3340
502
        urgency."""
496
        urgency."""
3341
503
        unity_proxy = self.launch_unity()
497
        unity_proxy = self.launch_unity()
3342
504
        unlock_unity(unity_proxy)
3343
505
498
3344
506
        notify_list = self._get_notifications_list()
499
        notify_list = self._get_notifications_list()
3345
507
500
3346
@@ -588,7 +581,6 @@
3347
588
    def test_summary_and_body(self):
581
    def test_summary_and_body(self):
3348
589
        """Notification must display the expected summary- and body-text."""
582
        """Notification must display the expected summary- and body-text."""
3349
590
        unity_proxy = self.launch_unity()
583
        unity_proxy = self.launch_unity()
3350
591
        unlock_unity(unity_proxy)
3351
592
584
3352
593
        notify_list = self._get_notifications_list()
585
        notify_list = self._get_notifications_list()
3353
594
586
3354
@@ -613,7 +605,6 @@
3355
613
    def test_summary_only(self):
605
    def test_summary_only(self):
3356
614
        """Notification must display only the expected summary-text."""
606
        """Notification must display only the expected summary-text."""
3357
615
        unity_proxy = self.launch_unity()
607
        unity_proxy = self.launch_unity()
3358
616
        unlock_unity(unity_proxy)
3359
617
608
3360
618
        notify_list = self._get_notifications_list()
609
        notify_list = self._get_notifications_list()
3361
619
610
3362
@@ -631,7 +622,6 @@
3363
631
        """Notification must allow updating its contents while being
622
        """Notification must allow updating its contents while being
3364
632
        displayed."""
623
        displayed."""
3365
633
        unity_proxy = self.launch_unity()
624
        unity_proxy = self.launch_unity()
3366
634
        unlock_unity(unity_proxy)
3367
635
625
3368
636
        notify_list = self._get_notifications_list()
626
        notify_list = self._get_notifications_list()
3369
637
627
3370
@@ -669,7 +659,6 @@
3371
669
        """Notification must allow updating its contents and layout while
659
        """Notification must allow updating its contents and layout while
3372
670
        being displayed."""
660
        being displayed."""
3373
671
        unity_proxy = self.launch_unity()
661
        unity_proxy = self.launch_unity()
3374
672
        unlock_unity(unity_proxy)
3375
673
662
3376
674
        notify_list = self._get_notifications_list()
663
        notify_list = self._get_notifications_list()
3377
675
664
3378
@@ -715,7 +704,6 @@
3379
715
    def test_append_hint(self):
704
    def test_append_hint(self):
3380
716
        """Notification has to accumulate body-text using append-hint."""
705
        """Notification has to accumulate body-text using append-hint."""
3381
717
        unity_proxy = self.launch_unity()
706
        unity_proxy = self.launch_unity()
3382
718
        unlock_unity(unity_proxy)
3383
719
707
3384
720
        notify_list = self._get_notifications_list()
708
        notify_list = self._get_notifications_list()
3385
721
709
3386
722
710
3387
=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
3388
--- tests/mocks/AccountsService/AccountsService.cpp	2014-02-20 20:14:40 +0000
3389
+++ tests/mocks/AccountsService/AccountsService.cpp	2014-05-29 14:11:15 +0000
3390
@@ -45,6 +45,15 @@
3391
45
    Q_UNUSED(demoEdges)
45
    Q_UNUSED(demoEdges)
3392
46
}
46
}
3393
47
47
3394
48
bool AccountsService::demoEdgesForCurrentUser() const
3395
49
{
3396
50
    return false;
3397
51
}
3398
52
3399
53
void AccountsService::setDemoEdgesForCurrentUser(bool)
3400
54
{
3401
55
}
3402
56
3403
48
QString AccountsService::backgroundFile() const
57
QString AccountsService::backgroundFile() const
3404
49
{
58
{
3405
50
    return m_backgroundFile;
59
    return m_backgroundFile;
3406
51
60
3407
=== modified file 'tests/mocks/AccountsService/AccountsService.h'
3408
--- tests/mocks/AccountsService/AccountsService.h	2013-09-24 18:50:56 +0000
3409
+++ tests/mocks/AccountsService/AccountsService.h	2014-05-29 14:11:15 +0000
3410
@@ -35,6 +35,10 @@
3411
35
                READ demoEdges
35
                READ demoEdges
3412
36
                WRITE setDemoEdges
36
                WRITE setDemoEdges
3413
37
                NOTIFY demoEdgesChanged)
37
                NOTIFY demoEdgesChanged)
3414
38
    Q_PROPERTY (bool demoEdgesForCurrentUser
3415
39
                READ demoEdgesForCurrentUser
3416
40
                WRITE setDemoEdgesForCurrentUser
3417
41
                NOTIFY demoEdgesForCurrentUserChanged)
3418
38
    Q_PROPERTY (QString backgroundFile
42
    Q_PROPERTY (QString backgroundFile
3419
39
                READ backgroundFile
43
                READ backgroundFile
3420
40
                WRITE setBackgroundFile // only available in mock
44
                WRITE setBackgroundFile // only available in mock
3421
@@ -51,6 +55,8 @@
3422
51
    void setUser(const QString &user);
55
    void setUser(const QString &user);
3423
52
    bool demoEdges() const;
56
    bool demoEdges() const;
3424
53
    void setDemoEdges(bool demoEdges);
57
    void setDemoEdges(bool demoEdges);
3425
58
    bool demoEdgesForCurrentUser() const;
3426
59
    void setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser);
3427
54
    QString backgroundFile() const;
60
    QString backgroundFile() const;
3428
55
    void setBackgroundFile(const QString &backgroundFile);
61
    void setBackgroundFile(const QString &backgroundFile);
3429
56
    bool statsWelcomeScreen() const;
62
    bool statsWelcomeScreen() const;
3430
@@ -59,6 +65,7 @@
3431
59
Q_SIGNALS:
65
Q_SIGNALS:
3432
60
    void userChanged();
66
    void userChanged();
3433
61
    void demoEdgesChanged();
67
    void demoEdgesChanged();
3434
68
    void demoEdgesForCurrentUserChanged();
3435
62
    void backgroundFileChanged();
69
    void backgroundFileChanged();
3436
63
    void statsWelcomeScreenChanged();
70
    void statsWelcomeScreenChanged();
3437
64
71
3438
65
72
3439
=== modified file 'tests/mocks/CMakeLists.txt'
3440
--- tests/mocks/CMakeLists.txt	2014-05-02 22:57:21 +0000
3441
+++ tests/mocks/CMakeLists.txt	2014-05-29 14:11:15 +0000
3442
@@ -31,10 +31,11 @@
3443
31
add_subdirectory(AccountsService)
31
add_subdirectory(AccountsService)
3444
32
add_subdirectory(GSettings.1.0)
32
add_subdirectory(GSettings.1.0)
3445
33
add_subdirectory(HudClient)
33
add_subdirectory(HudClient)
3446
34
add_subdirectory(liblightdm)
3447
34
add_subdirectory(libusermetrics)
35
add_subdirectory(libusermetrics)
3448
35
add_subdirectory(LightDM)
3449
36
add_subdirectory(Powerd)
36
add_subdirectory(Powerd)
3450
37
add_subdirectory(QMenuModel)
37
add_subdirectory(QMenuModel)
3451
38
add_subdirectory(SessionManager)
3452
38
add_subdirectory(Ubuntu)
39
add_subdirectory(Ubuntu)
3453
39
add_subdirectory(Unity)
40
add_subdirectory(Unity)
3454
40
add_subdirectory(QtMultimedia)
41
add_subdirectory(QtMultimedia)
3455
41
42
3456
=== removed directory 'tests/mocks/LightDM/demo'
3457
=== removed file 'tests/mocks/LightDM/demo/CMakeLists.txt'
3458
--- tests/mocks/LightDM/demo/CMakeLists.txt	2013-12-13 01:02:53 +0000
3459
+++ tests/mocks/LightDM/demo/CMakeLists.txt	1970-01-01 00:00:00 +0000
3460
@@ -1,21 +0,0 @@
3461
1
pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
3462
2
3463
3
set(LibLightDM_SOURCES
3464
4
    ../Greeter.cpp
3465
5
    ../UsersModel.cpp
3466
6
    GreeterPrivate.cpp
3467
7
    UsersModelPrivate.cpp
3468
8
    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
3469
9
    )
3470
10
3471
11
add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
3472
12
3473
13
include_directories(
3474
14
    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
3475
15
)
3476
16
3477
17
target_link_libraries(MockLightDM-demo
3478
18
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
3479
19
    )
3480
20
3481
21
qt5_use_modules(MockLightDM-demo Gui)
3482
22
0
3483
=== removed file 'tests/mocks/LightDM/demo/GreeterPrivate.cpp'
3484
--- tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-01-29 19:04:20 +0000
3485
+++ tests/mocks/LightDM/demo/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
3486
@@ -1,70 +0,0 @@
3487
1
/*
3488
2
 * Copyright (C) 2013 Canonical, Ltd.
3489
3
 *
3490
4
 * This program is free software; you can redistribute it and/or modify
3491
5
 * it under the terms of the GNU General Public License as published by
3492
6
 * the Free Software Foundation; version 3.
3493
7
 *
3494
8
 * This program is distributed in the hope that it will be useful,
3495
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3496
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3497
11
 * GNU General Public License for more details.
3498
12
 *
3499
13
 * You should have received a copy of the GNU General Public License
3500
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3501
15
 *
3502
16
 * Author: Michael Terry <michael.terry@canonical.com>
3503
17
 */
3504
18
3505
19
#include "../Greeter.h"
3506
20
#include "../GreeterPrivate.h"
3507
21
#include <QtCore/QDir>
3508
22
#include <QtCore/QSettings>
3509
23
3510
24
namespace QLightDM
3511
25
{
3512
26
3513
27
GreeterPrivate::GreeterPrivate(Greeter* parent)
3514
28
  : authenticated(false),
3515
29
    authenticationUser(),
3516
30
    q_ptr(parent)
3517
31
{
3518
32
}
3519
33
3520
34
void GreeterPrivate::handleAuthenticate()
3521
35
{
3522
36
    Q_Q(Greeter);
3523
37
3524
38
    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
3525
39
    settings.beginGroup(authenticationUser);
3526
40
    QVariant password = settings.value("password", "none");
3527
41
3528
42
    if (password == "pin") {
3529
43
        Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);
3530
44
    } else if (password == "keyboard") {
3531
45
        Q_EMIT q->showPrompt("Password", Greeter::PromptTypeSecret);
3532
46
    } else {
3533
47
        authenticated = true;
3534
48
        Q_EMIT q->authenticationComplete();
3535
49
    }
3536
50
}
3537
51
3538
52
void GreeterPrivate::handleRespond(const QString &response)
3539
53
{
3540
54
    Q_Q(Greeter);
3541
55
3542
56
    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
3543
57
    settings.beginGroup(authenticationUser);
3544
58
    QVariant password = settings.value("password", "none");
3545
59
3546
60
    QString passwordValue;
3547
61
    if (password == "pin") {
3548
62
        passwordValue = settings.value("passwordValue", "1234").toString();
3549
63
    } else {
3550
64
        passwordValue = settings.value("passwordValue", "password").toString();
3551
65
    }
3552
66
    authenticated = (response == passwordValue);
3553
67
    Q_EMIT q->authenticationComplete();
3554
68
}
3555
69
3556
70
}
3557
71
0
3558
=== removed file 'tests/mocks/LightDM/demo/UsersModelPrivate.cpp'
3559
--- tests/mocks/LightDM/demo/UsersModelPrivate.cpp	2014-02-04 14:38:00 +0000
3560
+++ tests/mocks/LightDM/demo/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
3561
@@ -1,41 +0,0 @@
3562
1
/*
3563
2
 * Copyright (C) 2013 Canonical, Ltd.
3564
3
 *
3565
4
 * This program is free software; you can redistribute it and/or modify
3566
5
 * it under the terms of the GNU General Public License as published by
3567
6
 * the Free Software Foundation; version 3.
3568
7
 *
3569
8
 * This program is distributed in the hope that it will be useful,
3570
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3571
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3572
11
 * GNU General Public License for more details.
3573
12
 *
3574
13
 * You should have received a copy of the GNU General Public License
3575
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3576
15
 *
3577
16
 * Author: Michael Terry <michael.terry@canonical.com>
3578
17
 */
3579
18
3580
19
#include "../UsersModelPrivate.h"
3581
20
3582
21
#include <QDir>
3583
22
#include <QSettings>
3584
23
#include <QStringList>
3585
24
3586
25
namespace QLightDM
3587
26
{
3588
27
3589
28
UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
3590
29
  : q_ptr(parent)
3591
30
{
3592
31
    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
3593
32
    QStringList users = settings.value("users", QStringList() << "phablet").toStringList();
3594
33
3595
34
    Q_FOREACH(const QString &user, users)
3596
35
    {
3597
36
        QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();
3598
37
        entries.append({user, name, 0, 0, false, false, 0, 0});
3599
38
    }
3600
39
}
3601
40
3602
41
}
3603
42
0
3604
=== removed file 'tests/mocks/LightDM/qmldir'
3605
--- tests/mocks/LightDM/qmldir	2014-05-02 22:57:21 +0000
3606
+++ tests/mocks/LightDM/qmldir	1970-01-01 00:00:00 +0000
3607
@@ -1,3 +0,0 @@
3608
1
module LightDM
3609
2
plugin MockLightDM-qml
3610
3
typeinfo LightDM.qmltypes
3611
4
0
3612
=== added directory 'tests/mocks/SessionManager'
3613
=== added file 'tests/mocks/SessionManager/CMakeLists.txt'
3614
--- tests/mocks/SessionManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
3615
+++ tests/mocks/SessionManager/CMakeLists.txt	2014-05-29 14:11:15 +0000
3616
@@ -0,0 +1,19 @@
3617
1
add_library(MockSessionManager-qml MODULE
3618
2
    plugin.cpp
3619
3
    SessionManager.cpp
3620
4
    )
3621
5
3622
6
qt5_use_modules(MockSessionManager-qml Qml)
3623
7
3624
8
# copy qmldir file into build directory for shadow builds
3625
9
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
3626
10
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
3627
11
    )
3628
12
3629
13
install(TARGETS MockSessionManager-qml
3630
14
    DESTINATION ${SHELL_INSTALL_QML}/mocks/SessionManager
3631
15
    )
3632
16
3633
17
install(FILES qmldir
3634
18
    DESTINATION ${SHELL_INSTALL_QML}/mocks/SessionManager
3635
19
    )
3636
0
20
3637
=== added file 'tests/mocks/SessionManager/SessionManager.cpp'
3638
--- tests/mocks/SessionManager/SessionManager.cpp	1970-01-01 00:00:00 +0000
3639
+++ tests/mocks/SessionManager/SessionManager.cpp	2014-05-29 14:11:15 +0000
3640
@@ -0,0 +1,43 @@
3641
1
/*
3642
2
 * Copyright (C) 2013 Canonical, Ltd.
3643
3
 *
3644
4
 * This program is free software; you can redistribute it and/or modify
3645
5
 * it under the terms of the GNU General Public License as published by
3646
6
 * the Free Software Foundation; version 3.
3647
7
 *
3648
8
 * This program is distributed in the hope that it will be useful,
3649
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3650
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3651
11
 * GNU General Public License for more details.
3652
12
 *
3653
13
 * You should have received a copy of the GNU General Public License
3654
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3655
15
 *
3656
16
 * Author: Michael Terry <michael.terry@canonical.com>
3657
17
 */
3658
18
3659
19
#include "SessionManager.h"
3660
20
3661
21
SessionManager::SessionManager(QObject* parent)
3662
22
  : QObject(parent),
3663
23
    m_active(true)
3664
24
{
3665
25
}
3666
26
3667
27
bool SessionManager::active() const
3668
28
{
3669
29
    return m_active;
3670
30
}
3671
31
3672
32
void SessionManager::setActive(bool active)
3673
33
{
3674
34
    if (m_active != active) {
3675
35
        m_active = active;
3676
36
        activeChanged();
3677
37
    }
3678
38
}
3679
39
3680
40
void SessionManager::lock()
3681
41
{
3682
42
    setActive(false);
3683
43
}
3684
0
44
3685
=== added file 'tests/mocks/SessionManager/SessionManager.h'
3686
--- tests/mocks/SessionManager/SessionManager.h	1970-01-01 00:00:00 +0000
3687
+++ tests/mocks/SessionManager/SessionManager.h	2014-05-29 14:11:15 +0000
3688
@@ -0,0 +1,49 @@
3689
1
/*
3690
2
 * Copyright (C) 2013 Canonical, Ltd.
3691
3
 *
3692
4
 * This program is free software; you can redistribute it and/or modify
3693
5
 * it under the terms of the GNU General Public License as published by
3694
6
 * the Free Software Foundation; version 3.
3695
7
 *
3696
8
 * This program is distributed in the hope that it will be useful,
3697
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3698
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3699
11
 * GNU General Public License for more details.
3700
12
 *
3701
13
 * You should have received a copy of the GNU General Public License
3702
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3703
15
 *
3704
16
 * Authors: Michael Terry <michael.terry@canonical.com>
3705
17
 */
3706
18
3707
19
#ifndef UNITY_MOCK_SESSIONMANAGER_H
3708
20
#define UNITY_MOCK_SESSIONMANAGER_H
3709
21
3710
22
#include <QObject>
3711
23
3712
24
class SessionManager: public QObject
3713
25
{
3714
26
    Q_OBJECT
3715
27
    Q_PROPERTY(bool active
3716
28
               READ active
3717
29
               WRITE setActive // Only in mock
3718
30
               NOTIFY activeChanged
3719
31
               FINAL)
3720
32
3721
33
public:
3722
34
    explicit SessionManager(QObject *parent = 0);
3723
35
3724
36
    bool active() const;
3725
37
    void setActive(bool active);
3726
38
3727
39
public Q_SLOTS:
3728
40
    void lock();
3729
41
3730
42
Q_SIGNALS:
3731
43
    void activeChanged();
3732
44
3733
45
private:
3734
46
    bool m_active;
3735
47
};
3736
48
3737
49
#endif
3738
0
50
3739
=== added file 'tests/mocks/SessionManager/plugin.cpp'
3740
--- tests/mocks/SessionManager/plugin.cpp	1970-01-01 00:00:00 +0000
3741
+++ tests/mocks/SessionManager/plugin.cpp	2014-05-29 14:11:15 +0000
3742
@@ -0,0 +1,34 @@
3743
1
/*
3744
2
 * Copyright (C) 2013 Canonical, Ltd.
3745
3
 *
3746
4
 * This program is free software; you can redistribute it and/or modify
3747
5
 * it under the terms of the GNU General Public License as published by
3748
6
 * the Free Software Foundation; version 3.
3749
7
 *
3750
8
 * This program is distributed in the hope that it will be useful,
3751
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3752
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3753
11
 * GNU General Public License for more details.
3754
12
 *
3755
13
 * You should have received a copy of the GNU General Public License
3756
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3757
15
 *
3758
16
 * Authors: Michael Terry <michael.terry@canonical.com>
3759
17
 */
3760
18
3761
19
#include "plugin.h"
3762
20
#include "SessionManager.h"
3763
21
#include <QtQml/qqml.h>
3764
22
3765
23
static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
3766
24
{
3767
25
    Q_UNUSED(engine)
3768
26
    Q_UNUSED(scriptEngine)
3769
27
    return new SessionManager();
3770
28
}
3771
29
3772
30
void SessionManagerPlugin::registerTypes(const char *uri)
3773
31
{
3774
32
    Q_ASSERT(uri == QLatin1String("SessionManager"));
3775
33
    qmlRegisterSingletonType<SessionManager>(uri, 0, 1, "SessionManager", sessionmanager_provider);
3776
34
}
3777
0
35
3778
=== added file 'tests/mocks/SessionManager/plugin.h'
3779
--- tests/mocks/SessionManager/plugin.h	1970-01-01 00:00:00 +0000
3780
+++ tests/mocks/SessionManager/plugin.h	2014-05-29 14:11:15 +0000
3781
@@ -0,0 +1,34 @@
3782
1
/*
3783
2
 * Copyright (C) 2013 Canonical, Ltd.
3784
3
 *
3785
4
 * This program is free software; you can redistribute it and/or modify
3786
5
 * it under the terms of the GNU General Public License as published by
3787
6
 * the Free Software Foundation; version 3.
3788
7
 *
3789
8
 * This program is distributed in the hope that it will be useful,
3790
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3791
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3792
11
 * GNU General Public License for more details.
3793
12
 *
3794
13
 * You should have received a copy of the GNU General Public License
3795
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3796
15
 *
3797
16
 * Authors: Michael Terry <michael.terry@canonical.com>
3798
17
 */
3799
18
3800
19
#ifndef MOCK_SESSIONMANAGER_PLUGIN_H
3801
20
#define MOCK_SESSIONMANAGER_PLUGIN_H
3802
21
3803
22
#include <QQmlEngine>
3804
23
#include <QQmlExtensionPlugin>
3805
24
3806
25
class SessionManagerPlugin : public QQmlExtensionPlugin
3807
26
{
3808
27
    Q_OBJECT
3809
28
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
3810
29
3811
30
public:
3812
31
    void registerTypes(const char *uri);
3813
32
};
3814
33
3815
34
#endif
3816
0
35
3817
=== added file 'tests/mocks/SessionManager/qmldir'
3818
--- tests/mocks/SessionManager/qmldir	1970-01-01 00:00:00 +0000
3819
+++ tests/mocks/SessionManager/qmldir	2014-05-29 14:11:15 +0000
3820
@@ -0,0 +1,2 @@
3821
1
module SessionManager
3822
2
plugin MockSessionManager-qml
3823
0
3
3824
=== renamed directory 'tests/mocks/LightDM' => 'tests/mocks/liblightdm'
3825
=== modified file 'tests/mocks/liblightdm/CMakeLists.txt'
3826
--- tests/mocks/LightDM/CMakeLists.txt	2014-05-02 22:57:21 +0000
3827
+++ tests/mocks/liblightdm/CMakeLists.txt	2014-05-29 14:11:15 +0000
3828
@@ -1,50 +1,4 @@
3829
1
# This is a copy of the normal LightDM plugin, but instead of statically
3830
2
# linking in the lightdm bits, this one uses shared libraries so we can swap
3831
3
# out different sets of users for different tests.  When we finally switch to
3832
4
# actually using the system liblightdm in the normal plugin, this version can
3833
5
# be deleted.
3834
6
3835
7
add_subdirectory(demo)
3836
8
add_subdirectory(full)
1
add_subdirectory(full)
3837
9
add_subdirectory(single)
2
add_subdirectory(single)
3838
10
add_subdirectory(single-pin)
3
add_subdirectory(single-pin)
3839
11
add_subdirectory(single-passphrase)
4
add_subdirectory(single-passphrase)
3840
12
3841
13
include_directories(
3842
14
    ${CMAKE_CURRENT_SOURCE_DIR}
3843
15
    ${CMAKE_CURRENT_BINARY_DIR}
3844
16
    ${CMAKE_SOURCE_DIR}/plugins/Utils
3845
17
    ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
3846
18
)
3847
19
3848
20
set(QMLPLUGIN_SRC
3849
21
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
3850
22
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
3851
23
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/plugin.cpp
3852
24
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
3853
25
    ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp
3854
26
    )
3855
27
3856
28
add_library(MockLightDM-qml MODULE
3857
29
    ${QMLPLUGIN_SRC}
3858
30
    )
3859
31
3860
32
# We want to link to liblightdm-qt5-2, but we don't want to depend on it being
3861
33
# installed on the system.  So we make sure we link to our full fake version
3862
34
# At run time, we can point to whichever version we happen to be using via
3863
35
# LD_LIBRARY_PATH.
3864
36
add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
3865
37
target_link_libraries(MockLightDM-qml
3866
38
    -L${CMAKE_CURRENT_BINARY_DIR}/full
3867
39
    -llightdm-qt5-2
3868
40
    -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
3869
41
    -lusermetricsoutput
3870
42
    )
3871
43
3872
44
qt5_use_modules(MockLightDM-qml DBus Gui Qml)
3873
45
3874
46
add_unity8_mock(LightDM 0.1 LightDM
3875
47
    PREFIX mocks
3876
48
    TARGETS MockLightDM-qml
3877
49
    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/full"
3878
50
)
3879
51
5
3880
=== modified file 'tests/mocks/liblightdm/Greeter.cpp'
3881
--- tests/mocks/LightDM/Greeter.cpp	2013-06-05 22:03:08 +0000
3882
+++ tests/mocks/liblightdm/Greeter.cpp	2014-05-29 14:11:15 +0000
3883
@@ -151,12 +151,23 @@
3884
151
    Q_UNUSED(language)
151
    Q_UNUSED(language)
3885
152
}
152
}
3886
153
153
3887
154
void Greeter::setResettable (bool resettable)
3888
155
{
3889
156
    Q_UNUSED(resettable)
3890
157
}
3891
158
3892
154
bool Greeter::startSessionSync(const QString &session)
159
bool Greeter::startSessionSync(const QString &session)
3893
155
{
160
{
3894
156
    Q_UNUSED(session)
161
    Q_UNUSED(session)
3895
157
    return true;
162
    return true;
3896
158
}
163
}
3897
159
164
3898
165
QString Greeter::ensureSharedDataDirSync(const QString &username)
3899
166
{
3900
167
    Q_UNUSED(username)
3901
168
    return "";
3902
169
}
3903
170
3904
160
void Greeter::respond(const QString &response)
171
void Greeter::respond(const QString &response)
3905
161
{
172
{
3906
162
    Q_D(Greeter);
173
    Q_D(Greeter);
3907
163
174
3908
=== modified file 'tests/mocks/liblightdm/Greeter.h'
3909
--- tests/mocks/LightDM/Greeter.h	2013-06-05 22:03:08 +0000
3910
+++ tests/mocks/liblightdm/Greeter.h	2014-05-29 14:11:15 +0000
3911
@@ -88,13 +88,17 @@
3912
88
    void respond(const QString &response);
88
    void respond(const QString &response);
3913
89
    void cancelAuthentication();
89
    void cancelAuthentication();
3914
90
    void setLanguage (const QString &language);
90
    void setLanguage (const QString &language);
3915
91
    void setResettable (bool resettable);
3916
91
    bool startSessionSync(const QString &session=QString());
92
    bool startSessionSync(const QString &session=QString());
3917
93
    QString ensureSharedDataDirSync(const QString &username);
3918
92
94
3919
93
Q_SIGNALS:
95
Q_SIGNALS:
3920
94
    void showMessage(QString text, QLightDM::Greeter::MessageType type);
96
    void showMessage(QString text, QLightDM::Greeter::MessageType type);
3921
95
    void showPrompt(QString text, QLightDM::Greeter::PromptType type);
97
    void showPrompt(QString text, QLightDM::Greeter::PromptType type);
3922
96
    void authenticationComplete();
98
    void authenticationComplete();
3923
97
    void autologinTimerExpired();
99
    void autologinTimerExpired();
3924
100
    void idle();
3925
101
    void reset();
3926
98
102
3927
99
private:
103
private:
3928
100
    GreeterPrivate *d_ptr;
104
    GreeterPrivate *d_ptr;
3929
101
105
3930
=== modified file 'tests/mocks/liblightdm/full/CMakeLists.txt'
3931
--- tests/mocks/LightDM/full/CMakeLists.txt	2013-11-25 17:26:15 +0000
3932
+++ tests/mocks/liblightdm/full/CMakeLists.txt	2014-05-29 14:11:15 +0000
3933
@@ -11,8 +11,9 @@
3934
11
qt5_use_modules(MockLightDM-full Gui)
11
qt5_use_modules(MockLightDM-full Gui)
3935
12
12
3936
13
set_target_properties(MockLightDM-full PROPERTIES
13
set_target_properties(MockLightDM-full PROPERTIES
3938
14
                      OUTPUT_NAME lightdm-qt5-2)
14
                      OUTPUT_NAME lightdm-qt5-3
3939
15
                      SOVERSION 0)
3940
15
16
3941
16
install(TARGETS MockLightDM-full
17
install(TARGETS MockLightDM-full
3943
17
    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/full
18
    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/full
3944
18
    )
19
    )
3945
19
20
3946
=== modified file 'tests/mocks/liblightdm/single-passphrase/CMakeLists.txt'
3947
--- tests/mocks/LightDM/single-passphrase/CMakeLists.txt	2013-11-25 17:26:15 +0000
3948
+++ tests/mocks/liblightdm/single-passphrase/CMakeLists.txt	2014-05-29 14:11:15 +0000
3949
@@ -12,8 +12,9 @@
3950
12
qt5_use_modules(MockLightDM-single-passphrase Gui)
12
qt5_use_modules(MockLightDM-single-passphrase Gui)
3951
13
13
3952
14
set_target_properties(MockLightDM-single-passphrase PROPERTIES
14
set_target_properties(MockLightDM-single-passphrase PROPERTIES
3954
15
                      OUTPUT_NAME lightdm-qt5-2)
15
                      OUTPUT_NAME lightdm-qt5-3
3955
16
                      SOVERSION 0)
3956
16
17
3957
17
install(TARGETS MockLightDM-single-passphrase
18
install(TARGETS MockLightDM-single-passphrase
3959
18
    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-passphrase
19
    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/single-passphrase
3960
19
    )
20
    )
3961
20
21
3962
=== modified file 'tests/mocks/liblightdm/single-pin/CMakeLists.txt'
3963
--- tests/mocks/LightDM/single-pin/CMakeLists.txt	2013-11-25 17:26:15 +0000
3964
+++ tests/mocks/liblightdm/single-pin/CMakeLists.txt	2014-05-29 14:11:15 +0000
3965
@@ -12,8 +12,9 @@
3966
12
qt5_use_modules(MockLightDM-single-pin Gui)
12
qt5_use_modules(MockLightDM-single-pin Gui)
3967
13
13
3968
14
set_target_properties(MockLightDM-single-pin PROPERTIES
14
set_target_properties(MockLightDM-single-pin PROPERTIES
3970
15
                      OUTPUT_NAME lightdm-qt5-2)
15
                      OUTPUT_NAME lightdm-qt5-3
3971
16
                      SOVERSION 0)
3972
16
17
3973
17
install(TARGETS MockLightDM-single-pin
18
install(TARGETS MockLightDM-single-pin
3975
18
    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-pin
19
    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/single-pin
3976
19
    )
20
    )
3977
20
21
3978
=== modified file 'tests/mocks/liblightdm/single/CMakeLists.txt'
3979
--- tests/mocks/LightDM/single/CMakeLists.txt	2013-11-25 17:26:15 +0000
3980
+++ tests/mocks/liblightdm/single/CMakeLists.txt	2014-05-29 14:11:15 +0000
3981
@@ -11,8 +11,9 @@
3982
11
qt5_use_modules(MockLightDM-single Gui)
11
qt5_use_modules(MockLightDM-single Gui)
3983
12
12
3984
13
set_target_properties(MockLightDM-single PROPERTIES
13
set_target_properties(MockLightDM-single PROPERTIES
3986
14
                      OUTPUT_NAME lightdm-qt5-2)
14
                      OUTPUT_NAME lightdm-qt5-3
3987
15
                      SOVERSION 0)
3988
15
16
3989
16
install(TARGETS MockLightDM-single
17
install(TARGETS MockLightDM-single
3991
17
    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single
18
    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/single
3992
18
    )
19
    )
3993
19
20
3994
=== modified file 'tests/plugins/CMakeLists.txt'
3995
--- tests/plugins/CMakeLists.txt	2014-04-30 10:06:33 +0000
3996
+++ tests/plugins/CMakeLists.txt	2014-05-29 14:11:15 +0000
3997
@@ -1,6 +1,7 @@
3998
1
add_subdirectory(AccountsService)
1
add_subdirectory(AccountsService)
3999
2
add_subdirectory(Dash)
4000
2
add_subdirectory(LightDM)
3
add_subdirectory(LightDM)
4002
3
add_subdirectory(Dash)
4
add_subdirectory(SessionManager)
4003
4
add_subdirectory(Ubuntu)
5
add_subdirectory(Ubuntu)
4004
5
add_subdirectory(Unity)
6
add_subdirectory(Unity)
4005
6
add_subdirectory(Utils)
7
add_subdirectory(Utils)
4006
7
8
4007
=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
4008
--- tests/plugins/LightDM/CMakeLists.txt	2014-01-14 21:01:28 +0000
4009
+++ tests/plugins/LightDM/CMakeLists.txt	2014-05-29 14:11:15 +0000
4010
@@ -1,3 +1,6 @@
4011
1
include(FindPkgConfig)
4012
2
pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
4013
3
4014
1
add_executable(test-lightdm-dbus
4
add_executable(test-lightdm-dbus
4015
2
    dbus.cpp
5
    dbus.cpp
4016
3
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
6
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
4017
@@ -7,19 +10,17 @@
4018
7
include_directories(
10
include_directories(
4019
8
    ${CMAKE_CURRENT_BINARY_DIR}
11
    ${CMAKE_CURRENT_BINARY_DIR}
4020
9
    ${CMAKE_SOURCE_DIR}/plugins/LightDM
12
    ${CMAKE_SOURCE_DIR}/plugins/LightDM
4021
10
    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
4022
11
    ${LIBLIGHTDM_INCLUDE_DIRS}
13
    ${LIBLIGHTDM_INCLUDE_DIRS}
4023
12
    )
14
    )
4024
13
15
4025
14
add_dependencies(test-lightdm-dbus MockLightDM-full)
16
add_dependencies(test-lightdm-dbus MockLightDM-full)
4026
15
target_link_libraries(test-lightdm-dbus
17
target_link_libraries(test-lightdm-dbus
4029
16
    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
18
    ${LIBLIGHTDM_LDFLAGS}
4028
17
    -llightdm-qt5-2
4030
18
    )
19
    )
4031
19
20
4032
20
add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
21
add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
4033
21
22
4035
22
add_custom_target(testLightDMDBus dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
23
add_custom_target(testLightDMDBus dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/plugins LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
4036
23
add_dependencies(testLightDMDBus test-lightdm-dbus)
24
add_dependencies(testLightDMDBus test-lightdm-dbus)
4037
24
25
4038
25
add_dependencies(qmluitests testLightDMDBus)
26
add_dependencies(qmluitests testLightDMDBus)
4039
26
27
4040
=== added directory 'tests/plugins/SessionManager'
4041
=== added file 'tests/plugins/SessionManager/CMakeLists.txt'
4042
--- tests/plugins/SessionManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
4043
+++ tests/plugins/SessionManager/CMakeLists.txt	2014-05-29 14:11:15 +0000
4044
@@ -0,0 +1,48 @@
4045
1
macro(make_dbus_class PREFIX SERVICE INTERFACE)
4046
2
    if (${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${INTERFACE}Adaptor.h)
4047
3
        execute_process(COMMAND qdbusxml2cpp -c ${PREFIX}${INTERFACE}Adaptor -a ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${INTERFACE}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${SERVICE}.${INTERFACE})
4048
4
    endif ()
4049
5
endmacro(make_dbus_class)
4050
6
4051
7
make_dbus_class(LightDM org.freedesktop.DisplayManager Session)
4052
8
make_dbus_class(Login org.freedesktop.login1 Manager)
4053
9
make_dbus_class(Login org.freedesktop.login1 Session)
4054
10
make_dbus_class(Login org.freedesktop.DBus Properties)
4055
11
4056
12
include_directories(
4057
13
    ${CMAKE_CURRENT_BINARY_DIR}
4058
14
    ${CMAKE_SOURCE_DIR}/plugins/SessionManager
4059
15
    )
4060
16
4061
17
add_definitions(-DSM_BUSNAME=sessionBus)
4062
18
4063
19
add_executable(sessionmanagermock
4064
20
    ${CMAKE_CURRENT_BINARY_DIR}/LightDMSessionAdaptor.cpp
4065
21
    ${CMAKE_CURRENT_BINARY_DIR}/LoginManagerAdaptor.cpp
4066
22
    ${CMAKE_CURRENT_BINARY_DIR}/LoginPropertiesAdaptor.cpp
4067
23
    ${CMAKE_CURRENT_BINARY_DIR}/LoginSessionAdaptor.cpp
4068
24
    server.cpp
4069
25
    LightDMSessionServer.cpp
4070
26
    LoginManagerServer.cpp
4071
27
    LoginSessionServer.cpp
4072
28
    )
4073
29
qt5_use_modules(sessionmanagermock Core DBus)
4074
30
4075
31
add_executable(sessionmanagertest
4076
32
    ${CMAKE_SOURCE_DIR}/plugins/SessionManager/SessionManager.cpp
4077
33
    client.cpp
4078
34
    )
4079
35
qt5_use_modules(sessionmanagertest Core DBus Test)
4080
36
4081
37
add_test(NAME sessionmanagertest
4082
38
    COMMAND env
4083
39
        XDG_SESSION_ID=sessionid
4084
40
        XDG_SESSION_PATH=/mocksession/lightdm
4085
41
        dbus-test-runner
4086
42
        --task ${CMAKE_CURRENT_BINARY_DIR}/sessionmanagermock
4087
43
        --task-name server
4088
44
        --ignore-return
4089
45
        --task ${CMAKE_CURRENT_BINARY_DIR}/sessionmanagertest
4090
46
        --task-name client
4091
47
        --wait-for org.freedesktop.login1
4092
48
    )
4093
0
49
4094
=== added file 'tests/plugins/SessionManager/LightDMSessionServer.cpp'
4095
--- tests/plugins/SessionManager/LightDMSessionServer.cpp	1970-01-01 00:00:00 +0000
4096
+++ tests/plugins/SessionManager/LightDMSessionServer.cpp	2014-05-29 14:11:15 +0000
4097
@@ -0,0 +1,38 @@
4098
1
/*
4099
2
 * Copyright 2013 Canonical Ltd.
4100
3
 *
4101
4
 * This program is free software: you can redistribute it and/or modify it
4102
5
 * under the terms of the GNU General Public License version 3, as published
4103
6
 * by the  Free Software Foundation.
4104
7
 *
4105
8
 * This program is distributed in the hope that it will be useful, but
4106
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
4107
10
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
4108
11
 * PURPOSE.  See the GNU General Public License for more details.
4109
12
 *
4110
13
 * You should have received a copy of the GNU General Public License
4111
14
 * version 3 along with this program.  If not, see
4112
15
 * <http://www.gnu.org/licenses/>
4113
16
 *
4114
17
 * Authored by: Michael Terry <michael.terry@canonical.com>
4115
18
 */
4116
19
4117
20
#include "LightDMSessionServer.h"
4118
21
4119
22
LightDMSessionServer::LightDMSessionServer(LoginSessionServer *logind, QObject *parent)
4120
23
    : QObject(parent),
4121
24
      logind(logind)
4122
25
{
4123
26
}
4124
27
4125
28
void LightDMSessionServer::Lock()
4126
29
{
4127
30
    // As a side effect of locking, change Active state of logind.
4128
31
    // Note that this will say Active is true while the Active property will be
4129
32
    // false.  This is intentional, as we don't want to keep any state in the
4130
33
    // mocks.  Having this signal side effect lets us test that lock() was
4131
34
    // actually called by the plugin as well as test the changed signal itself.
4132
35
    QVariantMap changes;
4133
36
    changes.insert("Active", QVariant(true));
4134
37
    Q_EMIT logind->PropertiesChanged("org.freedesktop.login1.Session", changes, QStringList());
4135
38
}
4136
0
39
4137
=== added file 'tests/plugins/SessionManager/LightDMSessionServer.h'
4138
--- tests/plugins/SessionManager/LightDMSessionServer.h	1970-01-01 00:00:00 +0000
4139
+++ tests/plugins/SessionManager/LightDMSessionServer.h	2014-05-29 14:11:15 +0000
4140
@@ -0,0 +1,40 @@
4141
1
/*
4142
2
 * Copyright 2013 Canonical Ltd.
4143
3
 *
4144
4
 * This program is free software: you can redistribute it and/or modify it
4145
5
 * under the terms of the GNU General Public License version 3, as published
4146
6
 * by the  Free Software Foundation.
4147
7
 *
4148
8
 * This program is distributed in the hope that it will be useful, but
4149
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
4150
10
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
4151
11
 * PURPOSE.  See the GNU General Public License for more details.
4152
12
 *
4153
13
 * You should have received a copy of the GNU General Public License
4154
14
 * version 3 along with this program.  If not, see
4155
15
 * <http://www.gnu.org/licenses/>
4156
16
 *
4157
17
 * Authored by: Michael Terry <michael.terry@canonical.com>
4158
18
 */
4159
19
4160
20
#ifndef UNITY_LIGHTDMSESSIONSERVER_H
4161
21
#define UNITY_LIGHTDMSESSIONSERVER_H
4162
22
4163
23
#include "LoginSessionServer.h"
4164
24
#include <QtCore/QObject>
4165
25
4166
26
class LightDMSessionServer: public QObject
4167
27
{
4168
28
    Q_OBJECT
4169
29
4170
30
public:
4171
31
    explicit LightDMSessionServer(LoginSessionServer *logind, QObject *parent = 0);
4172
32
4173
33
public Q_SLOTS:
4174
34
    void Lock();
4175
35
4176
36
private:
4177
37
    LoginSessionServer *logind;
4178
38
};
4179
39
4180
40
#endif
4181
0
41
4182
=== added file 'tests/plugins/SessionManager/LoginManagerServer.cpp'
4183
--- tests/plugins/SessionManager/LoginManagerServer.cpp	1970-01-01 00:00:00 +0000
4184
+++ tests/plugins/SessionManager/LoginManagerServer.cpp	2014-05-29 14:11:15 +0000
4185
@@ -0,0 +1,34 @@
4186
1
/*
4187
2
 * Copyright 2013 Canonical Ltd.
4188
3
 *
4189
4
 * This program is free software: you can redistribute it and/or modify it
4190
5
 * under the terms of the GNU General Public License version 3, as published
4191
6
 * by the  Free Software Foundation.
4192
7
 *
4193
8
 * This program is distributed in the hope that it will be useful, but
4194
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
4195
10
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
4196
11
 * PURPOSE.  See the GNU General Public License for more details.
4197
12
 *
4198
13
 * You should have received a copy of the GNU General Public License
4199
14
 * version 3 along with this program.  If not, see
4200
15
 * <http://www.gnu.org/licenses/>
4201
16
 *
4202
17
 * Authored by: Michael Terry <michael.terry@canonical.com>
4203
18
 */
4204
19
4205
20
#include "LoginManagerServer.h"
4206
21
4207
22
LoginManagerServer::LoginManagerServer(QObject *parent)
4208
23
    : QObject(parent)
4209
24
{
4210
25
}
4211
26
4212
27
QDBusObjectPath LoginManagerServer::GetSession(const QString &id)
4213
28
{
4214
29
    if (id == "sessionid") {
4215
30
        return QDBusObjectPath("/mocksession/login1");
4216
31
    } else {
4217
32
        return QDBusObjectPath();
4218
33
    }
4219
34
}
4220
0
35
4221
=== added file 'tests/plugins/SessionManager/LoginManagerServer.h'
4222
--- tests/plugins/SessionManager/LoginManagerServer.h	1970-01-01 00:00:00 +0000
4223
+++ tests/plugins/SessionManager/LoginManagerServer.h	2014-05-29 14:11:15 +0000
4224
@@ -0,0 +1,37 @@
4225
1
/*
4226
2
 * Copyright 2013 Canonical Ltd.
4227
3
 *
4228
4
 * This program is free software: you can redistribute it and/or modify it
4229
5
 * under the terms of the GNU General Public License version 3, as published
4230
6
 * by the  Free Software Foundation.
4231
7
 *
4232
8
 * This program is distributed in the hope that it will be useful, but
4233
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
4234
10
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
4235
11
 * PURPOSE.  See the GNU General Public License for more details.
4236
12
 *
4237
13
 * You should have received a copy of the GNU General Public License
4238
14
 * version 3 along with this program.  If not, see
4239
15
 * <http://www.gnu.org/licenses/>
4240
16
 *
4241
17
 * Authored by: Michael Terry <michael.terry@canonical.com>
4242
18
 */
4243
19
4244
20
#ifndef UNITY_LOGINMANAGERSERVER_H
4245
21
#define UNITY_LOGINMANAGERSERVER_H
4246
22
4247
23
#include <QtCore/QObject>
4248
24
#include <QtDBus/QDBusObjectPath>
4249
25
4250
26
class LoginManagerServer: public QObject
4251
27
{
4252
28
    Q_OBJECT
4253
29
4254
30
public:
4255
31
    explicit LoginManagerServer(QObject *parent = 0);
4256
32
4257
33
public Q_SLOTS:
4258
34
    QDBusObjectPath GetSession(const QString &id);
4259
35
};
4260
36
4261
37
#endif
4262
0
38
4263
=== added file 'tests/plugins/SessionManager/LoginSessionServer.cpp'
4264
--- tests/plugins/SessionManager/LoginSessionServer.cpp	1970-01-01 00:00:00 +0000
4265
+++ tests/plugins/SessionManager/LoginSessionServer.cpp	2014-05-29 14:11:15 +0000
4266
@@ -0,0 +1,25 @@
4267
1
/*
4268
2
 * Copyright 2013 Canonical Ltd.
4269
3
 *
4270
4
 * This program is free software: you can redistribute it and/or modify it
4271
5
 * under the terms of the GNU General Public License version 3, as published
4272
6
 * by the  Free Software Foundation.
4273
7
 *
4274
8
 * This program is distributed in the hope that it will be useful, but
4275
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
4276
10
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
4277
11
 * PURPOSE.  See the GNU General Public License for more details.
4278
12
 *
4279
13
 * You should have received a copy of the GNU General Public License
4280
14
 * version 3 along with this program.  If not, see
4281
15
 * <http://www.gnu.org/licenses/>
4282
16
 *
4283
17
 * Authored by: Michael Terry <michael.terry@canonical.com>
4284
18
 */
4285
19
4286
20
#include "LoginSessionServer.h"
4287
21
4288
22
LoginSessionServer::LoginSessionServer(QObject *parent)
4289
23
    : QObject(parent)
4290
24
{
4291
25
}
4292
0
26
4293
=== added file 'tests/plugins/SessionManager/LoginSessionServer.h'
4294
--- tests/plugins/SessionManager/LoginSessionServer.h	1970-01-01 00:00:00 +0000
4295
+++ tests/plugins/SessionManager/LoginSessionServer.h	2014-05-29 14:11:15 +0000
4296
@@ -0,0 +1,39 @@
4297
1
/*
4298
2
 * Copyright 2013 Canonical Ltd.
4299
3
 *
4300
4
 * This program is free software: you can redistribute it and/or modify it
4301
5
 * under the terms of the GNU General Public License version 3, as published
4302
6
 * by the  Free Software Foundation.
4303
7
 *
4304
8
 * This program is distributed in the hope that it will be useful, but
4305
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
4306
10
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
4307
11
 * PURPOSE.  See the GNU General Public License for more details.
4308
12
 *
4309
13
 * You should have received a copy of the GNU General Public License
4310
14
 * version 3 along with this program.  If not, see
4311
15
 * <http://www.gnu.org/licenses/>
4312
16
 *
4313
17
 * Authored by: Michael Terry <michael.terry@canonical.com>
4314
18
 */
4315
19
4316
20
#ifndef UNITY_LOGINSESSIONSERVER_H
4317
21
#define UNITY_LOGINSESSIONSERVER_H
4318
22
4319
23
#include <QtCore/QObject>
4320
24
#include <QtCore/QStringList>
4321
25
#include <QtCore/QVariant>
4322
26
#include <QtCore/QVariantMap>
4323
27
4324
28
class LoginSessionServer: public QObject
4325
29
{
4326
30
    Q_OBJECT
4327
31
4328
32
public:
4329
33
    explicit LoginSessionServer(QObject *parent = 0);
4330
34
4331
35
Q_SIGNALS:
4332
36
    void PropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
4333
37
};
4334
38
4335
39
#endif
4336
0
40
4337
=== added file 'tests/plugins/SessionManager/client.cpp'
4338
--- tests/plugins/SessionManager/client.cpp	1970-01-01 00:00:00 +0000
4339
+++ tests/plugins/SessionManager/client.cpp	2014-05-29 14:11:15 +0000
4340
@@ -0,0 +1,88 @@
4341
1
/*
4342
2
 * Copyright 2013 Canonical Ltd.
4343
3
 *
4344
4
 * This program is free software: you can redistribute it and/or modify it
4345
5
 * under the terms of the GNU General Public License version 3, as published
4346
6
 * by the  Free Software Foundation.
4347
7
 *
4348
8
 * This program is distributed in the hope that it will be useful, but
4349
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
4350
10
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
4351
11
 * PURPOSE.  See the GNU General Public License for more details.
4352
12
 *
4353
13
 * You should have received a copy of the GNU General Public License
4354
14
 * version 3 along with this program.  If not, see
4355
15
 * <http://www.gnu.org/licenses/>
4356
16
 *
4357
17
 * Authored by: Michael Terry <michael.terry@canonical.com>
4358
18
 */
4359
19
4360
20
#include "SessionManager.h"
4361
21
#include <QtTest/QSignalSpy>
4362
22
#include <QtTest/QTest>
4363
23
4364
24
4365
25
// These tests assume the following behavior from our mock logind server:
4366
26
// * IsActive will return false
4367
27
// * Lock() will emit an ActiveChanged(true) signal
4368
28
//
4369
29
// This should lead to the following behavior from our SessionManager plugin:
4370
30
// * Starts active
4371
31
// * Becomes inactive once it connects to logind and sees IsActive result
4372
32
// * Becomes active once Lock() is called (which isn't really sensible, but
4373
33
//   it's just a mock)
4374
34
4375
35
class SessionManagerTest : public QObject
4376
36
{
4377
37
    Q_OBJECT
4378
38
4379
39
private Q_SLOTS:
4380
40
4381
41
    void waitForChange(SessionManager *session)
4382
42
    {
4383
43
        // Wait 5 seconds for initial activeChanged signal
4384
44
        QSignalSpy spy(session, SIGNAL(activeChanged()));
4385
45
        int i = 0;
4386
46
        while (spy.count() == 0 && i++ < 50)
4387
47
            QTest::qWait(100);
4388
48
        QCOMPARE(spy.count(), 1);
4389
49
    }
4390
50
4391
51
    void testAssumeActive()
4392
52
    {
4393
53
        // Test that active() starts as true before we connect to service
4394
54
        SessionManager session;
4395
55
        QCOMPARE(session.active(), true);
4396
56
    }
4397
57
4398
58
    void testSafeLock()
4399
59
    {
4400
60
        // Test that lock() doesn't crash if used before we connect to service
4401
61
        // (i.e. just test that we're not being stupid about pointers)
4402
62
        SessionManager session;
4403
63
        session.lock();
4404
64
    }
4405
65
4406
66
    void testInitialSignal()
4407
67
    {
4408
68
        // Test that we get notified of change once we connect to service
4409
69
        SessionManager session;
4410
70
        waitForChange(&session);
4411
71
        QCOMPARE(session.active(), false);
4412
72
    }
4413
73
4414
74
    void testLock()
4415
75
    {
4416
76
        // Test that lock() gets called correctly and that we listen for
4417
77
        // the activeChanged signal too.
4418
78
        SessionManager session;
4419
79
        waitForChange(&session);
4420
80
        session.lock();
4421
81
        waitForChange(&session);
4422
82
        QCOMPARE(session.active(), true);
4423
83
    }
4424
84
};
4425
85
4426
86
QTEST_MAIN(SessionManagerTest)
4427
87
4428
88
#include "client.moc"
4429
0
89
4430
=== added file 'tests/plugins/SessionManager/interfaces.xml'
4431
--- tests/plugins/SessionManager/interfaces.xml	1970-01-01 00:00:00 +0000
4432
+++ tests/plugins/SessionManager/interfaces.xml	2014-05-29 14:11:15 +0000
4433
@@ -0,0 +1,22 @@
4434
1
<node>
4435
2
  <interface name="org.freedesktop.login1.Manager">
4436
3
    <method name="GetSession">
4437
4
      <arg name="id" type="s" direction="in" />
4438
5
      <arg name="path" type="o" direction="out" />
4439
6
    </method>
4440
7
  </interface>
4441
8
  <interface name="org.freedesktop.login1.Session">
4442
9
    <property name="Active" type="b" access="read"/>
4443
10
  </interface>
4444
11
  <interface name="org.freedesktop.DBus.Properties">
4445
12
    <signal name="PropertiesChanged">
4446
13
      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
4447
14
      <arg name="interface" type="s" direction="out"/>
4448
15
      <arg name="changed" type="a{sv}" direction="out"/>
4449
16
      <arg name="invalid" type="as" direction="out"/>
4450
17
    </signal>
4451
18
  </interface>
4452
19
  <interface name="org.freedesktop.DisplayManager.Session">
4453
20
    <method name="Lock"/>
4454
21
  </interface>
4455
22
</node>
4456
0
23
4457
=== added file 'tests/plugins/SessionManager/server.cpp'
4458
--- tests/plugins/SessionManager/server.cpp	1970-01-01 00:00:00 +0000
4459
+++ tests/plugins/SessionManager/server.cpp	2014-05-29 14:11:15 +0000
4460
@@ -0,0 +1,57 @@
4461
1
/*
4462
2
 * Copyright 2013 Canonical Ltd.
4463
3
 *
4464
4
 * This program is free software: you can redistribute it and/or modify it
4465
5
 * under the terms of the GNU General Public License version 3, as published
4466
6
 * by the  Free Software Foundation.
4467
7
 *
4468
8
 * This program is distributed in the hope that it will be useful, but
4469
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
4470
10
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
4471
11
 * PURPOSE.  See the GNU General Public License for more details.
4472
12
 *
4473
13
 * You should have received a copy of the GNU General Public License
4474
14
 * version 3 along with this program.  If not, see
4475
15
 * <http://www.gnu.org/licenses/>
4476
16
 *
4477
17
 * Authored by: Michael Terry <michael.terry@canonical.com>
4478
18
 */
4479
19
4480
20
#include "LightDMSessionAdaptor.h"
4481
21
#include "LightDMSessionServer.h"
4482
22
#include "LoginManagerAdaptor.h"
4483
23
#include "LoginManagerServer.h"
4484
24
#include "LoginPropertiesAdaptor.h"
4485
25
#include "LoginSessionAdaptor.h"
4486
26
#include "LoginSessionServer.h"
4487
27
#include <QtCore/QCoreApplication>
4488
28
4489
29
int main(int argc, char *argv[])
4490
30
{
4491
31
    QCoreApplication a(argc, argv);
4492
32
4493
33
    LoginManagerServer *manager = new LoginManagerServer();
4494
34
    new LoginManagerAdaptor(manager);
4495
35
4496
36
    LoginSessionServer *l1_session = new LoginSessionServer();
4497
37
    new LoginSessionAdaptor(l1_session);
4498
38
    new LoginPropertiesAdaptor(l1_session);
4499
39
4500
40
    LightDMSessionServer *ldm_session = new LightDMSessionServer(l1_session);
4501
41
    new LightDMSessionAdaptor(ldm_session);
4502
42
4503
43
    // We use the session bus for testing.  The real plugin uses the system bus
4504
44
    QDBusConnection connection = QDBusConnection::sessionBus();
4505
45
    if (!connection.registerObject("/org/freedesktop/login1", manager))
4506
46
        return 1;
4507
47
    if (!connection.registerObject("/mocksession/login1", l1_session))
4508
48
        return 1;
4509
49
    if (!connection.registerObject("/mocksession/lightdm", ldm_session))
4510
50
        return 1;
4511
51
    if (!connection.registerService("org.freedesktop.DisplayManager"))
4512
52
        return 1;
4513
53
    if (!connection.registerService("org.freedesktop.login1"))
4514
54
        return 1;
4515
55
4516
56
    return a.exec();
4517
57
}
4518
0
58
4519
=== modified file 'tests/qmltests/CMakeLists.txt'
4520
--- tests/qmltests/CMakeLists.txt	2014-05-22 14:16:00 +0000
4521
+++ tests/qmltests/CMakeLists.txt	2014-05-29 14:11:15 +0000
4522
@@ -4,6 +4,7 @@
4523
4
add_subdirectory(Components)
4
add_subdirectory(Components)
4524
5
5
4525
6
set(qmltest_DEFAULT_IMPORT_PATHS
6
set(qmltest_DEFAULT_IMPORT_PATHS
4526
7
  ${CMAKE_BINARY_DIR}/plugins
4527
7
  ${CMAKE_BINARY_DIR}/tests/utils/modules
8
  ${CMAKE_BINARY_DIR}/tests/utils/modules
4528
8
  ${CMAKE_BINARY_DIR}/tests/mocks
9
  ${CMAKE_BINARY_DIR}/tests/mocks
4529
9
)
10
)
4530
@@ -18,12 +19,12 @@
4531
18
set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
19
set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
4532
19
set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
20
set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
4533
20
21
4536
21
add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
22
add_qml_test(. Shell)
4537
22
                     ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
23
add_qml_test(. GreeterShell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/single")
4538
23
add_qml_test(Components Carousel)
24
add_qml_test(Components Carousel)
4539
24
add_qml_test(Components DraggingArea)
25
add_qml_test(Components DraggingArea)
4540
25
add_qml_test(Components EdgeDemoOverlay)
26
add_qml_test(Components EdgeDemoOverlay)
4542
26
add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
27
add_qml_test(Components FilterGrid)
4543
27
add_qml_test(Components LazyImage)
28
add_qml_test(Components LazyImage)
4544
28
add_qml_test(Components Rating)
29
add_qml_test(Components Rating)
4545
29
add_qml_test(Components ResponsiveFlowView)
30
add_qml_test(Components ResponsiveFlowView)
4546
@@ -32,53 +33,43 @@
4547
32
add_qml_test(Components Showable)
33
add_qml_test(Components Showable)
4548
33
add_qml_test(Components PageHeaderLabel)
34
add_qml_test(Components PageHeaderLabel)
4549
34
add_qml_test(Components ZoomableImage)
35
add_qml_test(Components ZoomableImage)
4581
35
add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
36
add_qml_test(Dash Dash)
4582
36
add_qml_test(Dash DashContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
37
add_qml_test(Dash DashContent)
4583
37
add_qml_test(Dash Card IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
38
add_qml_test(Dash Card)
4584
38
add_qml_benchmark(Dash CardBenchmark 1000  IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
39
add_qml_benchmark(Dash CardBenchmark 1000)
4585
39
add_qml_test(Dash CardTool IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
40
add_qml_test(Dash CardTool)
4586
40
add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
41
add_qml_test(Dash GenericScopeView)
4587
41
add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
42
add_qml_test(Dash/Apps RunningApplicationsGrid)
4588
42
                                                            ${CMAKE_BINARY_DIR}/tests/mocks
43
add_qml_test(Dash/Previews Preview)
4589
43
                                                            ${CMAKE_BINARY_DIR}/plugins)
44
add_qml_test(Dash/Previews PreviewActions)
4590
44
add_qml_test(Dash/Previews Preview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
45
add_qml_test(Dash/Previews PreviewAudioPlayback)
4591
45
add_qml_test(Dash/Previews PreviewActions IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
46
add_qml_test(Dash/Previews PreviewHeader)
4592
46
add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
47
add_qml_test(Dash/Previews PreviewImageGallery)
4593
47
add_qml_test(Dash/Previews PreviewHeader IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
48
add_qml_test(Dash/Previews PreviewProgress)
4594
48
add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
49
add_qml_test(Dash/Previews PreviewRatingDisplay)
4595
49
add_qml_test(Dash/Previews PreviewProgress IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
50
add_qml_test(Dash/Previews PreviewRatingInput)
4596
50
add_qml_test(Dash/Previews PreviewRatingDisplay IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
51
add_qml_test(Dash/Previews PreviewTextSummary)
4597
51
add_qml_test(Dash/Previews PreviewRatingInput IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
52
add_qml_test(Dash/Previews PreviewVideoPlayback)
4598
52
add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
53
add_qml_test(Dash/Previews PreviewWidgetFactory)
4599
53
add_qml_test(Dash/Previews PreviewVideoPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
54
add_qml_test(Dash/Previews PreviewZoomableImage)
4600
54
add_qml_test(Dash/Previews PreviewWidgetFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
55
add_qml_test(Greeter Lockscreen ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full")
4601
55
add_qml_test(Dash/Previews PreviewZoomableImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
56
add_qml_test(Greeter Tablet ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full")
4602
56
add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
57
add_qml_test(Greeter Phone ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/single")
4603
57
                             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
58
add_qml_test(Greeter Infographics ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full")
4604
58
add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
59
add_qml_test(Greeter Clock ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
4574
59
                            ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
4575
60
add_qml_test(Greeter Phone IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
4576
61
                           ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
4577
62
add_qml_test(Greeter Infographics IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
4578
63
                                  ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
4579
64
add_qml_test(Greeter Clock IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
4580
65
                           ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
4605
66
add_qml_test(Hud Hud)
60
add_qml_test(Hud Hud)
4606
67
add_qml_test(Hud Result)
61
add_qml_test(Hud Result)
4610
68
add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
62
add_qml_test(Launcher Launcher)
4611
69
add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
63
add_qml_test(Notifications Notifications)
4612
70
add_qml_test(Notifications VisualSnapDecisionsQueue IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
64
add_qml_test(Notifications VisualSnapDecisionsQueue)
4613
71
add_qml_test(Panel IndicatorRow)
65
add_qml_test(Panel IndicatorRow)
4617
72
add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
66
add_qml_test(Panel Indicators)
4618
73
add_qml_test(Panel MenuContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
67
add_qml_test(Panel MenuContent)
4619
74
add_qml_test(Panel Panel IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
68
add_qml_test(Panel Panel)
4620
75
add_qml_test(Panel SearchIndicator)
69
add_qml_test(Panel SearchIndicator)
4630
76
add_qml_test(Panel/Indicators DefaultIndicatorWidget IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
70
add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
4631
77
                                                  ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
71
add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
4632
78
add_qml_test(Panel/Indicators DefaultIndicatorPage IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
72
# These MenuItemFactory tests need the test/mocks/ to come before plugins/
4633
79
                                                  ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
73
add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
4634
80
add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
74
add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
4635
81
add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
75
add_qml_test(Stages PhoneStage)
4627
82
add_qml_test(Stages PhoneStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
4628
83
                                              ${CMAKE_BINARY_DIR}/tests/mocks
4629
84
                                              ${CMAKE_BINARY_DIR}/plugins)
4636
85
76
4637
=== modified file 'tests/qmltests/Greeter/tst_Lockscreen.qml'
4638
--- tests/qmltests/Greeter/tst_Lockscreen.qml	2014-05-20 12:10:23 +0000
4639
+++ tests/qmltests/Greeter/tst_Lockscreen.qml	2014-05-29 14:11:15 +0000
4640
@@ -17,7 +17,7 @@
4641
17
import QtQuick 2.0
17
import QtQuick 2.0
4642
18
import QtTest 1.0
18
import QtTest 1.0
4643
19
import ".."
19
import ".."
4645
20
import "../../../qml/Greeter"
20
import "../../../qml/Components"
4646
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
4647
22
import LightDM 0.1 as LightDM
22
import LightDM 0.1 as LightDM
4648
23
import Unity.Test 0.1 as UT
23
import Unity.Test 0.1 as UT
4649
@@ -39,7 +39,6 @@
4650
39
        minPinLength: minPinLengthTextField.text
39
        minPinLength: minPinLengthTextField.text
4651
40
        maxPinLength: maxPinLengthTextField.text
40
        maxPinLength: maxPinLengthTextField.text
4652
41
        username: "Lola"
41
        username: "Lola"
4653
42
        background: "../../../qml/graphics/phone_background.jpg"
4654
43
        infoText: infoTextTextField.text
42
        infoText: infoTextTextField.text
4655
44
    }
43
    }
4656
45
44
4657
46
45
4658
=== modified file 'tests/qmltests/Greeter/tst_Phone.qml'
4659
--- tests/qmltests/Greeter/tst_Phone.qml	2014-03-21 17:49:22 +0000
4660
+++ tests/qmltests/Greeter/tst_Phone.qml	2014-05-29 14:11:15 +0000
4661
@@ -33,7 +33,7 @@
4662
33
        height: parent.height
33
        height: parent.height
4663
34
        x: 0; y: 0
34
        x: 0; y: 0
4664
35
35
4666
36
        defaultBackground: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
36
        background: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
4667
37
37
4668
38
        property int minX: 0
38
        property int minX: 0
4669
39
39
4670
@@ -104,22 +104,6 @@
4671
104
            tryCompare(LightDM.Infographic, "username", "single")
104
            tryCompare(LightDM.Infographic, "username", "single")
4672
105
        }
105
        }
4673
106
106
4674
107
        function test_background_data() {
4675
108
            return [
4676
109
                {tag: "set", accounts: Qt.resolvedUrl("../../data/unity/backgrounds/blue.png"), expected: "blue.png"},
4677
110
                {tag: "unset", accounts: "", expected: "background.jpg"},
4678
111
                {tag: "invalid", accounts: "invalid", expected: "background.jpg"},
4679
112
            ]
4680
113
        }
4681
114
4682
115
        function test_background(data) {
4683
116
            var loader = findChild(greeter, "greeterContentLoader")
4684
117
            var background = findChild(loader.item, "greeterBackground")
4685
118
            AccountsService.backgroundFile = data.accounts
4686
119
            tryCompareFunction(function() { return background.source.toString().indexOf(data.expected) !== -1; }, true)
4687
120
            tryCompare(background, "status", Image.Ready)
4688
121
        }
4689
122
4690
123
        function test_initial_selected_signal() {
107
        function test_initial_selected_signal() {
4691
124
            var greeterObj = greeterComponent.createObject(this)
108
            var greeterObj = greeterComponent.createObject(this)
4692
125
            var spy = findChild(greeterObj, "selectedSpy")
109
            var spy = findChild(greeterObj, "selectedSpy")
4693
126
110
4694
=== added file 'tests/qmltests/tst_GreeterShell.qml'
4695
--- tests/qmltests/tst_GreeterShell.qml	1970-01-01 00:00:00 +0000
4696
+++ tests/qmltests/tst_GreeterShell.qml	2014-05-29 14:11:15 +0000
4697
@@ -0,0 +1,88 @@
4698
1
/*
4699
2
 * Copyright (C) 2013 Canonical, Ltd.
4700
3
 *
4701
4
 * Authors:
4702
5
 *   Michael Terry <michael.terry@canonical.com>
4703
6
 *
4704
7
 * This program is free software; you can redistribute it and/or modify
4705
8
 * it under the terms of the GNU General Public License as published by
4706
9
 * the Free Software Foundation; version 3.
4707
10
 *
4708
11
 * This program is distributed in the hope that it will be useful,
4709
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4710
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4711
14
 * GNU General Public License for more details.
4712
15
 *
4713
16
 * You should have received a copy of the GNU General Public License
4714
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4715
18
 */
4716
19
4717
20
import QtQuick 2.0
4718
21
import QtTest 1.0
4719
22
import AccountsService 0.1
4720
23
import GSettings 1.0
4721
24
import Unity.Application 0.1
4722
25
import Unity.Test 0.1 as UT
4723
26
import Powerd 0.1
4724
27
import LightDM 0.1 as LightDM
4725
28
4726
29
import "../../qml"
4727
30
4728
31
Item {
4729
32
    width: shell.width
4730
33
    height: shell.height
4731
34
4732
35
    QtObject {
4733
36
        id: applicationArguments
4734
37
4735
38
        function hasGeometry() {
4736
39
            return false;
4737
40
        }
4738
41
4739
42
        function width() {
4740
43
            return 0;
4741
44
        }
4742
45
4743
46
        function height() {
4744
47
            return 0;
4745
48
        }
4746
49
    }
4747
50
4748
51
    GreeterShell {
4749
52
        id: shell
4750
53
        defaultBackground: Qt.resolvedUrl("../../qml/graphics/phone_background.jpg")
4751
54
    }
4752
55
4753
56
    UT.UnityTestCase {
4754
57
        name: "GreeterShell"
4755
58
        when: windowShown
4756
59
4757
60
        function test_wallpaper_data() {
4758
61
            return [
4759
62
                {tag: "both", accounts: "../tests/data/unity/backgrounds/blue.png", gsettings: "../tests/data/unity/backgrounds/red.png", expected: "blue.png"},
4760
63
                {tag: "accounts", accounts: "../tests/data/unity/backgrounds/blue.png", gsettings: "", expected: "blue.png"},
4761
64
                {tag: "gsettings", accounts: "", gsettings: "../tests/data/unity/backgrounds/red.png", expected: "red.png"},
4762
65
                {tag: "none", accounts: "", gsettings: "", expected: shell.defaultBackground},
4763
66
                {tag: "invalid-both", accounts: "invalid", gsettings: "invalid", expected: shell.defaultBackground},
4764
67
                {tag: "invalid-accounts", accounts: "invalid", gsettings: "../tests/data/unity/backgrounds/red.png", expected: shell.defaultBackground},
4765
68
                {tag: "invalid-gsettings", accounts: "../tests/data/unity/backgrounds/blue.png", gsettings: "invalid", expected: "blue.png"},
4766
69
            ]
4767
70
        }
4768
71
4769
72
        function test_wallpaper(data) {
4770
73
            var greeterBackground = findChild(shell, "greeterBackground")
4771
74
            GSettingsController.setPictureUri(data.gsettings)
4772
75
            AccountsService.backgroundFile = data.accounts
4773
76
            verify(greeterBackground.source.toString().indexOf(data.expected) !== -1)
4774
77
            tryCompare(greeterBackground, "status", Image.Ready)
4775
78
        }
4776
79
4777
80
        function test_dispatchURLHidesGreeter() {
4778
81
            var greeter = findChild(shell, "greeter")
4779
82
            greeter.showNow()
4780
83
            tryCompare(greeter, "showProgress", 1)
4781
84
            LightDM.URLDispatcher.dispatchURL("application:///notes-app")
4782
85
            tryCompare(greeter, "showProgress", 0)
4783
86
        }
4784
87
    }
4785
88
}
4786
0
89
4787
=== modified file 'tests/qmltests/tst_Shell.qml'
4788
--- tests/qmltests/tst_Shell.qml	2014-05-21 15:09:07 +0000
4789
+++ tests/qmltests/tst_Shell.qml	2014-05-29 14:11:15 +0000
4790
@@ -23,6 +23,7 @@
4791
23
import Unity.Application 0.1
23
import Unity.Application 0.1
4792
24
import Unity.Test 0.1 as UT
24
import Unity.Test 0.1 as UT
4793
25
import Powerd 0.1
25
import Powerd 0.1
4794
26
import SessionManager 0.1
4795
26
27
4796
27
import "../../qml"
28
import "../../qml"
4797
28
29
4798
@@ -48,6 +49,7 @@
4799
48
49
4800
49
    Shell {
50
    Shell {
4801
50
        id: shell
51
        id: shell
4802
52
        defaultBackground: Qt.resolvedUrl("../../qml/graphics/phone_background.jpg")
4803
51
    }
53
    }
4804
52
54
4805
53
    UT.UnityTestCase {
55
    UT.UnityTestCase {
4806
@@ -72,9 +74,6 @@
4807
72
                ok = homeLoader !== null
74
                ok = homeLoader !== null
4808
73
                    && homeLoader.item !== undefined;
75
                    && homeLoader.item !== undefined;
4809
74
76
4810
75
                var greeter = findChild(shell, "greeter");
4811
76
                ok &= greeter !== null;
4812
77
4813
78
                var launcherPanel = findChild(shell, "launcherPanel");
77
                var launcherPanel = findChild(shell, "launcherPanel");
4814
79
                ok &= launcherPanel !== null;
78
                ok &= launcherPanel !== null;
4815
80
79
4816
@@ -89,17 +88,9 @@
4817
89
            } while (!ok && attempts <= maxAttempts);
88
            } while (!ok && attempts <= maxAttempts);
4818
90
89
4819
91
            verify(ok);
90
            verify(ok);
4820
92
4821
93
            swipeAwayGreeter();
4822
94
        }
91
        }
4823
95
92
4824
96
        function cleanup() {
93
        function cleanup() {
4825
97
            // If a test invoked the greeter, make sure we swipe it away again
4826
98
            var greeter = findChild(shell, "greeter");
4827
99
            if (greeter.shown) {
4828
100
                swipeAwayGreeter();
4829
101
            }
4830
102
4831
103
            // kill all (fake) running apps
94
            // kill all (fake) running apps
4832
104
            killApps(ApplicationManager);
95
            killApps(ApplicationManager);
4833
105
96
4834
@@ -181,8 +172,6 @@
4835
181
        }
172
        }
4836
182
173
4837
183
        function test_suspend() {
174
        function test_suspend() {
4838
184
            var greeter = findChild(shell, "greeter");
4839
185
4840
186
            // Launch an app from the launcher
175
            // Launch an app from the launcher
4841
187
            dragLauncherIntoView();
176
            dragLauncherIntoView();
4842
188
            tapOnAppIconInLauncher();
177
            tapOnAppIconInLauncher();
4843
@@ -196,40 +185,27 @@
4844
196
185
4845
197
            // Try to suspend while proximity is engaged...
186
            // Try to suspend while proximity is engaged...
4846
198
            Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);
187
            Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);
4848
199
            tryCompare(greeter, "showProgress", 0);
188
            tryCompare(SessionManager, "active", true);
4849
200
189
4850
201
            // Now really suspend
190
            // Now really suspend
4851
202
            print("suspending")
191
            print("suspending")
4852
203
            Powerd.displayPowerStateChange(Powerd.Off, 0);
192
            Powerd.displayPowerStateChange(Powerd.Off, 0);
4853
204
            print("done suspending")
193
            print("done suspending")
4855
205
            tryCompare(greeter, "showProgress", 1);
194
            tryCompare(SessionManager, "active", false);
4856
206
195
4857
207
            tryCompare(ApplicationManager, "suspended", true);
196
            tryCompare(ApplicationManager, "suspended", true);
4858
208
            compare(mainApp.state, ApplicationInfo.Suspended);
197
            compare(mainApp.state, ApplicationInfo.Suspended);
4859
209
198
4860
210
            // And wake up
199
            // And wake up
4861
211
            Powerd.displayPowerStateChange(Powerd.On, 0);
200
            Powerd.displayPowerStateChange(Powerd.On, 0);
4862
212
            tryCompare(greeter, "showProgress", 1);
4863
213
201
4866
214
            // Swipe away greeter to focus app
202
            // Activate session to focus app
4867
215
            swipeAwayGreeter();
203
            SessionManager.active = true;
4868
216
            tryCompare(ApplicationManager, "suspended", false);
204
            tryCompare(ApplicationManager, "suspended", false);
4869
217
            compare(mainApp.state, ApplicationInfo.Running);
205
            compare(mainApp.state, ApplicationInfo.Running);
4870
218
            tryCompare(ApplicationManager, "focusedApplicationId", mainAppId);
206
            tryCompare(ApplicationManager, "focusedApplicationId", mainAppId);
4871
219
        }
207
        }
4872
220
208
4873
221
        function swipeAwayGreeter() {
4874
222
            var greeter = findChild(shell, "greeter");
4875
223
            tryCompare(greeter, "showProgress", 1);
4876
224
4877
225
            var touchX = shell.width - (shell.edgeSize / 2);
4878
226
            var touchY = shell.height / 2;
4879
227
            touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);
4880
228
4881
229
            // wait until the animation has finished
4882
230
            tryCompare(greeter, "showProgress", 0);
4883
231
        }
4884
232
4885
233
        /*
209
        /*
4886
234
            Perform a right-edge drag when the Dash is being show and there are
210
            Perform a right-edge drag when the Dash is being show and there are
4887
235
            no running/minimized apps to be restored.
211
            no running/minimized apps to be restored.
4888
@@ -477,22 +453,14 @@
4889
477
453
4890
478
        function test_DashShown_data() {
454
        function test_DashShown_data() {
4891
479
            return [
455
            return [
4897
480
                {tag: "in focus", greeter: false, app: false, launcher: false, indicators: false, expectedShown: true},
456
                {tag: "in focus", app: false, launcher: false, indicators: false, expectedShown: true},
4898
481
                {tag: "under greeter", greeter: true, app: false, launcher: false, indicators: false, expectedShown: false},
457
                {tag: "under app", app: true, launcher: false, indicators: false, expectedShown: false},
4899
482
                {tag: "under app", greeter: false, app: true, launcher: false, indicators: false, expectedShown: false},
458
                {tag: "under launcher", app: false, launcher: true, indicators: false, expectedShown: true},
4900
483
                {tag: "under launcher", greeter: false, app: false, launcher: true, indicators: false, expectedShown: true},
459
                {tag: "under indicators", app: false, launcher: false, indicators: true, expectedShown: true},
4896
484
                {tag: "under indicators", greeter: false, app: false, launcher: false, indicators: true, expectedShown: true},
4901
485
            ]
460
            ]
4902
486
        }
461
        }
4903
487
462
4904
488
        function test_DashShown(data) {
463
        function test_DashShown(data) {
4905
489
            if (data.greeter) {
4906
490
                // Swipe the greeter in
4907
491
                var greeter = findChild(shell, "greeter");
4908
492
                Powerd.displayPowerStateChange(Powerd.Off, 0);
4909
493
                tryCompare(greeter, "showProgress", 1);
4910
494
            }
4911
495
4912
496
            if (data.app) {
464
            if (data.app) {
4913
497
                dragLauncherIntoView();
465
                dragLauncherIntoView();
4914
498
                tapOnAppIconInLauncher();
466
                tapOnAppIconInLauncher();
4915
@@ -522,17 +490,6 @@
4916
522
            tryCompare(searchIndicator, "opacity", 0);
490
            tryCompare(searchIndicator, "opacity", 0);
4917
523
        }
491
        }
4918
524
492
4919
525
        function test_searchIndicatorHidesOnGreeterShown() {
4920
526
            var searchIndicator = findChild(shell, "container")
4921
527
            var greeter = findChild(shell, "greeter");
4922
528
4923
529
            tryCompare(searchIndicator, "opacity", 1)
4924
530
4925
531
            greeter.show()
4926
532
            tryCompare(greeter, "shown", true)
4927
533
            tryCompare(searchIndicator, "opacity", 0)
4928
534
        }
4929
535
4930
536
        function test_searchIndicatorHideOnPreviewShown() {
493
        function test_searchIndicatorHideOnPreviewShown() {
4931
537
            var searchIndicator = findChild(shell, "container");
494
            var searchIndicator = findChild(shell, "container");
4932
538
            var dashContent = findChild(shell, "dashContent");
495
            var dashContent = findChild(shell, "dashContent");
4933
@@ -545,16 +502,5 @@
4934
545
502
4935
546
            tryCompare(searchIndicator, "opacity", 0);
503
            tryCompare(searchIndicator, "opacity", 0);
4936
547
        }
504
        }
4937
548
4938
549
        function test_focusRequestedHidesGreeter() {
4939
550
            var greeter = findChild(shell, "greeter")
4940
551
4941
552
            greeter.show()
4942
553
            tryCompare(greeter, "showProgress", 1)
4943
554
4944
555
            ApplicationManager.focusRequested("notes-app")
4945
556
            tryCompare(greeter, "showProgress", 0)
4946
557
            waitUntilApplicationWindowIsFullyVisible()
4947
558
        }
4948
559
    }
505
    }
4949
560
}
506
}
4950
561
507
4951
=== modified file 'tools/unlock-device'
4952
--- tools/unlock-device	2014-05-14 17:09:07 +0000
4953
+++ tools/unlock-device	2014-05-29 14:11:15 +0000
4954
@@ -17,24 +17,16 @@
4955
17
        esac
17
        esac
4956
18
done
18
done
4957
19
19
4968
20
UNLOCK_SCRIPT='
20
LIGHTDM_CONFIG="
4969
21
import dbus, logging;
21
[SeatDefaults]
4970
22
from unity8 import process_helpers as helpers;
22
autologin-in-background=false
4971
23
logging.basicConfig(level=logging.INFO);
23
"
4972
24
bus = dbus.SystemBus().get_object("com.canonical.powerd", "/com/canonical/powerd");
24
LIGHTDM_CONFIG_FILE="/etc/lightdm/lightdm.conf.d/99-unity8-greeter-unlock.conf"
4973
25
cookie = bus.requestSysState("unlock-device-hold", 1, dbus_interface="com.canonical.powerd");
25
4974
26
helpers.restart_unity_with_testability();
26
adb shell "echo '$LIGHTDM_CONFIG' > $LIGHTDM_CONFIG_FILE"
4965
27
bus.clearSysState(cookie, dbus_interface="com.canonical.powerd");
4966
28
helpers.unlock_unity()
4967
29
'
4975
30
27
4976
31
eval "$WAIT_COMMAND"
28
eval "$WAIT_COMMAND"
4977
32
29
4986
33
UNLOCK_OUTPUT=$(adb shell "sudo -u phablet -i python3 -c '$UNLOCK_SCRIPT'" 2>&1)
30
adb shell "rm -f $LIGHTDM_CONFIG_FILE"
4987
34
if echo "$UNLOCK_OUTPUT" | grep 'Greeter unlocked' >/dev/null; then
31
4988
35
    echo "I: Unlock passed"
32
exit 0
4981
36
    exit 0
4982
37
else
4983
38
    echo "I: Unlock failed, script output: '$UNLOCK_OUTPUT'"
4984
39
    exit 1
4985
40
fi
Status:	Merged
Approved by:	Albert Astals Cid on 2014-05-26
Approved revision:	271
Merged at revision:	933
Proposed branch:	lp:~mterry/unity8/split
Merge into:	lp:unity8
Prerequisite:	lp:~mterry/unity8/greeter-ux-fixes
Diff against target:	4988 lines (+2256/-853) 104 files modified CMakeLists.txt (+1/-0) data/51-unity8-greeter.conf (+2/-0) data/CMakeLists.txt (+13/-0) data/unity8-greeter-init.conf (+12/-0) data/unity8-greeter-wrapper (+98/-0) data/unity8-greeter.desktop.in (+5/-0) debian/changelog (+6/-0) debian/control (+16/-0) debian/copyright (+1/-1) debian/rules (+0/-4) debian/unity8-greeter.install (+6/-0) debian/unity8-private.install (+1/-0) debian/unity8.install (+0/-1) plugins/AccountsService/AccountsService.cpp (+34/-11) plugins/AccountsService/AccountsService.h (+9/-0) plugins/CMakeLists.txt (+1/-0) plugins/LightDM/CMakeLists.txt (+6/-9) plugins/LightDM/Greeter.cpp (+3/-0) plugins/LightDM/Greeter.h (+2/-0) plugins/LightDM/URLDispatcher.cpp (+55/-0) plugins/LightDM/URLDispatcher.h (+34/-0) plugins/LightDM/plugin.cpp (+9/-0) plugins/SessionBroadcast/SessionBroadcast.cpp (+35/-0) plugins/SessionBroadcast/SessionBroadcast.h (+11/-0) plugins/SessionManager/CMakeLists.txt (+22/-0) plugins/SessionManager/SessionManager.cpp (+124/-0) plugins/SessionManager/SessionManager.h (+61/-0) plugins/SessionManager/plugin.cpp (+35/-0) plugins/SessionManager/plugin.h (+35/-0) plugins/SessionManager/qmldir (+2/-0) plugins/Unity/Launcher/backend/launcherbackend.cpp (+16/-2) plugins/Unity/Launcher/backend/launcherbackend.h (+7/-1) plugins/Unity/Launcher/launcheritem.cpp (+14/-9) plugins/Unity/Launcher/launcheritem.h (+2/-1) plugins/Unity/Launcher/launchermodel.cpp (+41/-11) plugins/Unity/Launcher/launchermodel.h (+2/-0) po/ug.po (+2/-1) qml/Components/BasicShell.qml (+84/-0) qml/Components/EdgeDemo.qml (+1/-53) qml/Components/Lockscreen.qml (+0/-20) qml/Components/PageHeader.qml (+3/-2) qml/Dash/ScopeListView.qml (+3/-2) qml/Greeter/Clock.qml (+1/-1) qml/Greeter/Greeter.qml (+36/-3) qml/Greeter/GreeterContent.qml (+0/-38) qml/Greeter/GreeterEdgeDemo.qml (+102/-0) qml/Greeter/Infographics.qml (+0/-2) qml/GreeterShell.qml (+283/-0) qml/Hud/Hud.qml (+1/-4) qml/Notifications/NotificationMenuItemFactory.qml (+29/-13) qml/Panel/Panel.qml (+1/-1) qml/Shell.qml (+31/-177) run.sh (+6/-4) src/CMakeLists.txt (+15/-3) src/main.cpp (+18/-4) tests/autopilot/unity8/application_lifecycle/tests/__init__.py (+0/-2) tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py (+1/-29) tests/autopilot/unity8/application_lifecycle/tests/test_greeter.py (+75/-0) tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py (+1/-0) tests/autopilot/unity8/indicators/tests/test_indicators.py (+0/-2) tests/autopilot/unity8/process_helpers.py (+0/-56) tests/autopilot/unity8/shell/tests/__init__.py (+16/-4) tests/autopilot/unity8/shell/tests/disabled_test_hud.py (+1/-7) tests/autopilot/unity8/shell/tests/test_emulators.py (+0/-3) tests/autopilot/unity8/shell/tests/test_lock_screen.py (+12/-13) tests/autopilot/unity8/shell/tests/test_notifications.py (+2/-14) tests/mocks/AccountsService/AccountsService.cpp (+9/-0) tests/mocks/AccountsService/AccountsService.h (+7/-0) tests/mocks/CMakeLists.txt (+2/-1) tests/mocks/LightDM/demo/CMakeLists.txt (+0/-21) tests/mocks/LightDM/demo/GreeterPrivate.cpp (+0/-70) tests/mocks/LightDM/demo/UsersModelPrivate.cpp (+0/-41) tests/mocks/LightDM/qmldir (+0/-3) tests/mocks/SessionManager/CMakeLists.txt (+19/-0) tests/mocks/SessionManager/SessionManager.cpp (+43/-0) tests/mocks/SessionManager/SessionManager.h (+49/-0) tests/mocks/SessionManager/plugin.cpp (+34/-0) tests/mocks/SessionManager/plugin.h (+34/-0) tests/mocks/SessionManager/qmldir (+2/-0) tests/mocks/liblightdm/CMakeLists.txt (+0/-46) tests/mocks/liblightdm/Greeter.cpp (+11/-0) tests/mocks/liblightdm/Greeter.h (+4/-0) tests/mocks/liblightdm/full/CMakeLists.txt (+3/-2) tests/mocks/liblightdm/single-passphrase/CMakeLists.txt (+3/-2) tests/mocks/liblightdm/single-pin/CMakeLists.txt (+3/-2) tests/mocks/liblightdm/single/CMakeLists.txt (+3/-2) tests/plugins/CMakeLists.txt (+2/-1) tests/plugins/LightDM/CMakeLists.txt (+5/-4) tests/plugins/SessionManager/CMakeLists.txt (+48/-0) tests/plugins/SessionManager/LightDMSessionServer.cpp (+38/-0) tests/plugins/SessionManager/LightDMSessionServer.h (+40/-0) tests/plugins/SessionManager/LoginManagerServer.cpp (+34/-0) tests/plugins/SessionManager/LoginManagerServer.h (+37/-0) tests/plugins/SessionManager/LoginSessionServer.cpp (+25/-0) tests/plugins/SessionManager/LoginSessionServer.h (+39/-0) tests/plugins/SessionManager/client.cpp (+88/-0) tests/plugins/SessionManager/interfaces.xml (+22/-0) tests/plugins/SessionManager/server.cpp (+57/-0) tests/qmltests/CMakeLists.txt (+40/-49) tests/qmltests/Greeter/tst_Lockscreen.qml (+1/-2) tests/qmltests/Greeter/tst_Phone.qml (+1/-17) tests/qmltests/tst_GreeterShell.qml (+88/-0) tests/qmltests/tst_Shell.qml (+10/-64) tools/unlock-device (+10/-18)
To merge this branch:	bzr merge lp:~mterry/unity8/split
Related bugs:	Link a bug report
Related blueprints:	Make Fake Phablet Greeter a Real One (Undefined) Unity8 greeter and associated components/activities, 14.10 tasks. (Undefined)
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2014-03-27	Approve on 2014-05-26
PS Jenkins bot (community)	continuous-integration	2014-03-27	Needs Fixing on 2014-05-23
Michał Sawicz			Needs Fixing on 2014-05-23
Timo Jyrinki			Needs Fixing on 2014-04-02
Review via email: mp+213149@code.launchpad.net