Ubuntu Settings Components

Merge lp:~dandrader/ubuntu-settings-components/deprecation-warnings into lp:~registry/ubuntu-settings-components/trunk

  1. deprecation-warnings
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 92
Merged at revision: 96
Proposed branch: lp:~dandrader/ubuntu-settings-components/deprecation-warnings
Merge into: lp:~registry/ubuntu-settings-components/trunk
Diff against target: 572 lines (+53/-53)
31 files modified
examples/MessageComponents.qml (+1/-1)
examples/OtherComponents.qml (+1/-1)
examples/SettingsComponents.qml (+2/-2)
examples/TransferComponents.qml (+1/-1)
plugins/Ubuntu/Settings/Components/ActionTextField.qml (+1/-1)
plugins/Ubuntu/Settings/Components/Calendar.qml (+3/-3)
plugins/Ubuntu/Settings/Components/MessageHeader.qml (+3/-3)
plugins/Ubuntu/Settings/Components/QuickReply.qml (+1/-1)
plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml (+4/-4)
plugins/Ubuntu/Settings/Menus/ButtonMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/CalendarMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/CheckableMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/EventMenu.qml (+2/-2)
plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml (+3/-3)
plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml (+7/-7)
plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/SectionMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/SliderMenu.qml (+3/-3)
plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/StandardMenu.qml (+2/-2)
plugins/Ubuntu/Settings/Menus/SwitchMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/TransferMenu.qml (+2/-2)
plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml (+2/-2)
tests/qmltests/Components/tst_ServerPropertySynchroniser.qml (+1/-1)
tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml (+1/-1)
To merge this branch: bzr merge lp:~dandrader/ubuntu-settings-components/deprecation-warnings
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Needs Information
Andrea Cimitan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+262267@code.launchpad.net

Commit message

Avoid creating a deluge of deprecation warnings

unity8 log is getting filled with the following warning:

"""
<Unknown File>: QML UCDeprecatedTheme: Theme.palette is deprecated. Use ThemeSettings instead.
"""

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/113/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

Can we move everything to 1.3 at this point and test it works fine?

review: Needs Fixing
lp:~dandrader/ubuntu-settings-components/deprecation-warnings updated
91. By Daniel d'Andrada

Moving everything to Ubuntu.Components 1.3

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

> Can we move everything to 1.3 at this point and test it works fine?

Done. Tested on the phone and all seems fine.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/114/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

There's just a minor "Theme.name" in examples/SettingsComponents.qml but the rest is fine

review: Needs Fixing
lp:~dandrader/ubuntu-settings-components/deprecation-warnings updated
92. By Daniel d'Andrada

s/Theme.name/theme.name

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

On 22/06/15 07:32, Andrea Cimitan wrote:
> Review: Needs Fixing
>
> There's just a minor "Theme.name" in examples/SettingsComponents.qml but the rest is fine

Fixed.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/115/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Yes

review: Approve
Revision history for this message
Michael Zanetti (mzanetti) wrote :

The SDK guys said that 1.3 is not stable API yet. I'm afraid we block them of changing the API when we're already using it.

review: Needs Information
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

