Ubuntu Settings Components

Merge lp:~nick-dedekind/ubuntu-settings-components/icon-aspect-ratio-crop into lp:~registry/ubuntu-settings-components/trunk

  1. icon-aspect-ratio-crop
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Superseded
Proposed branch: lp:~nick-dedekind/ubuntu-settings-components/icon-aspect-ratio-crop
Merge into: lp:~registry/ubuntu-settings-components/trunk
Diff against target: 605 lines (+57/-61)
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/-4)
plugins/Ubuntu/Settings/Components/QuickReply.qml (+1/-1)
plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml (+5/-7)
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/-3)
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:~nick-dedekind/ubuntu-settings-components/icon-aspect-ratio-crop
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Abstain
Sebastien Bacher (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+265146@code.launchpad.net

This proposal has been superseded by a proposal from 2015-09-15.

Commit message

Crop icons to aspect ratio inside UbuntuShapes.

Description of the change

Crop icons to aspect ratio inside UbuntuShapes.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
no

 * Did you perform an exploratory manual test run of your code change and any related functionality?
yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a

 * If you changed the UI, has there been a design review?
yes

To post a comment you must log in.
lp:~nick-dedekind/ubuntu-settings-components/icon-aspect-ratio-crop updated
90. By Nick Dedekind

Fixed aspect ratio cropping in Message/Transfer menu images

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/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/23/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

The change looks good and resolves the issue!

review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

Top approving following Sebastien's approval

review: Abstain
lp:~nick-dedekind/ubuntu-settings-components/icon-aspect-ratio-crop updated
91. By Nick Dedekind

merged with deprecation warning branch

Unmerged revisions

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

Subscribers

People subscribed via source and target branches

to all changes: