1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-02-12 00:12:30 +0000
3
+++ CMakeLists.txt	2016-03-11 18:12:46 +0000
4
@@ -58,6 +58,7 @@
5
58
find_package(Qt5Sql 5.4 REQUIRED)
58
find_package(Qt5Sql 5.4 REQUIRED)
6
59
59
7
60
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
60
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
8
61
pkg_check_modules(GEONAMES REQUIRED geonames)
9
61
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
62
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
10
62
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
63
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
11
63
pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
64
pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
12
@@ -131,7 +132,7 @@
13
131
    set(STDOUT_LOGGER "-o" "-,txt")
132
    set(STDOUT_LOGGER "-o" "-,txt")
14
132
endif()
133
endif()
15
133
134
17
134
execute_process(COMMAND arch OUTPUT_VARIABLE ARCH)
135
execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH OUTPUT_VARIABLE ARCH)
18
135
if (NOT ARCH MATCHES "arm*")
136
if (NOT ARCH MATCHES "arm*")
19
136
    set(ENABLE_TOUCH_EMULATION true)
137
    set(ENABLE_TOUCH_EMULATION true)
20
137
    add_definitions(-DUNITY8_ENABLE_TOUCH_EMULATION)
138
    add_definitions(-DUNITY8_ENABLE_TOUCH_EMULATION)
21
138
139
22
=== modified file 'cmake/modules/QmlTest.cmake'
23
--- cmake/modules/QmlTest.cmake	2015-05-21 20:24:47 +0000
24
+++ cmake/modules/QmlTest.cmake	2016-03-11 18:12:46 +0000
25
@@ -183,7 +183,7 @@
26
183
    cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
183
    cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
27
184
    mangle_arguments()
184
    mangle_arguments()
28
185
185
30
186
    bake_arguments("${QMLTEST_ARG_PREFIX}" args -qmljsdebugger=port:3768)
186
    bake_arguments("${QMLTEST_ARG_PREFIX}" args -qmljsdebugger=port:3768,3800)
31
187
187
32
188
    set(qmltry_command
188
    set(qmltry_command
33
189
        $<TARGET_FILE:${TARGET}>
189
        $<TARGET_FILE:${TARGET}>
34
190
190
35
=== modified file 'data/com.canonical.Unity8.gschema.xml'
36
--- data/com.canonical.Unity8.gschema.xml	2015-11-24 17:44:18 +0000
37
+++ data/com.canonical.Unity8.gschema.xml	2016-03-11 18:12:46 +0000
38
@@ -27,6 +27,17 @@
39
27
      <summary>Maximum push needed to overcome edge barrier</summary>
27
      <summary>Maximum push needed to overcome edge barrier</summary>
40
28
      <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
28
      <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
41
29
    </key>
29
    </key>
42
30
    <key type="b" name="autohide-launcher">
43
31
      <default>true</default>
44
32
      <summary>Autohide the launcher</summary>
45
33
      <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
46
34
    </key>
47
35
    <key type="u" name="launcher-width">
48
36
      <default>8</default>
49
37
      <range min="6" max="12"/>
50
38
      <summary>Width of the launcher in grid units.</summary>
51
39
      <description>Changes the width of the launcher in all usage modes.</description>
52
40
    </key>
53
30
  </schema>
41
  </schema>
54
31
42
55
32
  <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
43
  <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
56
33
44
57
=== modified file 'data/unity8-dash.conf'
58
--- data/unity8-dash.conf	2015-04-21 15:41:09 +0000
59
+++ data/unity8-dash.conf	2016-03-11 18:12:46 +0000
60
@@ -14,6 +14,7 @@
61
14
oom score 50
14
oom score 50
62
15
15
63
16
respawn
16
respawn
64
17
respawn limit unlimited
65
17
18
66
18
env APP_ID=unity8-dash
19
env APP_ID=unity8-dash
67
19
20
68
20
21
69
=== modified file 'debian/changelog'
70
--- debian/changelog	2016-03-08 20:59:35 +0000
71
+++ debian/changelog	2016-03-11 18:12:46 +0000
72
@@ -1,3 +1,100 @@
73
1
unity8 (8.13+15.04.20150914-0ubuntu1) UNRELEASED; urgency=medium
74
2
75
3
  * bump version to fix OOBE build
76
4
77
5
 -- Lukas Tinkl <ltinkl@canonical.com>  Mon, 14 Sep 2015 19:19:23 +0200
78
6
79
7
unity8 (8.11+16.04.20160310.4-0ubuntu1) xenial; urgency=medium
80
8
81
9
  [ Albert Astals Cid ]
82
10
  * Add context for Re-dock as asked by translators (LP: #1534608)
83
11
  * Add emblem to the preview header widget (LP: #1424720)
84
12
  * Add haptics to ScopesListCategoryItem buttons
85
13
  * Audio Cards: Make some of the image loading async (LP: #1533432)
86
14
  * Do not create fallback code for the card tool fake card (LP:
87
15
    #1545865)
88
16
  * Fix resizing the dash bringing temp scopes size out of sync (LP:
89
17
    #1543130)
90
18
  * Minor fixes for unity-scope-tool
91
19
  * Resolve title alignment on card creator time instead of on runtime
92
20
  * Use fixedHeaderHeight only in the non cardtool cards
93
21
  * Use the new undeprecated connectivityqt::Connectivity
94
22
  * asynchronous is only false on the fake card in cardtool
95
23
  * clazy fixes
96
24
97
25
  [ Albert Astals Cid, CI Train Bot ]
98
26
  * click scope: Add the else branch so we reset the card size in all
99
27
    situations
100
28
101
29
  [ Andrea Cimitan ]
102
30
  * PreviewSharing widget now accepts both string and array of
103
31
    widgetData["share-data"]["uri"] (LP: #1549056)
104
32
  * Update AP tests for new single preview
105
33
  * Use Text.Wrap for body notification text (LP: #1544909)
106
34
107
35
  [ Andrea Cimitan, Lukáš Tinkl, Michael Zanetti, Nick Dedekind ]
108
36
  * some fixes for the new palette (LP: #1554616)
109
37
110
38
  [ CI Train Bot ]
111
39
  * Resync trunk.
112
40
  * Update translation template
113
41
114
42
  [ CI Train Bot, Daniel d'Andrada ]
115
43
  * Ensure the QML engine doesn't delete our mock MirSurfaces on its
116
44
    own.
117
45
118
46
  [ Daniel d'Andrada ]
119
47
  * tst_Shell: Remove unused qml items
120
48
121
49
  [ Josh Arenson ]
122
50
  * Allow the shell to blacklist input devices and force the OSK shown.
123
51
    (LP: #1542224)
124
52
125
53
  [ Lukáš Tinkl ]
126
54
  * Disallow resizing windows up, past the Panel (LP: #1544766)
127
55
  * Elide the window title not to let it overflow into the indicators
128
56
    area (LP: #1535767)
129
57
  * Enable the PIN lockscreen to be used with a HW keyboard (LP:
130
58
    #1550359)
131
59
  * Fix tiny windows when switching stages
132
60
  * Provide a range of ports to QML JS Debugger
133
61
  * Watch for launcher item icon changes (LP: #1543290)
134
62
135
63
  [ Michael Terry ]
136
64
  * Proxy more mouse and touchpad properties to USC (LP: #1540398) (LP:
137
65
    #1543344, #1540398)
138
66
  * Refactor the AccountsService plugin and make it slightly faster.
139
67
  * To let the user log in if a mouse is connected, hide the greeter
140
68
    cover page on a mouse click (but NOT a touch click). (LP: #1540497)
141
69
  * Watch AccountsService for changes to the user's real name.  This was
142
70
    preventing us from noticing when the user set their name in the
143
71
    welcome wizard.
144
72
145
73
  [ Michael Zanetti ]
146
74
  * Allow alt+tabbing in staged mode too (LP: #1540502)
147
75
  * Allow invoking the staged mode spreads by mouse right edge pushes
148
76
    too (LP: #1540392)
149
77
  * Allow loading the device configuration from an external file
150
78
  * Implement Launcher's keyboard navigation and updated pip design
151
79
  * Make launcher scalable, allow it locking (LP: #1511015)
152
80
  * Properly parent launcher items in all cases (LP: #1495732)
153
81
  * Read inputMethod surface from the new property int QtMir (LP:
154
82
    #1545286)
155
83
  * Some visual updates and rotation lock for the virtual touchpad (LP:
156
84
    #1549087)
157
85
  * Visual updates for the windowed spread (LP: #1488148)
158
86
  * stabilize swipeAwayGreeter()
159
87
160
88
  [ Michał Sawicz ]
161
89
  * Add udev rules to make sure we have access to uinput
162
90
  * Make dash respawn indefinitely (LP: #1550056)
163
91
  * Use dpkg-architecture, not arch, to disable touch emulation
164
92
165
93
  [ Vesa Rautiainen ]
166
94
  * Fixing the vertical position of desktop spread item icon.
167
95
168
96
 -- Michał Sawicz <michal.sawicz@canonical.com>  Thu, 10 Mar 2016 22:44:16 +0000
169
97
170
1
unity8 (8.11+16.04.20160308-0ubuntu1) xenial; urgency=medium
98
unity8 (8.11+16.04.20160308-0ubuntu1) xenial; urgency=medium
171
2
99
172
3
  [ Albert Astals Cid ]
100
  [ Albert Astals Cid ]
173
4
101
174
=== modified file 'debian/control'
175
--- debian/control	2016-03-04 21:03:43 +0000
176
+++ debian/control	2016-03-11 18:12:46 +0000
177
@@ -8,13 +8,14 @@
178
8
               doxyqml,
8
               doxyqml,
179
9
# To allow cross-compiling to work, we also must append :native
9
# To allow cross-compiling to work, we also must append :native
180
10
# to g++ so we don't try to run armhf g++
10
# to g++ so we don't try to run armhf g++
182
11
# on an x86 CPU for eaxmple, when cross-compiling.
11
# on an x86 CPU for example, when cross-compiling.
183
12
               g++:native,
12
               g++:native,
184
13
               libandroid-properties-dev,
13
               libandroid-properties-dev,
185
14
               graphviz,
14
               graphviz,
186
15
               gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
15
               gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
188
16
               libconnectivity-qt1-dev,
16
               libconnectivity-qt1-dev (>= 0.7.1),
189
17
               libevdev-dev,
17
               libevdev-dev,
190
18
               libgeonames-dev (>= 0.2),
191
18
               libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
19
               libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
192
19
               libgl1-mesa-dri,
20
               libgl1-mesa-dri,
193
20
               libgles2-mesa-dev[armhf],
21
               libgles2-mesa-dev[armhf],
194
@@ -55,7 +56,7 @@
195
55
               qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
56
               qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
196
56
               qtdeclarative5-ubuntu-content1,
57
               qtdeclarative5-ubuntu-content1,
197
57
               qtdeclarative5-ubuntu-settings-components (>= 0.7),
58
               qtdeclarative5-ubuntu-settings-components (>= 0.7),
199
58
               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
59
               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
200
59
               qtdeclarative5-ubuntu-web-plugin,
60
               qtdeclarative5-ubuntu-web-plugin,
201
60
               ttf-ubuntu-font-family,
61
               ttf-ubuntu-font-family,
202
61
Standards-Version: 3.9.4
62
Standards-Version: 3.9.4
203
@@ -70,7 +71,7 @@
204
70
Package: indicators-client
71
Package: indicators-client
205
71
Architecture: amd64 armhf i386
72
Architecture: amd64 armhf i386
206
72
Depends: qmenumodel-qml (>= 0.2.9),
73
Depends: qmenumodel-qml (>= 0.2.9),
208
73
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
74
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
209
74
         unity8 (= ${binary:Version}),
75
         unity8 (= ${binary:Version}),
210
75
         ${misc:Depends},
76
         ${misc:Depends},
211
76
         ${shlibs:Depends},
77
         ${shlibs:Depends},
212
@@ -101,7 +102,6 @@
213
101
         qml-module-qt-labs-folderlistmodel,
102
         qml-module-qt-labs-folderlistmodel,
214
102
         qml-module-qtquick-xmllistmodel,
103
         qml-module-qtquick-xmllistmodel,
215
103
         qml-module-qtsysteminfo,
104
         qml-module-qtsysteminfo,
216
104
         qtdeclarative5-gsettings1.0,
217
105
         qtdeclarative5-qtmir-plugin (>= 0.4.5),
105
         qtdeclarative5-qtmir-plugin (>= 0.4.5),
218
106
         qtdeclarative5-ubuntu-telephony0.1,
106
         qtdeclarative5-ubuntu-telephony0.1,
219
107
         qtdeclarative5-ubuntu-web-plugin,
107
         qtdeclarative5-ubuntu-web-plugin,
220
@@ -128,7 +128,7 @@
221
128
Depends: qml-module-qtquick-layouts,
128
Depends: qml-module-qtquick-layouts,
222
129
         qtdeclarative5-ubuntu-settings-components (>= 0.7),
129
         qtdeclarative5-ubuntu-settings-components (>= 0.7),
223
130
         qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
130
         qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
225
131
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
131
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
226
132
         qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
132
         qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
227
133
         ubuntu-thumbnailer-impl-0,
133
         ubuntu-thumbnailer-impl-0,
228
134
         unity-application-impl-13,
134
         unity-application-impl-13,
229
@@ -158,7 +158,7 @@
230
158
         python3-fixtures,
158
         python3-fixtures,
231
159
         python3-gi,
159
         python3-gi,
232
160
         qttestability-autopilot (>= 1.4),
160
         qttestability-autopilot (>= 1.4),
234
161
         ubuntu-ui-toolkit-autopilot (>= 1.3.1796),
161
         ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
235
162
         unity-scope-click,
162
         unity-scope-click,
236
163
         unity8 (= ${source:Version}),
163
         unity8 (= ${source:Version}),
237
164
         unity8-fake-env (= ${source:Version}),
164
         unity8-fake-env (= ${source:Version}),
238
@@ -192,6 +192,8 @@
239
192
         libhardware2,
192
         libhardware2,
240
193
         pay-service,
193
         pay-service,
241
194
         unity-schemas (>= 7.3.1+14.10.20140915),
194
         unity-schemas (>= 7.3.1+14.10.20140915),
242
195
         qtdeclarative5-gsettings1.0,
243
196
         qml-module-qtmultimedia,
244
195
         ${misc:Depends},
197
         ${misc:Depends},
245
196
         ${shlibs:Depends},
198
         ${shlibs:Depends},
246
197
Provides: unity-launcher-impl,
199
Provides: unity-launcher-impl,
247
198
200
248
=== added file 'debian/unity8-common.udev'
249
--- debian/unity8-common.udev	1970-01-01 00:00:00 +0000
250
+++ debian/unity8-common.udev	2016-03-11 18:12:46 +0000
251
@@ -0,0 +1,2 @@
252
1
# Make local foreground session able to inject input
253
2
KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess"
254
0
3
255
=== modified file 'debian/unity8-doc.install'
256
--- debian/unity8-doc.install	2014-01-30 22:32:37 +0000
257
+++ debian/unity8-doc.install	2016-03-11 18:12:46 +0000
258
@@ -1,1 +1,2 @@
259
1
doc/devices.conf usr/share/doc/unity8/
260
1
usr/share/doc/unity8/*
2
usr/share/doc/unity8/*
261
2
3
262
=== added file 'doc/devices.conf'
263
--- doc/devices.conf	1970-01-01 00:00:00 +0000
264
+++ doc/devices.conf	2016-03-11 18:12:46 +0000
265
@@ -0,0 +1,30 @@
266
1
# This file can hold multiple device configs. Devices are separated by sections.
267
2
#
268
3
# SupportedOrientations holds a list of all enabled orientations. A standard
269
4
# phone will usually have Portrait,Landcape,InvertedLandscape in order to
270
5
# disable upside down usage.
271
6
#
272
7
# PrimaryOrientation gives the orientation the device will start up with
273
8
# when there is no orientations sensor input available (yet) or lock to
274
9
# when an application specifies to be locked to PrimaryOrientation.
275
10
#
276
11
# The other Orientation settings can be used to re-map the orientations.
277
12
# A device might be used with different orientations than how the screen
278
13
# is physically mounted on the hardware.
279
14
#
280
15
# Category can be phone, tablet, or desktop. This option determines
281
16
# whether the side stage is shown (tablet) or not (phone). Using
282
17
# desktop will load the shell in windowed mode. Note that the user
283
18
# can override/change this by connecting input hardware or change
284
19
# user settings.
285
20
#
286
21
# Any options not listed will default to the values of the example below.
287
22
288
23
[devicename]
289
24
SupportedOrientations=Portrait,InvertedPortrait,Landscape,InvertedLandscape
290
25
PrimaryOrientation=PrimaryOrienation
291
26
PortraitOrientation=Portrait
292
27
InvertedPortraitOrientation=InvertedPortrait
293
28
LandscapeOrientation=Landscape
294
29
InvertedLandscapeOrientation=InvertedLandscape
295
30
Category=phone
296
0
31
297
=== modified file 'plugins/AccountsService/AccountsService.cpp'
298
--- plugins/AccountsService/AccountsService.cpp	2016-01-21 21:04:00 +0000
299
+++ plugins/AccountsService/AccountsService.cpp	2016-03-11 18:12:46 +0000
300
@@ -1,5 +1,5 @@
301
1
/*
1
/*
303
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013, 2015 Canonical, Ltd.
304
3
 *
3
 *
305
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
306
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
307
@@ -12,8 +12,6 @@
308
12
 *
12
 *
309
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU General Public License
310
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
311
15
 *
312
16
 * Author: Michael Terry <michael.terry@canonical.com>
313
17
 */
15
 */
314
18
16
315
19
#include "AccountsService.h"
17
#include "AccountsService.h"
316
@@ -24,17 +22,55 @@
317
24
#include <QStringList>
22
#include <QStringList>
318
25
#include <QDebug>
23
#include <QDebug>
319
26
24
320
25
#define IFACE_ACCOUNTS_USER          QStringLiteral("org.freedesktop.Accounts.User")
321
26
#define IFACE_LOCATION_HERE          QStringLiteral("com.ubuntu.location.providers.here.AccountsService")
322
27
#define IFACE_UBUNTU_INPUT           QStringLiteral("com.ubuntu.AccountsService.Input")
323
28
#define IFACE_UBUNTU_SECURITY        QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy")
324
29
#define IFACE_UBUNTU_SECURITY_OLD    QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy")
325
30
#define IFACE_UNITY                  QStringLiteral("com.canonical.unity.AccountsService")
326
31
#define IFACE_UNITY_PRIVATE          QStringLiteral("com.canonical.unity.AccountsService.Private")
327
32
328
33
#define PROP_BACKGROUND_FILE                   QStringLiteral("BackgroundFile")
329
34
#define PROP_DEMO_EDGES                        QStringLiteral("demo-edges")
330
35
#define PROP_DEMO_EDGES_COMPLETED              QStringLiteral("DemoEdgesCompleted")
331
36
#define PROP_EMAIL                             QStringLiteral("Email")
332
37
#define PROP_ENABLE_INDICATORS_WHILE_LOCKED    QStringLiteral("EnableIndicatorsWhileLocked")
333
38
#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED      QStringLiteral("EnableLauncherWhileLocked")
334
39
#define PROP_FAILED_LOGINS                     QStringLiteral("FailedLogins")
335
40
#define PROP_LICENSE_ACCEPTED                  QStringLiteral("LicenseAccepted")
336
41
#define PROP_LICENSE_BASE_PATH                 QStringLiteral("LicenseBasePath")
337
42
#define PROP_MOUSE_CURSOR_SPEED                QStringLiteral("MouseCursorSpeed")
338
43
#define PROP_MOUSE_DOUBLE_CLICK_SPEED          QStringLiteral("MouseDoubleClickSpeed")
339
44
#define PROP_MOUSE_PRIMARY_BUTTON              QStringLiteral("MousePrimaryButton")
340
45
#define PROP_MOUSE_SCROLL_SPEED                QStringLiteral("MouseScrollSpeed")
341
46
#define PROP_PASSWORD_DISPLAY_HINT             QStringLiteral("PasswordDisplayHint")
342
47
#define PROP_REAL_NAME                         QStringLiteral("RealName")
343
48
#define PROP_STATS_WELCOME_SCREEN              QStringLiteral("StatsWelcomeScreen")
344
49
#define PROP_TOUCHPAD_CURSOR_SPEED             QStringLiteral("TouchpadCursorSpeed")
345
50
#define PROP_TOUCHPAD_DISABLE_WHILE_TYPING     QStringLiteral("TouchpadDisableWhileTyping")
346
51
#define PROP_TOUCHPAD_DISABLE_WITH_MOUSE       QStringLiteral("TouchpadDisableWithMouse")
347
52
#define PROP_TOUCHPAD_DOUBLE_CLICK_SPEED       QStringLiteral("TouchpadDoubleClickSpeed")
348
53
#define PROP_TOUCHPAD_PRIMARY_BUTTON           QStringLiteral("TouchpadPrimaryButton")
349
54
#define PROP_TOUCHPAD_SCROLL_SPEED             QStringLiteral("TouchpadScrollSpeed")
350
55
#define PROP_TOUCHPAD_TAP_TO_CLICK             QStringLiteral("TouchpadTapToClick")
351
56
#define PROP_TOUCHPAD_TWO_FINGER_SCROLL        QStringLiteral("TouchpadTwoFingerScroll")
352
57
353
58
354
59
QVariant primaryButtonConverter(const QVariant &value)
355
60
{
356
61
    QString stringValue = value.toString();
357
62
    if (stringValue == "left") {
358
63
        return QVariant::fromValue(0);
359
64
    } else if (stringValue == "right") {
360
65
        return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same
361
66
    } else {
362
67
        return QVariant::fromValue(0); // default to left
363
68
    }
364
69
}
365
70
366
27
AccountsService::AccountsService(QObject* parent, const QString &user)
71
AccountsService::AccountsService(QObject* parent, const QString &user)
377
28
    : QObject(parent),
72
    : QObject(parent)
378
29
    m_service(new AccountsServiceDBusAdaptor(this)),
73
    , m_service(new AccountsServiceDBusAdaptor(this))
369
30
    m_demoEdges(false),
370
31
    m_enableLauncherWhileLocked(false),
371
32
    m_enableIndicatorsWhileLocked(false),
372
33
    m_statsWelcomeScreen(false),
373
34
    m_passwordDisplayHint(Keyboard),
374
35
    m_failedLogins(0),
375
36
    m_hereEnabled(false),
376
37
    m_hereLicensePath() // null means not set yet
379
38
{
74
{
380
39
    m_unityInput = new QDBusInterface(QStringLiteral("com.canonical.Unity.Input"),
75
    m_unityInput = new QDBusInterface(QStringLiteral("com.canonical.Unity.Input"),
381
40
                                      QStringLiteral("/com/canonical/Unity/Input"),
76
                                      QStringLiteral("/com/canonical/Unity/Input"),
382
@@ -44,6 +80,46 @@
383
44
    connect(m_service, &AccountsServiceDBusAdaptor::propertiesChanged, this, &AccountsService::onPropertiesChanged);
80
    connect(m_service, &AccountsServiceDBusAdaptor::propertiesChanged, this, &AccountsService::onPropertiesChanged);
384
45
    connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged, this, &AccountsService::onMaybeChanged);
81
    connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged, this, &AccountsService::onMaybeChanged);
385
46
82
386
83
    registerProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE, QStringLiteral("backgroundFileChanged"));
387
84
    registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));
388
85
    registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));
389
86
    registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));
390
87
    registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));
391
88
    registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
392
89
    registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED, QStringLiteral("enableIndicatorsWhileLockedChanged"));
393
90
    registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));
394
91
    registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));
395
92
    registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));
396
93
    registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));
397
94
    registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));
398
95
399
96
    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
400
97
                  m_unityInput, QStringLiteral("setMouseCursorSpeed"));
401
98
    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_DOUBLE_CLICK_SPEED,
402
99
                  m_unityInput, QStringLiteral("setMouseDoubleClickSpeed"));
403
100
    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_PRIMARY_BUTTON,
404
101
                  m_unityInput, QStringLiteral("setMousePrimaryButton"),
405
102
                  primaryButtonConverter);
406
103
    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_SCROLL_SPEED,
407
104
                  m_unityInput, QStringLiteral("setMouseScrollSpeed"));
408
105
    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_CURSOR_SPEED,
409
106
                  m_unityInput, QStringLiteral("setTouchpadCursorSpeed"));
410
107
    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_SCROLL_SPEED,
411
108
                  m_unityInput, QStringLiteral("setTouchpadScrollSpeed"));
412
109
    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DISABLE_WHILE_TYPING,
413
110
                  m_unityInput, QStringLiteral("setTouchpadDisableWhileTyping"));
414
111
    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DISABLE_WITH_MOUSE,
415
112
                  m_unityInput, QStringLiteral("setTouchpadDisableWithMouse"));
416
113
    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DOUBLE_CLICK_SPEED,
417
114
                  m_unityInput, QStringLiteral("setTouchpadDoubleClickSpeed"));
418
115
    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_PRIMARY_BUTTON,
419
116
                  m_unityInput, QStringLiteral("setTouchpadPrimaryButton"),
420
117
                  primaryButtonConverter);
421
118
    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_TAP_TO_CLICK,
422
119
                  m_unityInput, QStringLiteral("setTouchpadTapToClick"));
423
120
    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_TWO_FINGER_SCROLL,
424
121
                  m_unityInput, QStringLiteral("setTouchpadTwoFingerScroll"));
425
122
426
47
    setUser(!user.isEmpty() ? user : QString::fromUtf8(qgetenv("USER")));
123
    setUser(!user.isEmpty() ? user : QString::fromUtf8(qgetenv("USER")));
427
48
}
124
}
428
49
125
429
@@ -57,410 +133,236 @@
430
57
    if (user.isEmpty() || m_user == user)
133
    if (user.isEmpty() || m_user == user)
431
58
        return;
134
        return;
432
59
135
433
136
    bool wasEmpty = m_user.isEmpty();
434
137
435
60
    m_user = user;
138
    m_user = user;
436
61
    Q_EMIT userChanged();
139
    Q_EMIT userChanged();
437
62
140
449
63
    updateDemoEdges(false);
141
    // Do the first update synchronously, as a cheap way to block rendering
450
64
    updateEnableLauncherWhileLocked(false);
142
    // until we have the right values on bootup.
451
65
    updateEnableIndicatorsWhileLocked(false);
143
    refresh(!wasEmpty);
441
66
    updateBackgroundFile(false);
442
67
    updateMouseCursorSpeed();
443
68
    updateTouchpadCursorSpeed();
444
69
    updateStatsWelcomeScreen(false);
445
70
    updatePasswordDisplayHint(false);
446
71
    updateFailedLogins(false);
447
72
    updateHereEnabled(false);
448
73
    updateHereLicensePath(false);
452
74
}
144
}
453
75
145
454
76
bool AccountsService::demoEdges() const
146
bool AccountsService::demoEdges() const
455
77
{
147
{
457
78
    return m_demoEdges;
148
    auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES);
458
149
    return value.toBool();
459
79
}
150
}
460
80
151
461
81
void AccountsService::setDemoEdges(bool demoEdges)
152
void AccountsService::setDemoEdges(bool demoEdges)
462
82
{
153
{
468
83
    if (m_demoEdges != demoEdges) {
154
    setProperty(IFACE_UNITY, PROP_DEMO_EDGES, demoEdges);
469
84
        m_demoEdges = demoEdges;
155
}
470
85
        m_service->setUserPropertyAsync(m_user, QStringLiteral("com.canonical.unity.AccountsService"), QStringLiteral("demo-edges"), demoEdges);
156
471
86
157
QStringList AccountsService::demoEdgesCompleted() const
472
87
        Q_EMIT demoEdgesChanged();
158
{
473
159
    auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED);
474
160
    return value.toStringList();
475
161
}
476
162
477
163
void AccountsService::markDemoEdgeCompleted(const QString &edge)
478
164
{
479
165
    auto currentList = demoEdgesCompleted();
480
166
    if (!currentList.contains(edge)) {
481
167
        setProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, currentList << edge);
482
88
    }
168
    }
483
89
}
169
}
484
90
170
485
91
bool AccountsService::enableLauncherWhileLocked() const
171
bool AccountsService::enableLauncherWhileLocked() const
486
92
{
172
{
488
93
    return m_enableLauncherWhileLocked;
173
    auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);
489
174
    return value.toBool();
490
94
}
175
}
491
95
176
492
96
bool AccountsService::enableIndicatorsWhileLocked() const
177
bool AccountsService::enableIndicatorsWhileLocked() const
493
97
{
178
{
495
98
    return m_enableIndicatorsWhileLocked;
179
    auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED);
496
180
    return value.toBool();
497
99
}
181
}
498
100
182
499
101
QString AccountsService::backgroundFile() const
183
QString AccountsService::backgroundFile() const
500
102
{
184
{
502
103
    return m_backgroundFile;
185
    auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE);
503
186
    return value.toString();
504
104
}
187
}
505
105
188
506
106
bool AccountsService::statsWelcomeScreen() const
189
bool AccountsService::statsWelcomeScreen() const
507
107
{
190
{
509
108
    return m_statsWelcomeScreen;
191
    auto value = getProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN);
510
192
    return value.toBool();
511
109
}
193
}
512
110
194
513
111
AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const
195
AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const
514
112
{
196
{
516
113
    return m_passwordDisplayHint;
197
    auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT);
517
198
    return (PasswordDisplayHint)value.toInt();
518
114
}
199
}
519
115
200
520
116
bool AccountsService::hereEnabled() const
201
bool AccountsService::hereEnabled() const
521
117
{
202
{
523
118
    return m_hereEnabled;
203
    auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED);
524
204
    return value.toBool();
525
119
}
205
}
526
120
206
527
121
void AccountsService::setHereEnabled(bool enabled)
207
void AccountsService::setHereEnabled(bool enabled)
528
122
{
208
{
535
123
    if (m_hereEnabled != enabled) {
209
    setProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, enabled);
530
124
        m_hereEnabled = enabled;
531
125
        m_service->setUserPropertyAsync(m_user, QStringLiteral("com.ubuntu.location.providers.here.AccountsService"), QStringLiteral("LicenseAccepted"), enabled);
532
126
533
127
        Q_EMIT hereEnabledChanged();
534
128
    }
536
129
}
210
}
537
130
211
538
131
QString AccountsService::hereLicensePath() const
212
QString AccountsService::hereLicensePath() const
539
132
{
213
{
541
133
    return m_hereLicensePath;
214
    auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);
542
215
    QString hereLicensePath = value.toString();
543
216
    if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
544
217
        hereLicensePath = QStringLiteral("");
545
218
    return hereLicensePath;
546
134
}
219
}
547
135
220
548
136
bool AccountsService::hereLicensePathValid() const
221
bool AccountsService::hereLicensePathValid() const
549
137
{
222
{
861
138
    return !m_hereLicensePath.isNull();
223
    auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);
862
139
}
224
    return !value.toString().isNull();
863
140
225
}
864
141
void AccountsService::updateDemoEdges(bool async)
226
865
142
{
227
QString AccountsService::realName() const
866
143
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
228
{
867
144
                                                                    QStringLiteral("com.canonical.unity.AccountsService"),
229
    auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);
868
145
                                                                    QStringLiteral("demo-edges"));
230
    return value.toString();
869
146
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
231
}
870
147
232
871
148
    connect(watcher, &QDBusPendingCallWatcher::finished,
233
void AccountsService::setRealName(const QString &realName)
872
149
            this, [this](QDBusPendingCallWatcher* watcher) {
234
{
873
150
235
    setProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, realName);
874
151
        QDBusPendingReply<QDBusVariant> reply = *watcher;
236
}
875
152
        watcher->deleteLater();
237
876
153
        if (reply.isError()) {
238
QString AccountsService::email() const
877
154
            qWarning() << "Failed to get 'demo-edges' property - " << reply.error().message();
239
{
878
155
            return;
240
    auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL);
879
156
        }
241
    return value.toString();
880
157
242
}
881
158
        auto demoEdges = reply.value().variant().toBool();
243
882
159
        if (m_demoEdges != demoEdges) {
244
void AccountsService::setEmail(const QString &email)
883
160
            m_demoEdges = demoEdges;
245
{
884
161
            Q_EMIT demoEdgesChanged();
246
    setProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, email);
574
162
        }
575
163
    });
576
164
    if (!async) {
577
165
        watcher->waitForFinished();
578
166
        delete watcher;
579
167
    }
580
168
}
581
169
582
170
void AccountsService::updateEnableLauncherWhileLocked(bool async)
583
171
{
584
172
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
585
173
                                                                    QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
586
174
                                                                    QStringLiteral("EnableLauncherWhileLocked"));
587
175
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
588
176
589
177
    connect(watcher, &QDBusPendingCallWatcher::finished,
590
178
            this, [this](QDBusPendingCallWatcher* watcher) {
591
179
592
180
        QDBusPendingReply<QVariant> reply = *watcher;
593
181
        watcher->deleteLater();
594
182
        if (reply.isError()) {
595
183
            qWarning() << "Failed to get 'EnableLauncherWhileLocked' property - " << reply.error().message();
596
184
            return;
597
185
        }
598
186
599
187
        const bool enableLauncherWhileLocked = reply.value().toBool();
600
188
        if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
601
189
            m_enableLauncherWhileLocked = enableLauncherWhileLocked;
602
190
            Q_EMIT enableLauncherWhileLockedChanged();
603
191
        }
604
192
    });
605
193
    if (!async) {
606
194
        watcher->waitForFinished();
607
195
        delete watcher;
608
196
    }
609
197
}
610
198
611
199
void AccountsService::updateEnableIndicatorsWhileLocked(bool async)
612
200
{
613
201
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
614
202
                                                                    QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
615
203
                                                                    QStringLiteral("EnableIndicatorsWhileLocked"));
616
204
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
617
205
618
206
    connect(watcher, &QDBusPendingCallWatcher::finished,
619
207
            this, [this](QDBusPendingCallWatcher* watcher) {
620
208
621
209
        QDBusPendingReply<QVariant> reply = *watcher;
622
210
        watcher->deleteLater();
623
211
        if (reply.isError()) {
624
212
            qWarning() << "Failed to get 'EnableIndicatorsWhileLocked' property - " << reply.error().message();
625
213
            return;
626
214
        }
627
215
628
216
        const bool enableIndicatorsWhileLocked = reply.value().toBool();
629
217
        if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
630
218
            m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
631
219
            Q_EMIT enableIndicatorsWhileLockedChanged();
632
220
        }
633
221
    });
634
222
    if (!async) {
635
223
        watcher->waitForFinished();
636
224
        delete watcher;
637
225
    }
638
226
}
639
227
640
228
void AccountsService::updateBackgroundFile(bool async)
641
229
{
642
230
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
643
231
                                                                    QStringLiteral("org.freedesktop.Accounts.User"),
644
232
                                                                    QStringLiteral("BackgroundFile"));
645
233
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
646
234
647
235
    connect(watcher, &QDBusPendingCallWatcher::finished,
648
236
            this, [this](QDBusPendingCallWatcher* watcher) {
649
237
650
238
        QDBusPendingReply<QVariant> reply = *watcher;
651
239
        watcher->deleteLater();
652
240
        if (reply.isError()) {
653
241
            qWarning() << "Failed to get 'BackgroundFile' property - " << reply.error().message();
654
242
            return;
655
243
        }
656
244
657
245
        const QString backgroundFile = reply.value().toString();
658
246
        if (m_backgroundFile != backgroundFile) {
659
247
            m_backgroundFile = backgroundFile;
660
248
            Q_EMIT backgroundFileChanged();
661
249
        }
662
250
    });
663
251
    if (!async) {
664
252
        watcher->waitForFinished();
665
253
        delete watcher;
666
254
    }
667
255
}
668
256
669
257
void AccountsService::updateMouseCursorSpeed()
670
258
{
671
259
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
672
260
                                                                    QStringLiteral("com.ubuntu.AccountsService.Input"),
673
261
                                                                    QStringLiteral("MouseCursorSpeed"));
674
262
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
675
263
676
264
    connect(watcher, &QDBusPendingCallWatcher::finished,
677
265
            this, [this](QDBusPendingCallWatcher* watcher) {
678
266
679
267
        QDBusPendingReply<QVariant> reply = *watcher;
680
268
        watcher->deleteLater();
681
269
        if (reply.isError()) {
682
270
            qWarning() << "Failed to get 'MouseCursorSpeed' property - " << reply.error().message();
683
271
            return;
684
272
        }
685
273
686
274
        // Merely proxy this along to USC.  We don't care about keeping a copy
687
275
        // or exporting it internally.
688
276
        m_unityInput->asyncCall(QStringLiteral("setMouseCursorSpeed"), reply.value());
689
277
    });
690
278
}
691
279
692
280
void AccountsService::updateTouchpadCursorSpeed()
693
281
{
694
282
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
695
283
                                                                    QStringLiteral("com.ubuntu.AccountsService.Input"),
696
284
                                                                    QStringLiteral("TouchpadCursorSpeed"));
697
285
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
698
286
699
287
    connect(watcher, &QDBusPendingCallWatcher::finished,
700
288
            this, [this](QDBusPendingCallWatcher* watcher) {
701
289
702
290
        QDBusPendingReply<QVariant> reply = *watcher;
703
291
        watcher->deleteLater();
704
292
        if (reply.isError()) {
705
293
            qWarning() << "Failed to get 'TouchpadCursorSpeed' property - " << reply.error().message();
706
294
            return;
707
295
        }
708
296
709
297
        // Merely proxy this along to USC.  We don't care about keeping a copy
710
298
        // or exporting it internally.
711
299
        m_unityInput->asyncCall(QStringLiteral("setTouchpadCursorSpeed"), reply.value());
712
300
    });
713
301
}
714
302
715
303
void AccountsService::updateStatsWelcomeScreen(bool async)
716
304
{
717
305
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
718
306
                                                                    QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy"),
719
307
                                                                    QStringLiteral("StatsWelcomeScreen"));
720
308
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
721
309
722
310
    connect(watcher, &QDBusPendingCallWatcher::finished,
723
311
            this, [this](QDBusPendingCallWatcher* watcher) {
724
312
725
313
        QDBusPendingReply<QVariant> reply = *watcher;
726
314
        watcher->deleteLater();
727
315
        if (reply.isError()) {
728
316
            qWarning() << "Failed to get 'StatsWelcomeScreen' property - " << reply.error().message();
729
317
            return;
730
318
        }
731
319
732
320
        const bool statsWelcomeScreen = reply.value().toBool();
733
321
        if (m_statsWelcomeScreen != statsWelcomeScreen) {
734
322
            m_statsWelcomeScreen = statsWelcomeScreen;
735
323
            Q_EMIT statsWelcomeScreenChanged();
736
324
        }
737
325
    });
738
326
    if (!async) {
739
327
        watcher->waitForFinished();
740
328
        delete watcher;
741
329
    }
742
330
}
743
331
744
332
void AccountsService::updatePasswordDisplayHint(bool async)
745
333
{
746
334
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
747
335
                                                                    QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
748
336
                                                                    QStringLiteral("PasswordDisplayHint"));
749
337
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
750
338
751
339
    connect(watcher, &QDBusPendingCallWatcher::finished,
752
340
            this, [this](QDBusPendingCallWatcher* watcher) {
753
341
754
342
        QDBusPendingReply<QVariant> reply = *watcher;
755
343
        watcher->deleteLater();
756
344
        if (reply.isError()) {
757
345
            qWarning() << "Failed to get 'PasswordDisplayHint' property - " << reply.error().message();
758
346
            return;
759
347
        }
760
348
761
349
        const PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)reply.value().toInt();
762
350
        if (m_passwordDisplayHint != passwordDisplayHint) {
763
351
            m_passwordDisplayHint = passwordDisplayHint;
764
352
            Q_EMIT passwordDisplayHintChanged();
765
353
        }
766
354
    });
767
355
    if (!async) {
768
356
        watcher->waitForFinished();
769
357
        delete watcher;
770
358
    }
771
359
}
772
360
773
361
void AccountsService::updateFailedLogins(bool async)
774
362
{
775
363
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
776
364
                                                                    QStringLiteral("com.canonical.unity.AccountsService.Private"),
777
365
                                                                    QStringLiteral("FailedLogins"));
778
366
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
779
367
780
368
    connect(watcher, &QDBusPendingCallWatcher::finished,
781
369
            this, [this](QDBusPendingCallWatcher* watcher) {
782
370
783
371
        QDBusPendingReply<QVariant> reply = *watcher;
784
372
        watcher->deleteLater();
785
373
        if (reply.isError()) {
786
374
            qWarning() << "Failed to get 'FailedLogins' property - " << reply.error().message();
787
375
            return;
788
376
        }
789
377
790
378
        const uint failedLogins = reply.value().toUInt();
791
379
        if (m_failedLogins != failedLogins) {
792
380
            m_failedLogins = failedLogins;
793
381
            Q_EMIT failedLoginsChanged();
794
382
        }
795
383
    });
796
384
    if (!async) {
797
385
        watcher->waitForFinished();
798
386
        delete watcher;
799
387
    }
800
388
}
801
389
802
390
void AccountsService::updateHereEnabled(bool async)
803
391
{
804
392
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
805
393
                                                                    QStringLiteral("com.ubuntu.location.providers.here.AccountsService"),
806
394
                                                                    QStringLiteral("LicenseAccepted"));
807
395
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
808
396
809
397
    connect(watcher, &QDBusPendingCallWatcher::finished,
810
398
            this, [this](QDBusPendingCallWatcher* watcher) {
811
399
812
400
        QDBusPendingReply<QVariant> reply = *watcher;
813
401
        watcher->deleteLater();
814
402
        if (reply.isError()) {
815
403
            qWarning() << "Failed to get 'LicenseAccepted' property - " << reply.error().message();
816
404
            return;
817
405
        }
818
406
819
407
        const bool hereEnabled = reply.value().toBool();
820
408
        if (m_hereEnabled != hereEnabled) {
821
409
            m_hereEnabled = hereEnabled;
822
410
            Q_EMIT hereEnabledChanged();
823
411
        }
824
412
    });
825
413
    if (!async) {
826
414
        watcher->waitForFinished();
827
415
        delete watcher;
828
416
    }
829
417
}
830
418
831
419
void AccountsService::updateHereLicensePath(bool async)
832
420
{
833
421
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
834
422
                                                                    QStringLiteral("com.ubuntu.location.providers.here.AccountsService"),
835
423
                                                                    QStringLiteral("LicenseBasePath"));
836
424
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
837
425
838
426
    connect(watcher, &QDBusPendingCallWatcher::finished,
839
427
            this, [this](QDBusPendingCallWatcher* watcher) {
840
428
841
429
        QDBusPendingReply<QVariant> reply = *watcher;
842
430
        watcher->deleteLater();
843
431
        if (reply.isError()) {
844
432
            qWarning() << "Failed to get 'LicenseBasePath' property - " << reply.error().message();
845
433
            return;
846
434
        }
847
435
848
436
        QString hereLicensePath = reply.value().toString();
849
437
        if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
850
438
            hereLicensePath = QLatin1String("");
851
439
852
440
        if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {
853
441
            m_hereLicensePath = hereLicensePath;
854
442
            Q_EMIT hereLicensePathChanged();
855
443
        }
856
444
    });
857
445
    if (!async) {
858
446
        watcher->waitForFinished();
859
447
        delete watcher;
860
448
    }
885
449
}
247
}
886
450
248
887
451
uint AccountsService::failedLogins() const
249
uint AccountsService::failedLogins() const
888
452
{
250
{
890
453
    return m_failedLogins;
251
    return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();
891
454
}
252
}
892
455
253
893
456
void AccountsService::setFailedLogins(uint failedLogins)
254
void AccountsService::setFailedLogins(uint failedLogins)
894
457
{
255
{
901
458
    if (m_failedLogins != failedLogins) {
256
    setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, failedLogins);
902
459
        m_failedLogins = failedLogins;
257
}
903
460
        m_service->setUserPropertyAsync(m_user, QStringLiteral("com.canonical.unity.AccountsService.Private"), QStringLiteral("FailedLogins"), failedLogins);
258
904
461
259
// ====================================================
905
462
        Q_EMIT failedLoginsChanged();
260
// Everything below this line is generic helper methods
906
463
    }
261
// ====================================================
907
262
908
263
void AccountsService::emitChangedForProperty(const QString &interface, const QString &property)
909
264
{
910
265
    QString signalName = m_properties[interface][property].signal;
911
266
    QMetaObject::invokeMethod(this, signalName.toUtf8().data());
912
267
}
913
268
914
269
QVariant AccountsService::getProperty(const QString &interface, const QString &property) const
915
270
{
916
271
    return m_properties[interface][property].value;
917
272
}
918
273
919
274
void AccountsService::setProperty(const QString &interface, const QString &property, const QVariant &value)
920
275
{
921
276
    if (m_properties[interface][property].value != value) {
922
277
        m_properties[interface][property].value = value;
923
278
        m_service->setUserPropertyAsync(m_user, interface, property, value);
924
279
        emitChangedForProperty(interface, property);
925
280
    }
926
281
}
927
282
928
283
void AccountsService::updateCache(const QString &interface, const QString &property, const QVariant &value)
929
284
{
930
285
    PropertyInfo &info = m_properties[interface][property];
931
286
932
287
    if (info.proxyInterface) {
933
288
        QVariant finalValue;
934
289
        if (info.proxyConverter) {
935
290
            finalValue = info.proxyConverter(value);
936
291
        } else {
937
292
            finalValue = value;
938
293
        }
939
294
        info.proxyInterface->asyncCall(info.proxyMethod, finalValue);
940
295
        return; // don't bother saving a copy
941
296
    }
942
297
943
298
    if (info.value != value) {
944
299
        info.value = value;
945
300
        emitChangedForProperty(interface, property);
946
301
    }
947
302
}
948
303
949
304
void AccountsService::updateProperty(const QString &interface, const QString &property)
950
305
{
951
306
    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
952
307
                                                                    interface,
953
308
                                                                    property);
954
309
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
955
310
956
311
    connect(watcher, &QDBusPendingCallWatcher::finished,
957
312
            this, [this, interface, property](QDBusPendingCallWatcher* watcher) {
958
313
959
314
        QDBusPendingReply<QVariant> reply = *watcher;
960
315
        watcher->deleteLater();
961
316
        if (reply.isError()) {
962
317
            qWarning() << "Failed to get '" << property << "' property:" << reply.error().message();
963
318
            return;
964
319
        }
965
320
966
321
        updateCache(interface, property, reply.value());
967
322
    });
968
323
}
969
324
970
325
void AccountsService::updateAllProperties(const QString &interface, bool async)
971
326
{
972
327
    QDBusPendingCall pendingReply = m_service->getAllPropertiesAsync(m_user,
973
328
                                                                     interface);
974
329
    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
975
330
976
331
    connect(watcher, &QDBusPendingCallWatcher::finished,
977
332
            this, [this, interface](QDBusPendingCallWatcher* watcher) {
978
333
979
334
        QDBusPendingReply< QHash<QString, QVariant> > reply = *watcher;
980
335
        watcher->deleteLater();
981
336
        if (reply.isError()) {
982
337
            qWarning() << "Failed to get all properties for" << interface << ":" << reply.error().message();
983
338
            return;
984
339
        }
985
340
986
341
        auto valueHash = reply.value();
987
342
        auto i = valueHash.constBegin();
988
343
        while (i != valueHash.constEnd()) {
989
344
            updateCache(interface, i.key(), i.value());
990
345
            ++i;
991
346
        }
992
347
    });
993
348
    if (!async) {
994
349
        watcher->waitForFinished();
995
350
    }
996
351
}
997
352
998
353
void AccountsService::registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter)
999
354
{
1000
355
    registerProperty(interface, property, nullptr);
1001
356
1002
357
    m_properties[interface][property].proxyInterface = iface;
1003
358
    m_properties[interface][property].proxyMethod = method;
1004
359
    m_properties[interface][property].proxyConverter = converter;
1005
360
}
1006
361
1007
362
void AccountsService::registerProperty(const QString &interface, const QString &property, const QString &signal)
1008
363
{
1009
364
    m_properties[interface][property] = PropertyInfo();
1010
365
    m_properties[interface][property].signal = signal;
1011
464
}
366
}
1012
465
367
1013
466
void AccountsService::onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
368
void AccountsService::onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
1014
@@ -469,42 +371,13 @@
1015
469
        return;
371
        return;
1016
470
    }
372
    }
1017
471
373
1054
472
    if (interface == QLatin1String("com.canonical.unity.AccountsService")) {
374
    auto propHash = m_properties.value(interface);
1055
473
        if (changed.contains(QStringLiteral("demo-edges"))) {
375
    auto i = propHash.constBegin();
1056
474
            updateDemoEdges();
376
    while (i != propHash.constEnd()) {
1057
475
        }
377
        if (changed.contains(i.key())) {
1058
476
    } else if (interface == QLatin1String("com.canonical.unity.AccountsService.Private")) {
378
            updateProperty(interface, i.key());
1059
477
        if (changed.contains(QStringLiteral("FailedLogins"))) {
379
        }
1060
478
            updateFailedLogins();
380
        ++i;
1025
479
        }
1026
480
    } else if (interface == QLatin1String("com.ubuntu.AccountsService.Input")) {
1027
481
        if (changed.contains(QStringLiteral("MouseCursorSpeed"))) {
1028
482
            updateMouseCursorSpeed();
1029
483
        }
1030
484
        if (changed.contains(QStringLiteral("TouchpadCursorSpeed"))) {
1031
485
            updateTouchpadCursorSpeed();
1032
486
        }
1033
487
    } else if (interface == QLatin1String("com.ubuntu.touch.AccountsService.SecurityPrivacy")) {
1034
488
        if (changed.contains(QStringLiteral("StatsWelcomeScreen"))) {
1035
489
            updateStatsWelcomeScreen();
1036
490
        }
1037
491
    } else if (interface == QLatin1String("com.ubuntu.AccountsService.SecurityPrivacy")) {
1038
492
        if (changed.contains(QStringLiteral("PasswordDisplayHint"))) {
1039
493
            updatePasswordDisplayHint();
1040
494
        }
1041
495
        if (changed.contains(QStringLiteral("EnableLauncherWhileLocked"))) {
1042
496
            updateEnableLauncherWhileLocked();
1043
497
        }
1044
498
        if (changed.contains(QStringLiteral("EnableIndicatorsWhileLocked"))) {
1045
499
            updateEnableIndicatorsWhileLocked();
1046
500
        }
1047
501
    } else if (interface == QLatin1String("com.ubuntu.location.providers.here.AccountsService")) {
1048
502
        if (changed.contains(QStringLiteral("LicenseAccepted"))) {
1049
503
            updateHereEnabled();
1050
504
        }
1051
505
        if (changed.contains(QStringLiteral("LicenseBasePath"))) {
1052
506
            updateHereLicensePath();
1053
507
        }
1061
508
    }
381
    }
1062
509
}
382
}
1063
510
383
1064
@@ -514,6 +387,20 @@
1065
514
        return;
387
        return;
1066
515
    }
388
    }
1067
516
389
1070
517
    // Standard properties might have changed
390
    // Any of the standard properties might have changed!
1071
518
    updateBackgroundFile();
391
    auto propHash = m_properties.value(IFACE_ACCOUNTS_USER);
1072
392
    auto i = propHash.constBegin();
1073
393
    while (i != propHash.constEnd()) {
1074
394
        updateProperty(IFACE_ACCOUNTS_USER, i.key());
1075
395
        ++i;
1076
396
    }
1077
397
}
1078
398
1079
399
void AccountsService::refresh(bool async)
1080
400
{
1081
401
    auto i = m_properties.constBegin();
1082
402
    while (i != m_properties.constEnd()) {
1083
403
        updateAllProperties(i.key(), async);
1084
404
        ++i;
1085
405
    }
1086
519
}
406
}
1087
520
407
1088
=== modified file 'plugins/AccountsService/AccountsService.h'
1089
--- plugins/AccountsService/AccountsService.h	2016-01-21 21:04:00 +0000
1090
+++ plugins/AccountsService/AccountsService.h	2016-03-11 18:12:46 +0000
1091
@@ -1,5 +1,5 @@
1092
1
/*
1
/*
1094
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013, 2015 Canonical, Ltd.
1095
3
 *
3
 *
1096
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1097
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1098
@@ -12,15 +12,16 @@
1099
12
 *
12
 *
1100
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU General Public License
1101
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1102
15
 *
1103
16
 * Authors: Michael Terry <michael.terry@canonical.com>
1104
17
 */
15
 */
1105
18
16
1106
19
#ifndef UNITY_ACCOUNTSSERVICE_H
17
#ifndef UNITY_ACCOUNTSSERVICE_H
1107
20
#define UNITY_ACCOUNTSSERVICE_H
18
#define UNITY_ACCOUNTSSERVICE_H
1108
21
19
1109
20
#include <QHash>
1110
22
#include <QObject>
21
#include <QObject>
1111
23
#include <QString>
22
#include <QString>
1112
23
#include <QStringList>
1113
24
#include <QVariant>
1114
24
25
1115
25
class AccountsServiceDBusAdaptor;
26
class AccountsServiceDBusAdaptor;
1116
26
class QDBusInterface;
27
class QDBusInterface;
1117
@@ -37,6 +38,9 @@
1118
37
                READ demoEdges
38
                READ demoEdges
1119
38
                WRITE setDemoEdges
39
                WRITE setDemoEdges
1120
39
                NOTIFY demoEdgesChanged)
40
                NOTIFY demoEdgesChanged)
1121
41
    Q_PROPERTY (QStringList demoEdgesCompleted
1122
42
                READ demoEdgesCompleted
1123
43
                NOTIFY demoEdgesCompletedChanged)
1124
40
    Q_PROPERTY (bool enableLauncherWhileLocked
44
    Q_PROPERTY (bool enableLauncherWhileLocked
1125
41
                READ enableLauncherWhileLocked
45
                READ enableLauncherWhileLocked
1126
42
                NOTIFY enableLauncherWhileLockedChanged)
46
                NOTIFY enableLauncherWhileLockedChanged)
1127
@@ -66,6 +70,8 @@
1128
66
    Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
70
    Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
1129
67
               READ hereLicensePathValid
71
               READ hereLicensePathValid
1130
68
               NOTIFY hereLicensePathChanged)
72
               NOTIFY hereLicensePathChanged)
1131
73
    Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)
1132
74
    Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)
1133
69
75
1134
70
public:
76
public:
1135
71
    enum PasswordDisplayHint {
77
    enum PasswordDisplayHint {
1136
@@ -80,6 +86,8 @@
1137
80
    void setUser(const QString &user);
86
    void setUser(const QString &user);
1138
81
    bool demoEdges() const;
87
    bool demoEdges() const;
1139
82
    void setDemoEdges(bool demoEdges);
88
    void setDemoEdges(bool demoEdges);
1140
89
    QStringList demoEdgesCompleted() const;
1141
90
    Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
1142
83
    bool enableLauncherWhileLocked() const;
91
    bool enableLauncherWhileLocked() const;
1143
84
    bool enableIndicatorsWhileLocked() const;
92
    bool enableIndicatorsWhileLocked() const;
1144
85
    QString backgroundFile() const;
93
    QString backgroundFile() const;
1145
@@ -91,10 +99,15 @@
1146
91
    void setHereEnabled(bool enabled);
99
    void setHereEnabled(bool enabled);
1147
92
    QString hereLicensePath() const;
100
    QString hereLicensePath() const;
1148
93
    bool hereLicensePathValid() const;
101
    bool hereLicensePathValid() const;
1149
102
    QString realName() const;
1150
103
    void setRealName(const QString &realName);
1151
104
    QString email() const;
1152
105
    void setEmail(const QString &email);
1153
94
106
1154
95
Q_SIGNALS:
107
Q_SIGNALS:
1155
96
    void userChanged();
108
    void userChanged();
1156
97
    void demoEdgesChanged();
109
    void demoEdgesChanged();
1157
110
    void demoEdgesCompletedChanged();
1158
98
    void enableLauncherWhileLockedChanged();
111
    void enableLauncherWhileLockedChanged();
1159
99
    void enableIndicatorsWhileLockedChanged();
112
    void enableIndicatorsWhileLockedChanged();
1160
100
    void backgroundFileChanged();
113
    void backgroundFileChanged();
1161
@@ -103,36 +116,41 @@
1162
103
    void failedLoginsChanged();
116
    void failedLoginsChanged();
1163
104
    void hereEnabledChanged();
117
    void hereEnabledChanged();
1164
105
    void hereLicensePathChanged();
118
    void hereLicensePathChanged();
1165
119
    void realNameChanged();
1166
120
    void emailChanged();
1167
106
121
1168
107
private Q_SLOTS:
122
private Q_SLOTS:
1169
108
    void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
123
    void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
1170
109
    void onMaybeChanged(const QString &user);
124
    void onMaybeChanged(const QString &user);
1171
110
125
1172
111
private:
126
private:
1185
112
    void updateDemoEdges(bool async = true);
127
    typedef QVariant (*ProxyConverter)(const QVariant &);
1186
113
    void updateEnableLauncherWhileLocked(bool async = true);
128
1187
114
    void updateEnableIndicatorsWhileLocked(bool async = true);
129
    void refresh(bool async);
1188
115
    void updateBackgroundFile(bool async = true);
130
    void registerProperty(const QString &interface, const QString &property, const QString &signal);
1189
116
    void updateMouseCursorSpeed();
131
    void registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter = nullptr);
1190
117
    void updateTouchpadCursorSpeed();
132
1191
118
    void updateStatsWelcomeScreen(bool async = true);
133
    void updateAllProperties(const QString &interface, bool async);
1192
119
    void updatePasswordDisplayHint(bool async = true);
134
    void updateProperty(const QString &interface, const QString &property);
1193
120
    void updateFailedLogins(bool async = true);
135
    void updateCache(const QString &interface, const QString &property, const QVariant &value);
1194
121
    void updateHereEnabled(bool async = true);
136
1195
122
    void updateHereLicensePath(bool async = true);
137
    void setProperty(const QString &interface, const QString &property, const QVariant &value);
1196
123
138
    QVariant getProperty(const QString &interface, const QString &property) const;
1197
139
1198
140
    void emitChangedForProperty(const QString &interface, const QString &property);
1199
141
1200
142
    struct PropertyInfo {
1201
143
        QVariant value{};
1202
144
        QString signal{};
1203
145
        QDBusInterface *proxyInterface{};
1204
146
        QString proxyMethod{};
1205
147
        ProxyConverter proxyConverter{};
1206
148
    };
1207
149
    typedef QHash< QString, QHash<QString, PropertyInfo> > PropertyHash;
1208
150
    PropertyHash m_properties;
1209
124
    AccountsServiceDBusAdaptor *m_service;
151
    AccountsServiceDBusAdaptor *m_service;
1210
125
    QDBusInterface *m_unityInput;
152
    QDBusInterface *m_unityInput;
1211
126
    QString m_user;
153
    QString m_user;
1212
127
    bool m_demoEdges;
1213
128
    bool m_enableLauncherWhileLocked;
1214
129
    bool m_enableIndicatorsWhileLocked;
1215
130
    QString m_backgroundFile;
1216
131
    bool m_statsWelcomeScreen;
1217
132
    PasswordDisplayHint m_passwordDisplayHint;
1218
133
    uint m_failedLogins;
1219
134
    bool m_hereEnabled;
1220
135
    QString m_hereLicensePath;
1221
136
};
154
};
1222
137
155
1223
138
#endif
156
#endif
1224
139
157
1225
=== modified file 'plugins/AccountsService/AccountsService.qmltypes'
1226
--- plugins/AccountsService/AccountsService.qmltypes	2015-02-13 09:01:16 +0000
1227
+++ plugins/AccountsService/AccountsService.qmltypes	2016-03-11 18:12:46 +0000
1228
@@ -23,6 +23,7 @@
1229
23
        }
23
        }
1230
24
        Property { name: "user"; type: "string" }
24
        Property { name: "user"; type: "string" }
1231
25
        Property { name: "demoEdges"; type: "bool" }
25
        Property { name: "demoEdges"; type: "bool" }
1232
26
        Property { name: "demoEdgesCompleted"; type: "QStringList"; isReadonly: true }
1233
26
        Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
27
        Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
1234
27
        Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
28
        Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
1235
28
        Property { name: "backgroundFile"; type: "string"; isReadonly: true }
29
        Property { name: "backgroundFile"; type: "string"; isReadonly: true }
1236
@@ -32,5 +33,9 @@
1237
32
        Property { name: "hereEnabled"; type: "bool" }
33
        Property { name: "hereEnabled"; type: "bool" }
1238
33
        Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
34
        Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
1239
34
        Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
35
        Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
1240
36
        Method {
1241
37
            name: "markDemoEdgeCompleted"
1242
38
            Parameter { name: "edge"; type: "string" }
1243
39
        }
1244
35
    }
40
    }
1245
36
}
41
}
1246
37
42
1247
=== modified file 'plugins/AccountsService/AccountsServiceDBusAdaptor.cpp'
1248
--- plugins/AccountsService/AccountsServiceDBusAdaptor.cpp	2015-10-26 14:05:14 +0000
1249
+++ plugins/AccountsService/AccountsServiceDBusAdaptor.cpp	2016-03-11 18:12:46 +0000
1250
@@ -1,5 +1,5 @@
1251
1
/*
1
/*
1253
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013-2016 Canonical, Ltd.
1254
3
 *
3
 *
1255
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1256
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1257
@@ -12,8 +12,6 @@
1258
12
 *
12
 *
1259
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU General Public License
1260
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1261
15
 *
1262
16
 * Author: Michael Terry <michael.terry@canonical.com>
1263
17
 */
15
 */
1264
18
16
1265
19
#include "AccountsServiceDBusAdaptor.h"
17
#include "AccountsServiceDBusAdaptor.h"
1266
@@ -37,6 +35,15 @@
1267
37
                                           connection, this);
35
                                           connection, this);
1268
38
}
36
}
1269
39
37
1270
38
QDBusPendingReply<QVariantMap> AccountsServiceDBusAdaptor::getAllPropertiesAsync(const QString &user, const QString &interface)
1271
39
{
1272
40
    QDBusInterface *iface = getUserInterface(user);
1273
41
    if (iface != nullptr && iface->isValid()) {
1274
42
        return iface->asyncCall(QStringLiteral("GetAll"), interface);
1275
43
    }
1276
44
    return QDBusPendingReply<QVariantMap>(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));
1277
45
}
1278
46
1279
40
QDBusPendingReply<QVariant> AccountsServiceDBusAdaptor::getUserPropertyAsync(const QString &user, const QString &interface, const QString &property)
47
QDBusPendingReply<QVariant> AccountsServiceDBusAdaptor::getUserPropertyAsync(const QString &user, const QString &interface, const QString &property)
1280
41
{
48
{
1281
42
    QDBusInterface *iface = getUserInterface(user);
49
    QDBusInterface *iface = getUserInterface(user);
1282
@@ -80,7 +87,7 @@
1283
80
    m_ignoreNextChanged = false;
87
    m_ignoreNextChanged = false;
1284
81
}
88
}
1285
82
89
1287
83
QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)
90
QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path) const
1288
84
{
91
{
1289
85
    QMap<QString, QDBusInterface *>::const_iterator i;
92
    QMap<QString, QDBusInterface *>::const_iterator i;
1290
86
    for (i = m_users.constBegin(); i != m_users.constEnd(); ++i) {
93
    for (i = m_users.constBegin(); i != m_users.constEnd(); ++i) {
1291
87
94
1292
=== modified file 'plugins/AccountsService/AccountsServiceDBusAdaptor.h'
1293
--- plugins/AccountsService/AccountsServiceDBusAdaptor.h	2015-10-26 14:05:14 +0000
1294
+++ plugins/AccountsService/AccountsServiceDBusAdaptor.h	2016-03-11 18:12:46 +0000
1295
@@ -1,5 +1,5 @@
1296
1
/*
1
/*
1298
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013-2016 Canonical, Ltd.
1299
3
 *
3
 *
1300
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1301
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1302
@@ -12,8 +12,6 @@
1303
12
 *
12
 *
1304
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU General Public License
1305
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1306
15
 *
1307
16
 * Authors: Michael Terry <michael.terry@canonical.com>
1308
17
 */
15
 */
1309
18
16
1310
19
#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H
17
#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H
1311
@@ -35,8 +33,9 @@
1312
35
    explicit AccountsServiceDBusAdaptor(QObject *parent = 0);
33
    explicit AccountsServiceDBusAdaptor(QObject *parent = 0);
1313
36
    ~AccountsServiceDBusAdaptor() = default;
34
    ~AccountsServiceDBusAdaptor() = default;
1314
37
35
1317
38
    Q_INVOKABLE QDBusPendingReply<QVariant> getUserPropertyAsync(const QString &user, const QString &interface, const QString &property);
36
    QDBusPendingReply<QVariantMap> getAllPropertiesAsync(const QString &user, const QString &interface);
1318
39
    Q_INVOKABLE QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);
37
    QDBusPendingReply<QVariant> getUserPropertyAsync(const QString &user, const QString &interface, const QString &property);
1319
38
    QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);
1320
40
39
1321
41
Q_SIGNALS:
40
Q_SIGNALS:
1322
42
    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
41
    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
1323
@@ -48,7 +47,7 @@
1324
48
47
1325
49
private:
48
private:
1326
50
    QDBusInterface *getUserInterface(const QString &user);
49
    QDBusInterface *getUserInterface(const QString &user);
1328
51
    QString getUserForPath(const QString &path);
50
    QString getUserForPath(const QString &path) const;
1329
52
51
1330
53
    QDBusInterface *m_accountsManager;
52
    QDBusInterface *m_accountsManager;
1331
54
    QMap<QString, QDBusInterface *> m_users;
53
    QMap<QString, QDBusInterface *> m_users;
1332
55
54
1333
=== modified file 'plugins/AccountsService/com.canonical.unity.AccountsService.xml'
1334
--- plugins/AccountsService/com.canonical.unity.AccountsService.xml	2015-02-04 15:12:36 +0000
1335
+++ plugins/AccountsService/com.canonical.unity.AccountsService.xml	2016-03-11 18:12:46 +0000
1336
@@ -14,6 +14,11 @@
1337
14
      <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
14
      <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
1338
15
    </property>
15
    </property>
1339
16
16
1340
17
    <!-- List of tutorial pages that have been completed by the user -->
1341
18
    <property name="DemoEdgesCompleted" type="as" access="readwrite">
1342
19
      <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>
1343
20
    </property>
1344
21
1345
17
    <property name="LauncherItems" type="aa{sv}" access="readwrite">
22
    <property name="LauncherItems" type="aa{sv}" access="readwrite">
1346
18
      <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
23
      <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
1347
19
    </property>
24
    </property>
1348
20
25
1349
=== modified file 'plugins/Dash/AudioProgressBar.qml'
1350
--- plugins/Dash/AudioProgressBar.qml	2015-12-03 14:44:08 +0000
1351
+++ plugins/Dash/AudioProgressBar.qml	2016-03-11 18:12:46 +0000
1352
@@ -31,6 +31,7 @@
1353
31
        anchors { left: parent.left; right: parent.right }
31
        anchors { left: parent.left; right: parent.right }
1354
32
        height: units.dp(6)
32
        height: units.dp(6)
1355
33
        source: "graphics/music_progress_bg.png"
33
        source: "graphics/music_progress_bg.png"
1356
34
        asynchronous: true
1357
34
        sourceSize.width: width
35
        sourceSize.width: width
1358
35
        sourceSize.height: height
36
        sourceSize.height: height
1359
36
    }
37
    }
1360
37
38
1361
=== modified file 'plugins/Dash/CardCreator.js'
1362
--- plugins/Dash/CardCreator.js	2016-02-12 00:11:52 +0000
1363
+++ plugins/Dash/CardCreator.js	2016-03-11 18:12:46 +0000
1364
@@ -18,12 +18,13 @@
1365
18
18
1366
19
// %1 is the template["card-background"]["elements"][0]
19
// %1 is the template["card-background"]["elements"][0]
1367
20
// %2 is the template["card-background"]["elements"][1]
20
// %2 is the template["card-background"]["elements"][1]
1369
21
// %3 is the template["card-background"] string
21
// %3 is whether the loader should be asynchronous or not
1370
22
// %4 is the template["card-background"] string
1371
22
var kBackgroundLoaderCode = 'Loader {\n\
23
var kBackgroundLoaderCode = 'Loader {\n\
1372
23
                                id: backgroundLoader; \n\
24
                                id: backgroundLoader; \n\
1373
24
                                objectName: "backgroundLoader"; \n\
25
                                objectName: "backgroundLoader"; \n\
1374
25
                                anchors.fill: parent; \n\
26
                                anchors.fill: parent; \n\
1376
26
                                asynchronous: root.asynchronous; \n\
27
                                asynchronous: %3; \n\
1377
27
                                visible: status == Loader.Ready; \n\
28
                                visible: status == Loader.Ready; \n\
1378
28
                                sourceComponent: UbuntuShape { \n\
29
                                sourceComponent: UbuntuShape { \n\
1379
29
                                    objectName: "background"; \n\
30
                                    objectName: "background"; \n\
1380
@@ -46,7 +47,7 @@
1381
46
                                        objectName: "backgroundImage"; \n\
47
                                        objectName: "backgroundImage"; \n\
1382
47
                                        source: { \n\
48
                                        source: { \n\
1383
48
                                            if (cardData && typeof cardData["background"] === "string") return cardData["background"]; \n\
49
                                            if (cardData && typeof cardData["background"] === "string") return cardData["background"]; \n\
1385
49
                                            else return %3; \n\
50
                                            else return %4; \n\
1386
50
                                        } \n\
51
                                        } \n\
1387
51
                                    } \n\
52
                                    } \n\
1388
52
                                    function getColor(index) { \n\
53
                                    function getColor(index) { \n\
1389
@@ -63,8 +64,9 @@
1390
63
// %3 is used as image height
64
// %3 is used as image height
1391
64
// %4 is used for artShapeSource.hideSource and inner Loader visible
65
// %4 is used for artShapeSource.hideSource and inner Loader visible
1392
65
// %5 is used as aspect ratio fallback
66
// %5 is used as aspect ratio fallback
1395
66
// %6 is injected as code to artImage
67
// %6 is whether the loader should be asynchronous or not
1396
67
// %7 is used as image fallback
68
// %7 is injected as code to artImage
1397
69
// %8 is used as image fallback
1398
68
var kArtShapeHolderCode = 'Item { \n\
70
var kArtShapeHolderCode = 'Item { \n\
1399
69
                            id: artShapeHolder; \n\
71
                            id: artShapeHolder; \n\
1400
70
                            height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\
72
                            height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\
1401
@@ -73,9 +75,9 @@
1402
73
                            Loader { \n\
75
                            Loader { \n\
1403
74
                                id: artShapeLoader; \n\
76
                                id: artShapeLoader; \n\
1404
75
                                objectName: "artShapeLoader"; \n\
77
                                objectName: "artShapeLoader"; \n\
1406
76
                                readonly property string cardArt: cardData && cardData["art"] || %7; \n\
78
                                readonly property string cardArt: cardData && cardData["art"] || %8; \n\
1407
77
                                active: cardArt != ""; \n\
79
                                active: cardArt != ""; \n\
1409
78
                                asynchronous: root.asynchronous; \n\
80
                                asynchronous: %6; \n\
1410
79
                                visible: status == Loader.Ready; \n\
81
                                visible: status == Loader.Ready; \n\
1411
80
                                sourceComponent: Item { \n\
82
                                sourceComponent: Item { \n\
1412
81
                                    id: artShape; \n\
83
                                    id: artShape; \n\
1413
@@ -132,10 +134,10 @@
1414
132
                                        id: artImage; \n\
134
                                        id: artImage; \n\
1415
133
                                        objectName: "artImage"; \n\
135
                                        objectName: "artImage"; \n\
1416
134
                                        source: artShapeLoader.cardArt; \n\
136
                                        source: artShapeLoader.cardArt; \n\
1418
135
                                        asynchronous: root.asynchronous; \n\
137
                                        asynchronous: %6; \n\
1419
136
                                        width: %2; \n\
138
                                        width: %2; \n\
1420
137
                                        height: %3; \n\
139
                                        height: %3; \n\
1422
138
                                        %6 \n\
140
                                        %7 \n\
1423
139
                                    } \n\
141
                                    } \n\
1424
140
                                } \n\
142
                                } \n\
1425
141
                            } \n\
143
                            } \n\
1426
@@ -144,6 +146,7 @@
1427
144
// %1 is anchors.fill
146
// %1 is anchors.fill
1428
145
// %2 is width
147
// %2 is width
1429
146
// %3 is height
148
// %3 is height
1430
149
// %4 is whether the icon should be asynchronous or not
1431
147
var kAudioButtonCode = 'AbstractButton { \n\
150
var kAudioButtonCode = 'AbstractButton { \n\
1432
148
                            id: audioButton; \n\
151
                            id: audioButton; \n\
1433
149
                            anchors.fill: %1; \n\
152
                            anchors.fill: %1; \n\
1434
@@ -169,6 +172,7 @@
1435
169
                                opacity: 0.9; \n\
172
                                opacity: 0.9; \n\
1436
170
                                name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
173
                                name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
1437
171
                                color: "white"; \n\
174
                                color: "white"; \n\
1438
175
                                asynchronous: %4; \n\
1439
172
                            } \n\
176
                            } \n\
1440
173
                            onClicked: { \n\
177
                            onClicked: { \n\
1441
174
                                if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
178
                                if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
1442
@@ -187,12 +191,14 @@
1443
187
                            } \n\
191
                            } \n\
1444
188
                        }';
192
                        }';
1445
189
193
1446
194
// %1 is whether the loader should be asynchronous or not
1447
195
// %2 is the header height code
1448
190
var kOverlayLoaderCode = 'Loader { \n\
196
var kOverlayLoaderCode = 'Loader { \n\
1449
191
                            id: overlayLoader; \n\
197
                            id: overlayLoader; \n\
1451
192
                            readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
198
                            readonly property real overlayHeight: %2 + units.gu(2); \n\
1452
193
                            anchors.fill: artShapeHolder; \n\
199
                            anchors.fill: artShapeHolder; \n\
1453
194
                            active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
200
                            active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
1455
195
                            asynchronous: root.asynchronous; \n\
201
                            asynchronous: %1; \n\
1456
196
                            visible: showHeader && status == Loader.Ready; \n\
202
                            visible: showHeader && status == Loader.Ready; \n\
1457
197
                            sourceComponent: UbuntuShapeOverlay { \n\
203
                            sourceComponent: UbuntuShapeOverlay { \n\
1458
198
                                id: overlay; \n\
204
                                id: overlay; \n\
1459
@@ -211,17 +217,19 @@
1460
211
                        objectName: "outerRow"; \n\
217
                        objectName: "outerRow"; \n\
1461
212
                        property real margins: units.gu(1); \n\
218
                        property real margins: units.gu(1); \n\
1462
213
                        spacing: margins; \n\
219
                        spacing: margins; \n\
1464
214
                        height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\
220
                        %2\
1465
215
                        anchors { %1 } \n\
221
                        anchors { %1 } \n\
1466
216
                        anchors.right: parent.right; \n\
222
                        anchors.right: parent.right; \n\
1467
217
                        anchors.margins: margins; \n\
223
                        anchors.margins: margins; \n\
1468
218
                        anchors.rightMargin: 0; \n\
224
                        anchors.rightMargin: 0; \n\
1469
219
                        data: [ \n\
225
                        data: [ \n\
1471
220
                                %2 \n\
226
                                %3 \n\
1472
221
                                ] \n\
227
                                ] \n\
1473
222
                    }\n';
228
                    }\n';
1474
223
    var args = Array.prototype.slice.call(arguments);
229
    var args = Array.prototype.slice.call(arguments);
1476
224
    var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(args.join(',\n'));
230
    var isCardTool = args.shift();
1477
231
    var heightCode = isCardTool ? "" : "height: root.fixedHeaderHeight; \n";
1478
232
    var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(heightCode).arg(args.join(',\n'));
1479
225
    return code;
233
    return code;
1480
226
}
234
}
1481
227
235
1482
@@ -242,10 +250,11 @@
1483
242
}
250
}
1484
243
251
1485
244
// %1 is used as anchors of mascotShapeLoader
252
// %1 is used as anchors of mascotShapeLoader
1486
253
// %2 is whether the loader should be asynchronous or not
1487
245
var kMascotShapeLoaderCode = 'Loader { \n\
254
var kMascotShapeLoaderCode = 'Loader { \n\
1488
246
                                id: mascotShapeLoader; \n\
255
                                id: mascotShapeLoader; \n\
1489
247
                                objectName: "mascotShapeLoader"; \n\
256
                                objectName: "mascotShapeLoader"; \n\
1491
248
                                asynchronous: root.asynchronous; \n\
257
                                asynchronous: %2; \n\
1492
249
                                active: mascotImage.status === Image.Ready; \n\
258
                                active: mascotImage.status === Image.Ready; \n\
1493
250
                                visible: showHeader && active && status == Loader.Ready; \n\
259
                                visible: showHeader && active && status == Loader.Ready; \n\
1494
251
                                width: units.gu(6); \n\
260
                                width: units.gu(6); \n\
1495
@@ -275,6 +284,7 @@
1496
275
// %2 is used as color of titleLabel
284
// %2 is used as color of titleLabel
1497
276
// %3 is used as extra condition for visible of titleLabel
285
// %3 is used as extra condition for visible of titleLabel
1498
277
// %4 is used as title width
286
// %4 is used as title width
1499
287
// %5 is used as horizontal alignment
1500
278
var kTitleLabelCode = 'Label { \n\
288
var kTitleLabelCode = 'Label { \n\
1501
279
                        id: titleLabel; \n\
289
                        id: titleLabel; \n\
1502
280
                        objectName: "titleLabel"; \n\
290
                        objectName: "titleLabel"; \n\
1503
@@ -289,7 +299,7 @@
1504
289
                        width: %4; \n\
299
                        width: %4; \n\
1505
290
                        text: root.title; \n\
300
                        text: root.title; \n\
1506
291
                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
301
                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
1508
292
                        horizontalAlignment: root.titleAlignment; \n\
302
                        horizontalAlignment: %5; \n\
1509
293
                    }\n';
303
                    }\n';
1510
294
304
1511
295
// %1 is used as extra anchors of emblemIcon
305
// %1 is used as extra anchors of emblemIcon
1512
@@ -398,7 +408,7 @@
1513
398
    return colorString;
408
    return colorString;
1514
399
}
409
}
1515
400
410
1517
401
function cardString(template, components) {
411
function cardString(template, components, isCardTool) {
1518
402
    var code;
412
    var code;
1519
403
413
1520
404
    var templateInteractive = (template == null ? true : (template["non-interactive"] !== undefined ? !template["non-interactive"] : true)) ? "true" : "false";
414
    var templateInteractive = (template == null ? true : (template["non-interactive"] !== undefined ? !template["non-interactive"] : true)) ? "true" : "false";
1521
@@ -410,16 +420,16 @@
1522
410
                property string backgroundShapeStyle: "inset"; \n\
420
                property string backgroundShapeStyle: "inset"; \n\
1523
411
                property real fontScale: 1.0; \n\
421
                property real fontScale: 1.0; \n\
1524
412
                property var scopeStyle: null; \n\
422
                property var scopeStyle: null; \n\
1527
413
                property int titleAlignment: Text.AlignLeft; \n\
423
                %2\
1526
414
                property int fixedHeaderHeight: -1; \n\
1528
415
                property size fixedArtShapeSize: Qt.size(-1, -1); \n\
424
                property size fixedArtShapeSize: Qt.size(-1, -1); \n\
1529
416
                readonly property string title: cardData && cardData["title"] || ""; \n\
425
                readonly property string title: cardData && cardData["title"] || ""; \n\
1530
417
                property bool asynchronous: true; \n\
1531
418
                property bool showHeader: true; \n\
426
                property bool showHeader: true; \n\
1532
419
                implicitWidth: childrenRect.width; \n\
427
                implicitWidth: childrenRect.width; \n\
1533
420
                enabled: %1; \n\
428
                enabled: %1; \n\
1534
421
                \n'.arg(templateInteractive);
429
                \n'.arg(templateInteractive);
1535
422
430
1536
431
    code = code.arg(isCardTool ? "" : "property int fixedHeaderHeight: -1; \n");
1537
432
1538
423
    var hasArt = components["art"] && components["art"]["field"] || false;
433
    var hasArt = components["art"] && components["art"]["field"] || false;
1539
424
    var hasSummary = components["summary"] || false;
434
    var hasSummary = components["summary"] || false;
1540
425
    var isConciergeMode = components["art"] && components["art"]["conciergeMode"] || false;
435
    var isConciergeMode = components["art"] && components["art"]["conciergeMode"] || false;
1541
@@ -435,6 +445,7 @@
1542
435
    var hasHeaderRow = hasMascot && hasTitle;
445
    var hasHeaderRow = hasMascot && hasTitle;
1543
436
    var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;
446
    var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;
1544
437
    var isAudio = template["quick-preview-type"] === "audio";
447
    var isAudio = template["quick-preview-type"] === "audio";
1545
448
    var asynchronous = isCardTool ? "false" : "true";
1546
438
449
1547
439
    if (isAudio) {
450
    if (isAudio) {
1548
440
        // For now we only support audio cards with [optional] art, title, subtitle
451
        // For now we only support audio cards with [optional] art, title, subtitle
1549
@@ -468,7 +479,7 @@
1550
468
                backgroundElements1 = '"%1"'.arg(element1);
479
                backgroundElements1 = '"%1"'.arg(element1);
1551
469
            }
480
            }
1552
470
        }
481
        }
1554
471
        code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(templateCardBackground);
482
        code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(asynchronous).arg(templateCardBackground);
1555
472
    }
483
    }
1556
473
484
1557
474
    if (hasArt) {
485
    if (hasArt) {
1558
@@ -497,23 +508,31 @@
1559
497
        if (isNaN(aspectRatio)) {
508
        if (isNaN(aspectRatio)) {
1560
498
            aspectRatio = 1;
509
            aspectRatio = 1;
1561
499
        }
510
        }
1563
500
        var fallback = components["art"] && components["art"]["fallback"] || "";
511
        var fallback = !isCardTool && components["art"] && components["art"]["fallback"] || "";
1564
501
        fallback = encodeURI(fallback);
512
        fallback = encodeURI(fallback);
1565
502
        var fallbackStatusCode = "";
513
        var fallbackStatusCode = "";
1566
503
        var fallbackURICode = '""';
514
        var fallbackURICode = '""';
1567
504
        if (fallback !== "") {
515
        if (fallback !== "") {
1568
505
            // fallbackStatusCode has %6 in it because we want to substitute it for fallbackURICode
516
            // fallbackStatusCode has %6 in it because we want to substitute it for fallbackURICode
1571
506
            // which in kArtShapeHolderCode is %7
517
            // which in kArtShapeHolderCode is %8
1572
507
            fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %7;';
518
            fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %8;';
1573
508
            fallbackURICode = 'decodeURI("%1")'.arg(fallback);
519
            fallbackURICode = 'decodeURI("%1")'.arg(fallback);
1574
509
        }
520
        }
1576
510
        code += kArtShapeHolderCode.arg(artAnchors).arg(widthCode).arg(heightCode).arg(isConciergeMode ? "false" : "true").arg(aspectRatio).arg(fallbackStatusCode).arg(fallbackURICode);
521
        code += kArtShapeHolderCode.arg(artAnchors)
1577
522
                                   .arg(widthCode)
1578
523
                                   .arg(heightCode)
1579
524
                                   .arg(isConciergeMode ? "false" : "true")
1580
525
                                   .arg(aspectRatio)
1581
526
                                   .arg(asynchronous)
1582
527
                                   .arg(fallbackStatusCode)
1583
528
                                   .arg(fallbackURICode);
1584
511
    } else {
529
    } else {
1585
512
        code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
530
        code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
1586
513
    }
531
    }
1587
514
532
1588
515
    if (headerAsOverlay) {
533
    if (headerAsOverlay) {
1590
516
        code += kOverlayLoaderCode;
534
        var headerHeightCode = isCardTool ? "headerHeight" : "root.fixedHeaderHeight";
1591
535
        code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);
1592
517
    }
536
    }
1593
518
537
1594
519
    var headerVerticalAnchors;
538
    var headerVerticalAnchors;
1595
@@ -595,11 +614,11 @@
1596
595
        }
614
        }
1597
596
615
1598
597
        if (useMascotShape) {
616
        if (useMascotShape) {
1600
598
            mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
617
            mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors).arg(asynchronous);
1601
599
        }
618
        }
1602
600
619
1603
601
        var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
620
        var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
1605
602
        var fallback = components["mascot"] && components["mascot"]["fallback"] || "";
621
        var fallback = !isCardTool && components["mascot"] && components["mascot"]["fallback"] || "";
1606
603
        fallback = encodeURI(fallback);
622
        fallback = encodeURI(fallback);
1607
604
        var fallbackStatusCode = "";
623
        var fallbackStatusCode = "";
1608
605
        var fallbackURICode = '""';
624
        var fallbackURICode = '""';
1609
@@ -715,9 +734,24 @@
1610
715
            }
734
            }
1611
716
        }
735
        }
1612
717
736
1613
737
        var titleAlignment = "Text.AlignHCenter";
1614
738
        if (template["card-layout"] === "horizontal"
1615
739
            || typeof components["title"] !== "object"
1616
740
            || components["title"]["align"] === "left") titleAlignment = "Text.AlignLeft";
1617
741
        var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
1618
742
        for (var key in keys) {
1619
743
            key = keys[key];
1620
744
            try {
1621
745
                if (typeof components[key] === "string"
1622
746
                    || typeof components[key]["field"] === "string") titleAlignment = "Text.AlignLeft";
1623
747
            } catch (e) {
1624
748
                continue;
1625
749
            }
1626
750
        }
1627
751
1628
718
        // code for different elements
752
        // code for different elements
1629
719
        var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
753
        var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
1631
720
        var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth);
754
        var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth).arg(titleAlignment);
1632
721
        var subtitleCode;
755
        var subtitleCode;
1633
722
        var attributesCode;
756
        var attributesCode;
1634
723
757
1635
@@ -759,7 +793,7 @@
1636
759
        if (mascotShapeCode != '') {
793
        if (mascotShapeCode != '') {
1637
760
           rowCode.unshift(mascotShapeCode);
794
           rowCode.unshift(mascotShapeCode);
1638
761
        }
795
        }
1640
762
        code += kHeaderRowCodeGenerator(headerVerticalAnchors + headerLeftAnchor, rowCode)
796
        code += kHeaderRowCodeGenerator(isCardTool, headerVerticalAnchors + headerLeftAnchor, rowCode)
1641
763
    } else {
797
    } else {
1642
764
        code += mascotShapeCode + mascotCode + titleSubtitleCode;
798
        code += mascotShapeCode + mascotCode + titleSubtitleCode;
1643
765
    }
799
    }
1644
@@ -783,9 +817,10 @@
1645
783
        } else {
817
        } else {
1646
784
            audioButtonAnchorsFill = 'undefined';
818
            audioButtonAnchorsFill = 'undefined';
1647
785
            audioButtonWidth = 'height';
819
            audioButtonWidth = 'height';
1649
786
            audioButtonHeight = '(root.fixedHeaderHeight > 0 ? root.fixedHeaderHeight : headerHeight) + 2 * units.gu(1)';
820
            audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
1650
821
                                           : 'root.fixedHeaderHeight + 2 * units.gu(1)';
1651
787
        }
822
        }
1653
788
        code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight);
823
        code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight).arg(asynchronous);
1654
789
    }
824
    }
1655
790
825
1656
791
    if (hasSummary) {
826
    if (hasSummary) {
1657
@@ -854,13 +889,13 @@
1658
854
    return code;
889
    return code;
1659
855
}
890
}
1660
856
891
1662
857
function createCardComponent(parent, template, components, identifier) {
892
function createCardComponent(parent, template, components, isCardTool, identifier) {
1663
858
    var imports = 'import QtQuick 2.4; \n\
893
    var imports = 'import QtQuick 2.4; \n\
1664
859
                   import Ubuntu.Components 1.3; \n\
894
                   import Ubuntu.Components 1.3; \n\
1665
860
                   import Ubuntu.Settings.Components 0.1; \n\
895
                   import Ubuntu.Settings.Components 0.1; \n\
1666
861
                   import Dash 0.1;\n\
896
                   import Dash 0.1;\n\
1667
862
                   import Utils 0.1;\n';
897
                   import Utils 0.1;\n';
1669
863
    var card = cardString(template, components);
898
    var card = cardString(template, components, isCardTool);
1670
864
    var code = imports + 'Component {\n' + card + '}\n';
899
    var code = imports + 'Component {\n' + card + '}\n';
1671
865
900
1672
866
    try {
901
    try {
1673
867
902
1674
=== modified file 'plugins/Dash/CardCreatorCache.qml'
1675
--- plugins/Dash/CardCreatorCache.qml	2016-01-21 17:56:08 +0000
1676
+++ plugins/Dash/CardCreatorCache.qml	2016-03-11 18:12:46 +0000
1677
@@ -23,16 +23,16 @@
1678
23
23
1679
24
    property var cache: new Object();
24
    property var cache: new Object();
1680
25
25
1682
26
    function getCardComponent(template, components) {
26
    function getCardComponent(template, components, isCardTool) {
1683
27
        if (template === undefined || components === undefined)
27
        if (template === undefined || components === undefined)
1684
28
            return undefined;
28
            return undefined;
1685
29
29
1686
30
        var tString = JSON.stringify(template);
30
        var tString = JSON.stringify(template);
1687
31
        var cString = JSON.stringify(components);
31
        var cString = JSON.stringify(components);
1689
32
        var allString = tString + cString;
32
        var allString = tString + cString + isCardTool;
1690
33
        var component = cache[allString];
33
        var component = cache[allString];
1691
34
        if (component === undefined) {
34
        if (component === undefined) {
1693
35
            component = CardCreator.createCardComponent(root, template, components, allString);
35
            component = CardCreator.createCardComponent(root, template, components, isCardTool, allString);
1694
36
            cache[allString] = component;
36
            cache[allString] = component;
1695
37
        }
37
        }
1696
38
        return component;
38
        return component;
1697
39
39
1698
=== modified file 'plugins/Dash/plugin.cpp'
1699
--- plugins/Dash/plugin.cpp	2015-09-18 07:44:50 +0000
1700
+++ plugins/Dash/plugin.cpp	2016-03-11 18:12:46 +0000
1701
@@ -28,12 +28,12 @@
1702
28
static QUrl oauthCleanedUrl(QUrl u)
28
static QUrl oauthCleanedUrl(QUrl u)
1703
29
{
29
{
1704
30
    QUrlQuery q(u);
30
    QUrlQuery q(u);
1711
31
    q.removeQueryItem("oauth_nonce");
31
    q.removeQueryItem(QStringLiteral("oauth_nonce"));
1712
32
    q.removeQueryItem("oauth_timestamp");
32
    q.removeQueryItem(QStringLiteral("oauth_timestamp"));
1713
33
    q.removeQueryItem("oauth_consumer_key");
33
    q.removeQueryItem(QStringLiteral("oauth_consumer_key"));
1714
34
    q.removeQueryItem("oauth_signature_method");
34
    q.removeQueryItem(QStringLiteral("oauth_signature_method"));
1715
35
    q.removeQueryItem("oauth_version");
35
    q.removeQueryItem(QStringLiteral("oauth_version"));
1716
36
    q.removeQueryItem("oauth_signature");
36
    q.removeQueryItem(QStringLiteral("oauth_signature"));
1717
37
    u.setQuery(q);
37
    u.setQuery(q);
1718
38
    return u;
38
    return u;
1719
39
}
39
}
1720
40
40
1721
=== modified file 'plugins/GlobalShortcut/globalshortcutregistry.cpp'
1722
--- plugins/GlobalShortcut/globalshortcutregistry.cpp	2015-11-20 15:01:39 +0000
1723
+++ plugins/GlobalShortcut/globalshortcutregistry.cpp	2016-03-11 18:12:46 +0000
1724
@@ -35,13 +35,13 @@
1725
35
35
1726
36
bool GlobalShortcutRegistry::hasShortcut(const QVariant &seq) const
36
bool GlobalShortcutRegistry::hasShortcut(const QVariant &seq) const
1727
37
{
37
{
1729
38
    return m_shortcuts.keys().contains(seq);
38
    return m_shortcuts.contains(seq);
1730
39
}
39
}
1731
40
40
1732
41
void GlobalShortcutRegistry::addShortcut(const QVariant &seq, GlobalShortcut *sc)
41
void GlobalShortcutRegistry::addShortcut(const QVariant &seq, GlobalShortcut *sc)
1733
42
{
42
{
1734
43
    if (sc) {
43
    if (sc) {
1736
44
        if (!m_shortcuts.keys().contains(seq)) { // create a new entry
44
        if (!m_shortcuts.contains(seq)) { // create a new entry
1737
45
            m_shortcuts.insert(seq, {sc});
45
            m_shortcuts.insert(seq, {sc});
1738
46
        } else { // append to an existing one
46
        } else { // append to an existing one
1739
47
            auto shortcuts = m_shortcuts[seq];
47
            auto shortcuts = m_shortcuts[seq];
1740
@@ -75,8 +75,8 @@
1741
75
75
1742
76
    if (event->type() == QEvent::KeyPress) {
76
    if (event->type() == QEvent::KeyPress) {
1743
77
        QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
77
        QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
1746
78
        QKeySequence seq = QKeySequence(keyEvent->key() + keyEvent->modifiers());
78
        int seq = keyEvent->key() + keyEvent->modifiers();
1747
79
        if (m_shortcuts.keys().contains(seq)) {
79
        if (m_shortcuts.contains(seq)) {
1748
80
            const auto shortcuts = m_shortcuts.value(seq);
80
            const auto shortcuts = m_shortcuts.value(seq);
1749
81
            Q_FOREACH(const auto &shortcut, shortcuts) {
81
            Q_FOREACH(const auto &shortcut, shortcuts) {
1750
82
                if (shortcut) {
82
                if (shortcut) {
1751
83
83
1752
=== modified file 'plugins/IntegratedLightDM/liblightdm/CMakeLists.txt'
1753
--- plugins/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-02-01 15:15:09 +0000
1754
+++ plugins/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-03-11 18:12:46 +0000
1755
@@ -5,13 +5,16 @@
1756
5
    UsersModel.cpp
5
    UsersModel.cpp
1757
6
    GreeterPrivate.cpp
6
    GreeterPrivate.cpp
1758
7
    UsersModelPrivate.cpp
7
    UsersModelPrivate.cpp
1759
8
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
1760
8
    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
9
    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
1761
9
    )
10
    )
1762
10
11
1763
11
add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})
12
add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})
1764
13
add_library(integratedLightDMSession STATIC ${LibLightDM_SOURCES})
1765
12
add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
14
add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
1766
13
15
1767
14
include_directories(
16
include_directories(
1768
17
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
1769
15
    ${CMAKE_CURRENT_BINARY_DIR}
18
    ${CMAKE_CURRENT_BINARY_DIR}
1770
16
    ${GLIB_INCLUDE_DIRS}
19
    ${GLIB_INCLUDE_DIRS}
1771
17
    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
20
    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
1772
@@ -22,17 +25,27 @@
1773
22
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
25
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
1774
23
    -lpam
26
    -lpam
1775
24
)
27
)
1776
28
target_link_libraries(integratedLightDMSession
1777
29
    ${GLIB_LIBRARIES}
1778
30
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
1779
31
    -lpam
1780
32
)
1781
25
target_link_libraries(MockLightDM-demo-shared
33
target_link_libraries(MockLightDM-demo-shared
1782
26
    ${GLIB_LIBRARIES}
34
    ${GLIB_LIBRARIES}
1783
27
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
35
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
1784
28
    -lpam
36
    -lpam
1785
29
)
37
)
1786
30
38
1789
31
qt5_use_modules(integratedLightDM Concurrent Gui)
39
qt5_use_modules(integratedLightDM Concurrent DBus Gui)
1790
32
qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
40
qt5_use_modules(integratedLightDMSession Concurrent DBus Gui)
1791
41
qt5_use_modules(MockLightDM-demo-shared Concurrent DBus Gui)
1792
33
42
1794
34
set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)
43
set_target_properties(integratedLightDM PROPERTIES
1795
44
                      COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
1796
45
set_target_properties(integratedLightDMSession PROPERTIES
1797
46
                      COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")
1798
35
set_target_properties(MockLightDM-demo-shared PROPERTIES
47
set_target_properties(MockLightDM-demo-shared PROPERTIES
1799
48
                      COMPILE_FLAGS "-DSM_BUSNAME=systemBus"
1800
36
                      OUTPUT_NAME lightdm-qt5-2)
49
                      OUTPUT_NAME lightdm-qt5-2)
1801
37
50
1802
38
install(TARGETS MockLightDM-demo-shared
51
install(TARGETS MockLightDM-demo-shared
1803
39
52
1804
=== modified file 'plugins/IntegratedLightDM/liblightdm/UsersModel.cpp'
1805
--- plugins/IntegratedLightDM/liblightdm/UsersModel.cpp	2015-09-14 09:11:08 +0000
1806
+++ plugins/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-03-11 18:12:46 +0000
1807
@@ -54,24 +54,10 @@
1808
54
    roles[ImagePathRole] = "imagePath";
54
    roles[ImagePathRole] = "imagePath";
1809
55
    setRoleNames(roles);
55
    setRoleNames(roles);
1810
56
56
1829
57
    // Now modify our mock user backgrounds
57
    connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {
1830
58
    QDir bgdir = QDir(QStringLiteral("/usr/share/demo-assets/shell/backgrounds/"));
58
        QModelIndex index = createIndex(i, 0);
1831
59
    QStringList backgrounds = bgdir.entryList(QDir::Files | QDir::NoDotAndDotDot);
59
        Q_EMIT dataChanged(index, index);
1832
60
60
    });
1815
61
    for (int i = 0, j = 0; i < d->entries.size(); i++) {
1816
62
        Entry &entry = d->entries[i];
1817
63
        if (entry.background.isNull() && !backgrounds.isEmpty()) {
1818
64
            entry.background = bgdir.filePath(backgrounds[j++]);
1819
65
            if (j >= backgrounds.length()) {
1820
66
                j = 0;
1821
67
            }
1822
68
        }
1823
69
    }
1824
70
}
1825
71
1826
72
UsersModel::~UsersModel()
1827
73
{
1828
74
    delete d_ptr;
1833
75
}
61
}
1834
76
62
1835
77
int UsersModel::rowCount(const QModelIndex &parent) const
63
int UsersModel::rowCount(const QModelIndex &parent) const
1836
78
64
1837
=== modified file 'plugins/IntegratedLightDM/liblightdm/UsersModel.h'
1838
--- plugins/IntegratedLightDM/liblightdm/UsersModel.h	2015-04-30 09:31:51 +0000
1839
+++ plugins/IntegratedLightDM/liblightdm/UsersModel.h	2016-03-11 18:12:46 +0000
1840
@@ -41,7 +41,7 @@
1841
41
41
1842
42
public:
42
public:
1843
43
    explicit UsersModel(QObject *parent = 0);
43
    explicit UsersModel(QObject *parent = 0);
1845
44
    virtual ~UsersModel();
44
    virtual ~UsersModel() = default;
1846
45
45
1847
46
    enum UserModelRoles {NameRole = Qt::UserRole,
46
    enum UserModelRoles {NameRole = Qt::UserRole,
1848
47
                         RealNameRole,
47
                         RealNameRole,
1849
48
48
1850
=== modified file 'plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
1851
--- plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-02-04 14:10:42 +0000
1852
+++ plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-03-11 18:12:46 +0000
1853
@@ -18,7 +18,11 @@
1854
18
18
1855
19
#include "UsersModelPrivate.h"
19
#include "UsersModelPrivate.h"
1856
20
20
1857
21
#include "AccountsServiceDBusAdaptor.h"
1858
22
#include "UsersModel.h"
1859
23
1860
21
#include <glib.h>
24
#include <glib.h>
1861
25
#include <QDebug>
1862
22
#include <QDir>
26
#include <QDir>
1863
23
#include <QSettings>
27
#include <QSettings>
1864
24
#include <QStringList>
28
#include <QStringList>
1865
@@ -27,7 +31,9 @@
1866
27
{
31
{
1867
28
32
1868
29
UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
33
UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
1870
30
  : q_ptr(parent)
34
  : QObject(parent),
1871
35
    q_ptr(parent),
1872
36
    m_service(new AccountsServiceDBusAdaptor(this))
1873
31
{
37
{
1874
32
    QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
38
    QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
1875
33
    QString currentUser = g_get_user_name();
39
    QString currentUser = g_get_user_name();
1876
@@ -43,15 +49,43 @@
1877
43
            entries.append({user, name, 0, 0, false, false, 0, 0});
49
            entries.append({user, name, 0, 0, false, false, 0, 0});
1878
44
        }
50
        }
1879
45
    } else {
51
    } else {
1889
46
        // If we were using the actual liblightdm, we could just ask it
52
        entries.append({currentUser, 0, 0, 0, false, false, 0, 0});
1890
47
        // for the user's real name.  But we aren't.  We *should* ask
53
1891
48
        // AccountsService for the real name, like liblightdm does internally,
54
        connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,
1892
49
        // but this is close enough since AS and passwd are always in sync.
55
                this, [this](const QString &user) {
1893
50
        QString realName = QString::fromUtf8(g_get_real_name()); // gets name from passwd entry
56
            if (user == entries[0].username) {
1894
51
        if (realName == QStringLiteral("Unknown")) { // glib doesn't translate this string
57
                updateName(true);
1895
52
            realName.clear();
58
            }
1896
53
        }
59
        });
1897
54
        entries.append({currentUser, realName, 0, 0, false, false, 0, 0});
60
        updateName(false);
1898
61
    }
1899
62
}
1900
63
1901
64
void UsersModelPrivate::updateName(bool async)
1902
65
{
1903
66
    auto pendingReply = m_service->getUserPropertyAsync(entries[0].username,
1904
67
                                                        QStringLiteral("org.freedesktop.Accounts.User"),
1905
68
                                                        QStringLiteral("RealName"));
1906
69
    auto *watcher = new QDBusPendingCallWatcher(pendingReply, this);
1907
70
1908
71
    connect(watcher, &QDBusPendingCallWatcher::finished,
1909
72
            this, [this](QDBusPendingCallWatcher* watcher) {
1910
73
1911
74
        QDBusPendingReply<QVariant> reply = *watcher;
1912
75
        watcher->deleteLater();
1913
76
        if (reply.isError()) {
1914
77
            qWarning() << "Failed to get 'RealName' property - " << reply.error().message();
1915
78
            return;
1916
79
        }
1917
80
1918
81
        const QString realName = reply.value().toString();
1919
82
        if (entries[0].real_name != realName) {
1920
83
            entries[0].real_name = realName;
1921
84
            Q_EMIT dataChanged(0);
1922
85
        }
1923
86
    });
1924
87
    if (!async) {
1925
88
        watcher->waitForFinished();
1926
55
    }
89
    }
1927
56
}
90
}
1928
57
91
1929
58
92
1930
=== modified file 'plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h'
1931
--- plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2015-01-20 11:50:19 +0000
1932
+++ plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2016-03-11 18:12:46 +0000
1933
@@ -19,8 +19,11 @@
1934
19
#ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H
19
#ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H
1935
20
#define UNITY_MOCK_USERSMODEL_PRIVATE_H
20
#define UNITY_MOCK_USERSMODEL_PRIVATE_H
1936
21
21
1939
22
#include <QtCore/QList>
22
#include <QList>
1940
23
#include <QtCore/QString>
23
#include <QObject>
1941
24
#include <QString>
1942
25
1943
26
class AccountsServiceDBusAdaptor;
1944
24
27
1945
25
namespace QLightDM
28
namespace QLightDM
1946
26
{
29
{
1947
@@ -39,19 +42,28 @@
1948
39
    QString infographic;
42
    QString infographic;
1949
40
};
43
};
1950
41
44
1952
42
class UsersModelPrivate
45
class UsersModelPrivate : public QObject
1953
43
{
46
{
1954
47
    Q_OBJECT
1955
48
1956
44
public:
49
public:
1957
45
    explicit UsersModelPrivate(UsersModel *parent = 0);
50
    explicit UsersModelPrivate(UsersModel *parent = 0);
1958
46
    virtual ~UsersModelPrivate() = default;
51
    virtual ~UsersModelPrivate() = default;
1959
47
52
1960
48
    QList<Entry> entries;
53
    QList<Entry> entries;
1961
49
54
1962
55
Q_SIGNALS:
1963
56
    void dataChanged(int);
1964
57
1965
50
protected:
58
protected:
1966
51
    UsersModel * const q_ptr;
59
    UsersModel * const q_ptr;
1967
52
60
1968
53
private:
61
private:
1969
54
    Q_DECLARE_PUBLIC(UsersModel)
62
    Q_DECLARE_PUBLIC(UsersModel)
1970
63
1971
64
    void updateName(bool async);
1972
65
1973
66
    AccountsServiceDBusAdaptor *m_service;
1974
55
};
67
};
1975
56
68
1976
57
}
69
}
1977
58
70
1978
=== modified file 'plugins/ScreenGrabber/screengrabber.cpp'
1979
--- plugins/ScreenGrabber/screengrabber.cpp	2015-11-18 18:38:36 +0000
1980
+++ plugins/ScreenGrabber/screengrabber.cpp	2016-03-11 18:12:46 +0000
1981
@@ -46,12 +46,10 @@
1982
46
46
1983
47
    QDir screenshotsDir;
47
    QDir screenshotsDir;
1984
48
    if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
48
    if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
1985
49
        qDebug() << "Using test environment";
1986
50
        QTemporaryDir tDir;
49
        QTemporaryDir tDir;
1987
51
        tDir.setAutoRemove(false);
50
        tDir.setAutoRemove(false);
1988
52
        screenshotsDir = tDir.path();
51
        screenshotsDir = tDir.path();
1989
53
    } else {
52
    } else {
1990
54
        qDebug() << "Using real environment";
1991
55
        screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
53
        screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
1992
56
    }
54
    }
1993
57
    screenshotsDir.mkpath(QStringLiteral("Screenshots"));
55
    screenshotsDir.mkpath(QStringLiteral("Screenshots"));
1994
58
56
1995
=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.cpp'
1996
--- plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2015-12-16 18:28:21 +0000
1997
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2016-03-11 18:12:46 +0000
1998
@@ -194,6 +194,26 @@
1999
194
    }
194
    }
2000
195
}
195
}
2001
196
196
2002
197
bool DirectionalDragArea::monitorOnly() const
2003
198
{
2004
199
    return d->monitorOnly;
2005
200
}
2006
201
2007
202
void DirectionalDragArea::setMonitorOnly(bool monitorOnly)
2008
203
{
2009
204
    if (d->monitorOnly != monitorOnly) {
2010
205
        d->monitorOnly = monitorOnly;
2011
206
2012
207
        if (monitorOnly && d->status == DirectionalDragAreaPrivate::Undecided) {
2013
208
            TouchRegistry::instance()->removeCandidateOwnerForTouch(d->touchId, this);
2014
209
            // We still wanna know when it ends for keeping the composition time window up-to-date
2015
210
            TouchRegistry::instance()->addTouchWatcher(d->touchId, this);
2016
211
        }
2017
212
2018
213
        Q_EMIT monitorOnlyChanged(monitorOnly);
2019
214
    }
2020
215
}
2021
216
2022
197
void DirectionalDragArea::removeTimeConstraints()
217
void DirectionalDragArea::removeTimeConstraints()
2023
198
{
218
{
2024
199
    d->setMaxTime(60 * 60 * 1000);
219
    d->setMaxTime(60 * 60 * 1000);
2025
@@ -260,7 +280,10 @@
2026
260
            unownedTouchEvent_undecided(unownedTouchEvent);
280
            unownedTouchEvent_undecided(unownedTouchEvent);
2027
261
            break;
281
            break;
2028
262
        default: // Recognized:
282
        default: // Recognized:
2030
263
            // do nothing
283
            if (monitorOnly) {
2031
284
                // Treat unowned event as if we owned it, but we are really just watching it
2032
285
                touchEvent_recognized(event);
2033
286
            }
2034
264
            break;
287
            break;
2035
265
    }
288
    }
2036
266
289
2037
@@ -311,7 +334,9 @@
2038
311
    }
334
    }
2039
312
335
2040
313
    if (movedFarEnoughAlongGestureAxis()) {
336
    if (movedFarEnoughAlongGestureAxis()) {
2042
314
        TouchRegistry::instance()->requestTouchOwnership(touchId, q);
337
        if (!monitorOnly) {
2043
338
            TouchRegistry::instance()->requestTouchOwnership(touchId, q);
2044
339
        }
2045
315
        setStatus(Recognized);
340
        setStatus(Recognized);
2046
316
        setPublicPos(touchPoint->pos());
341
        setPublicPos(touchPoint->pos());
2047
317
        setPublicScenePos(touchScenePos);
342
        setPublicScenePos(touchScenePos);
2048
@@ -411,12 +436,21 @@
2049
411
        if (recognitionIsDisabled()) {
436
        if (recognitionIsDisabled()) {
2050
412
            // Behave like a dumb TouchArea
437
            // Behave like a dumb TouchArea
2051
413
            ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
438
            ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
2052
414
            TouchRegistry::instance()->requestTouchOwnership(touchId, q);
2053
415
            setStatus(Recognized);
439
            setStatus(Recognized);
2055
416
            event->accept();
440
            if (monitorOnly) {
2056
441
                watchPressedTouchPoints(touchPoints);
2057
442
                event->ignore();
2058
443
            } else {
2059
444
                TouchRegistry::instance()->requestTouchOwnership(touchId, q);
2060
445
                event->accept();
2061
446
            }
2062
417
        } else {
447
        } else {
2063
418
            // just monitor the touch points for now.
448
            // just monitor the touch points for now.
2065
419
            TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
449
            if (monitorOnly) {
2066
450
                watchPressedTouchPoints(touchPoints);
2067
451
            } else {
2068
452
                TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
2069
453
            }
2070
420
454
2071
421
            setStatus(Undecided);
455
            setStatus(Undecided);
2072
422
            // Let the item below have it. We will monitor it and grab it later if a gesture
456
            // Let the item below have it. We will monitor it and grab it later if a gesture
2073
@@ -890,5 +924,6 @@
2074
890
    , recognitionTimer(nullptr)
924
    , recognitionTimer(nullptr)
2075
891
    , timeSource(new RealTimeSource)
925
    , timeSource(new RealTimeSource)
2076
892
    , activeTouches(timeSource)
926
    , activeTouches(timeSource)
2077
927
    , monitorOnly(false)
2078
893
{
928
{
2079
894
}
929
}
2080
895
930
2081
=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.h'
2082
--- plugins/Ubuntu/Gestures/DirectionalDragArea.h	2015-05-11 07:49:36 +0000
2083
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.h	2016-03-11 18:12:46 +0000
2084
@@ -77,6 +77,10 @@
2085
77
            WRITE setImmediateRecognition
77
            WRITE setImmediateRecognition
2086
78
            NOTIFY immediateRecognitionChanged)
78
            NOTIFY immediateRecognitionChanged)
2087
79
79
2088
80
    // Whether we are merely monitoring touch events (in which case, we don't
2089
81
    // claim ownership of the touch).
2090
82
    Q_PROPERTY(bool monitorOnly READ monitorOnly WRITE setMonitorOnly NOTIFY monitorOnlyChanged)
2091
83
2092
80
    Q_ENUMS(Direction)
84
    Q_ENUMS(Direction)
2093
81
public:
85
public:
2094
82
    DirectionalDragArea(QQuickItem *parent = 0);
86
    DirectionalDragArea(QQuickItem *parent = 0);
2095
@@ -100,6 +104,9 @@
2096
100
    bool immediateRecognition() const;
104
    bool immediateRecognition() const;
2097
101
    void setImmediateRecognition(bool enabled);
105
    void setImmediateRecognition(bool enabled);
2098
102
106
2099
107
    bool monitorOnly() const;
2100
108
    void setMonitorOnly(bool monitorOnly);
2101
109
2102
103
    bool event(QEvent *e) override;
110
    bool event(QEvent *e) override;
2103
104
111
2104
105
    /*
112
    /*
2105
@@ -123,6 +130,7 @@
2106
123
    void touchSceneXChanged(qreal value);
130
    void touchSceneXChanged(qreal value);
2107
124
    void touchSceneYChanged(qreal value);
131
    void touchSceneYChanged(qreal value);
2108
125
    void immediateRecognitionChanged(bool value);
132
    void immediateRecognitionChanged(bool value);
2109
133
    void monitorOnlyChanged(bool value);
2110
126
134
2111
127
protected:
135
protected:
2112
128
    void touchEvent(QTouchEvent *event) override;
136
    void touchEvent(QTouchEvent *event) override;
2113
129
137
2114
=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea_p.h'
2115
--- plugins/Ubuntu/Gestures/DirectionalDragArea_p.h	2015-11-20 15:01:39 +0000
2116
+++ plugins/Ubuntu/Gestures/DirectionalDragArea_p.h	2016-03-11 18:12:46 +0000
2117
@@ -160,6 +160,8 @@
2118
160
160
2119
161
    ActiveTouchesInfo activeTouches;
161
    ActiveTouchesInfo activeTouches;
2120
162
162
2121
163
    bool monitorOnly;
2122
164
2123
163
Q_SIGNALS:
165
Q_SIGNALS:
2124
164
    void statusChanged(Status value);
166
    void statusChanged(Status value);
2125
165
};
167
};
2126
166
168
2127
=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
2128
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2015-12-02 12:02:50 +0000
2129
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-03-11 18:12:46 +0000
2130
@@ -116,7 +116,7 @@
2131
116
    QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
116
    QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
2132
117
    const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
117
    const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
2133
118
118
2135
119
    if (m_platform.isPC() && name == "indicator-keyboard") {
119
    if (m_platform.isPC() && name == QLatin1String("indicator-keyboard")) {
2136
120
        return; // convergence: skip this indicator until it works in Mir
120
        return; // convergence: skip this indicator until it works in Mir
2137
121
    }
121
    }
2138
122
122
2139
@@ -293,7 +293,7 @@
2140
293
    // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
293
    // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
2141
294
    if ((new_indicator->identifier() == QStringLiteral("indicator-session") && m_platform.isMultiSession())
294
    if ((new_indicator->identifier() == QStringLiteral("indicator-session") && m_platform.isMultiSession())
2142
295
            || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
295
            || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
2144
296
        new_indicator->setProfile("desktop");
296
        new_indicator->setProfile(QStringLiteral("desktop"));
2145
297
    } else {
297
    } else {
2146
298
        new_indicator->setProfile(m_profile);
298
        new_indicator->setProfile(m_profile);
2147
299
    }
299
    }
2148
300
300
2149
=== modified file 'plugins/Unity/Indicators/rootstateparser.h'
2150
--- plugins/Unity/Indicators/rootstateparser.h	2014-11-11 15:28:13 +0000
2151
+++ plugins/Unity/Indicators/rootstateparser.h	2016-03-11 18:12:46 +0000
2152
@@ -23,6 +23,7 @@
2153
23
23
2154
24
class UNITYINDICATORS_EXPORT RootStateParser : public ActionStateParser
24
class UNITYINDICATORS_EXPORT RootStateParser : public ActionStateParser
2155
25
{
25
{
2156
26
Q_OBJECT
2157
26
public:
27
public:
2158
27
    RootStateParser(QObject* parent = nullptr);
28
    RootStateParser(QObject* parent = nullptr);
2159
28
    virtual QVariant toQVariant(GVariant* state) const override;
29
    virtual QVariant toQVariant(GVariant* state) const override;
2160
29
30
2161
=== modified file 'plugins/Unity/Launcher/desktopfilehandler.cpp'
2162
--- plugins/Unity/Launcher/desktopfilehandler.cpp	2015-09-30 12:43:53 +0000
2163
+++ plugins/Unity/Launcher/desktopfilehandler.cpp	2016-03-11 18:12:46 +0000
2164
@@ -146,9 +146,9 @@
2165
146
    QString iconString = settings.value(QStringLiteral("Icon")).toString();
146
    QString iconString = settings.value(QStringLiteral("Icon")).toString();
2166
147
    QString pathString = settings.value(QStringLiteral("Path")).toString();
147
    QString pathString = settings.value(QStringLiteral("Path")).toString();
2167
148
148
2169
149
    if (QFileInfo(iconString).exists()) {
149
    if (QFileInfo::exists(iconString)) {
2170
150
        return QFileInfo(iconString).absoluteFilePath();
150
        return QFileInfo(iconString).absoluteFilePath();
2172
151
    } else if (QFileInfo(pathString + '/' + iconString).exists()) {
151
    } else if (QFileInfo::exists(pathString + '/' + iconString)) {
2173
152
        return pathString + '/' + iconString;
152
        return pathString + '/' + iconString;
2174
153
    }
153
    }
2175
154
    return "image://theme/" + iconString;
154
    return "image://theme/" + iconString;
2176
155
155
2177
=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
2178
--- plugins/Unity/Launcher/launcheritem.cpp	2015-09-14 09:11:08 +0000
2179
+++ plugins/Unity/Launcher/launcheritem.cpp	2016-03-11 18:12:46 +0000
2180
@@ -37,6 +37,7 @@
2181
37
    m_alerting(false),
37
    m_alerting(false),
2182
38
    m_quickList(new QuickListModel(this))
38
    m_quickList(new QuickListModel(this))
2183
39
{
39
{
2184
40
    Q_ASSERT(parent != nullptr);
2185
40
    QuickListEntry nameAction;
41
    QuickListEntry nameAction;
2186
41
    nameAction.setActionId(QStringLiteral("launch_item"));
42
    nameAction.setActionId(QStringLiteral("launch_item"));
2187
42
    nameAction.setText(m_name);
43
    nameAction.setText(m_name);
2188
43
44
2189
=== modified file 'plugins/Unity/Launcher/launcheritem.h'
2190
--- plugins/Unity/Launcher/launcheritem.h	2015-07-23 14:13:57 +0000
2191
+++ plugins/Unity/Launcher/launcheritem.h	2016-03-11 18:12:46 +0000
2192
@@ -32,7 +32,7 @@
2193
32
{
32
{
2194
33
    Q_OBJECT
33
    Q_OBJECT
2195
34
public:
34
public:
2197
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, QObject *parent);
2198
36
36
2199
37
    QString appId() const override;
37
    QString appId() const override;
2200
38
    QString name() const override;
38
    QString name() const override;
2201
39
39
2202
=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
2203
--- plugins/Unity/Launcher/launchermodel.cpp	2015-09-14 09:11:08 +0000
2204
+++ plugins/Unity/Launcher/launchermodel.cpp	2016-03-11 18:12:46 +0000
2205
@@ -103,7 +103,7 @@
2206
103
        LauncherItem *item = m_list.at(index);
103
        LauncherItem *item = m_list.at(index);
2207
104
        if (!item->focused()) {
104
        if (!item->focused()) {
2208
105
            item->setAlerting(alerting);
105
            item->setAlerting(alerting);
2210
106
            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleAlerting);
106
            Q_EMIT dataChanged(modelIndex, modelIndex, {RoleAlerting});
2211
107
        }
107
        }
2212
108
    }
108
    }
2213
109
}
109
}
2214
@@ -389,7 +389,8 @@
2215
389
        if (countVisible && desktopFile.isValid()) {
389
        if (countVisible && desktopFile.isValid()) {
2216
390
            LauncherItem *item = new LauncherItem(appId,
390
            LauncherItem *item = new LauncherItem(appId,
2217
391
                                                  desktopFile.displayName(),
391
                                                  desktopFile.displayName(),
2219
392
                                                  desktopFile.icon());
392
                                                  desktopFile.icon(),
2220
393
                                                  this);
2221
393
            item->setCountVisible(true);
394
            item->setCountVisible(true);
2222
394
            beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
395
            beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
2223
395
            m_list.append(item);
396
            m_list.append(item);
2224
@@ -414,10 +415,19 @@
2225
414
        } else {
415
        } else {
2226
415
            int idx = m_list.indexOf(item);
416
            int idx = m_list.indexOf(item);
2227
416
            item->setName(desktopFile.displayName());
417
            item->setName(desktopFile.displayName());
2228
417
            item->setIcon(desktopFile.icon());
2229
418
            item->setPinned(item->pinned()); // update pinned text if needed
418
            item->setPinned(item->pinned()); // update pinned text if needed
2230
419
            item->setRunning(item->running());
419
            item->setRunning(item->running());
2232
420
            Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon, RoleRunning});
420
            Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleRunning});
2233
421
2234
422
            const QString oldIcon = item->icon();
2235
423
            if (oldIcon == desktopFile.icon()) { // same icon file, perhaps different contents, simulate changing the icon name to force reload
2236
424
                item->setIcon(QString());
2237
425
                Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
2238
426
            }
2239
427
2240
428
            // now set the icon for real
2241
429
            item->setIcon(desktopFile.icon());
2242
430
            Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
2243
421
        }
431
        }
2244
422
    }
432
    }
2245
423
433
2246
@@ -489,7 +499,7 @@
2247
489
    if (idx >= 0) {
499
    if (idx >= 0) {
2248
490
        LauncherItem *item = m_list.at(idx);
500
        LauncherItem *item = m_list.at(idx);
2249
491
        setAlerting(item->appId(), true);
501
        setAlerting(item->appId(), true);
2251
492
        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleAlerting);
502
        Q_EMIT dataChanged(index(idx), index(idx), {RoleAlerting});
2252
493
    }
503
    }
2253
494
}
504
}
2254
495
505
2255
496
506
2256
=== modified file 'plugins/Unity/Launcher/launchermodel.h'
2257
--- plugins/Unity/Launcher/launchermodel.h	2015-07-29 12:32:57 +0000
2258
+++ plugins/Unity/Launcher/launchermodel.h	2016-03-11 18:12:46 +0000
2259
@@ -38,7 +38,7 @@
2260
38
   Q_OBJECT
38
   Q_OBJECT
2261
39
39
2262
40
public:
40
public:
2264
41
    LauncherModel(QObject *parent = 0);
41
    LauncherModel(QObject *parent = nullptr);
2265
42
    ~LauncherModel();
42
    ~LauncherModel();
2266
43
43
2267
44
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
44
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
2268
45
45
2269
=== modified file 'plugins/Utils/CMakeLists.txt'
2270
--- plugins/Utils/CMakeLists.txt	2016-02-08 09:37:48 +0000
2271
+++ plugins/Utils/CMakeLists.txt	2016-03-11 18:12:46 +0000
2272
@@ -17,12 +17,13 @@
2273
17
    unitysortfilterproxymodelqml.cpp
17
    unitysortfilterproxymodelqml.cpp
2274
18
    Timer.cpp
18
    Timer.cpp
2275
19
    unitymenumodelpaths.cpp
19
    unitymenumodelpaths.cpp
2277
20
    windowkeysfilter.cpp
20
    windowinputfilter.cpp
2278
21
    windowscreenshotprovider.cpp
21
    windowscreenshotprovider.cpp
2279
22
    easingcurve.cpp
22
    easingcurve.cpp
2280
23
    windowstatestorage.cpp
23
    windowstatestorage.cpp
2281
24
    timezoneFormatter.cpp
24
    timezoneFormatter.cpp
2282
25
    inputeventgenerator.cpp
25
    inputeventgenerator.cpp
2283
26
    deviceconfigparser.cpp
2284
26
    plugin.cpp
27
    plugin.cpp
2285
27
    )
28
    )
2286
28
29
2287
29
30
2288
=== modified file 'plugins/Utils/Utils.qmltypes'
2289
--- plugins/Utils/Utils.qmltypes	2015-09-03 11:08:46 +0000
2290
+++ plugins/Utils/Utils.qmltypes	2016-03-11 18:12:46 +0000
2291
@@ -147,10 +147,10 @@
2292
147
        }
147
        }
2293
148
    }
148
    }
2294
149
    Component {
149
    Component {
2296
150
        name: "WindowKeysFilter"
150
        name: "WindowInputFilter"
2297
151
        defaultProperty: "data"
151
        defaultProperty: "data"
2298
152
        prototype: "QQuickItem"
152
        prototype: "QQuickItem"
2300
153
        exports: ["Utils/WindowKeysFilter 0.1"]
153
        exports: ["Utils/WindowInputFilter 0.1"]
2301
154
        exportMetaObjectRevisions: [0]
154
        exportMetaObjectRevisions: [0]
2302
155
    }
155
    }
2303
156
    Component {
156
    Component {
2304
157
157
2305
=== added file 'plugins/Utils/deviceconfigparser.cpp'
2306
--- plugins/Utils/deviceconfigparser.cpp	1970-01-01 00:00:00 +0000
2307
+++ plugins/Utils/deviceconfigparser.cpp	2016-03-11 18:12:46 +0000
2308
@@ -0,0 +1,150 @@
2309
1
/*
2310
2
 * Copyright 2016 Canonical Ltd.
2311
3
 *
2312
4
 * This program is free software; you can redistribute it and/or modify
2313
5
 * it under the terms of the GNU Lesser General Public License as published by
2314
6
 * the Free Software Foundation; version 3.
2315
7
 *
2316
8
 * This program is distributed in the hope that it will be useful,
2317
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2318
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2319
11
 * GNU Lesser General Public License for more details.
2320
12
 *
2321
13
 * You should have received a copy of the GNU Lesser General Public License
2322
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
15
 */
2324
16
2325
17
#include "deviceconfigparser.h"
2326
18
2327
19
#include <QSettings>
2328
20
#include <QFileInfo>
2329
21
#include <QDebug>
2330
22
#include <QStandardPaths>
2331
23
2332
24
DeviceConfigParser::DeviceConfigParser(QObject *parent): QObject(parent)
2333
25
{
2334
26
    QString path;
2335
27
    Q_FOREACH (const QString &standardPath, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
2336
28
        if (QFileInfo(standardPath + "/devices.conf").exists()) {
2337
29
            path = standardPath + "/devices.conf";
2338
30
            break;
2339
31
        }
2340
32
    }
2341
33
2342
34
    if (path.isEmpty()) {
2343
35
        path = "/etc/ubuntu/devices.conf";
2344
36
    }
2345
37
    qDebug() << "Using" << path << "as device configuration file";
2346
38
    m_config = new QSettings(path, QSettings::IniFormat, this);
2347
39
}
2348
40
2349
41
QString DeviceConfigParser::name() const
2350
42
{
2351
43
    return m_name;
2352
44
}
2353
45
2354
46
void DeviceConfigParser::setName(const QString &name)
2355
47
{
2356
48
    if (m_name == name) {
2357
49
        return;
2358
50
    }
2359
51
    m_name = name;
2360
52
    Q_EMIT changed();
2361
53
}
2362
54
2363
55
Qt::ScreenOrientation DeviceConfigParser::primaryOrientation() const
2364
56
{
2365
57
    return stringToOrientation(readOrientationFromConfig("PrimaryOrientation"), Qt::PrimaryOrientation);
2366
58
}
2367
59
2368
60
Qt::ScreenOrientations DeviceConfigParser::supportedOrientations() const
2369
61
{
2370
62
    QStringList values = readOrientationsFromConfig("SupportedOrientations");
2371
63
    if (values.isEmpty()) {
2372
64
        return Qt::PortraitOrientation
2373
65
                | Qt::InvertedPortraitOrientation
2374
66
                | Qt::LandscapeOrientation
2375
67
                | Qt::InvertedLandscapeOrientation;
2376
68
    }
2377
69
2378
70
    Qt::ScreenOrientations ret = Qt::PrimaryOrientation;
2379
71
    Q_FOREACH(const QString &orientationString, values) {
2380
72
        ret |= stringToOrientation(orientationString, Qt::PrimaryOrientation);
2381
73
    }
2382
74
    return ret;
2383
75
}
2384
76
2385
77
Qt::ScreenOrientation DeviceConfigParser::landscapeOrientation() const
2386
78
{
2387
79
    return stringToOrientation(readOrientationFromConfig("LandscapeOrientation"), Qt::LandscapeOrientation);
2388
80
}
2389
81
2390
82
Qt::ScreenOrientation DeviceConfigParser::invertedLandscapeOrientation() const
2391
83
{
2392
84
    return stringToOrientation(readOrientationFromConfig("InvertedLandscapeOrientation"), Qt::InvertedLandscapeOrientation);
2393
85
}
2394
86
2395
87
Qt::ScreenOrientation DeviceConfigParser::portraitOrientation() const
2396
88
{
2397
89
    return stringToOrientation(readOrientationFromConfig("PortraitOrientation"), Qt::PortraitOrientation);
2398
90
}
2399
91
2400
92
Qt::ScreenOrientation DeviceConfigParser::invertedPortraitOrientation() const
2401
93
{
2402
94
    return stringToOrientation(readOrientationFromConfig("InvertedPortraitOrientation"), Qt::InvertedPortraitOrientation);
2403
95
}
2404
96
2405
97
QString DeviceConfigParser::category() const
2406
98
{
2407
99
    QStringList supportedValues = {"phone", "tablet", "desktop"};
2408
100
    m_config->beginGroup(m_name);
2409
101
    QString value = m_config->value("Category", "phone").toString();
2410
102
    if (!supportedValues.contains(value)) {
2411
103
        qWarning().nospace().noquote() << "Unknown option \"" << value << "\" in " << m_config->fileName()
2412
104
                    << ". Supported options are: " << supportedValues.join(", ") << ".";
2413
105
        return "phone";
2414
106
    }
2415
107
    m_config->endGroup();
2416
108
    return value;
2417
109
}
2418
110
2419
111
QStringList DeviceConfigParser::readOrientationsFromConfig(const QString &key) const
2420
112
{
2421
113
    m_config->beginGroup(m_name);
2422
114
2423
115
    QStringList ret;
2424
116
    if (m_config->contains(key)) {
2425
117
        ret = m_config->value(key).toStringList();
2426
118
    }
2427
119
2428
120
    m_config->endGroup();
2429
121
    return ret;
2430
122
}
2431
123
2432
124
QString DeviceConfigParser::readOrientationFromConfig(const QString &key) const
2433
125
{
2434
126
    QStringList ret = readOrientationsFromConfig(key);
2435
127
    return ret.count() > 0 ? ret.first() : QString();
2436
128
}
2437
129
2438
130
Qt::ScreenOrientation DeviceConfigParser::stringToOrientation(const QString &orientationString, Qt::ScreenOrientation defaultValue) const
2439
131
{
2440
132
    if (orientationString == "Landscape") {
2441
133
        return Qt::LandscapeOrientation;
2442
134
    }
2443
135
    if (orientationString == "InvertedLandscape") {
2444
136
        return Qt::InvertedLandscapeOrientation;
2445
137
    }
2446
138
    if (orientationString == "Portrait") {
2447
139
        return Qt::PortraitOrientation;
2448
140
    }
2449
141
    if (orientationString == "InvertedPortrait") {
2450
142
        return Qt::InvertedPortraitOrientation;
2451
143
    }
2452
144
    if (!orientationString.isEmpty()) {
2453
145
        // Some option we don't know. Give some hint on what went wrong.
2454
146
        qWarning().nospace().noquote() << "Unknown option \"" << orientationString << "\" in " << m_config->fileName()
2455
147
                    << ". Supported options are: Landscape, InvertedLandscape, Portrait and InvertedPortrait.";
2456
148
    }
2457
149
    return defaultValue;
2458
150
}
2459
0
151
2460
=== added file 'plugins/Utils/deviceconfigparser.h'
2461
--- plugins/Utils/deviceconfigparser.h	1970-01-01 00:00:00 +0000
2462
+++ plugins/Utils/deviceconfigparser.h	2016-03-11 18:12:46 +0000
2463
@@ -0,0 +1,62 @@
2464
1
/*
2465
2
 * Copyright 2016 Canonical Ltd.
2466
3
 *
2467
4
 * This program is free software; you can redistribute it and/or modify
2468
5
 * it under the terms of the GNU Lesser General Public License as published by
2469
6
 * the Free Software Foundation; version 3.
2470
7
 *
2471
8
 * This program is distributed in the hope that it will be useful,
2472
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2473
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2474
11
 * GNU Lesser General Public License for more details.
2475
12
 *
2476
13
 * You should have received a copy of the GNU Lesser General Public License
2477
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2478
15
 */
2479
16
2480
17
#ifndef DEVICECONFIGPARSER_H
2481
18
#define DEVICECONFIGPARSER_H
2482
19
2483
20
#include <QObject>
2484
21
#include <QSettings>
2485
22
2486
23
class DeviceConfigParser: public QObject
2487
24
{
2488
25
    Q_OBJECT
2489
26
    Q_PROPERTY(QString name READ name WRITE setName NOTIFY changed)
2490
27
2491
28
    Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation NOTIFY changed)
2492
29
    Q_PROPERTY(Qt::ScreenOrientations supportedOrientations READ supportedOrientations NOTIFY changed)
2493
30
    Q_PROPERTY(Qt::ScreenOrientation landscapeOrientation READ landscapeOrientation NOTIFY changed)
2494
31
    Q_PROPERTY(Qt::ScreenOrientation invertedLandscapeOrientation READ invertedLandscapeOrientation NOTIFY changed)
2495
32
    Q_PROPERTY(Qt::ScreenOrientation portraitOrientation READ portraitOrientation NOTIFY changed)
2496
33
    Q_PROPERTY(Qt::ScreenOrientation invertedPortraitOrientation READ invertedPortraitOrientation NOTIFY changed)
2497
34
    Q_PROPERTY(QString category READ category NOTIFY changed)
2498
35
2499
36
public:
2500
37
    DeviceConfigParser(QObject *parent = nullptr);
2501
38
2502
39
    QString name() const;
2503
40
    void setName(const QString &name);
2504
41
2505
42
    Qt::ScreenOrientation primaryOrientation() const;
2506
43
    Qt::ScreenOrientations supportedOrientations() const;
2507
44
    Qt::ScreenOrientation landscapeOrientation() const;
2508
45
    Qt::ScreenOrientation invertedLandscapeOrientation() const;
2509
46
    Qt::ScreenOrientation portraitOrientation() const;
2510
47
    Qt::ScreenOrientation invertedPortraitOrientation() const;
2511
48
    QString category() const;
2512
49
2513
50
Q_SIGNALS:
2514
51
    void changed();
2515
52
2516
53
private:
2517
54
    QString m_name;
2518
55
    QSettings *m_config;
2519
56
2520
57
    QStringList readOrientationsFromConfig(const QString &key) const;
2521
58
    QString readOrientationFromConfig(const QString &key) const;
2522
59
    Qt::ScreenOrientation stringToOrientation(const QString &orientationString, Qt::ScreenOrientation defaultValue) const;
2523
60
};
2524
61
2525
62
#endif
2526
0
63
2527
=== modified file 'plugins/Utils/plugin.cpp'
2528
--- plugins/Utils/plugin.cpp	2016-01-29 11:52:14 +0000
2529
+++ plugins/Utils/plugin.cpp	2016-03-11 18:12:46 +0000
2530
@@ -30,13 +30,14 @@
2531
30
#include "qlimitproxymodelqml.h"
30
#include "qlimitproxymodelqml.h"
2532
31
#include "unitysortfilterproxymodelqml.h"
31
#include "unitysortfilterproxymodelqml.h"
2533
32
#include "unitymenumodelpaths.h"
32
#include "unitymenumodelpaths.h"
2535
33
#include "windowkeysfilter.h"
33
#include "windowinputfilter.h"
2536
34
#include "windowscreenshotprovider.h"
34
#include "windowscreenshotprovider.h"
2537
35
#include "windowstatestorage.h"
35
#include "windowstatestorage.h"
2538
36
#include "constants.h"
36
#include "constants.h"
2539
37
#include "timezoneFormatter.h"
37
#include "timezoneFormatter.h"
2540
38
#include "applicationsfiltermodel.h"
38
#include "applicationsfiltermodel.h"
2541
39
#include "inputeventgenerator.h"
39
#include "inputeventgenerator.h"
2542
40
#include "deviceconfigparser.h"
2543
40
41
2544
41
static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
42
static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
2545
42
{
43
{
2546
@@ -60,7 +61,7 @@
2547
60
    qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
61
    qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
2548
61
    qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
62
    qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
2549
62
    qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
63
    qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
2551
63
    qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
64
    qmlRegisterType<WindowInputFilter>(uri, 0, 1, "WindowInputFilter");
2552
64
    qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
65
    qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
2553
65
    qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
66
    qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
2554
66
    qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
67
    qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
2555
@@ -70,6 +71,7 @@
2556
70
    qmlRegisterType<ActiveFocusLogger>(uri, 0, 1, "ActiveFocusLogger");
71
    qmlRegisterType<ActiveFocusLogger>(uri, 0, 1, "ActiveFocusLogger");
2557
71
    qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
72
    qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
2558
72
    qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
73
    qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
2559
74
    qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
2560
73
}
75
}
2561
74
76
2562
75
void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
77
void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
2563
76
78
2564
=== modified file 'plugins/Utils/timezoneFormatter.cpp'
2565
--- plugins/Utils/timezoneFormatter.cpp	2015-11-20 15:01:39 +0000
2566
+++ plugins/Utils/timezoneFormatter.cpp	2016-03-11 18:12:46 +0000
2567
@@ -33,3 +33,13 @@
2568
33
    }
33
    }
2569
34
    return QString();
34
    return QString();
2570
35
}
35
}
2571
36
2572
37
QString TimezoneFormatter::currentTimeInTimezoneWithAbbrev(const QVariant &tzId) const
2573
38
{
2574
39
    QTimeZone tz(tzId.toByteArray());
2575
40
    if (tz.isValid()) {
2576
41
        const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
2577
42
        return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm"))).arg(tz.abbreviation(now));
2578
43
    }
2579
44
    return QString();
2580
45
}
2581
36
46
2582
=== modified file 'plugins/Utils/timezoneFormatter.h'
2583
--- plugins/Utils/timezoneFormatter.h	2015-09-17 13:42:15 +0000
2584
+++ plugins/Utils/timezoneFormatter.h	2016-03-11 18:12:46 +0000
2585
@@ -27,6 +27,7 @@
2586
27
    ~TimezoneFormatter() = default;
27
    ~TimezoneFormatter() = default;
2587
28
28
2588
29
    Q_INVOKABLE QString currentTimeInTimezone(const QVariant &tzId) const;
29
    Q_INVOKABLE QString currentTimeInTimezone(const QVariant &tzId) const;
2589
30
    Q_INVOKABLE QString currentTimeInTimezoneWithAbbrev(const QVariant &tzId) const;
2590
30
};
31
};
2591
31
32
2592
32
#endif
33
#endif
2593
33
34
2594
=== renamed file 'plugins/Utils/windowkeysfilter.cpp' => 'plugins/Utils/windowinputfilter.cpp'
2595
--- plugins/Utils/windowkeysfilter.cpp	2015-10-22 17:37:26 +0000
2596
+++ plugins/Utils/windowinputfilter.cpp	2016-03-11 18:12:46 +0000
2597
@@ -16,36 +16,34 @@
2598
16
 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
16
 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
2599
17
 */
17
 */
2600
18
18
2602
19
#include "windowkeysfilter.h"
19
#include "windowinputfilter.h"
2603
20
20
2604
21
#include <QQuickWindow>
21
#include <QQuickWindow>
2605
22
22
2607
23
WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)
23
WindowInputFilter::WindowInputFilter(QQuickItem *parent)
2608
24
    : QQuickItem(parent),
24
    : QQuickItem(parent),
2610
25
      m_currentEventTimestamp(0)
25
      m_lastInputTimestamp(0)
2611
26
{
26
{
2612
27
    connect(this, &QQuickItem::windowChanged,
27
    connect(this, &QQuickItem::windowChanged,
2614
28
            this, &WindowKeysFilter::setupFilterOnWindow);
28
            this, &WindowInputFilter::setupFilterOnWindow);
2615
29
}
29
}
2616
30
30
2618
31
bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)
31
bool WindowInputFilter::eventFilter(QObject *watched, QEvent *event)
2619
32
{
32
{
2620
33
    Q_ASSERT(!m_filteredWindow.isNull());
33
    Q_ASSERT(!m_filteredWindow.isNull());
2621
34
    Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));
34
    Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));
2622
35
    Q_UNUSED(watched);
35
    Q_UNUSED(watched);
2623
36
36
2624
37
    QInputEvent *inputEvent = dynamic_cast<QInputEvent*>(event);
2625
38
    if (inputEvent) {
2626
39
        m_lastInputTimestamp = inputEvent->timestamp();
2627
40
        Q_EMIT lastInputTimestampChanged();
2628
41
    }
2629
42
2630
37
    if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
43
    if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
2631
38
        // Let QML see this event and decide if it does not want it
44
        // Let QML see this event and decide if it does not want it
2632
39
        event->accept();
45
        event->accept();
2633
40
2634
41
        m_currentEventTimestamp = static_cast<QInputEvent*>(event)->timestamp();
2635
42
        Q_EMIT currentEventTimestampChanged();
2636
43
2637
44
        QCoreApplication::sendEvent(this, event);
46
        QCoreApplication::sendEvent(this, event);
2638
45
2639
46
        m_currentEventTimestamp = 0;
2640
47
        Q_EMIT currentEventTimestampChanged();
2641
48
2642
49
        return event->isAccepted();
47
        return event->isAccepted();
2643
50
    } else {
48
    } else {
2644
51
        // Not interested
49
        // Not interested
2645
@@ -53,7 +51,7 @@
2646
53
    }
51
    }
2647
54
}
52
}
2648
55
53
2650
56
void WindowKeysFilter::setupFilterOnWindow(QQuickWindow *window)
54
void WindowInputFilter::setupFilterOnWindow(QQuickWindow *window)
2651
57
{
55
{
2652
58
    if (!m_filteredWindow.isNull()) {
56
    if (!m_filteredWindow.isNull()) {
2653
59
        m_filteredWindow->removeEventFilter(this);
57
        m_filteredWindow->removeEventFilter(this);
2654
@@ -66,7 +64,7 @@
2655
66
    }
64
    }
2656
67
}
65
}
2657
68
66
2659
69
ulong WindowKeysFilter::currentEventTimestamp() const
67
ulong WindowInputFilter::lastInputTimestamp() const
2660
70
{
68
{
2662
71
    return m_currentEventTimestamp;
69
    return m_lastInputTimestamp;
2663
72
}
70
}
2664
73
71
2665
=== renamed file 'plugins/Utils/windowkeysfilter.h' => 'plugins/Utils/windowinputfilter.h'
2666
--- plugins/Utils/windowkeysfilter.h	2015-10-22 17:37:26 +0000
2667
+++ plugins/Utils/windowinputfilter.h	2016-03-11 18:12:46 +0000
2668
@@ -16,8 +16,8 @@
2669
16
 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
16
 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
2670
17
 */
17
 */
2671
18
18
2674
19
#ifndef UNITY_WINDOWKEYSFILTER_H
19
#ifndef UNITY_WINDOWINPUTFILTER_H
2675
20
#define UNITY_WINDOWKEYSFILTER_H
20
#define UNITY_WINDOWINPUTFILTER_H
2676
21
21
2677
22
#include <QQuickItem>
22
#include <QQuickItem>
2678
23
#include <QPointer>
23
#include <QPointer>
2679
@@ -29,30 +29,30 @@
2680
29
   accepted ones will be filtered out. Events are accepted by default, so make sure you reject
29
   accepted ones will be filtered out. Events are accepted by default, so make sure you reject
2681
30
   the keys you're not interested in.
30
   the keys you're not interested in.
2682
31
31
2684
32
   If more than one WindowKeysFilter exist in the same QML scene (and thus in the same QQuickWindow)
32
   If more than one WindowInputFilter exist in the same QML scene (and thus in the same QQuickWindow)
2685
33
   they will be called in the order of creation, which can be tricky to assess. So the best practice
33
   they will be called in the order of creation, which can be tricky to assess. So the best practice
2687
34
   is to have at most one WindowKeysFilter per QML scene.
34
   is to have at most one WindowInputFilter per QML scene.
2688
35
 */
35
 */
2690
36
class WindowKeysFilter : public QQuickItem
36
class WindowInputFilter : public QQuickItem
2691
37
{
37
{
2692
38
    Q_OBJECT
38
    Q_OBJECT
2694
39
    Q_PROPERTY(ulong currentEventTimestamp READ currentEventTimestamp NOTIFY currentEventTimestampChanged)
39
    Q_PROPERTY(ulong lastInputTimestamp READ lastInputTimestamp NOTIFY lastInputTimestampChanged)
2695
40
public:
40
public:
2697
41
    WindowKeysFilter(QQuickItem *parent = 0);
41
    WindowInputFilter(QQuickItem *parent = 0);
2698
42
42
2699
43
    bool eventFilter(QObject *watched, QEvent *event) override;
43
    bool eventFilter(QObject *watched, QEvent *event) override;
2700
44
44
2702
45
    ulong currentEventTimestamp() const;
45
    ulong lastInputTimestamp() const;
2703
46
46
2704
47
Q_SIGNALS:
47
Q_SIGNALS:
2706
48
    void currentEventTimestampChanged();
48
    void lastInputTimestampChanged();
2707
49
49
2708
50
private Q_SLOTS:
50
private Q_SLOTS:
2709
51
    void setupFilterOnWindow(QQuickWindow *window);
51
    void setupFilterOnWindow(QQuickWindow *window);
2710
52
52
2711
53
private:
53
private:
2712
54
    QPointer<QQuickWindow> m_filteredWindow;
54
    QPointer<QQuickWindow> m_filteredWindow;
2714
55
    ulong m_currentEventTimestamp;
55
    ulong m_lastInputTimestamp;
2715
56
};
56
};
2716
57
57
2718
58
#endif // UNITY_WINDOWKEYSFILTER_H
58
#endif // UNITY_WINDOWINPUTFILTER_H
2719
59
59
2720
=== modified file 'plugins/Wizard/CMakeLists.txt'
2721
--- plugins/Wizard/CMakeLists.txt	2014-11-14 17:47:00 +0000
2722
+++ plugins/Wizard/CMakeLists.txt	2016-03-11 18:12:46 +0000
2723
@@ -1,10 +1,16 @@
2724
1
include_directories(${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS})
2725
2
2726
1
add_library(Wizard-qml MODULE
3
add_library(Wizard-qml MODULE
2727
2
    plugin.cpp
4
    plugin.cpp
2728
3
    PageList.cpp
5
    PageList.cpp
2729
4
    System.cpp
6
    System.cpp
2730
7
    LocalePlugin.cpp
2731
8
    timezonemodel.cpp
2732
9
    Status.cpp
2733
5
)
10
)
2734
6
11
2736
7
qt5_use_modules(Wizard-qml DBus Qml)
12
qt5_use_modules(Wizard-qml DBus Qml Concurrent)
2737
13
target_link_libraries(Wizard-qml ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
2738
8
add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
14
add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
2739
9
15
2740
10
set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
16
set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
2741
11
17
2742
=== added file 'plugins/Wizard/LocalePlugin.cpp'
2743
--- plugins/Wizard/LocalePlugin.cpp	1970-01-01 00:00:00 +0000
2744
+++ plugins/Wizard/LocalePlugin.cpp	2016-03-11 18:12:46 +0000
2745
@@ -0,0 +1,291 @@
2746
1
/*
2747
2
 * Copyright (C) 2015 Canonical Ltd.
2748
3
 *
2749
4
 * This program is free software: you can redistribute it and/or modify it
2750
5
 * under the terms of the GNU General Public License version 3, as published
2751
6
 * by the Free Software Foundation.
2752
7
 *
2753
8
 * This program is distributed in the hope that it will be useful, but
2754
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
2755
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
2756
11
 * PURPOSE.  See the GNU General Public License for more details.
2757
12
 *
2758
13
 * You should have received a copy of the GNU General Public License along
2759
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2760
15
 */
2761
16
2762
17
#include <QLocale>
2763
18
#include <QStringList>
2764
19
2765
20
#include <libintl.h>
2766
21
2767
22
#include "LocalePlugin.h"
2768
23
2769
24
class LocalePrivate {
2770
25
public:
2771
26
    LocalePrivate() {
2772
27
        m_mccCodes = QHash<int, QString>
2773
28
                ({{202,"gr"},
2774
29
                  {204,"nl"},
2775
30
                  {206,"be"},
2776
31
                  {208,"fr"},
2777
32
                  {212,"mc"},
2778
33
                  {213,"ad"},
2779
34
                  {214,"es"},
2780
35
                  {216,"hu"},
2781
36
                  {218,"ba"},
2782
37
                  {219,"hr"},
2783
38
                  {220,"rs"},
2784
39
                  {222,"it"},
2785
40
                  {226,"ro"},
2786
41
                  {228,"ch"},
2787
42
                  {230,"cz"},
2788
43
                  {231,"sk"},
2789
44
                  {232,"at"},
2790
45
                  {234,"gb"},
2791
46
                  {235,"gb"},
2792
47
                  {238,"dk"},
2793
48
                  {240,"se"},
2794
49
                  {242,"no"},
2795
50
                  {244,"fi"},
2796
51
                  {246,"lt"},
2797
52
                  {247,"lv"},
2798
53
                  {248,"ee"},
2799
54
                  {250,"ru"},
2800
55
                  {255,"ua"},
2801
56
                  {257,"by"},
2802
57
                  {259,"md"},
2803
58
                  {260,"pl"},
2804
59
                  {262,"de"},
2805
60
                  {266,"gi"},
2806
61
                  {268,"pt"},
2807
62
                  {270,"lu"},
2808
63
                  {272,"ie"},
2809
64
                  {274,"is"},
2810
65
                  {276,"al"},
2811
66
                  {278,"mt"},
2812
67
                  {280,"cy"},
2813
68
                  {282,"ge"},
2814
69
                  {283,"am"},
2815
70
                  {284,"bg"},
2816
71
                  {286,"tr"},
2817
72
                  {288,"fo"},
2818
73
                  {289,"ge"},
2819
74
                  {290,"gl"},
2820
75
                  {292,"sm"},
2821
76
                  {293,"si"},
2822
77
                  {294,"mk"},
2823
78
                  {295,"li"},
2824
79
                  {297,"me"},
2825
80
                  {302,"ca"},
2826
81
                  {308,"pm"},
2827
82
                  {310,"gu"},
2828
83
                  {310,"us"},
2829
84
                  {311,"gu"},
2830
85
                  {311,"us"},
2831
86
                  {312,"us"},
2832
87
                  {316,"us"},
2833
88
                  {330,"pr"},
2834
89
                  {334,"mx"},
2835
90
                  {338,"jm"},
2836
91
                  {340,"fg"},
2837
92
                  {340,"gp"},
2838
93
                  {340,"mq"},
2839
94
                  {342,"bb"},
2840
95
                  {344,"ag"},
2841
96
                  {346,"ky"},
2842
97
                  {348,"vg"},
2843
98
                  {350,"bm"},
2844
99
                  {352,"gd"},
2845
100
                  {354,"ms"},
2846
101
                  {356,"kn"},
2847
102
                  {358,"lc"},
2848
103
                  {360,"vc"},
2849
104
                  {362,"an"},
2850
105
                  {362,"cw"},
2851
106
                  {363,"aw"},
2852
107
                  {364,"bs"},
2853
108
                  {365,"ai"},
2854
109
                  {366,"dm"},
2855
110
                  {368,"cu"},
2856
111
                  {370,"do"},
2857
112
                  {372,"ht"},
2858
113
                  {374,"tt"},
2859
114
                  {376,"tc"},
2860
115
                  {376,"vi"},
2861
116
                  {400,"az"},
2862
117
                  {401,"kz"},
2863
118
                  {402,"bt"},
2864
119
                  {404,"in"},
2865
120
                  {405,"in"},
2866
121
                  {410,"pk"},
2867
122
                  {412,"af"},
2868
123
                  {413,"lk"},
2869
124
                  {414,"mm"},
2870
125
                  {415,"lb"},
2871
126
                  {416,"jo"},
2872
127
                  {417,"sy"},
2873
128
                  {418,"iq"},
2874
129
                  {419,"kw"},
2875
130
                  {420,"sa"},
2876
131
                  {421,"ye"},
2877
132
                  {422,"om"},
2878
133
                  {424,"ae"},
2879
134
                  {425,"il"},
2880
135
                  {425,"ps"},
2881
136
                  {426,"bh"},
2882
137
                  {427,"qa"},
2883
138
                  {428,"mn"},
2884
139
                  {429,"np"},
2885
140
                  {430,"ae"},
2886
141
                  {431,"ae"},
2887
142
                  {432,"ir"},
2888
143
                  {434,"uz"},
2889
144
                  {436,"tk"},
2890
145
                  {437,"kg"},
2891
146
                  {438,"tm"},
2892
147
                  {440,"jp"},
2893
148
                  {441,"jp"},
2894
149
                  {450,"kr"},
2895
150
                  {452,"vn"},
2896
151
                  {454,"hk"},
2897
152
                  {455,"mo"},
2898
153
                  {456,"kh"},
2899
154
                  {457,"la"},
2900
155
                  {460,"cn"},
2901
156
                  {466,"tw"},
2902
157
                  {467,"kp"},
2903
158
                  {470,"bd"},
2904
159
                  {472,"mv"},
2905
160
                  {502,"my"},
2906
161
                  {505,"au"},
2907
162
                  {510,"id"},
2908
163
                  {514,"tp"},
2909
164
                  {515,"ph"},
2910
165
                  {520,"th"},
2911
166
                  {525,"sg"},
2912
167
                  {528,"bn"},
2913
168
                  {530,"nz"},
2914
169
                  {537,"pg"},
2915
170
                  {539,"to"},
2916
171
                  {540,"sb"},
2917
172
                  {541,"vu"},
2918
173
                  {542,"fj"},
2919
174
                  {544,"as"},
2920
175
                  {545,"ki"},
2921
176
                  {546,"nc"},
2922
177
                  {547,"pf"},
2923
178
                  {548,"ck"},
2924
179
                  {549,"ws"},
2925
180
                  {550,"fm"},
2926
181
                  {552,"pw"},
2927
182
                  {553,"tv"},
2928
183
                  {555,"nu"},
2929
184
                  {602,"eg"},
2930
185
                  {603,"dz"},
2931
186
                  {604,"ma"},
2932
187
                  {605,"tn"},
2933
188
                  {606,"ly"},
2934
189
                  {607,"gm"},
2935
190
                  {608,"sn"},
2936
191
                  {609,"mr"},
2937
192
                  {610,"ml"},
2938
193
                  {611,"gn"},
2939
194
                  {612,"ci"},
2940
195
                  {613,"bf"},
2941
196
                  {614,"ne"},
2942
197
                  {615,"tg"},
2943
198
                  {616,"bj"},
2944
199
                  {617,"mu"},
2945
200
                  {618,"lr"},
2946
201
                  {619,"sl"},
2947
202
                  {620,"gh"},
2948
203
                  {621,"ng"},
2949
204
                  {622,"td"},
2950
205
                  {623,"cf"},
2951
206
                  {624,"cm"},
2952
207
                  {625,"cv"},
2953
208
                  {626,"st"},
2954
209
                  {627,"gq"},
2955
210
                  {628,"ga"},
2956
211
                  {629,"cg"},
2957
212
                  {630,"cd"},
2958
213
                  {631,"ao"},
2959
214
                  {632,"gw"},
2960
215
                  {633,"sc"},
2961
216
                  {634,"sd"},
2962
217
                  {635,"rw"},
2963
218
                  {636,"et"},
2964
219
                  {637,"so"},
2965
220
                  {638,"dj"},
2966
221
                  {639,"ke"},
2967
222
                  {640,"tz"},
2968
223
                  {641,"ug"},
2969
224
                  {642,"bi"},
2970
225
                  {643,"mz"},
2971
226
                  {645,"zm"},
2972
227
                  {646,"mg"},
2973
228
                  {647,"re"},
2974
229
                  {648,"zw"},
2975
230
                  {649,"na"},
2976
231
                  {650,"mw"},
2977
232
                  {651,"ls"},
2978
233
                  {652,"bw"},
2979
234
                  {653,"sz"},
2980
235
                  {654,"km"},
2981
236
                  {655,"za"},
2982
237
                  {657,"er"},
2983
238
                  {659,"ss"},
2984
239
                  {702,"bz"},
2985
240
                  {704,"gt"},
2986
241
                  {706,"sv"},
2987
242
                  {708,"hn"},
2988
243
                  {710,"ni"},
2989
244
                  {712,"cr"},
2990
245
                  {714,"pa"},
2991
246
                  {716,"pe"},
2992
247
                  {722,"ar"},
2993
248
                  {724,"br"},
2994
249
                  {730,"cl"},
2995
250
                  {732,"co"},
2996
251
                  {734,"ve"},
2997
252
                  {736,"bo"},
2998
253
                  {738,"gy"},
2999
254
                  {740,"ec"},
3000
255
                  {744,"py"},
3001
256
                  {746,"sr"},
3002
257
                  {748,"uy"},
3003
258
                  {750,"fk"}}
3004
259
                 );
3005
260
    }
3006
261
3007
262
    QString mccToCountryCode(int mcc) const {
3008
263
        return m_mccCodes.value(mcc, "us").toUpper();
3009
264
    }
3010
265
3011
266
private:
3012
267
    // MCC = Mobile Country Code, see https://en.wikipedia.org/wiki/Mobile_country_code
3013
268
    QHash<int,QString> m_mccCodes;
3014
269
};
3015
270
3016
271
Q_GLOBAL_STATIC(LocalePrivate, d)
3017
272
3018
273
LocaleAttached::LocaleAttached(QObject* parent)
3019
274
    : QObject(parent)
3020
275
{
3021
276
}
3022
277
3023
278
QString LocaleAttached::mccToCountryCode(int mcc) const
3024
279
{
3025
280
    return d->mccToCountryCode(mcc);
3026
281
}
3027
282
3028
283
LocalePlugin::LocalePlugin(QObject* parent)
3029
284
    : QObject(parent)
3030
285
{
3031
286
}
3032
287
3033
288
LocaleAttached* LocalePlugin::qmlAttachedProperties(QObject* parent)
3034
289
{
3035
290
    return new LocaleAttached(parent);
3036
291
}
3037
0
292
3038
=== added file 'plugins/Wizard/LocalePlugin.h'
3039
--- plugins/Wizard/LocalePlugin.h	1970-01-01 00:00:00 +0000
3040
+++ plugins/Wizard/LocalePlugin.h	2016-03-11 18:12:46 +0000
3041
@@ -0,0 +1,58 @@
3042
1
/*
3043
2
 * Copyright (C) 2015 Canonical Ltd.
3044
3
 *
3045
4
 * This program is free software: you can redistribute it and/or modify it
3046
5
 * under the terms of the GNU General Public License version 3, as published
3047
6
 * by the Free Software Foundation.
3048
7
 *
3049
8
 * This program is distributed in the hope that it will be useful, but
3050
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
3051
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3052
11
 * PURPOSE.  See the GNU General Public License for more details.
3053
12
 *
3054
13
 * You should have received a copy of the GNU General Public License along
3055
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
3056
15
 */
3057
16
3058
17
#ifndef LOCALE_PLUGIN_H
3059
18
#define LOCALE_PLUGIN_H
3060
19
3061
20
#include <QObject>
3062
21
#include <QString>
3063
22
#include <QJsonObject>
3064
23
#include <QtQml>
3065
24
3066
25
class LocaleAttached: public QObject
3067
26
{
3068
27
    Q_OBJECT
3069
28
protected:
3070
29
    explicit LocaleAttached(QObject *parent = 0);
3071
30
3072
31
public:
3073
32
    Q_INVOKABLE QString mccToCountryCode(int mcc) const;
3074
33
3075
34
    friend class LocalePlugin;
3076
35
};
3077
36
3078
37
/**
3079
38
 * A simplified wrapper around QLocale.
3080
39
 *
3081
40
 * The wrapper is implemented as an attached property, which makes it possible
3082
41
 * to use it as if its methods were static:
3083
42
 *
3084
43
 * @code
3085
44
 * var langs = LocalePlugin.languages();
3086
45
 * @endcode
3087
46
 */
3088
47
class LocalePlugin: public QObject
3089
48
{
3090
49
    Q_OBJECT
3091
50
public:
3092
51
    explicit LocalePlugin(QObject *parent = 0);
3093
52
3094
53
    static LocaleAttached* qmlAttachedProperties(QObject *parent);
3095
54
};
3096
55
3097
56
QML_DECLARE_TYPEINFO(LocalePlugin, QML_HAS_ATTACHED_PROPERTIES)
3098
57
3099
58
#endif // LOCALE_PLUGIN_H
3100
0
59
3101
=== modified file 'plugins/Wizard/PageList.cpp'
3102
--- plugins/Wizard/PageList.cpp	2015-09-14 09:11:08 +0000
3103
+++ plugins/Wizard/PageList.cpp	2016-03-11 18:12:46 +0000
3104
@@ -40,20 +40,20 @@
3105
40
      m_index(-1),
40
      m_index(-1),
3106
41
      m_pages()
41
      m_pages()
3107
42
{
42
{
3110
43
    QString qmlSuffix = QStringLiteral(".qml");
43
    const QString qmlSuffix = QStringLiteral(".qml");
3111
44
    QString disabledSuffix = QStringLiteral(".disabled");
44
    const QString disabledSuffix = QStringLiteral(".disabled");
3112
45
    QSet<QString> disabledPages;
45
    QSet<QString> disabledPages;
3113
46
    QStringList dataDirs;
46
    QStringList dataDirs;
3114
47
47
3115
48
    if (!isRunningInstalled() && getenv("WIZARD_TESTING") == nullptr) {
48
    if (!isRunningInstalled() && getenv("WIZARD_TESTING") == nullptr) {
3117
49
        dataDirs = QStringList() << qmlDirectory();
49
        dataDirs << qmlDirectory();
3118
50
    } else {
50
    } else {
3119
51
        dataDirs = shellDataDirs();
51
        dataDirs = shellDataDirs();
3120
52
    }
52
    }
3121
53
53
3122
54
    Q_FOREACH(const QString &dataDir, dataDirs) {
54
    Q_FOREACH(const QString &dataDir, dataDirs) {
3123
55
        QDir dir(dataDir + "/Wizard/Pages");
55
        QDir dir(dataDir + "/Wizard/Pages");
3125
56
        QStringList entries = dir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Files | QDir::Readable);
56
        const QStringList entries = dir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Files | QDir::Readable);
3126
57
        Q_FOREACH(const QString &entry, entries) {
57
        Q_FOREACH(const QString &entry, entries) {
3127
58
            if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))
58
            if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))
3128
59
                m_pages.insert(entry, dir.absoluteFilePath(entry));
59
                m_pages.insert(entry, dir.absoluteFilePath(entry));
3129
60
60
3130
=== added file 'plugins/Wizard/Status.cpp'
3131
--- plugins/Wizard/Status.cpp	1970-01-01 00:00:00 +0000
3132
+++ plugins/Wizard/Status.cpp	2016-03-11 18:12:46 +0000
3133
@@ -0,0 +1,143 @@
3134
1
/*
3135
2
 * Copyright (C) 2015 Canonical Ltd.
3136
3
 *
3137
4
 * This program is free software: you can redistribute it and/or modify it
3138
5
 * under the terms of the GNU General Public License version 3, as published
3139
6
 * by the Free Software Foundation.
3140
7
 *
3141
8
 * This program is distributed in the hope that it will be useful, but
3142
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
3143
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3144
11
 * PURPOSE.  See the GNU General Public License for more details.
3145
12
 *
3146
13
 * You should have received a copy of the GNU General Public License along
3147
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
3148
15
 */
3149
16
3150
17
#include <QDebug>
3151
18
#include <QDBusConnection>
3152
19
3153
20
#include "Status.h"
3154
21
3155
22
Status::Status()
3156
23
{
3157
24
    initNM();
3158
25
    initUPower();
3159
26
}
3160
27
3161
28
void Status::initNM()
3162
29
{
3163
30
    m_nmIface = new QDBusInterface("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager",
3164
31
                                   QDBusConnection::systemBus(), this);
3165
32
3166
33
    QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager", "PropertiesChanged",
3167
34
                                         this, SLOT(onNMPropertiesChanged(QVariantMap)));
3168
35
}
3169
36
3170
37
void Status::onNMPropertiesChanged(const QVariantMap &changedProps)
3171
38
{
3172
39
    if (changedProps.contains("State") || changedProps.contains("Connectivity")) {
3173
40
        Q_EMIT onlineChanged();
3174
41
        Q_EMIT networkIconChanged();
3175
42
    }
3176
43
3177
44
    if (changedProps.contains("PrimaryConnection") || changedProps.contains("SpecificObject") || changedProps.contains("Strength")) {
3178
45
        Q_EMIT networkIconChanged();
3179
46
    }
3180
47
}
3181
48
3182
49
bool Status::online() const
3183
50
{
3184
51
    if (!m_nmIface->isValid())
3185
52
        return false;
3186
53
3187
54
    return m_nmIface->property("State").toUInt() == 70;
3188
55
}
3189
56
3190
57
QString Status::networkIcon()
3191
58
{
3192
59
    QString iconName = QStringLiteral("nm-no-connection");
3193
60
3194
61
    if (!online()) {
3195
62
        return iconName;
3196
63
    }
3197
64
3198
65
    const QString primaryConn = m_nmIface->property("PrimaryConnection").value<QDBusObjectPath>().path();
3199
66
    const QString primaryConnType = m_nmIface->property("PrimaryConnectionType").toString();
3200
67
3201
68
    if (primaryConn.isEmpty()) {
3202
69
        qWarning() << "Empty primary connection";
3203
70
        return iconName;
3204
71
    }
3205
72
3206
73
    if (primaryConnType == "802-11-wireless") {
3207
74
        QDBusInterface activeConn("org.freedesktop.NetworkManager", primaryConn, "org.freedesktop.NetworkManager.Connection.Active", QDBusConnection::systemBus());
3208
75
3209
76
        if (activeConn.isValid()) {
3210
77
            const QString apPath = activeConn.property("SpecificObject").value<QDBusObjectPath>().path();
3211
78
3212
79
            if (apPath.isEmpty()) {
3213
80
                qWarning() << "No AP path";
3214
81
                return iconName;
3215
82
            }
3216
83
3217
84
            QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", primaryConn, "org.freedesktop.NetworkManager.Connection.Active", "PropertiesChanged",
3218
85
                                                 this, SLOT(onNMPropertiesChanged(QVariantMap)));
3219
86
3220
87
            QDBusInterface ap("org.freedesktop.NetworkManager", apPath, "org.freedesktop.NetworkManager.AccessPoint", QDBusConnection::systemBus());
3221
88
3222
89
            if (!ap.isValid()) {
3223
90
                qWarning() << "Invalid AP";
3224
91
                return iconName;
3225
92
            }
3226
93
3227
94
            QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", apPath, "org.freedesktop.NetworkManager.AccessPoint", "PropertiesChanged",
3228
95
                                                 this, SLOT(onNMPropertiesChanged(QVariantMap)));
3229
96
3230
97
            const uint strength = ap.property("Strength").toUInt();
3231
98
            const uint flags = ap.property("Flags").toUInt();
3232
99
3233
100
            if (strength == 0) {
3234
101
                iconName = "nm-signal-00";
3235
102
            } else if (strength <= 25) {
3236
103
                iconName = "nm-signal-25";
3237
104
            } else if (strength <= 50) {
3238
105
                iconName = "nm-signal-50";
3239
106
            } else if (strength <= 75) {
3240
107
                iconName = "nm-signal-75";
3241
108
            } else if (strength <= 100) {
3242
109
                iconName = "nm-signal-100";
3243
110
            }
3244
111
3245
112
            if (flags >= 1) {
3246
113
                iconName += "-secure";
3247
114
            }
3248
115
        }
3249
116
    }
3250
117
3251
118
    return iconName;
3252
119
}
3253
120
3254
121
void Status::initUPower()
3255
122
{
3256
123
    m_upowerIface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower/devices/DisplayDevice", "org.freedesktop.UPower.Device",
3257
124
                                       QDBusConnection::systemBus(), this);
3258
125
    QDBusConnection::systemBus().connect("org.freedesktop.UPower", "/org/freedesktop/UPower/devices/DisplayDevice", "org.freedesktop.DBus.Properties",
3259
126
                                         "PropertiesChanged", this, SLOT(onUPowerPropertiesChanged(QString,QVariantMap,QStringList)));
3260
127
}
3261
128
3262
129
void Status::onUPowerPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps)
3263
130
{
3264
131
    Q_UNUSED(iface)
3265
132
    Q_UNUSED(invalidatedProps)
3266
133
3267
134
    if (changedProps.contains("IconName")) {
3268
135
        Q_EMIT batteryIconChanged();
3269
136
    }
3270
137
}
3271
138
3272
139
QString Status::batteryIcon() const
3273
140
{
3274
141
    const QString iconName = m_upowerIface->property("IconName").toString();
3275
142
    return iconName;
3276
143
}
3277
0
144
3278
=== added file 'plugins/Wizard/Status.h'
3279
--- plugins/Wizard/Status.h	1970-01-01 00:00:00 +0000
3280
+++ plugins/Wizard/Status.h	2016-03-11 18:12:46 +0000
3281
@@ -0,0 +1,60 @@
3282
1
/*
3283
2
 * Copyright (C) 2015 Canonical Ltd.
3284
3
 *
3285
4
 * This program is free software: you can redistribute it and/or modify it
3286
5
 * under the terms of the GNU General Public License version 3, as published
3287
6
 * by the Free Software Foundation.
3288
7
 *
3289
8
 * This program is distributed in the hope that it will be useful, but
3290
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
3291
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3292
11
 * PURPOSE.  See the GNU General Public License for more details.
3293
12
 *
3294
13
 * You should have received a copy of the GNU General Public License along
3295
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
3296
15
 */
3297
16
3298
17
#ifndef WIZARD_STATUS_H
3299
18
#define WIZARD_STATUS_H
3300
19
3301
20
#include <QObject>
3302
21
#include <QString>
3303
22
#include <QDBusInterface>
3304
23
3305
24
class Status: public QObject
3306
25
{
3307
26
    Q_OBJECT
3308
27
    Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
3309
28
    Q_PROPERTY(QString networkIcon READ networkIcon NOTIFY networkIconChanged)
3310
29
    Q_PROPERTY(QString batteryIcon READ batteryIcon NOTIFY batteryIconChanged)
3311
30
public:
3312
31
    Status();
3313
32
    ~Status() = default;
3314
33
3315
34
    bool online() const;
3316
35
    QString networkIcon();
3317
36
3318
37
    QString batteryIcon() const;
3319
38
3320
39
Q_SIGNALS:
3321
40
    void networkIconChanged();
3322
41
    void onlineChanged();
3323
42
    void batteryIconChanged();
3324
43
3325
44
private Q_SLOTS:
3326
45
    void onNMPropertiesChanged(const QVariantMap &changedProps);
3327
46
    void onUPowerPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps);
3328
47
3329
48
private:
3330
49
    Q_DISABLE_COPY(Status)
3331
50
3332
51
    // network status
3333
52
    void initNM();
3334
53
    QDBusInterface * m_nmIface = nullptr;
3335
54
3336
55
    // battery status
3337
56
    void initUPower();
3338
57
    QDBusInterface * m_upowerIface = nullptr;
3339
58
};
3340
59
3341
60
#endif
3342
0
61
3343
=== modified file 'plugins/Wizard/System.cpp'
3344
--- plugins/Wizard/System.cpp	2015-09-23 15:14:01 +0000
3345
+++ plugins/Wizard/System.cpp	2016-03-11 18:12:46 +0000
3346
@@ -1,5 +1,5 @@
3347
1
/*
1
/*
3349
2
 * Copyright (C) 2014 Canonical Ltd.
2
 * Copyright (C) 2014-2015 Canonical Ltd.
3350
3
 *
3
 *
3351
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
3352
5
 * under the terms of the GNU General Public License version 3, as published
5
 * under the terms of the GNU General Public License version 3, as published
3353
@@ -25,10 +25,10 @@
3354
25
#include <QLocale>
25
#include <QLocale>
3355
26
#include <QMap>
26
#include <QMap>
3356
27
#include <QProcess>
27
#include <QProcess>
3357
28
#include <QDebug>
3358
28
29
3359
29
System::System()
30
System::System()
3362
30
    : QObject(),
31
    : QObject()
3361
31
      m_fsWatcher()
3363
32
{
32
{
3364
33
    // Register the argument needed for UpdateActivationEnvironment below
33
    // Register the argument needed for UpdateActivationEnvironment below
3365
34
    qDBusRegisterMetaType<QMap<QString,QString>>();
34
    qDBusRegisterMetaType<QMap<QString,QString>>();
3366
@@ -88,7 +88,7 @@
3367
88
    QDBusConnection::sessionBus().asyncCall(msg);
88
    QDBusConnection::sessionBus().asyncCall(msg);
3368
89
}
89
}
3369
90
90
3371
91
void System::updateSessionLanguage(const QString &locale)
91
void System::updateSessionLocale(const QString &locale)
3372
92
{
92
{
3373
93
    const QString language = locale.split(QStringLiteral("."))[0];
93
    const QString language = locale.split(QStringLiteral("."))[0];
3374
94
94
3375
@@ -106,5 +106,6 @@
3376
106
                                     initctl stop smart-scopes-proxy; \
106
                                     initctl stop smart-scopes-proxy; \
3377
107
                                     initctl emit --no-wait indicator-services-start; \
107
                                     initctl emit --no-wait indicator-services-start; \
3378
108
                                     initctl restart --no-wait maliit-server; \
108
                                     initctl restart --no-wait maliit-server; \
3379
109
                                     initctl restart --no-wait indicator-messages; \
3380
109
                                     initctl restart --no-wait unity8-dash\""));
110
                                     initctl restart --no-wait unity8-dash\""));
3381
110
}
111
}
3382
111
112
3383
=== modified file 'plugins/Wizard/System.h'
3384
--- plugins/Wizard/System.h	2015-05-21 16:05:57 +0000
3385
+++ plugins/Wizard/System.h	2016-03-11 18:12:46 +0000
3386
@@ -1,5 +1,5 @@
3387
1
/*
1
/*
3389
2
 * Copyright (C) 2014 Canonical Ltd.
2
 * Copyright (C) 2014-2015 Canonical Ltd.
3390
3
 *
3
 *
3391
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
3392
5
 * under the terms of the GNU General Public License version 3, as published
5
 * under the terms of the GNU General Public License version 3, as published
3393
@@ -28,12 +28,13 @@
3394
28
28
3395
29
public:
29
public:
3396
30
    System();
30
    System();
3397
31
    ~System() = default;
3398
31
32
3399
32
    bool wizardEnabled() const;
33
    bool wizardEnabled() const;
3400
33
    void setWizardEnabled(bool enabled);
34
    void setWizardEnabled(bool enabled);
3401
34
35
3402
35
public Q_SLOTS:
36
public Q_SLOTS:
3404
36
    void updateSessionLanguage(const QString &locale);
37
    void updateSessionLocale(const QString &locale);
3405
37
38
3406
38
Q_SIGNALS:
39
Q_SIGNALS:
3407
39
    void wizardEnabledChanged();
40
    void wizardEnabledChanged();
3408
40
41
3409
=== modified file 'plugins/Wizard/plugin.cpp'
3410
--- plugins/Wizard/plugin.cpp	2014-11-21 19:28:16 +0000
3411
+++ plugins/Wizard/plugin.cpp	2016-03-11 18:12:46 +0000
3412
@@ -17,19 +17,18 @@
3413
17
#include "plugin.h"
17
#include "plugin.h"
3414
18
#include "PageList.h"
18
#include "PageList.h"
3415
19
#include "System.h"
19
#include "System.h"
3416
20
#include "timezonemodel.h"
3417
21
#include "LocalePlugin.h"
3418
22
#include "Status.h"
3419
20
23
3420
21
#include <QtQml/qqml.h>
24
#include <QtQml/qqml.h>
3421
22
25
3422
23
static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
3423
24
{
3424
25
    Q_UNUSED(engine)
3425
26
    Q_UNUSED(scriptEngine)
3426
27
    return new System();
3427
28
}
3428
29
3429
30
void WizardPlugin::registerTypes(const char *uri)
26
void WizardPlugin::registerTypes(const char *uri)
3430
31
{
27
{
3431
32
    Q_ASSERT(uri == QLatin1String("Wizard"));
28
    Q_ASSERT(uri == QLatin1String("Wizard"));
3432
33
    qmlRegisterType<PageList>(uri, 0, 1, "PageList");
29
    qmlRegisterType<PageList>(uri, 0, 1, "PageList");
3434
34
    qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
30
    qmlRegisterSingletonType<System>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new System; });
3435
31
    qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });
3436
32
    qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");
3437
33
    qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");
3438
35
}
34
}
3439
36
35
3440
=== modified file 'plugins/Wizard/plugin.h'
3441
--- plugins/Wizard/plugin.h	2015-04-30 09:31:51 +0000
3442
+++ plugins/Wizard/plugin.h	2016-03-11 18:12:46 +0000
3443
@@ -17,13 +17,12 @@
3444
17
#ifndef WIZARD_PLUGIN_H
17
#ifndef WIZARD_PLUGIN_H
3445
18
#define WIZARD_PLUGIN_H
18
#define WIZARD_PLUGIN_H
3446
19
19
3447
20
#include <QtQml/QQmlEngine>
3448
21
#include <QtQml/QQmlExtensionPlugin>
20
#include <QtQml/QQmlExtensionPlugin>
3449
22
21
3450
23
class WizardPlugin : public QQmlExtensionPlugin
22
class WizardPlugin : public QQmlExtensionPlugin
3451
24
{
23
{
3452
25
    Q_OBJECT
24
    Q_OBJECT
3454
26
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
25
    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
3455
27
26
3456
28
public:
27
public:
3457
29
    void registerTypes(const char *uri) override;
28
    void registerTypes(const char *uri) override;
3458
30
29
3459
=== added file 'plugins/Wizard/timezonemodel.cpp'
3460
--- plugins/Wizard/timezonemodel.cpp	1970-01-01 00:00:00 +0000
3461
+++ plugins/Wizard/timezonemodel.cpp	2016-03-11 18:12:46 +0000
3462
@@ -0,0 +1,239 @@
3463
1
/*
3464
2
 * Copyright (C) 2016 Canonical Ltd.
3465
3
 *
3466
4
 * This program is free software: you can redistribute it and/or modify it
3467
5
 * under the terms of the GNU General Public License version 3, as published
3468
6
 * by the Free Software Foundation.
3469
7
 *
3470
8
 * This program is distributed in the hope that it will be useful, but
3471
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
3472
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3473
11
 * PURPOSE.  See the GNU General Public License for more details.
3474
12
 *
3475
13
 * You should have received a copy of the GNU General Public License along
3476
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
3477
15
 */
3478
16
3479
17
#include <QDebug>
3480
18
3481
19
#include <glib.h>
3482
20
#include <glib-object.h>
3483
21
3484
22
#include "LocalePlugin.h"
3485
23
#include "timezonemodel.h"
3486
24
3487
25
TimeZoneLocationModel::TimeZoneLocationModel(QObject *parent):
3488
26
    QAbstractListModel(parent),
3489
27
    m_listUpdating(false),
3490
28
    m_cancellable(nullptr)
3491
29
{
3492
30
    m_roleNames[Qt::DisplayRole] = "displayName";
3493
31
    m_roleNames[TimeZoneRole] = "timeZone";
3494
32
    m_roleNames[CityRole] = "city";
3495
33
    m_roleNames[CountryRole] = "country";
3496
34
    m_roleNames[OffsetRole] = "offset";
3497
35
    m_roleNames[LatitudeRole] = "latitude";
3498
36
    m_roleNames[LongitudeRole] = "longitude";
3499
37
}
3500
38
3501
39
int TimeZoneLocationModel::rowCount(const QModelIndex &parent) const
3502
40
{
3503
41
    if (parent.isValid()) {
3504
42
        return 0;
3505
43
    } else if (m_filter.isEmpty()) {
3506
44
        return m_countryLocations.count();
3507
45
    } else {
3508
46
        return m_locations.count();
3509
47
    }
3510
48
}
3511
49
3512
50
QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const
3513
51
{
3514
52
    GeonamesCity *city;
3515
53
    if (m_filter.isEmpty()) {
3516
54
        city = m_countryLocations.value(index.row());
3517
55
    } else {
3518
56
        city = m_locations.value(index.row());
3519
57
    }
3520
58
    if (!city)
3521
59
        return QVariant();
3522
60
3523
61
    switch (role) {
3524
62
    case Qt::DisplayRole:
3525
63
        return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city))
3526
64
                                           .arg(geonames_city_get_state(city))
3527
65
                                           .arg(geonames_city_get_country(city));
3528
66
    case SimpleRole:
3529
67
        return QStringLiteral("%1, %2").arg(geonames_city_get_name(city))
3530
68
                                       .arg(geonames_city_get_country(city));
3531
69
    case TimeZoneRole:
3532
70
        return geonames_city_get_timezone(city);
3533
71
    case CountryRole:
3534
72
        return geonames_city_get_country(city);
3535
73
    case CityRole:
3536
74
        return geonames_city_get_name(city);
3537
75
    case OffsetRole: {
3538
76
        QTimeZone tmp(geonames_city_get_timezone(city));
3539
77
        return static_cast<double>(tmp.standardTimeOffset(QDateTime::currentDateTime())) / 3600;
3540
78
    }
3541
79
    case LatitudeRole:
3542
80
        return geonames_city_get_latitude(city);
3543
81
    case LongitudeRole:
3544
82
        return geonames_city_get_longitude(city);
3545
83
    default:
3546
84
        qWarning() << Q_FUNC_INFO << "Unknown role";
3547
85
        return QVariant();
3548
86
    }
3549
87
}
3550
88
3551
89
QHash<int, QByteArray> TimeZoneLocationModel::roleNames() const
3552
90
{
3553
91
    return m_roleNames;
3554
92
}
3555
93
3556
94
void TimeZoneLocationModel::setModel(const QList<GeonamesCity *> &locations)
3557
95
{
3558
96
    beginResetModel();
3559
97
3560
98
    Q_FOREACH(GeonamesCity *city, m_locations) {
3561
99
        geonames_city_free(city);
3562
100
    }
3563
101
3564
102
    m_locations = locations;
3565
103
    endResetModel();
3566
104
}
3567
105
3568
106
void TimeZoneLocationModel::filterFinished(GObject      *source_object,
3569
107
                                           GAsyncResult *res,
3570
108
                                           gpointer      user_data)
3571
109
{
3572
110
    Q_UNUSED(source_object);
3573
111
3574
112
    g_autofree gint *cities = nullptr;
3575
113
    guint cities_len = 0;
3576
114
    g_autoptr(GError) error = nullptr;
3577
115
3578
116
    cities = geonames_query_cities_finish(res, &cities_len, &error);
3579
117
    if (error) {
3580
118
        if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
3581
119
            TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
3582
120
            g_clear_object(&model->m_cancellable);
3583
121
            model->setListUpdating(false);
3584
122
            qWarning() << "Could not filter timezones:" << error->message;
3585
123
        }
3586
124
        return;
3587
125
    }
3588
126
3589
127
    QList<GeonamesCity *> locations;
3590
128
3591
129
    for (guint i = 0; i < cities_len; ++i) {
3592
130
        GeonamesCity *city = geonames_get_city(cities[i]);
3593
131
        if (city) {
3594
132
            locations.append(city);
3595
133
        }
3596
134
    }
3597
135
3598
136
    TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
3599
137
3600
138
    g_clear_object(&model->m_cancellable);
3601
139
3602
140
    model->setModel(locations);
3603
141
    model->setListUpdating(false);
3604
142
}
3605
143
3606
144
bool TimeZoneLocationModel::listUpdating() const
3607
145
{
3608
146
    return m_listUpdating;
3609
147
}
3610
148
3611
149
void TimeZoneLocationModel::setListUpdating(bool listUpdating)
3612
150
{
3613
151
    if (m_listUpdating != listUpdating) {
3614
152
        m_listUpdating = listUpdating;
3615
153
        Q_EMIT listUpdatingChanged();
3616
154
    }
3617
155
}
3618
156
3619
157
QString TimeZoneLocationModel::filter() const
3620
158
{
3621
159
    return m_filter;
3622
160
}
3623
161
3624
162
void TimeZoneLocationModel::setFilter(const QString &filter)
3625
163
{
3626
164
    if (filter != m_filter) {
3627
165
        m_filter = filter;
3628
166
        Q_EMIT filterChanged();
3629
167
    }
3630
168
3631
169
    setListUpdating(true);
3632
170
3633
171
    if (m_cancellable) {
3634
172
        g_cancellable_cancel(m_cancellable);
3635
173
        g_clear_object(&m_cancellable);
3636
174
    }
3637
175
3638
176
    setModel(QList<GeonamesCity *>());
3639
177
3640
178
    if (filter.isEmpty()) {
3641
179
        setListUpdating(false);
3642
180
        return;
3643
181
    }
3644
182
3645
183
    m_cancellable = g_cancellable_new();
3646
184
    geonames_query_cities(filter.toUtf8().data(),
3647
185
                          GEONAMES_QUERY_DEFAULT,
3648
186
                          m_cancellable,
3649
187
                          filterFinished,
3650
188
                          this);
3651
189
}
3652
190
3653
191
QString TimeZoneLocationModel::country() const
3654
192
{
3655
193
    return m_country;
3656
194
}
3657
195
3658
196
static bool citycmp(GeonamesCity *a, GeonamesCity *b)
3659
197
{
3660
198
    return geonames_city_get_population(b) < geonames_city_get_population(a);
3661
199
}
3662
200
3663
201
void TimeZoneLocationModel::setCountry(const QString &country)
3664
202
{
3665
203
    if (m_country == country)
3666
204
        return;
3667
205
3668
206
    m_country = country;
3669
207
3670
208
    Q_FOREACH(GeonamesCity *city, m_countryLocations) {
3671
209
        geonames_city_free(city);
3672
210
    }
3673
211
3674
212
    gint num_cities = geonames_get_n_cities();
3675
213
    for (gint i = 0; i < num_cities; i++) {
3676
214
        GeonamesCity *city = geonames_get_city(i);
3677
215
        if (city && m_country == geonames_city_get_country_code(city)) {
3678
216
            m_countryLocations.append(city);
3679
217
        }
3680
218
    }
3681
219
3682
220
    std::sort(m_countryLocations.begin(), m_countryLocations.end(), citycmp);
3683
221
3684
222
    Q_EMIT countryChanged(country);
3685
223
}
3686
224
3687
225
TimeZoneLocationModel::~TimeZoneLocationModel()
3688
226
{
3689
227
    if (m_cancellable) {
3690
228
        g_cancellable_cancel(m_cancellable);
3691
229
        g_clear_object(&m_cancellable);
3692
230
    }
3693
231
3694
232
    Q_FOREACH(GeonamesCity *city, m_countryLocations) {
3695
233
        geonames_city_free(city);
3696
234
    }
3697
235
3698
236
    Q_FOREACH(GeonamesCity *city, m_locations) {
3699
237
        geonames_city_free(city);
3700
238
    }
3701
239
}
3702
0
240
3703
=== added file 'plugins/Wizard/timezonemodel.h'
3704
--- plugins/Wizard/timezonemodel.h	1970-01-01 00:00:00 +0000
3705
+++ plugins/Wizard/timezonemodel.h	2016-03-11 18:12:46 +0000
3706
@@ -0,0 +1,80 @@
3707
1
/*
3708
2
 * Copyright (C) 2016 Canonical Ltd.
3709
3
 *
3710
4
 * This program is free software: you can redistribute it and/or modify it
3711
5
 * under the terms of the GNU General Public License version 3, as published
3712
6
 * by the Free Software Foundation.
3713
7
 *
3714
8
 * This program is distributed in the hope that it will be useful, but
3715
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
3716
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3717
11
 * PURPOSE.  See the GNU General Public License for more details.
3718
12
 *
3719
13
 * You should have received a copy of the GNU General Public License along
3720
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
3721
15
 */
3722
16
3723
17
#ifndef TIMEZONEMODEL_H
3724
18
#define TIMEZONEMODEL_H
3725
19
3726
20
#include <geonames.h>
3727
21
#include <glib.h>
3728
22
#include <QAbstractListModel>
3729
23
3730
24
class TimeZoneLocationModel: public QAbstractListModel
3731
25
{
3732
26
    Q_OBJECT
3733
27
    Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
3734
28
    Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
3735
29
    Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
3736
30
    Q_ENUMS(Roles)
3737
31
3738
32
public:
3739
33
    explicit TimeZoneLocationModel(QObject *parent = nullptr);
3740
34
    ~TimeZoneLocationModel();
3741
35
3742
36
    enum Roles {
3743
37
        TimeZoneRole = Qt::UserRole + 1,
3744
38
        CityRole,
3745
39
        CountryRole,
3746
40
        SimpleRole,
3747
41
        OffsetRole,
3748
42
        LatitudeRole,
3749
43
        LongitudeRole
3750
44
    };
3751
45
3752
46
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
3753
47
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
3754
48
    QHash<int, QByteArray> roleNames() const override;
3755
49
3756
50
    bool listUpdating() const;
3757
51
3758
52
    QString filter() const;
3759
53
    void setFilter(const QString &filter);
3760
54
3761
55
    QString country() const;
3762
56
    void setCountry(const QString &country);
3763
57
3764
58
Q_SIGNALS:
3765
59
    void listUpdatingChanged();
3766
60
    void filterChanged();
3767
61
    void countryChanged(const QString &country);
3768
62
3769
63
private:
3770
64
    void setModel(const QList<GeonamesCity *> &locations);
3771
65
    void setListUpdating(bool listUpdating);
3772
66
    static void filterFinished(GObject      *source_object,
3773
67
                               GAsyncResult *res,
3774
68
                               gpointer      user_data);
3775
69
3776
70
3777
71
    bool m_listUpdating;
3778
72
    QString m_filter;
3779
73
    QString m_country;
3780
74
    GCancellable *m_cancellable;
3781
75
    QHash<int, QByteArray> m_roleNames;
3782
76
    QList<GeonamesCity *> m_locations;
3783
77
    QList<GeonamesCity *> m_countryLocations;
3784
78
};
3785
79
3786
80
#endif
3787
0
81
3788
=== modified file 'po/unity8.pot'
3789
--- po/unity8.pot	2016-03-08 21:04:17 +0000
3790
+++ po/unity8.pot	2016-03-11 18:12:46 +0000
3791
@@ -8,7 +8,7 @@
3792
8
msgstr ""
8
msgstr ""
3793
9
"Project-Id-Version: unity8\n"
9
"Project-Id-Version: unity8\n"
3794
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
3796
11
"POT-Creation-Date: 2016-03-08 21:04+0000\n"
11
"POT-Creation-Date: 2016-03-10 22:48+0000\n"
3797
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
3798
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3799
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
3800
@@ -22,16 +22,16 @@
3801
22
msgid "Password: "
22
msgid "Password: "
3802
23
msgstr ""
23
msgstr ""
3803
24
24
3806
25
#: plugins/Unity/Launcher/launcheritem.cpp:47
25
#: plugins/Unity/Launcher/launcheritem.cpp:48
3807
26
#: plugins/Unity/Launcher/launcheritem.cpp:106
26
#: plugins/Unity/Launcher/launcheritem.cpp:107
3808
27
msgid "Pin shortcut"
27
msgid "Pin shortcut"
3809
28
msgstr ""
28
msgstr ""
3810
29
29
3812
30
#: plugins/Unity/Launcher/launcheritem.cpp:52
30
#: plugins/Unity/Launcher/launcheritem.cpp:53
3813
31
msgid "Quit"
31
msgid "Quit"
3814
32
msgstr ""
32
msgstr ""
3815
33
33
3817
34
#: plugins/Unity/Launcher/launcheritem.cpp:106
34
#: plugins/Unity/Launcher/launcheritem.cpp:107
3818
35
msgid "Unpin shortcut"
35
msgid "Unpin shortcut"
3819
36
msgstr ""
36
msgstr ""
3820
37
37
3821
@@ -135,15 +135,15 @@
3822
135
msgid "Restart"
135
msgid "Restart"
3823
136
msgstr ""
136
msgstr ""
3824
137
137
3826
138
#: qml/Components/Lockscreen.qml:245
138
#: qml/Components/Lockscreen.qml:231
3827
139
msgid "Return to Call"
139
msgid "Return to Call"
3828
140
msgstr ""
140
msgstr ""
3829
141
141
3831
142
#: qml/Components/Lockscreen.qml:245
142
#: qml/Components/Lockscreen.qml:231
3832
143
msgid "Emergency Call"
143
msgid "Emergency Call"
3833
144
msgstr ""
144
msgstr ""
3834
145
145
3836
146
#: qml/Components/Lockscreen.qml:277
146
#: qml/Components/Lockscreen.qml:263
3837
147
msgid "OK"
147
msgid "OK"
3838
148
msgstr ""
148
msgstr ""
3839
149
149
3840
@@ -152,6 +152,8 @@
3841
152
msgstr ""
152
msgstr ""
3842
153
153
3843
154
#: qml/Components/ModeSwitchWarningDialog.qml:57
154
#: qml/Components/ModeSwitchWarningDialog.qml:57
3844
155
msgctxt ""
3845
156
"Re-dock means connect the device again to an external screen/mouse/keyboard"
3846
155
msgid "Re-dock, save your work and close these apps to continue."
157
msgid "Re-dock, save your work and close these apps to continue."
3847
156
msgstr ""
158
msgstr ""
3848
157
159
3849
@@ -194,15 +196,15 @@
3850
194
msgid "Add to Favorites"
196
msgid "Add to Favorites"
3851
195
msgstr ""
197
msgstr ""
3852
196
198
3854
197
#: qml/Dash/GenericScopeView.qml:565 qml/Dash/GenericScopeView.qml:723
199
#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
3855
198
msgid "See less"
200
msgid "See less"
3856
199
msgstr ""
201
msgstr ""
3857
200
202
3859
201
#: qml/Dash/GenericScopeView.qml:565
203
#: qml/Dash/GenericScopeView.qml:567
3860
202
msgid "See all"
204
msgid "See all"
3861
203
msgstr ""
205
msgstr ""
3862
204
206
3864
205
#: qml/Dash/GenericScopeView.qml:627
207
#: qml/Dash/GenericScopeView.qml:629
3865
206
msgctxt "Label: Hint for dash search line edit"
208
msgctxt "Label: Hint for dash search line edit"
3866
207
msgid "Search"
209
msgid "Search"
3867
208
msgstr ""
210
msgstr ""
3868
@@ -228,7 +230,7 @@
3869
228
msgid "Add a review"
230
msgid "Add a review"
3870
229
msgstr ""
231
msgstr ""
3871
230
232
3873
231
#: qml/Dash/Previews/PreviewSharing.qml:50
233
#: qml/Dash/Previews/PreviewSharing.qml:66
3874
232
msgid "Preview Share Item"
234
msgid "Preview Share Item"
3875
233
msgstr ""
235
msgstr ""
3876
234
236
3877
@@ -256,13 +258,13 @@
3878
256
msgid "Also installed"
258
msgid "Also installed"
3879
257
msgstr ""
259
msgstr ""
3880
258
260
3882
259
#: qml/DisabledScreenNotice.qml:87
261
#: qml/DisabledScreenNotice.qml:104
3883
260
msgid ""
262
msgid ""
3884
261
"Your device is now connected to an external display. Use this screen as a "
263
"Your device is now connected to an external display. Use this screen as a "
3886
262
"touch pad to interact with the mouse."
264
"touch pad to interact with the pointer."
3887
263
msgstr ""
265
msgstr ""
3888
264
266
3890
265
#: qml/Greeter/CoverPage.qml:107
267
#: qml/Greeter/CoverPage.qml:118
3891
266
msgid "Unlock"
268
msgid "Unlock"
3892
267
msgstr ""
269
msgstr ""
3893
268
270
3894
@@ -341,62 +343,62 @@
3895
341
msgid "Conference"
343
msgid "Conference"
3896
342
msgstr ""
344
msgstr ""
3897
343
345
3899
344
#: qml/Panel/Indicators/MenuItemFactory.qml:753
346
#: qml/Panel/Indicators/MenuItemFactory.qml:752
3900
345
msgid "Nothing is playing"
347
msgid "Nothing is playing"
3901
346
msgstr ""
348
msgstr ""
3902
347
349
3904
348
#: qml/Panel/Indicators/MenuItemFactory.qml:882
350
#: qml/Panel/Indicators/MenuItemFactory.qml:881
3905
349
#, qt-format
351
#, qt-format
3906
350
msgid "%1 hour"
352
msgid "%1 hour"
3907
351
msgid_plural "%1 hours"
353
msgid_plural "%1 hours"
3908
352
msgstr[0] ""
354
msgstr[0] ""
3909
353
msgstr[1] ""
355
msgstr[1] ""
3910
354
356
3912
355
#: qml/Panel/Indicators/MenuItemFactory.qml:886
357
#: qml/Panel/Indicators/MenuItemFactory.qml:885
3913
356
#, qt-format
358
#, qt-format
3914
357
msgid "%1 minute"
359
msgid "%1 minute"
3915
358
msgid_plural "%1 minutes"
360
msgid_plural "%1 minutes"
3916
359
msgstr[0] ""
361
msgstr[0] ""
3917
360
msgstr[1] ""
362
msgstr[1] ""
3918
361
363
3920
362
#: qml/Panel/Indicators/MenuItemFactory.qml:891
364
#: qml/Panel/Indicators/MenuItemFactory.qml:890
3921
363
#, qt-format
365
#, qt-format
3922
364
msgid "%1 second"
366
msgid "%1 second"
3923
365
msgid_plural "%1 seconds"
367
msgid_plural "%1 seconds"
3924
366
msgstr[0] ""
368
msgstr[0] ""
3925
367
msgstr[1] ""
369
msgstr[1] ""
3926
368
370
3928
369
#: qml/Panel/Indicators/MenuItemFactory.qml:894
371
#: qml/Panel/Indicators/MenuItemFactory.qml:893
3929
370
msgid "0 seconds"
372
msgid "0 seconds"
3930
371
msgstr ""
373
msgstr ""
3931
372
374
3932
373
#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
375
#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
3934
374
#: qml/Panel/Indicators/MenuItemFactory.qml:896
376
#: qml/Panel/Indicators/MenuItemFactory.qml:895
3935
375
#, qt-format
377
#, qt-format
3936
376
msgid "%1 remaining"
378
msgid "%1 remaining"
3937
377
msgstr ""
379
msgstr ""
3938
378
380
3940
379
#: qml/Panel/Indicators/MenuItemFactory.qml:902
381
#: qml/Panel/Indicators/MenuItemFactory.qml:901
3941
380
msgid "In queue…"
382
msgid "In queue…"
3942
381
msgstr ""
383
msgstr ""
3943
382
384
3945
383
#: qml/Panel/Indicators/MenuItemFactory.qml:906
385
#: qml/Panel/Indicators/MenuItemFactory.qml:905
3946
384
msgid "Downloading"
386
msgid "Downloading"
3947
385
msgstr ""
387
msgstr ""
3948
386
388
3950
387
#: qml/Panel/Indicators/MenuItemFactory.qml:908
389
#: qml/Panel/Indicators/MenuItemFactory.qml:907
3951
388
msgid "Paused, tap to resume"
390
msgid "Paused, tap to resume"
3952
389
msgstr ""
391
msgstr ""
3953
390
392
3955
391
#: qml/Panel/Indicators/MenuItemFactory.qml:910
393
#: qml/Panel/Indicators/MenuItemFactory.qml:909
3956
392
msgid "Canceled"
394
msgid "Canceled"
3957
393
msgstr ""
395
msgstr ""
3958
394
396
3960
395
#: qml/Panel/Indicators/MenuItemFactory.qml:912
397
#: qml/Panel/Indicators/MenuItemFactory.qml:911
3961
396
msgid "Finished"
398
msgid "Finished"
3962
397
msgstr ""
399
msgstr ""
3963
398
400
3965
399
#: qml/Panel/Indicators/MenuItemFactory.qml:914
401
#: qml/Panel/Indicators/MenuItemFactory.qml:913
3966
400
msgid "Failed, tap to retry"
402
msgid "Failed, tap to retry"
3967
401
msgstr ""
403
msgstr ""
3968
402
404
3969
403
405
3970
=== modified file 'qml/Components/EdgeBarrier.qml'
3971
--- qml/Components/EdgeBarrier.qml	2015-11-24 17:44:18 +0000
3972
+++ qml/Components/EdgeBarrier.qml	2016-03-11 18:12:46 +0000
3973
@@ -105,7 +105,7 @@
3974
105
        },
105
        },
3975
106
        Transition {
106
        Transition {
3976
107
            from: "resisting"; to: "passed"
107
            from: "resisting"; to: "passed"
3978
108
            UbuntuNumberAnimation { target: materialContainer; property: "opacity" }
108
            UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration; target: materialContainer; property: "opacity" }
3979
109
        }
109
        }
3980
110
    ]
110
    ]
3981
111
}
111
}
3982
112
112
3983
=== modified file 'qml/Components/Lockscreen.qml'
3984
--- qml/Components/Lockscreen.qml	2015-07-15 15:07:19 +0000
3985
+++ qml/Components/Lockscreen.qml	2016-03-11 18:12:46 +0000
3986
@@ -121,107 +121,93 @@
3987
121
        opacity: root.darkenBackground
121
        opacity: root.darkenBackground
3988
122
    }
122
    }
3989
123
123
4000
124
    MouseArea {
124
    Loader {
4001
125
        anchors.fill: root
125
        id: pinPadLoader
4002
126
        onClicked: {
126
        objectName: "pinPadLoader"
3993
127
            if (pinPadLoader.item)
3994
128
                pinPadLoader.item.forceActiveFocus()
3995
129
        }
3996
130
    }
3997
131
3998
132
    FocusScope {
3999
133
        id: loaderScope
4003
134
        anchors.fill: parent
127
        anchors.fill: parent
4094
135
128
        property bool resetting: false
4095
136
        Loader {
129
        property bool waiting: false
4096
137
            id: pinPadLoader
130
        property bool showWrongText: false
4097
138
            objectName: "pinPadLoader"
131
        focus: true
4098
139
            anchors.fill: parent
132
4099
140
            property bool resetting: false
133
        source: {
4100
141
            property bool waiting: false
134
            if (resetting || !root.required) {
4101
142
            property bool showWrongText: false
135
                return ""
4102
143
136
            } else if (root.delayMinutes > 0) {
4103
144
            source: {
137
                return "DelayedLockscreen.qml"
4104
145
                if (resetting || !root.required) {
138
            } else if (root.alphaNumeric) {
4105
146
                    return ""
139
                return "PassphraseLockscreen.qml"
4106
147
                } else if (root.delayMinutes > 0) {
140
            } else {
4107
148
                    return "DelayedLockscreen.qml"
141
                return "PinLockscreen.qml"
4108
149
                } else if (root.alphaNumeric) {
142
            }
4109
150
                    return "PassphraseLockscreen.qml"
143
        }
4110
151
                } else {
144
        onSourceChanged: {
4111
152
                    return "PinLockscreen.qml"
145
            waiting = false
4112
153
                }
146
            showWrongText = false
4113
154
            }
147
        }
4114
155
            onSourceChanged: {
148
4115
156
                waiting = false
149
        Connections {
4116
157
                showWrongText = false
150
            target: pinPadLoader.item
4117
158
                if (loaderScope.activeFocus && pinPadLoader.item)
151
4118
159
                    pinPadLoader.item.forceActiveFocus()
152
            onEntered: {
4119
160
            }
153
                pinPadLoader.waiting = true
4120
161
154
                root.entered(passphrase);
4121
162
            Connections {
155
            }
4122
163
                target: pinPadLoader.item
156
4123
164
157
            onCancel: {
4124
165
                onEntered: {
158
                root.cancel()
4125
166
                    pinPadLoader.waiting = true
159
            }
4126
167
                    root.entered(passphrase);
160
        }
4127
168
                }
161
4128
169
162
        Binding {
4129
170
                onCancel: {
163
            target: pinPadLoader.item
4130
171
                    root.cancel()
164
            property: "minPinLength"
4131
172
                }
165
            value: root.minPinLength
4132
173
            }
166
        }
4133
174
167
        Binding {
4134
175
            Binding {
168
            target: pinPadLoader.item
4135
176
                target: pinPadLoader.item
169
            property: "maxPinLength"
4136
177
                property: "minPinLength"
170
            value: root.maxPinLength
4137
178
                value: root.minPinLength
171
        }
4138
179
            }
172
        Binding {
4139
180
            Binding {
173
            target: pinPadLoader.item
4140
181
                target: pinPadLoader.item
174
            property: "infoText"
4141
182
                property: "maxPinLength"
175
            value: root.infoText
4142
183
                value: root.maxPinLength
176
        }
4143
184
            }
177
        Binding {
4144
185
            Binding {
178
            target: pinPadLoader.item
4145
186
                target: pinPadLoader.item
179
            property: "retryText"
4146
187
                property: "infoText"
180
            value: root.retryText
4147
188
                value: root.infoText
181
        }
4148
189
            }
182
        Binding {
4149
190
            Binding {
183
            target: pinPadLoader.item
4150
191
                target: pinPadLoader.item
184
            property: "errorText"
4151
192
                property: "retryText"
185
            value: pinPadLoader.showWrongText ? root.errorText : ""
4152
193
                value: root.retryText
186
        }
4153
194
            }
187
        Binding {
4154
195
            Binding {
188
            target: pinPadLoader.item
4155
196
                target: pinPadLoader.item
189
            property: "entryEnabled"
4156
197
                property: "errorText"
190
            value: !pinPadLoader.waiting
4157
198
                value: pinPadLoader.showWrongText ? root.errorText : ""
191
        }
4158
199
            }
192
        Binding {
4159
200
            Binding {
193
            target: pinPadLoader.item
4160
201
                target: pinPadLoader.item
194
            property: "alphaNumeric"
4161
202
                property: "entryEnabled"
195
            value: root.alphaNumeric
4162
203
                value: !pinPadLoader.waiting
196
        }
4163
204
            }
197
        Binding {
4164
205
            Binding {
198
            target: pinPadLoader.item
4165
206
                target: pinPadLoader.item
199
            property: "delayMinutes"
4166
207
                property: "alphaNumeric"
200
            value: root.delayMinutes
4167
208
                value: root.alphaNumeric
201
        }
4168
209
            }
202
        Binding {
4169
210
            Binding {
203
            target: pinPadLoader.item
4170
211
                target: pinPadLoader.item
204
            property: "showCancelButton"
4171
212
                property: "delayMinutes"
205
            value: root.showCancelButton
4172
213
                value: root.delayMinutes
206
        }
4173
214
            }
207
        Binding {
4174
215
            Binding {
208
            target: pinPadLoader.item
4175
216
                target: pinPadLoader.item
209
            property: "foregroundColor"
4176
217
                property: "showCancelButton"
210
            value: root.foregroundColor
4087
218
                value: root.showCancelButton
4088
219
            }
4089
220
            Binding {
4090
221
                target: pinPadLoader.item
4091
222
                property: "foregroundColor"
4092
223
                value: root.foregroundColor
4093
224
            }
4177
225
        }
211
        }
4178
226
    }
212
    }
4179
227
213
4180
228
214
4181
=== modified file 'qml/Components/ModeSwitchWarningDialog.qml'
4182
--- qml/Components/ModeSwitchWarningDialog.qml	2015-11-25 13:57:34 +0000
4183
+++ qml/Components/ModeSwitchWarningDialog.qml	2016-03-11 18:12:46 +0000
4184
@@ -54,7 +54,7 @@
4185
54
    }
54
    }
4186
55
55
4187
56
    Label {
56
    Label {
4189
57
        text: i18n.tr("Re-dock, save your work and close these apps to continue.")
57
        text: i18n.ctr("Re-dock means connect the device again to an external screen/mouse/keyboard", "Re-dock, save your work and close these apps to continue.")
4190
58
        wrapMode: Text.WordWrap
58
        wrapMode: Text.WordWrap
4191
59
        color: "#888888"
59
        color: "#888888"
4192
60
    }
60
    }
4193
61
61
4194
=== modified file 'qml/Components/PassphraseLockscreen.qml'
4195
--- qml/Components/PassphraseLockscreen.qml	2015-07-15 15:07:19 +0000
4196
+++ qml/Components/PassphraseLockscreen.qml	2016-03-11 18:12:46 +0000
4197
@@ -18,10 +18,11 @@
4198
18
import Ubuntu.Components 1.3
18
import Ubuntu.Components 1.3
4199
19
import "../Components"
19
import "../Components"
4200
20
20
4202
21
Item {
21
FocusScope {
4203
22
    id: root
22
    id: root
4204
23
    y: units.gu(4)
23
    y: units.gu(4)
4205
24
    height: shakeContainer.height
24
    height: shakeContainer.height
4206
25
    focus: true
4207
25
26
4208
26
    property string infoText
27
    property string infoText
4209
27
    property string errorText
28
    property string errorText
4210
@@ -42,8 +43,6 @@
4211
42
        }
43
        }
4212
43
    }
44
    }
4213
44
45
4214
45
    onActiveFocusChanged: if (activeFocus) pinentryField.forceActiveFocus()
4215
46
4216
47
    Column {
46
    Column {
4217
48
        id: shakeContainer
47
        id: shakeContainer
4218
49
        anchors.horizontalCenter: parent.horizontalCenter
48
        anchors.horizontalCenter: parent.horizontalCenter
4219
@@ -59,14 +58,16 @@
4220
59
            text: root.infoText
58
            text: root.infoText
4221
60
        }
59
        }
4222
61
60
4224
62
        Item {
61
        FocusScope {
4225
63
            id: entryContainer
62
            id: entryContainer
4226
64
            anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
63
            anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
4227
65
            height: units.gu(4)
64
            height: units.gu(4)
4228
65
            focus: true
4229
66
66
4230
67
            TextInput {
67
            TextInput {
4231
68
                id: pinentryField
68
                id: pinentryField
4232
69
                objectName: "pinentryField"
69
                objectName: "pinentryField"
4233
70
                focus: true
4234
70
71
4235
71
                property bool incorrectOverride: false
72
                property bool incorrectOverride: false
4236
72
73
4237
73
74
4238
=== modified file 'qml/Components/PhysicalKeysMapper.qml'
4239
--- qml/Components/PhysicalKeysMapper.qml	2016-01-13 18:43:34 +0000
4240
+++ qml/Components/PhysicalKeysMapper.qml	2016-03-11 18:12:46 +0000
4241
@@ -42,12 +42,15 @@
4242
42
    signal screenshotTriggered;
42
    signal screenshotTriggered;
4243
43
43
4244
44
    readonly property bool altTabPressed: d.altTabPressed
44
    readonly property bool altTabPressed: d.altTabPressed
4245
45
    readonly property bool superPressed: d.superPressed
4246
46
    readonly property bool superTabPressed: d.superTabPressed
4247
45
47
4248
46
    property int powerKeyLongPressTime: 2000
48
    property int powerKeyLongPressTime: 2000
4249
47
49
4250
48
    // For testing. If running windowed (e.g. tryShell), Alt+Tab is taken by the
50
    // For testing. If running windowed (e.g. tryShell), Alt+Tab is taken by the
4251
49
    // running desktop, set this to true to use Ctrl+Tab instead.
51
    // running desktop, set this to true to use Ctrl+Tab instead.
4252
50
    property bool controlInsteadOfAlt: false
52
    property bool controlInsteadOfAlt: false
4253
53
    property bool controlInsteadOfSuper: false
4254
51
54
4255
52
    QtObject {
55
    QtObject {
4256
53
        id: d
56
        id: d
4257
@@ -59,6 +62,9 @@
4258
59
        property bool altPressed: false
62
        property bool altPressed: false
4259
60
        property bool altTabPressed: false
63
        property bool altTabPressed: false
4260
61
64
4261
65
        property bool superPressed: false
4262
66
        property bool superTabPressed: false
4263
67
4264
62
        property var powerButtonPressStart: 0
68
        property var powerButtonPressStart: 0
4265
63
69
4266
64
        // We need to eat ALT presses until we know what they're for (Alt+Tab or going to the app?)
70
        // We need to eat ALT presses until we know what they're for (Alt+Tab or going to the app?)
4267
@@ -119,11 +125,23 @@
4268
119
                event.accepted = true;
125
                event.accepted = true;
4269
120
                d.altPressInjected = false;
126
                d.altPressInjected = false;
4270
121
            }
127
            }
4271
128
4272
129
        // Adding MetaModifier here because that's what keyboards do. Pressing Super_L actually gives
4273
130
        // Super_L + MetaModifier. This helps to make sure we only invoke superPressed if no other
4274
131
        // Modifier is pressed too.
4275
132
        } else if (((event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R) && event.modifiers === Qt.MetaModifier)
4276
133
                    || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)
4277
134
                    ) {
4278
135
            d.superPressed = true;
4279
122
        } else if (event.key == Qt.Key_Tab) {
136
        } else if (event.key == Qt.Key_Tab) {
4280
123
            if (d.altPressed && !d.altTabPressed) {
137
            if (d.altPressed && !d.altTabPressed) {
4281
124
                d.altTabPressed = true;
138
                d.altTabPressed = true;
4282
125
                event.accepted = true;
139
                event.accepted = true;
4283
126
            }
140
            }
4284
141
            if (d.superPressed && !d.superTabPressed) {
4285
142
                d.superTabPressed = true;
4286
143
                event.accepted = true;
4287
144
            }
4288
127
        }
145
        }
4289
128
    }
146
    }
4290
129
147
4291
@@ -154,6 +172,12 @@
4292
154
            if (d.altTabPressed) {
172
            if (d.altTabPressed) {
4293
155
                event.accepted = true;
173
                event.accepted = true;
4294
156
            }
174
            }
4295
175
        } else if (event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)) {
4296
176
            d.superPressed = false;
4297
177
            if (d.superTabPressed) {
4298
178
                d.superTabPressed = false;
4299
179
                event.accepted = true;
4300
180
            }
4301
157
        }
181
        }
4302
158
    }
182
    }
4303
159
}
183
}
4304
160
184
4305
=== modified file 'qml/Components/PinLockscreen.qml'
4306
--- qml/Components/PinLockscreen.qml	2015-07-15 15:07:19 +0000
4307
+++ qml/Components/PinLockscreen.qml	2016-03-11 18:12:46 +0000
4308
@@ -19,8 +19,9 @@
4309
19
import Ubuntu.Components.ListItems 1.3
19
import Ubuntu.Components.ListItems 1.3
4310
20
import "../Components"
20
import "../Components"
4311
21
21
4313
22
Item {
22
FocusScope {
4314
23
    id: root
23
    id: root
4315
24
    focus: true
4316
24
25
4317
25
    property string infoText
26
    property string infoText
4318
26
    property string retryText
27
    property string retryText
4319
@@ -45,6 +46,24 @@
4320
45
        }
46
        }
4321
46
    }
47
    }
4322
47
48
4323
49
    Keys.onPressed: {
4324
50
        if (pinentryField.text.length == root.maxPinLength)
4325
51
            return;
4326
52
4327
53
        if (event.key === Qt.Key_Backspace) {
4328
54
            pinentryField.backspace();
4329
55
        } else if (event.key === Qt.Key_Delete || event.key === Qt.Key_Escape) {
4330
56
            closeButton.clicked()
4331
57
        } else if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) {
4332
58
            confirmButton.clicked()
4333
59
        } else {
4334
60
            var digit = parseInt(event.text);
4335
61
            if (!isNaN(digit) && typeof digit == "number") {
4336
62
                pinentryField.appendNumber(digit);
4337
63
            }
4338
64
        }
4339
65
    }
4340
66
4341
48
    Column {
67
    Column {
4342
49
        anchors {
68
        anchors {
4343
50
            left: parent.left;
69
            left: parent.left;
4344
@@ -204,6 +223,7 @@
4345
204
                width: numbersGrid.buttonWidth
223
                width: numbersGrid.buttonWidth
4346
205
            }
224
            }
4347
206
            PinPadButton {
225
            PinPadButton {
4348
226
                id: closeButton
4349
207
                iconName: "close"
227
                iconName: "close"
4350
208
                height: units.gu(5) // visual spec has this row a little closer in
228
                height: units.gu(5) // visual spec has this row a little closer in
4351
209
                width: numbersGrid.buttonWidth
229
                width: numbersGrid.buttonWidth
4352
@@ -216,6 +236,7 @@
4353
216
                width: numbersGrid.buttonWidth
236
                width: numbersGrid.buttonWidth
4354
217
            }
237
            }
4355
218
            PinPadButton {
238
            PinPadButton {
4356
239
                id: confirmButton
4357
219
                iconName: "tick"
240
                iconName: "tick"
4358
220
                objectName: "confirmButton"
241
                objectName: "confirmButton"
4359
221
                height: units.gu(5)
242
                height: units.gu(5)
4360
222
243
4361
=== modified file 'qml/Components/ShellDialog.qml'
4362
--- qml/Components/ShellDialog.qml	2015-11-06 10:06:58 +0000
4363
+++ qml/Components/ShellDialog.qml	2016-03-11 18:12:46 +0000
4364
@@ -37,7 +37,15 @@
4365
37
37
4366
38
    focus: true
38
    focus: true
4367
39
39
4368
40
    // FIXME: this is a hack because Dialog subtheming seems broken atm
4369
41
    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555548
4370
42
    ThemeSettings {
4371
43
        id: themeHack
4372
44
        name: "Ubuntu.Components.Themes.Ambiance"
4373
45
    }
4374
46
4375
40
    Component.onCompleted: {
47
    Component.onCompleted: {
4376
48
        __foreground.theme = themeHack
4377
41
        show();
49
        show();
4378
42
    }
50
    }
4379
43
}
51
}
4380
44
52
4381
=== modified file 'qml/Dash/CardCarousel.qml'
4382
--- qml/Dash/CardCarousel.qml	2016-01-28 14:11:14 +0000
4383
+++ qml/Dash/CardCarousel.qml	2016-03-11 18:12:46 +0000
4384
@@ -66,7 +66,6 @@
4385
66
                item.cardData = Qt.binding(function() { return model; });
66
                item.cardData = Qt.binding(function() { return model; });
4386
67
                item.fontScale = Qt.binding(function() { return carousel.fontScale; });
67
                item.fontScale = Qt.binding(function() { return carousel.fontScale; });
4387
68
                item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });
68
                item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });
4388
69
                item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
4389
70
                item.artShapeStyle = "shadow";
69
                item.artShapeStyle = "shadow";
4390
71
                item.scopeStyle = cardCarousel.scopeStyle;
70
                item.scopeStyle = cardCarousel.scopeStyle;
4391
72
            }
71
            }
4392
73
72
4393
=== modified file 'qml/Dash/CardGrid.qml'
4394
--- qml/Dash/CardGrid.qml	2016-02-02 08:47:07 +0000
4395
+++ qml/Dash/CardGrid.qml	2016-03-11 18:12:46 +0000
4396
@@ -70,7 +70,6 @@
4397
70
                    item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
70
                    item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
4398
71
                    item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
71
                    item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
4399
72
                    item.cardData = Qt.binding(function() { return model; });
72
                    item.cardData = Qt.binding(function() { return model; });
4400
73
                    item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
4401
74
                    item.scopeStyle = root.scopeStyle;
73
                    item.scopeStyle = root.scopeStyle;
4402
75
                    item.artShapeStyle = root.artShapeStyle;
74
                    item.artShapeStyle = root.artShapeStyle;
4403
76
                    item.backgroundShapeStyle = root.backgroundShapeStyle;
75
                    item.backgroundShapeStyle = root.backgroundShapeStyle;
4404
77
76
4405
=== modified file 'qml/Dash/CardHorizontalList.qml'
4406
--- qml/Dash/CardHorizontalList.qml	2016-01-28 14:11:14 +0000
4407
+++ qml/Dash/CardHorizontalList.qml	2016-03-11 18:12:46 +0000
4408
@@ -53,7 +53,6 @@
4409
53
                item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
53
                item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
4410
54
                item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
54
                item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
4411
55
                item.cardData = Qt.binding(function() { return model; });
55
                item.cardData = Qt.binding(function() { return model; });
4412
56
                item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
4413
57
                item.scopeStyle = root.scopeStyle;
56
                item.scopeStyle = root.scopeStyle;
4414
58
            }
57
            }
4415
59
            Connections {
58
            Connections {
4416
60
59
4417
=== modified file 'qml/Dash/CardTool.qml'
4418
--- qml/Dash/CardTool.qml	2016-01-28 14:11:14 +0000
4419
+++ qml/Dash/CardTool.qml	2016-03-11 18:12:46 +0000
4420
@@ -66,7 +66,7 @@
4421
66
        return layout;
66
        return layout;
4422
67
    }
67
    }
4423
68
68
4425
69
    property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components);
69
    property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false);
4426
70
70
4427
71
    // FIXME: Saviq
71
    // FIXME: Saviq
4428
72
    // Only way for the card below to actually be laid out completely.
72
    // Only way for the card below to actually be laid out completely.
4429
@@ -139,29 +139,6 @@
4430
139
    readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0
139
    readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0
4431
140
    property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0
140
    property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0
4432
141
141
4433
142
    /*!
4434
143
     \brief Desired alignment of title
4435
144
     */
4436
145
    readonly property int titleAlignment: {
4437
146
        if (template["card-layout"] === "horizontal"
4438
147
            || typeof components["title"] !== "object"
4439
148
            || components["title"]["align"] === "left") return Text.AlignLeft;
4440
149
4441
150
        var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
4442
151
4443
152
        for (var key in keys) {
4444
153
            key = keys[key];
4445
154
            try {
4446
155
                if (typeof components[key] === "string"
4447
156
                    || typeof components[key]["field"] === "string") return Text.AlignLeft;
4448
157
            } catch (e) {
4449
158
                continue;
4450
159
            }
4451
160
        }
4452
161
4453
162
        return Text.AlignHCenter;
4454
163
    }
4455
164
4456
165
    QtObject {
142
    QtObject {
4457
166
        id: carouselTool
143
        id: carouselTool
4458
167
144
4459
@@ -216,10 +193,9 @@
4460
216
            "summary": "—\n—\n—\n—\n—",
193
            "summary": "—\n—\n—\n—\n—",
4461
217
            "attributes": attributesModel.model
194
            "attributes": attributesModel.model
4462
218
        }
195
        }
4464
219
        sourceComponent: cardTool.cardComponent
196
        sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true);
4465
220
        onLoaded: {
197
        onLoaded: {
4466
221
            item.objectName = "cardToolCard";
198
            item.objectName = "cardToolCard";
4467
222
            item.asynchronous = false;
4468
223
            item.width = Qt.binding(function() { return cardTool.cardWidth !== -1 ? cardTool.cardWidth : item.implicitWidth; });
199
            item.width = Qt.binding(function() { return cardTool.cardWidth !== -1 ? cardTool.cardWidth : item.implicitWidth; });
4469
224
            item.height = Qt.binding(function() { return cardTool.cardHeight !== -1 ? cardTool.cardHeight : item.implicitHeight; });
200
            item.height = Qt.binding(function() { return cardTool.cardHeight !== -1 ? cardTool.cardHeight : item.implicitHeight; });
4470
225
        }
201
        }
4471
226
202
4472
=== modified file 'qml/Dash/CardVerticalJournal.qml'
4473
--- qml/Dash/CardVerticalJournal.qml	2016-01-28 14:11:14 +0000
4474
+++ qml/Dash/CardVerticalJournal.qml	2016-03-11 18:12:46 +0000
4475
@@ -72,7 +72,6 @@
4476
72
                item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
72
                item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
4477
73
                item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
73
                item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
4478
74
                item.cardData = Qt.binding(function() { return model; });
74
                item.cardData = Qt.binding(function() { return model; });
4479
75
                item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
4480
76
                item.scopeStyle = root.scopeStyle;
75
                item.scopeStyle = root.scopeStyle;
4481
77
            }
76
            }
4482
78
            Connections {
77
            Connections {
4483
79
78
4484
=== modified file 'qml/Dash/Dash.qml'
4485
--- qml/Dash/Dash.qml	2015-11-19 16:55:31 +0000
4486
+++ qml/Dash/Dash.qml	2016-03-11 18:12:46 +0000
4487
@@ -37,6 +37,7 @@
4488
37
    }
37
    }
4489
38
38
4490
39
    property bool windowActive: window.active
39
    property bool windowActive: window.active
4491
40
    property bool showOverlayScope: false
4492
40
41
4493
41
    DashCommunicatorService {
42
    DashCommunicatorService {
4494
42
        objectName: "dashCommunicatorService"
43
        objectName: "dashCommunicatorService"
4495
@@ -80,7 +81,7 @@
4496
80
            return
81
            return
4497
81
        }
82
        }
4498
82
83
4500
83
        closeOverlayScope();
84
        dash.showOverlayScope = false;
4501
84
85
4502
85
        dashContent.closePreview();
86
        dashContent.closePreview();
4503
86
87
4504
@@ -93,12 +94,6 @@
4505
93
        dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
94
        dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
4506
94
    }
95
    }
4507
95
96
4508
96
    function closeOverlayScope() {
4509
97
        if (dashContent.x != 0) {
4510
98
            dashContent.x = 0;
4511
99
        }
4512
100
    }
4513
101
4514
102
    Scopes {
97
    Scopes {
4515
103
        id: scopes
98
        id: scopes
4516
104
    }
99
    }
4517
@@ -133,12 +128,13 @@
4518
133
        height: dash.height
128
        height: dash.height
4519
134
        scopes: scopes
129
        scopes: scopes
4520
135
        visible: x != -width
130
        visible: x != -width
4521
131
        x: dash.showOverlayScope ? -width : 0
4522
136
        onGotoScope: {
132
        onGotoScope: {
4523
137
            dash.setCurrentScope(scopeId, true, false);
133
            dash.setCurrentScope(scopeId, true, false);
4524
138
        }
134
        }
4525
139
        onOpenScope: {
135
        onOpenScope: {
4526
140
            scopeItem.scope = scope;
136
            scopeItem.scope = scope;
4528
141
            x = -width;
137
            dash.showOverlayScope = true;
4529
142
        }
138
        }
4530
143
        Behavior on x {
139
        Behavior on x {
4531
144
            UbuntuNumberAnimation {
140
            UbuntuNumberAnimation {
4532
@@ -207,7 +203,7 @@
4533
207
                bottomEdgeController.enableAnimation = true;
203
                bottomEdgeController.enableAnimation = true;
4534
208
                bottomEdgeController.progress = 0;
204
                bottomEdgeController.progress = 0;
4535
209
                scopeItem.scope = scope;
205
                scopeItem.scope = scope;
4537
210
                dashContent.x = -dashContent.width;
206
                dash.showOverlayScope = true;
4538
211
            }
207
            }
4539
212
            onGotoScope: {
208
            onGotoScope: {
4540
213
                bottomEdgeController.enableAnimation = true;
209
                bottomEdgeController.enableAnimation = true;
4541
@@ -226,7 +222,7 @@
4542
226
        id: scopeItem
222
        id: scopeItem
4543
227
        objectName: "dashTempScopeItem"
223
        objectName: "dashTempScopeItem"
4544
228
224
4546
229
        x: dashContent.x + width
225
        x: dash.showOverlayScope ? 0 : width
4547
230
        y: dashContent.y
226
        y: dashContent.y
4548
231
        width: parent.width
227
        width: parent.width
4549
232
        height: parent.height
228
        height: parent.height
4550
@@ -234,7 +230,7 @@
4551
234
        hasBackAction: true
230
        hasBackAction: true
4552
235
        isCurrent: visible
231
        isCurrent: visible
4553
236
        onBackClicked: {
232
        onBackClicked: {
4555
237
            closeOverlayScope();
233
            dash.showOverlayScope = false;
4556
238
            closePreview();
234
            closePreview();
4557
239
        }
235
        }
4558
240
236
4559
@@ -250,6 +246,10 @@
4560
250
                scopes.closeScope(oldScope);
246
                scopes.closeScope(oldScope);
4561
251
            }
247
            }
4562
252
        }
248
        }
4563
249
4564
250
        Behavior on x {
4565
251
            UbuntuNumberAnimation { }
4566
252
        }
4567
253
    }
253
    }
4568
254
254
4569
255
    Rectangle {
255
    Rectangle {
4570
256
256
4571
=== modified file 'qml/Dash/GenericScopeView.qml'
4572
--- qml/Dash/GenericScopeView.qml	2016-02-19 11:50:12 +0000
4573
+++ qml/Dash/GenericScopeView.qml	2016-03-11 18:12:46 +0000
4574
@@ -370,6 +370,8 @@
4575
370
                            } else {
370
                            } else {
4576
371
                                cardTool.cardWidth = units.gu(10);
371
                                cardTool.cardWidth = units.gu(10);
4577
372
                            }
372
                            }
4578
373
                        } else {
4579
374
                            cardTool.cardWidth = units.gu(12);
4580
373
                        }
375
                        }
4581
374
                        item.minimumHorizontalSpacing = item.defaultMinimumHorizontalSpacing;
376
                        item.minimumHorizontalSpacing = item.defaultMinimumHorizontalSpacing;
4582
375
                    }
377
                    }
4583
376
378
4584
=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
4585
--- qml/Dash/Previews/PreviewHeader.qml	2016-01-08 14:19:08 +0000
4586
+++ qml/Dash/Previews/PreviewHeader.qml	2016-03-11 18:12:46 +0000
4587
@@ -25,6 +25,7 @@
4588
25
 *  The mascot fall back image comes in widgetData["fallback"]
25
 *  The mascot fall back image comes in widgetData["fallback"]
4589
26
 *  The subtitle comes in widgetData["subtitle"]
26
 *  The subtitle comes in widgetData["subtitle"]
4590
27
 *  The attributes comes in widgetData["attributes"]
27
 *  The attributes comes in widgetData["attributes"]
4591
28
 *  The emblem comes in widgetData["emblem"]
4592
28
 */
29
 */
4593
29
30
4594
30
PreviewWidget {
31
PreviewWidget {
4595
@@ -40,6 +41,7 @@
4596
40
        readonly property string title: root.widgetData["title"] || ""
41
        readonly property string title: root.widgetData["title"] || ""
4597
41
        readonly property string subtitle: root.widgetData["subtitle"] || ""
42
        readonly property string subtitle: root.widgetData["subtitle"] || ""
4598
42
        readonly property var attributes: root.widgetData["attributes"] || null
43
        readonly property var attributes: root.widgetData["attributes"] || null
4599
44
        readonly property url emblem: root.widgetData["emblem"] || ""
4600
43
        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
45
        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
4601
44
46
4602
45
        // Rewire the source since we may have unwired it on onStatusChanged
47
        // Rewire the source since we may have unwired it on onStatusChanged
4603
@@ -98,16 +100,42 @@
4604
98
                spacing: units.dp(2)
100
                spacing: units.dp(2)
4605
99
                anchors.verticalCenter: parent.verticalCenter
101
                anchors.verticalCenter: parent.verticalCenter
4606
100
102
4610
101
                Label {
103
                Item {
4608
102
                    id: titleLabel
4609
103
                    objectName: "titleLabel"
4611
104
                    anchors { left: parent.left; right: parent.right }
104
                    anchors { left: parent.left; right: parent.right }
4618
105
                    elide: Text.ElideRight
105
                    height: titleLabel.height
4619
106
                    font.weight: Font.Normal
106
4620
107
                    fontSize: "large"
107
                    Label {
4621
108
                    wrapMode: Text.Wrap
108
                        id: titleLabel
4622
109
                    color: headerRoot.fontColor
109
                        objectName: "titleLabel"
4623
110
                    text: headerRoot.title
110
                        anchors {
4624
111
                            left: parent.left;
4625
112
                            right: iconLoader.right
4626
113
                            rightMargin: iconLoader.width > 0 ? units.gu(0.5) : 0
4627
114
                        }
4628
115
                        elide: Text.ElideRight
4629
116
                        font.weight: Font.Normal
4630
117
                        fontSize: "large"
4631
118
                        wrapMode: Text.Wrap
4632
119
                        color: headerRoot.fontColor
4633
120
                        text: headerRoot.title
4634
121
                    }
4635
122
4636
123
                    Loader {
4637
124
                        id: iconLoader
4638
125
                        active: headerRoot.emblem != ""
4639
126
                        anchors {
4640
127
                            bottom: titleLabel.baseline
4641
128
                            right: parent.right
4642
129
                        }
4643
130
                        sourceComponent: Icon {
4644
131
                            objectName: "emblemIcon"
4645
132
                            source: headerRoot.emblem
4646
133
                            color: headerRoot.fontColor
4647
134
                            height: source != "" ? titleLabel.font.pixelSize : 0
4648
135
                            // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
4649
136
                            width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
4650
137
                        }
4651
138
                    }
4652
111
                }
139
                }
4653
112
140
4654
113
                Loader {
141
                Loader {
4655
114
142
4656
=== modified file 'qml/Dash/Previews/PreviewOverlay.qml'
4657
--- qml/Dash/Previews/PreviewOverlay.qml	2015-07-15 15:07:19 +0000
4658
+++ qml/Dash/Previews/PreviewOverlay.qml	2016-03-11 18:12:46 +0000
4659
@@ -158,7 +158,7 @@
4660
158
                anchors.centerIn: parent
158
                anchors.centerIn: parent
4661
159
                width: units.gu(2.5)
159
                width: units.gu(2.5)
4662
160
                height: width
160
                height: width
4664
161
                color: theme.palette.normal.foregroundText
161
                color: "white"
4665
162
                name: "close"
162
                name: "close"
4666
163
            }
163
            }
4667
164
        }
164
        }
4668
165
165
4669
=== modified file 'qml/Dash/Previews/PreviewSharing.qml'
4670
--- qml/Dash/Previews/PreviewSharing.qml	2015-12-17 15:42:39 +0000
4671
+++ qml/Dash/Previews/PreviewSharing.qml	2016-03-11 18:12:46 +0000
4672
@@ -44,6 +44,22 @@
4673
44
        }
44
        }
4674
45
    }
45
    }
4675
46
46
4676
47
    function createExportedItems(url) {
4677
48
        var items = new Array();
4678
49
        if (typeof url === "string") {
4679
50
            var exportItem = exportItemComponent.createObject();
4680
51
            exportItem.url = url;
4681
52
            items.push(exportItem);
4682
53
        } else {
4683
54
            for (var i = 0; i < url.length; i++) {
4684
55
                var exportItem = exportItemComponent.createObject();
4685
56
                exportItem.url = url[i];
4686
57
                items.push(exportItem);
4687
58
            }
4688
59
        }
4689
60
        return items;
4690
61
    }
4691
62
4692
47
    Component {
63
    Component {
4693
48
        id: exportItemComponent
64
        id: exportItemComponent
4694
49
        ContentItem {
65
        ContentItem {
4695
@@ -76,13 +92,7 @@
4696
76
            onPeerSelected: {
92
            onPeerSelected: {
4697
77
                var transfer = peer.request();
93
                var transfer = peer.request();
4698
78
                if (transfer.state === ContentTransfer.InProgress) {
94
                if (transfer.state === ContentTransfer.InProgress) {
4706
79
                    var items = new Array();
95
                    transfer.items = createExportedItems(url);
4700
80
                    for (var i = 0; i < url.length; i++) {
4701
81
                        var exportItem = exportItemComponent.createObject();
4702
82
                        exportItem.url = url[i];
4703
83
                        items.push(exportItem);
4704
84
                    }
4705
85
                    transfer.items = items;
4707
86
                    transfer.state = ContentTransfer.Charged;
96
                    transfer.state = ContentTransfer.Charged;
4708
87
                }
97
                }
4709
88
                peerPicker.visible = false;
98
                peerPicker.visible = false;
4710
89
99
4711
=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
4712
--- qml/Dash/ScopesListCategoryItem.qml	2015-11-04 14:57:13 +0000
4713
+++ qml/Dash/ScopesListCategoryItem.qml	2016-03-11 18:12:46 +0000
4714
@@ -18,7 +18,7 @@
4715
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4716
19
import Ubuntu.Components 1.3
19
import Ubuntu.Components 1.3
4717
20
20
4719
21
MouseArea {
21
AbstractButton {
4720
22
    id: root
22
    id: root
4721
23
23
4722
24
    signal requestFavorite(string scopeId, bool favorite)
24
    signal requestFavorite(string scopeId, bool favorite)
4723
@@ -84,15 +84,19 @@
4724
84
                visible: text != ""
84
                visible: text != ""
4725
85
            }
85
            }
4726
86
        }
86
        }
4728
87
        MouseArea {
87
        AbstractButton {
4729
88
            id: starArea
88
            id: starArea
4730
89
            objectName: "starArea"
89
            objectName: "starArea"
4731
90
            height: parent.height
90
            height: parent.height
4732
91
            width: height
91
            width: height
4733
92
            anchors.right: parent.right
92
            anchors.right: parent.right
4734
93
            onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite);
93
            onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite);
4737
94
            onPressed: if (editMode) root.handlePressed(starArea);
94
            onPressedChanged: {
4738
95
            onReleased: if (editMode) root.handleReleased(starArea);
95
                if (editMode) {
4739
96
                    if (pressed) root.handlePressed(starArea.__mouseArea);
4740
97
                    else root.handleReleased(starArea.__mouseArea);
4741
98
                }
4742
99
            }
4743
96
            visible: editMode || showStar
100
            visible: editMode || showStar
4744
97
            Icon {
101
            Icon {
4745
98
                id: star
102
                id: star
4746
99
103
4747
=== modified file 'qml/DeviceConfiguration.qml'
4748
--- qml/DeviceConfiguration.qml	2015-12-01 13:56:54 +0000
4749
+++ qml/DeviceConfiguration.qml	2016-03-11 18:12:46 +0000
4750
@@ -1,5 +1,5 @@
4751
1
/*
1
/*
4753
2
 * Copyright (C) 2015 Canonical, Ltd.
2
 * Copyright (C) 2015-2016 Canonical, Ltd.
4754
3
 *
3
 *
4755
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
4756
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
4757
@@ -15,6 +15,7 @@
4758
15
 */
15
 */
4759
16
16
4760
17
import QtQuick 2.4
17
import QtQuick 2.4
4761
18
import Utils 0.1
4762
18
19
4763
19
QtObject {
20
QtObject {
4764
20
    id: root
21
    id: root
4765
@@ -34,57 +35,83 @@
4766
34
35
4767
35
    readonly property alias category: priv.category
36
    readonly property alias category: priv.category
4768
36
37
4769
38
    readonly property var deviceConfigParser: DeviceConfigParser {
4770
39
        name: root.name
4771
40
    }
4772
41
4773
37
    readonly property var priv: StateGroup {
42
    readonly property var priv: StateGroup {
4774
38
        id: priv
43
        id: priv
4775
39
44
4791
40
        property int primaryOrientation: root.useNativeOrientation
45
        property int primaryOrientation: deviceConfigParser.primaryOrientation == Qt.PrimaryOrientation ?
4792
41
46
                                             root.useNativeOrientation : deviceConfigParser.primaryOrientation
4793
42
        property int supportedOrientations: Qt.PortraitOrientation
47
4794
43
                                          | Qt.InvertedPortraitOrientation
48
        property int supportedOrientations: deviceConfigParser.supportedOrientations
4795
44
                                          | Qt.LandscapeOrientation
49
4796
45
                                          | Qt.InvertedLandscapeOrientation
50
        property int landscapeOrientation: deviceConfigParser.landscapeOrientation
4797
46
51
        property int invertedLandscapeOrientation: deviceConfigParser.invertedLandscapeOrientation
4798
47
        property int landscapeOrientation: Qt.LandscapeOrientation
52
        property int portraitOrientation: deviceConfigParser.portraitOrientation
4799
48
        property int invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
53
        property int invertedPortraitOrientation: deviceConfigParser.invertedPortraitOrientation
4800
49
        property int portraitOrientation: Qt.PortraitOrientation
54
        property string category: deviceConfigParser.category
4786
50
        property int invertedPortraitOrientation: Qt.InvertedPortraitOrientation
4787
51
4788
52
        // Supported values so far:
4789
53
        // "phone", "tablet" or "desktop"
4790
54
        property string category: "phone"
4801
55
55
4802
56
        states: [
56
        states: [
4803
57
            State {
57
            State {
4804
58
                name: "mako"
58
                name: "mako"
4805
59
                PropertyChanges {
59
                PropertyChanges {
4806
60
                    target: priv
60
                    target: priv
4807
61
                    primaryOrientation: root.useNativeOrientation
4808
61
                    supportedOrientations: Qt.PortraitOrientation
62
                    supportedOrientations: Qt.PortraitOrientation
4809
62
                                         | Qt.LandscapeOrientation
63
                                         | Qt.LandscapeOrientation
4810
63
                                         | Qt.InvertedLandscapeOrientation
64
                                         | Qt.InvertedLandscapeOrientation
4811
65
                    landscapeOrientation: Qt.LandscapeOrientation
4812
66
                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
4813
67
                    portraitOrientation: Qt.PortraitOrientation
4814
68
                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
4815
69
                    category: "phone"
4816
64
                }
70
                }
4817
65
            },
71
            },
4818
66
            State {
72
            State {
4819
67
                name: "krillin"
73
                name: "krillin"
4820
68
                PropertyChanges {
74
                PropertyChanges {
4821
69
                    target: priv
75
                    target: priv
4822
76
                    primaryOrientation: root.useNativeOrientation
4823
70
                    supportedOrientations: Qt.PortraitOrientation
77
                    supportedOrientations: Qt.PortraitOrientation
4824
71
                                         | Qt.LandscapeOrientation
78
                                         | Qt.LandscapeOrientation
4825
72
                                         | Qt.InvertedLandscapeOrientation
79
                                         | Qt.InvertedLandscapeOrientation
4826
80
                    landscapeOrientation: Qt.LandscapeOrientation
4827
81
                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
4828
82
                    portraitOrientation: Qt.PortraitOrientation
4829
83
                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
4830
84
                    category: "phone"
4831
73
                }
85
                }
4832
74
            },
86
            },
4833
75
            State {
87
            State {
4834
76
                name: "arale"
88
                name: "arale"
4835
77
                PropertyChanges {
89
                PropertyChanges {
4836
78
                    target: priv
90
                    target: priv
4837
91
                    primaryOrientation: root.useNativeOrientation
4838
79
                    supportedOrientations: Qt.PortraitOrientation
92
                    supportedOrientations: Qt.PortraitOrientation
4839
80
                                         | Qt.LandscapeOrientation
93
                                         | Qt.LandscapeOrientation
4840
81
                                         | Qt.InvertedLandscapeOrientation
94
                                         | Qt.InvertedLandscapeOrientation
4841
95
                    landscapeOrientation: Qt.LandscapeOrientation
4842
96
                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
4843
97
                    portraitOrientation: Qt.PortraitOrientation
4844
98
                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
4845
99
                    category: "phone"
4846
82
                }
100
                }
4847
83
            },
101
            },
4848
84
            State {
102
            State {
4849
85
                name: "manta"
103
                name: "manta"
4850
86
                PropertyChanges {
104
                PropertyChanges {
4851
87
                    target: priv
105
                    target: priv
4852
106
                    primaryOrientation: root.useNativeOrientation
4853
107
                    supportedOrientations: Qt.PortraitOrientation
4854
108
                                         | Qt.InvertedPortraitOrientation
4855
109
                                         | Qt.LandscapeOrientation
4856
110
                                         | Qt.InvertedLandscapeOrientation
4857
111
                    landscapeOrientation: Qt.LandscapeOrientation
4858
112
                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
4859
113
                    portraitOrientation: Qt.PortraitOrientation
4860
114
                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
4861
88
                    category: "tablet"
115
                    category: "tablet"
4862
89
                }
116
                }
4863
90
            },
117
            },
4864
@@ -92,9 +119,15 @@
4865
92
                name: "flo"
119
                name: "flo"
4866
93
                PropertyChanges {
120
                PropertyChanges {
4867
94
                    target: priv
121
                    target: priv
4868
122
                    primaryOrientation: Qt.InvertedLandscapeOrientation
4869
123
                    supportedOrientations: Qt.PortraitOrientation
4870
124
                                         | Qt.InvertedPortraitOrientation
4871
125
                                         | Qt.LandscapeOrientation
4872
126
                                         | Qt.InvertedLandscapeOrientation
4873
95
                    landscapeOrientation: Qt.InvertedLandscapeOrientation
127
                    landscapeOrientation: Qt.InvertedLandscapeOrientation
4874
96
                    invertedLandscapeOrientation: Qt.LandscapeOrientation
128
                    invertedLandscapeOrientation: Qt.LandscapeOrientation
4876
97
                    primaryOrientation: Qt.InvertedLandscapeOrientation
129
                    portraitOrientation: Qt.PortraitOrientation
4877
130
                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
4878
98
                    category: "tablet"
131
                    category: "tablet"
4879
99
                }
132
                }
4880
100
            },
133
            },
4881
@@ -102,8 +135,13 @@
4882
102
                name: "desktop"
135
                name: "desktop"
4883
103
                PropertyChanges {
136
                PropertyChanges {
4884
104
                    target: priv
137
                    target: priv
4885
138
                    primaryOrientation: root.useNativeOrientation
4886
139
                    supportedOrientations: root.useNativeOrientation
4887
140
                    landscapeOrientation: Qt.LandscapeOrientation
4888
141
                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
4889
142
                    portraitOrientation: Qt.PortraitOrientation
4890
143
                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
4891
105
                    category: "desktop"
144
                    category: "desktop"
4892
106
                    supportedOrientations: root.useNativeOrientation
4893
107
                }
145
                }
4894
108
            }
146
            }
4895
109
        ]
147
        ]
4896
110
148
4897
=== modified file 'qml/DisabledScreenNotice.qml'
4898
--- qml/DisabledScreenNotice.qml	2016-01-26 15:29:54 +0000
4899
+++ qml/DisabledScreenNotice.qml	2016-03-11 18:12:46 +0000
4900
@@ -17,6 +17,7 @@
4901
17
import QtQuick 2.4
17
import QtQuick 2.4
4902
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4903
19
import Ubuntu.Components 1.3
19
import Ubuntu.Components 1.3
4904
20
import Unity.Session 0.1
4905
20
import QtQuick.Window 2.2
21
import QtQuick.Window 2.2
4906
21
import "Components"
22
import "Components"
4907
22
23
4908
@@ -25,19 +26,36 @@
4909
25
26
4910
26
    property bool infoNoteDisplayed: true
27
    property bool infoNoteDisplayed: true
4911
27
28
4915
28
    WallpaperResolver {
29
    // For testing
4916
29
        width: root.width
30
    property var screen: Screen
4917
30
        id: wallpaperResolver
31
    property var orientationLock: OrientationLock
4918
32
4919
33
    DeviceConfiguration {
4920
34
        id: deviceConfiguration
4921
35
        name: applicationArguments.deviceName
4922
31
    }
36
    }
4923
32
37
4924
33
    Item {
38
    Item {
4925
34
        id: contentContainer
39
        id: contentContainer
4926
40
        objectName: "contentContainer"
4927
35
        anchors.centerIn: parent
41
        anchors.centerIn: parent
4928
36
        height: rotation == 90 || rotation == 270 ? parent.width : parent.height
42
        height: rotation == 90 || rotation == 270 ? parent.width : parent.height
4929
37
        width: rotation == 90 || rotation == 270 ? parent.height : parent.width
43
        width: rotation == 90 || rotation == 270 ? parent.height : parent.width
4930
38
44
4931
45
        property int savedOrientation: deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
4932
46
                                       ? (root.width > root.height ? Qt.LandscapeOrientation : Qt.PortraitOrientation)
4933
47
                                       : deviceConfiguration.primaryOrientation
4934
48
4935
39
        rotation: {
49
        rotation: {
4937
40
            switch (Screen.orientation) {
50
            var usedOrientation = root.screen.orientation;
4938
51
4939
52
            if (root.orientationLock.enabled) {
4940
53
                usedOrientation = savedOrientation;
4941
54
            }
4942
55
4943
56
            savedOrientation = usedOrientation;
4944
57
4945
58
            switch (usedOrientation) {
4946
41
            case Qt.PortraitOrientation:
59
            case Qt.PortraitOrientation:
4947
42
                return 0;
60
                return 0;
4948
43
            case Qt.LandscapeOrientation:
61
            case Qt.LandscapeOrientation:
4949
@@ -47,6 +65,8 @@
4950
47
            case Qt.InvertedLandscapeOrientation:
65
            case Qt.InvertedLandscapeOrientation:
4951
48
                return 90;
66
                return 90;
4952
49
            }
67
            }
4953
68
4954
69
            return 0;
4955
50
        }
70
        }
4956
51
        transformOrigin: Item.Center
71
        transformOrigin: Item.Center
4957
52
72
4958
@@ -60,9 +80,9 @@
4959
60
            }
80
            }
4960
61
        }
81
        }
4961
62
82
4963
63
        Image {
83
        Rectangle {
4964
64
            anchors.fill: parent
84
            anchors.fill: parent
4966
65
            source: wallpaperResolver.background
85
            color: "#3b3b3b"
4967
66
        }
86
        }
4968
67
87
4969
68
        Item {
88
        Item {
4970
@@ -74,22 +94,26 @@
4971
74
                UbuntuNumberAnimation { }
94
                UbuntuNumberAnimation { }
4972
75
            }
95
            }
4973
76
96
4982
77
            Rectangle {
97
            Column {
4975
78
                anchors.fill: parent
4976
79
                color: "black"
4977
80
                opacity: 0.4
4978
81
            }
4979
82
4980
83
            Label {
4981
84
                id: text
4983
85
                anchors.centerIn: parent
98
                anchors.centerIn: parent
4984
86
                width: parent.width - units.gu(8)
99
                width: parent.width - units.gu(8)
4991
87
                text: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the mouse.")
100
                spacing: units.gu(4)
4992
88
                color: "white"
101
4993
89
                horizontalAlignment: Text.AlignHCenter
102
                Label {
4994
90
                verticalAlignment: Text.AlignVCenter
103
                    id: text
4995
91
                fontSize: "x-large"
104
                    text: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the pointer.")
4996
92
                wrapMode: Text.Wrap
105
                    color: "white"
4997
106
                    width: parent.width
4998
107
                    fontSize: "large"
4999
108
                    wrapMode: Text.Wrap
5000
109
                }
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-03-10	Needs Fixing on 2016-03-11
PS Jenkins bot	continuous-integration	2016-03-10	Pending
Albert Astals Cid	merges fine	2016-03-10	Pending
Michael Zanetti		2016-03-10	Pending
Review via email: mp+288674@code.launchpad.net