perhaps we shouldn't approve the branch until this happens?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/MessageComponents.qml'
2--- examples/MessageComponents.qml 2014-09-11 13:30:09 +0000
3+++ examples/MessageComponents.qml 2015-06-23 12:15:30 +0000
4@@ -17,7 +17,7 @@
5 */
6
7 import QtQuick 2.0
8-import Ubuntu.Components 1.1
9+import Ubuntu.Components 1.3
10 import Ubuntu.Settings.Components 0.1
11 import Ubuntu.Settings.Menus 0.1
12
13
14=== modified file 'examples/OtherComponents.qml'
15--- examples/OtherComponents.qml 2014-09-24 09:53:06 +0000
16+++ examples/OtherComponents.qml 2015-06-23 12:15:30 +0000
17@@ -17,7 +17,7 @@
18 */
19
20 import QtQuick 2.0
21-import Ubuntu.Components 1.1
22+import Ubuntu.Components 1.3
23 import Ubuntu.Settings.Components 0.1
24 import Ubuntu.Settings.Menus 0.1
25
26
27=== modified file 'examples/SettingsComponents.qml'
28--- examples/SettingsComponents.qml 2014-08-14 11:51:14 +0000
29+++ examples/SettingsComponents.qml 2015-06-23 12:15:30 +0000
30@@ -17,7 +17,7 @@
31 */
32
33 import QtQuick 2.0
34-import Ubuntu.Components 1.1
35+import Ubuntu.Components 1.3
36 import Ubuntu.Settings.Components 0.1
37 import Ubuntu.Settings.Menus 0.1
38
39@@ -30,7 +30,7 @@
40 height: units.gu(75)
41
42 Component.onCompleted: {
43- Theme.name = "Ubuntu.Components.Themes.SuruGradient"
44+ theme.name = "Ubuntu.Components.Themes.SuruGradient"
45 }
46
47 ListModel {
48
49=== modified file 'examples/TransferComponents.qml'
50--- examples/TransferComponents.qml 2014-09-11 13:30:09 +0000
51+++ examples/TransferComponents.qml 2015-06-23 12:15:30 +0000
52@@ -17,7 +17,7 @@
53 */
54
55 import QtQuick 2.0
56-import Ubuntu.Components 1.1
57+import Ubuntu.Components 1.3
58 import Ubuntu.Settings.Components 0.1
59 import Ubuntu.Settings.Menus 0.1
60
61
62=== modified file 'plugins/Ubuntu/Settings/Components/ActionTextField.qml'
63--- plugins/Ubuntu/Settings/Components/ActionTextField.qml 2014-11-12 10:49:22 +0000
64+++ plugins/Ubuntu/Settings/Components/ActionTextField.qml 2015-06-23 12:15:30 +0000
65@@ -19,7 +19,7 @@
66 */
67
68 import QtQuick 2.0
69-import Ubuntu.Components 1.1
70+import Ubuntu.Components 1.3
71 import QtQuick.Layouts 1.1
72
73 Item {
74
75=== modified file 'plugins/Ubuntu/Settings/Components/Calendar.qml'
76--- plugins/Ubuntu/Settings/Components/Calendar.qml 2014-08-14 11:51:14 +0000
77+++ plugins/Ubuntu/Settings/Components/Calendar.qml 2015-06-23 12:15:30 +0000
78@@ -15,7 +15,7 @@
79 */
80
81 import QtQuick 2.0
82-import Ubuntu.Components 1.1
83+import Ubuntu.Components 1.3
84 import "dateExt.js" as DateExt
85
86 ListView {
87@@ -203,8 +203,8 @@
88 property var dayStart: gridStart.addDays(index)
89
90 // Styling properties
91- property color color: Theme.palette.selected.backgroundText
92- property color todayColor: Theme.palette.selected.foreground
93+ property color color: theme.palette.selected.backgroundText
94+ property color todayColor: theme.palette.selected.foreground
95 property string fontSize: "large"
96 property var backgroundColor: "transparent" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)
97 property var sundayBackgroundColor: "#19AEA79F" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)
98
99=== modified file 'plugins/Ubuntu/Settings/Components/MessageHeader.qml'
100--- plugins/Ubuntu/Settings/Components/MessageHeader.qml 2014-09-15 17:18:27 +0000
101+++ plugins/Ubuntu/Settings/Components/MessageHeader.qml 2015-06-23 12:15:30 +0000
102@@ -19,7 +19,7 @@
103 */
104
105 import QtQuick 2.1
106-import Ubuntu.Components 1.1
107+import Ubuntu.Components 1.3
108 import QtQuick.Layouts 1.1
109
110 Item {
111@@ -60,7 +60,7 @@
112
113 color: {
114 if (String(source).match(/^image:\/\/theme/)) {
115- return Theme.palette.selected.backgroundText;
116+ return theme.palette.selected.backgroundText;
117 }
118 return Qt.rgba(0.0, 0.0, 0.0, 0.0);
119 }
120@@ -117,7 +117,7 @@
121 Layout.preferredHeight: units.gu(3)
122 Layout.preferredWidth: units.gu(3)
123 Layout.alignment: Qt.AlignRight
124- color: Theme.palette.selected.backgroundText
125+ color: theme.palette.selected.backgroundText
126
127 MouseArea {
128 anchors.fill: parent
129
130=== modified file 'plugins/Ubuntu/Settings/Components/QuickReply.qml'
131--- plugins/Ubuntu/Settings/Components/QuickReply.qml 2014-09-25 11:35:37 +0000
132+++ plugins/Ubuntu/Settings/Components/QuickReply.qml 2015-06-23 12:15:30 +0000
133@@ -19,7 +19,7 @@
134 */
135
136 import QtQuick 2.0
137-import Ubuntu.Components 1.1
138+import Ubuntu.Components 1.3
139 import Ubuntu.Components.ListItems 1.0 as ListItem
140
141 Item {
142
143=== modified file 'plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml'
144--- plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml 2014-09-15 17:18:27 +0000
145+++ plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml 2015-06-23 12:15:30 +0000
146@@ -15,7 +15,7 @@
147 */
148
149 import QtQuick 2.0
150-import Ubuntu.Components 0.1
151+import Ubuntu.Components 1.3
152
153 /* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
154 * general (Item-based) components. This ability should be incorporated into the SDK's
155
156=== modified file 'plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml'
157--- plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml 2014-09-11 13:30:09 +0000
158+++ plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml 2015-06-23 12:15:30 +0000
159@@ -18,7 +18,7 @@
160 */
161
162 import QtQuick 2.0
163-import Ubuntu.Components 1.1
164+import Ubuntu.Components 1.3
165 import Ubuntu.Components.ListItems 1.0 as ListItem
166
167 ListItem.Empty {
168@@ -35,7 +35,7 @@
169 id: iconSignal
170 objectName: "iconSignal"
171
172- color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText
173+ color: active ? UbuntuColors.green : theme.palette.selected.backgroundText
174
175 width: height
176 height: Math.min(units.gu(3), parent.height - units.gu(1))
177@@ -73,7 +73,7 @@
178 rightMargin: menu.__contentsMargins
179 }
180 elide: Text.ElideRight
181- color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText
182+ color: active ? UbuntuColors.green : theme.palette.selected.backgroundText
183 }
184
185 Icon {
186@@ -82,7 +82,7 @@
187 visible: secure
188 name: "network-secure"
189
190- color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText
191+ color: active ? UbuntuColors.green : theme.palette.selected.backgroundText
192
193 width: height
194 height: Math.min(units.gu(3), parent.height - units.gu(1))
195
196=== modified file 'plugins/Ubuntu/Settings/Menus/ButtonMenu.qml'
197--- plugins/Ubuntu/Settings/Menus/ButtonMenu.qml 2014-08-14 11:51:14 +0000
198+++ plugins/Ubuntu/Settings/Menus/ButtonMenu.qml 2015-06-23 12:15:30 +0000
199@@ -17,7 +17,7 @@
200 */
201
202 import QtQuick 2.0
203-import Ubuntu.Components 1.1
204+import Ubuntu.Components 1.3
205
206 StandardMenu {
207 id: menu
208
209=== modified file 'plugins/Ubuntu/Settings/Menus/CalendarMenu.qml'
210--- plugins/Ubuntu/Settings/Menus/CalendarMenu.qml 2014-09-11 13:30:09 +0000
211+++ plugins/Ubuntu/Settings/Menus/CalendarMenu.qml 2015-06-23 12:15:30 +0000
212@@ -17,7 +17,7 @@
213 */
214
215 import QtQuick 2.0
216-import Ubuntu.Components 1.1
217+import Ubuntu.Components 1.3
218 import Ubuntu.Components.ListItems 1.0 as ListItem
219 import Ubuntu.Settings.Components 0.1
220
221
222=== modified file 'plugins/Ubuntu/Settings/Menus/CheckableMenu.qml'
223--- plugins/Ubuntu/Settings/Menus/CheckableMenu.qml 2014-09-16 14:05:54 +0000
224+++ plugins/Ubuntu/Settings/Menus/CheckableMenu.qml 2015-06-23 12:15:30 +0000
225@@ -18,7 +18,7 @@
226 */
227
228 import QtQuick 2.0
229-import Ubuntu.Components 1.1 as Components
230+import Ubuntu.Components 1.3 as Components
231 import Ubuntu.Components.ListItems 1.0 as ListItem
232
233 ListItem.Empty {
234
235=== modified file 'plugins/Ubuntu/Settings/Menus/EventMenu.qml'
236--- plugins/Ubuntu/Settings/Menus/EventMenu.qml 2014-09-11 14:46:02 +0000
237+++ plugins/Ubuntu/Settings/Menus/EventMenu.qml 2015-06-23 12:15:30 +0000
238@@ -17,7 +17,7 @@
239 */
240
241 import QtQuick 2.0
242-import Ubuntu.Components 1.1
243+import Ubuntu.Components 1.3
244 import Ubuntu.Components.ListItems 1.0 as ListItems
245
246 ListItems.Empty {
247@@ -32,7 +32,7 @@
248 id: iconVisual
249 source: "image://theme/calendar"
250 visible: source != ""
251- color: Theme.palette.selected.backgroundText
252+ color: theme.palette.selected.backgroundText
253
254 height: Math.min(units.gu(3), parent.height - units.gu(1))
255 width: height
256
257=== modified file 'plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml'
258--- plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml 2014-08-14 11:51:14 +0000
259+++ plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml 2015-06-23 12:15:30 +0000
260@@ -19,7 +19,7 @@
261 */
262
263 import QtQuick 2.0
264-import Ubuntu.Components 1.1
265+import Ubuntu.Components 1.3
266 import Ubuntu.Components.ListItems 1.0 as ListItem
267
268 StandardMenu {
269@@ -36,7 +36,7 @@
270 height: label.implicitHeight + units.gu(2)
271 width: label.implicitWidth + units.gu(2)
272
273- color: Theme.palette.normal.backgroundText
274+ color: theme.palette.normal.backgroundText
275 radius: "medium"
276
277 Label {
278@@ -52,7 +52,7 @@
279 fontSize: "medium"
280 text: menu.count
281
282- color: Theme.palette.normal.foregroundText
283+ color: theme.palette.normal.foregroundText
284 }
285 }
286 }
287
288=== modified file 'plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml'
289--- plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml 2014-09-24 09:53:06 +0000
290+++ plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml 2015-06-23 12:15:30 +0000
291@@ -17,7 +17,7 @@
292 */
293
294 import QtQuick 2.0
295-import Ubuntu.Components 1.1
296+import Ubuntu.Components 1.3
297 import Ubuntu.Components.ListItems 1.0 as ListItem
298 import QtQuick.Layouts 1.1
299
300
301=== modified file 'plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml'
302--- plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml 2014-09-23 15:50:37 +0000
303+++ plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml 2015-06-23 12:15:30 +0000
304@@ -17,7 +17,7 @@
305 */
306
307 import QtQuick 2.0
308-import Ubuntu.Components 1.1
309+import Ubuntu.Components 1.3
310 import Ubuntu.Components.ListItems 1.0 as ListItem
311 import QtQuick.Layouts 1.1
312
313@@ -51,8 +51,8 @@
314 source: "image://theme/media-skip-backward"
315 color: {
316 if (!enabled)
317- return Theme.palette.normal.backgroundText;
318- return prevMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;
319+ return theme.palette.normal.backgroundText;
320+ return prevMA.pressed ? theme.palette.selected.foreground : theme.palette.normal.foregroundText;
321 }
322 enabled: canGoPrevious
323
324@@ -72,8 +72,8 @@
325 source: playing ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"
326 color: {
327 if (!enabled)
328- return Theme.palette.normal.backgroundText;
329- return playMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;
330+ return theme.palette.normal.backgroundText;
331+ return playMA.pressed ? theme.palette.selected.foreground : theme.palette.normal.foregroundText;
332 }
333 enabled: canPlay
334
335@@ -93,8 +93,8 @@
336 source: "image://theme/media-skip-forward"
337 color: {
338 if (!enabled)
339- return Theme.palette.normal.backgroundText;
340- return nextMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;
341+ return theme.palette.normal.backgroundText;
342+ return nextMA.pressed ? theme.palette.selected.foreground : theme.palette.normal.foregroundText;
343 }
344 enabled: canGoNext
345
346
347=== modified file 'plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml'
348--- plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml 2014-08-14 11:51:14 +0000
349+++ plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml 2015-06-23 12:15:30 +0000
350@@ -17,7 +17,7 @@
351 */
352
353 import QtQuick 2.0
354-import Ubuntu.Components 1.1
355+import Ubuntu.Components 1.3
356 import Ubuntu.Components.ListItems 1.0 as ListItem
357
358 StandardMenu {
359
360=== modified file 'plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml'
361--- plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml 2014-08-14 11:51:14 +0000
362+++ plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml 2015-06-23 12:15:30 +0000
363@@ -18,7 +18,7 @@
364 */
365
366 import QtQuick 2.0
367-import Ubuntu.Components 1.1
368+import Ubuntu.Components 1.3
369
370 StandardMenu {
371 id: menuItem
372
373=== modified file 'plugins/Ubuntu/Settings/Menus/SectionMenu.qml'
374--- plugins/Ubuntu/Settings/Menus/SectionMenu.qml 2014-08-14 11:51:14 +0000
375+++ plugins/Ubuntu/Settings/Menus/SectionMenu.qml 2015-06-23 12:15:30 +0000
376@@ -18,7 +18,7 @@
377 */
378
379 import QtQuick 2.0
380-import Ubuntu.Components 1.1
381+import Ubuntu.Components 1.3
382 import Ubuntu.Components.ListItems 1.0 as ListItem
383
384 ListItem.Header {
385
386=== modified file 'plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml'
387--- plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml 2014-09-11 13:30:09 +0000
388+++ plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml 2015-06-23 12:15:30 +0000
389@@ -19,7 +19,7 @@
390 */
391
392 import QtQuick 2.1
393-import Ubuntu.Components 1.1
394+import Ubuntu.Components 1.3
395 import Ubuntu.Components.ListItems 1.0 as ListItem
396 import Ubuntu.Settings.Components 0.1 as USC
397 import QtQuick.Layouts 1.1
398
399=== modified file 'plugins/Ubuntu/Settings/Menus/SliderMenu.qml'
400--- plugins/Ubuntu/Settings/Menus/SliderMenu.qml 2014-09-11 14:46:02 +0000
401+++ plugins/Ubuntu/Settings/Menus/SliderMenu.qml 2015-06-23 12:15:30 +0000
402@@ -17,7 +17,7 @@
403 */
404
405 import QtQuick 2.0
406-import Ubuntu.Components 1.1
407+import Ubuntu.Components 1.3
408 import Ubuntu.Components.ListItems 1.0 as ListItem
409
410 ListItem.Empty {
411@@ -133,7 +133,7 @@
412 anchors.verticalCenter: row.verticalCenter
413 height: slider.height - units.gu(2)
414 width: height
415- color: Theme.palette.selected.backgroundText
416+ color: theme.palette.selected.backgroundText
417
418 MouseArea {
419 anchors.fill: parent
420@@ -189,7 +189,7 @@
421 anchors.verticalCenter: row.verticalCenter
422 height: slider.height - units.gu(2)
423 width: height
424- color: Theme.palette.selected.backgroundText
425+ color: theme.palette.selected.backgroundText
426
427 MouseArea {
428 anchors.fill: parent
429
430=== modified file 'plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml'
431--- plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml 2014-08-14 11:19:43 +0000
432+++ plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml 2015-06-23 12:15:30 +0000
433@@ -19,7 +19,7 @@
434 */
435
436 import QtQuick 2.0
437-import Ubuntu.Components 1.1
438+import Ubuntu.Components 1.3
439 import Ubuntu.Settings.Components 0.1 as USC
440 import QtQuick.Layouts 1.1
441
442
443=== modified file 'plugins/Ubuntu/Settings/Menus/StandardMenu.qml'
444--- plugins/Ubuntu/Settings/Menus/StandardMenu.qml 2014-09-22 16:37:31 +0000
445+++ plugins/Ubuntu/Settings/Menus/StandardMenu.qml 2015-06-23 12:15:30 +0000
446@@ -15,7 +15,7 @@
447 */
448
449 import QtQuick 2.0
450-import Ubuntu.Components 1.1
451+import Ubuntu.Components 1.3
452 import Ubuntu.Components.ListItems 1.0 as ListItems
453 import QtQuick.Layouts 1.1
454
455@@ -52,7 +52,7 @@
456 Icon {
457 id: iconVisual
458 visible: source != ""
459- color: Theme.palette.selected.backgroundText
460+ color: theme.palette.selected.backgroundText
461
462 readonly property real size: Math.min(units.gu(3), parent.height - menu.__contentsMargins)
463
464
465=== modified file 'plugins/Ubuntu/Settings/Menus/SwitchMenu.qml'
466--- plugins/Ubuntu/Settings/Menus/SwitchMenu.qml 2014-09-16 12:49:38 +0000
467+++ plugins/Ubuntu/Settings/Menus/SwitchMenu.qml 2015-06-23 12:15:30 +0000
468@@ -18,7 +18,7 @@
469 */
470
471 import QtQuick 2.0
472-import Ubuntu.Components 1.1
473+import Ubuntu.Components 1.3
474
475 StandardMenu {
476 id: menu
477
478=== modified file 'plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml'
479--- plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml 2014-11-12 10:49:22 +0000
480+++ plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml 2015-06-23 12:15:30 +0000
481@@ -19,7 +19,7 @@
482 */
483
484 import QtQuick 2.0
485-import Ubuntu.Components 1.1
486+import Ubuntu.Components 1.3
487 import Ubuntu.Settings.Components 0.1 as USC
488
489 SimpleMessageMenu {
490
491=== modified file 'plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml'
492--- plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml 2014-08-14 11:51:14 +0000
493+++ plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml 2015-06-23 12:15:30 +0000
494@@ -17,7 +17,7 @@
495 */
496
497 import QtQuick 2.0
498-import Ubuntu.Components 1.1
499+import Ubuntu.Components 1.3
500 import Ubuntu.Components.ListItems 1.0 as ListItem
501
502 StandardMenu {
503
504=== modified file 'plugins/Ubuntu/Settings/Menus/TransferMenu.qml'
505--- plugins/Ubuntu/Settings/Menus/TransferMenu.qml 2014-09-15 17:18:27 +0000
506+++ plugins/Ubuntu/Settings/Menus/TransferMenu.qml 2015-06-23 12:15:30 +0000
507@@ -16,7 +16,7 @@
508
509 import QtQuick 2.1
510 import QtQuick.Layouts 1.1
511-import Ubuntu.Components 1.1
512+import Ubuntu.Components 1.3
513 import Ubuntu.Components.ListItems 1.0 as ListItem
514 import Ubuntu.Settings.Components 0.1
515
516@@ -56,7 +56,7 @@
517
518 color: {
519 if (String(source).match(/^image:\/\/theme/)) {
520- return Theme.palette.selected.backgroundText;
521+ return theme.palette.selected.backgroundText;
522 }
523 return Qt.rgba(0.0, 0.0, 0.0, 0.0);
524 }
525
526=== modified file 'plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml'
527--- plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml 2014-08-14 11:51:14 +0000
528+++ plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml 2015-06-23 12:15:30 +0000
529@@ -17,7 +17,7 @@
530 */
531
532 import QtQuick 2.0
533-import Ubuntu.Components 1.1
534+import Ubuntu.Components 1.3
535 import Ubuntu.Components.ListItems 1.0 as ListItem
536
537 StandardMenu {
538@@ -34,7 +34,7 @@
539 height: checkMark.height + units.gu(1.5)
540 radius: width / 2
541 antialiasing: true
542- color: Theme.palette.normal.backgroundText
543+ color: theme.palette.normal.backgroundText
544 visible: userSessionMenu.active
545
546 Image {
547
548=== modified file 'tests/qmltests/Components/tst_ServerPropertySynchroniser.qml'
549--- tests/qmltests/Components/tst_ServerPropertySynchroniser.qml 2015-04-24 13:15:20 +0000
550+++ tests/qmltests/Components/tst_ServerPropertySynchroniser.qml 2015-06-23 12:15:30 +0000
551@@ -19,7 +19,7 @@
552 import Ubuntu.Test 0.1
553 import Ubuntu.Settings.Components 0.1 as USC
554 import Ubuntu.Settings.Menus 0.1 as USM
555-import Ubuntu.Components 0.1
556+import Ubuntu.Components 1.3
557
558 Item {
559 id: root
560
561=== modified file 'tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml'
562--- tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml 2015-03-20 14:04:36 +0000
563+++ tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml 2015-06-23 12:15:30 +0000
564@@ -16,7 +16,7 @@
565
566 import QtQuick 2.0
567 import QtTest 1.0
568-import Ubuntu.Components 1.1
569+import Ubuntu.Components 1.3
570 import Ubuntu.Test 0.1 as UT
571
572 TestCase {

Subscribers

People subscribed via source and target branches

to all changes: