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
=== modified file 'examples/MessageComponents.qml'
--- examples/MessageComponents.qml 2014-09-11 13:30:09 +0000
+++ examples/MessageComponents.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Settings.Components 0.121import Ubuntu.Settings.Components 0.1
22import Ubuntu.Settings.Menus 0.122import Ubuntu.Settings.Menus 0.1
2323
2424
=== modified file 'examples/OtherComponents.qml'
--- examples/OtherComponents.qml 2014-09-24 09:53:06 +0000
+++ examples/OtherComponents.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Settings.Components 0.121import Ubuntu.Settings.Components 0.1
22import Ubuntu.Settings.Menus 0.122import Ubuntu.Settings.Menus 0.1
2323
2424
=== modified file 'examples/SettingsComponents.qml'
--- examples/SettingsComponents.qml 2014-08-14 11:51:14 +0000
+++ examples/SettingsComponents.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Settings.Components 0.121import Ubuntu.Settings.Components 0.1
22import Ubuntu.Settings.Menus 0.122import Ubuntu.Settings.Menus 0.1
2323
@@ -30,7 +30,7 @@
30 height: units.gu(75)30 height: units.gu(75)
3131
32 Component.onCompleted: {32 Component.onCompleted: {
33 Theme.name = "Ubuntu.Components.Themes.SuruGradient"33 theme.name = "Ubuntu.Components.Themes.SuruGradient"
34 }34 }
3535
36 ListModel {36 ListModel {
3737
=== modified file 'examples/TransferComponents.qml'
--- examples/TransferComponents.qml 2014-09-11 13:30:09 +0000
+++ examples/TransferComponents.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17*/17*/
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Settings.Components 0.121import Ubuntu.Settings.Components 0.1
22import Ubuntu.Settings.Menus 0.122import Ubuntu.Settings.Menus 0.1
2323
2424
=== modified file 'plugins/Ubuntu/Settings/Components/ActionTextField.qml'
--- plugins/Ubuntu/Settings/Components/ActionTextField.qml 2014-11-12 10:49:22 +0000
+++ plugins/Ubuntu/Settings/Components/ActionTextField.qml 2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
19 */19 */
2020
21import QtQuick 2.021import QtQuick 2.0
22import Ubuntu.Components 1.122import Ubuntu.Components 1.3
23import QtQuick.Layouts 1.123import QtQuick.Layouts 1.1
2424
25Item {25Item {
2626
=== modified file 'plugins/Ubuntu/Settings/Components/Calendar.qml'
--- plugins/Ubuntu/Settings/Components/Calendar.qml 2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Components/Calendar.qml 2015-06-23 12:15:30 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
19import "dateExt.js" as DateExt19import "dateExt.js" as DateExt
2020
21ListView {21ListView {
@@ -203,8 +203,8 @@
203 property var dayStart: gridStart.addDays(index)203 property var dayStart: gridStart.addDays(index)
204204
205 // Styling properties205 // Styling properties
206 property color color: Theme.palette.selected.backgroundText206 property color color: theme.palette.selected.backgroundText
207 property color todayColor: Theme.palette.selected.foreground207 property color todayColor: theme.palette.selected.foreground
208 property string fontSize: "large"208 property string fontSize: "large"
209 property var backgroundColor: "transparent" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)209 property var backgroundColor: "transparent" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)
210 property var sundayBackgroundColor: "#19AEA79F" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)210 property var sundayBackgroundColor: "#19AEA79F" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)
211211
=== modified file 'plugins/Ubuntu/Settings/Components/MessageHeader.qml'
--- plugins/Ubuntu/Settings/Components/MessageHeader.qml 2014-09-15 17:18:27 +0000
+++ plugins/Ubuntu/Settings/Components/MessageHeader.qml 2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
19 */19 */
2020
21import QtQuick 2.121import QtQuick 2.1
22import Ubuntu.Components 1.122import Ubuntu.Components 1.3
23import QtQuick.Layouts 1.123import QtQuick.Layouts 1.1
2424
25Item {25Item {
@@ -60,7 +60,7 @@
6060
61 color: {61 color: {
62 if (String(source).match(/^image:\/\/theme/)) {62 if (String(source).match(/^image:\/\/theme/)) {
63 return Theme.palette.selected.backgroundText;63 return theme.palette.selected.backgroundText;
64 }64 }
65 return Qt.rgba(0.0, 0.0, 0.0, 0.0);65 return Qt.rgba(0.0, 0.0, 0.0, 0.0);
66 }66 }
@@ -117,7 +117,7 @@
117 Layout.preferredHeight: units.gu(3)117 Layout.preferredHeight: units.gu(3)
118 Layout.preferredWidth: units.gu(3)118 Layout.preferredWidth: units.gu(3)
119 Layout.alignment: Qt.AlignRight119 Layout.alignment: Qt.AlignRight
120 color: Theme.palette.selected.backgroundText120 color: theme.palette.selected.backgroundText
121121
122 MouseArea {122 MouseArea {
123 anchors.fill: parent123 anchors.fill: parent
124124
=== modified file 'plugins/Ubuntu/Settings/Components/QuickReply.qml'
--- plugins/Ubuntu/Settings/Components/QuickReply.qml 2014-09-25 11:35:37 +0000
+++ plugins/Ubuntu/Settings/Components/QuickReply.qml 2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
19 */19 */
2020
21import QtQuick 2.021import QtQuick 2.0
22import Ubuntu.Components 1.122import Ubuntu.Components 1.3
23import Ubuntu.Components.ListItems 1.0 as ListItem23import Ubuntu.Components.ListItems 1.0 as ListItem
2424
25Item {25Item {
2626
=== modified file 'plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml'
--- plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml 2014-09-15 17:18:27 +0000
+++ plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml 2015-06-23 12:15:30 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Components 0.118import Ubuntu.Components 1.3
1919
20/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more20/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
21 * general (Item-based) components. This ability should be incorporated into the SDK's21 * general (Item-based) components. This ability should be incorporated into the SDK's
2222
=== modified file 'plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml'
--- plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml 2014-09-11 13:30:09 +0000
+++ plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml 2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
18 */18 */
1919
20import QtQuick 2.020import QtQuick 2.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
2323
24ListItem.Empty {24ListItem.Empty {
@@ -35,7 +35,7 @@
35 id: iconSignal35 id: iconSignal
36 objectName: "iconSignal"36 objectName: "iconSignal"
3737
38 color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText38 color: active ? UbuntuColors.green : theme.palette.selected.backgroundText
3939
40 width: height40 width: height
41 height: Math.min(units.gu(3), parent.height - units.gu(1))41 height: Math.min(units.gu(3), parent.height - units.gu(1))
@@ -73,7 +73,7 @@
73 rightMargin: menu.__contentsMargins73 rightMargin: menu.__contentsMargins
74 }74 }
75 elide: Text.ElideRight75 elide: Text.ElideRight
76 color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText76 color: active ? UbuntuColors.green : theme.palette.selected.backgroundText
77 }77 }
7878
79 Icon {79 Icon {
@@ -82,7 +82,7 @@
82 visible: secure82 visible: secure
83 name: "network-secure"83 name: "network-secure"
8484
85 color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText85 color: active ? UbuntuColors.green : theme.palette.selected.backgroundText
8686
87 width: height87 width: height
88 height: Math.min(units.gu(3), parent.height - units.gu(1))88 height: Math.min(units.gu(3), parent.height - units.gu(1))
8989
=== modified file 'plugins/Ubuntu/Settings/Menus/ButtonMenu.qml'
--- plugins/Ubuntu/Settings/Menus/ButtonMenu.qml 2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/ButtonMenu.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22StandardMenu {22StandardMenu {
23 id: menu23 id: menu
2424
=== modified file 'plugins/Ubuntu/Settings/Menus/CalendarMenu.qml'
--- plugins/Ubuntu/Settings/Menus/CalendarMenu.qml 2014-09-11 13:30:09 +0000
+++ plugins/Ubuntu/Settings/Menus/CalendarMenu.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
22import Ubuntu.Settings.Components 0.122import Ubuntu.Settings.Components 0.1
2323
2424
=== modified file 'plugins/Ubuntu/Settings/Menus/CheckableMenu.qml'
--- plugins/Ubuntu/Settings/Menus/CheckableMenu.qml 2014-09-16 14:05:54 +0000
+++ plugins/Ubuntu/Settings/Menus/CheckableMenu.qml 2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
18 */18 */
1919
20import QtQuick 2.020import QtQuick 2.0
21import Ubuntu.Components 1.1 as Components21import Ubuntu.Components 1.3 as Components
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
2323
24ListItem.Empty {24ListItem.Empty {
2525
=== modified file 'plugins/Ubuntu/Settings/Menus/EventMenu.qml'
--- plugins/Ubuntu/Settings/Menus/EventMenu.qml 2014-09-11 14:46:02 +0000
+++ plugins/Ubuntu/Settings/Menus/EventMenu.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItems21import Ubuntu.Components.ListItems 1.0 as ListItems
2222
23ListItems.Empty {23ListItems.Empty {
@@ -32,7 +32,7 @@
32 id: iconVisual32 id: iconVisual
33 source: "image://theme/calendar"33 source: "image://theme/calendar"
34 visible: source != ""34 visible: source != ""
35 color: Theme.palette.selected.backgroundText35 color: theme.palette.selected.backgroundText
3636
37 height: Math.min(units.gu(3), parent.height - units.gu(1))37 height: Math.min(units.gu(3), parent.height - units.gu(1))
38 width: height38 width: height
3939
=== modified file 'plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml 2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml 2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
19 */19 */
2020
21import QtQuick 2.021import QtQuick 2.0
22import Ubuntu.Components 1.122import Ubuntu.Components 1.3
23import Ubuntu.Components.ListItems 1.0 as ListItem23import Ubuntu.Components.ListItems 1.0 as ListItem
2424
25StandardMenu {25StandardMenu {
@@ -36,7 +36,7 @@
36 height: label.implicitHeight + units.gu(2)36 height: label.implicitHeight + units.gu(2)
37 width: label.implicitWidth + units.gu(2)37 width: label.implicitWidth + units.gu(2)
3838
39 color: Theme.palette.normal.backgroundText39 color: theme.palette.normal.backgroundText
40 radius: "medium"40 radius: "medium"
4141
42 Label {42 Label {
@@ -52,7 +52,7 @@
52 fontSize: "medium"52 fontSize: "medium"
53 text: menu.count53 text: menu.count
5454
55 color: Theme.palette.normal.foregroundText55 color: theme.palette.normal.foregroundText
56 }56 }
57 }57 }
58 }58 }
5959
=== modified file 'plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml'
--- plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml 2014-09-24 09:53:06 +0000
+++ plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
22import QtQuick.Layouts 1.122import QtQuick.Layouts 1.1
2323
2424
=== modified file 'plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml'
--- plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml 2014-09-23 15:50:37 +0000
+++ plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
22import QtQuick.Layouts 1.122import QtQuick.Layouts 1.1
2323
@@ -51,8 +51,8 @@
51 source: "image://theme/media-skip-backward"51 source: "image://theme/media-skip-backward"
52 color: {52 color: {
53 if (!enabled)53 if (!enabled)
54 return Theme.palette.normal.backgroundText;54 return theme.palette.normal.backgroundText;
55 return prevMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;55 return prevMA.pressed ? theme.palette.selected.foreground : theme.palette.normal.foregroundText;
56 }56 }
57 enabled: canGoPrevious57 enabled: canGoPrevious
5858
@@ -72,8 +72,8 @@
72 source: playing ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"72 source: playing ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"
73 color: {73 color: {
74 if (!enabled)74 if (!enabled)
75 return Theme.palette.normal.backgroundText;75 return theme.palette.normal.backgroundText;
76 return playMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;76 return playMA.pressed ? theme.palette.selected.foreground : theme.palette.normal.foregroundText;
77 }77 }
78 enabled: canPlay78 enabled: canPlay
7979
@@ -93,8 +93,8 @@
93 source: "image://theme/media-skip-forward"93 source: "image://theme/media-skip-forward"
94 color: {94 color: {
95 if (!enabled)95 if (!enabled)
96 return Theme.palette.normal.backgroundText;96 return theme.palette.normal.backgroundText;
97 return nextMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;97 return nextMA.pressed ? theme.palette.selected.foreground : theme.palette.normal.foregroundText;
98 }98 }
99 enabled: canGoNext99 enabled: canGoNext
100100
101101
=== modified file 'plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml'
--- plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml 2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23StandardMenu {23StandardMenu {
2424
=== modified file 'plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml'
--- plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml 2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml 2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
18 */18 */
1919
20import QtQuick 2.020import QtQuick 2.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
2222
23StandardMenu {23StandardMenu {
24 id: menuItem24 id: menuItem
2525
=== modified file 'plugins/Ubuntu/Settings/Menus/SectionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SectionMenu.qml 2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/SectionMenu.qml 2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
18 */18 */
1919
20import QtQuick 2.020import QtQuick 2.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
2323
24ListItem.Header {24ListItem.Header {
2525
=== modified file 'plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml 2014-09-11 13:30:09 +0000
+++ plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml 2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
19 */19 */
2020
21import QtQuick 2.121import QtQuick 2.1
22import Ubuntu.Components 1.122import Ubuntu.Components 1.3
23import Ubuntu.Components.ListItems 1.0 as ListItem23import Ubuntu.Components.ListItems 1.0 as ListItem
24import Ubuntu.Settings.Components 0.1 as USC24import Ubuntu.Settings.Components 0.1 as USC
25import QtQuick.Layouts 1.125import QtQuick.Layouts 1.1
2626
=== modified file 'plugins/Ubuntu/Settings/Menus/SliderMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SliderMenu.qml 2014-09-11 14:46:02 +0000
+++ plugins/Ubuntu/Settings/Menus/SliderMenu.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23ListItem.Empty {23ListItem.Empty {
@@ -133,7 +133,7 @@
133 anchors.verticalCenter: row.verticalCenter133 anchors.verticalCenter: row.verticalCenter
134 height: slider.height - units.gu(2)134 height: slider.height - units.gu(2)
135 width: height135 width: height
136 color: Theme.palette.selected.backgroundText136 color: theme.palette.selected.backgroundText
137137
138 MouseArea {138 MouseArea {
139 anchors.fill: parent139 anchors.fill: parent
@@ -189,7 +189,7 @@
189 anchors.verticalCenter: row.verticalCenter189 anchors.verticalCenter: row.verticalCenter
190 height: slider.height - units.gu(2)190 height: slider.height - units.gu(2)
191 width: height191 width: height
192 color: Theme.palette.selected.backgroundText192 color: theme.palette.selected.backgroundText
193193
194 MouseArea {194 MouseArea {
195 anchors.fill: parent195 anchors.fill: parent
196196
=== modified file 'plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml 2014-08-14 11:19:43 +0000
+++ plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml 2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
19 */19 */
2020
21import QtQuick 2.021import QtQuick 2.0
22import Ubuntu.Components 1.122import Ubuntu.Components 1.3
23import Ubuntu.Settings.Components 0.1 as USC23import Ubuntu.Settings.Components 0.1 as USC
24import QtQuick.Layouts 1.124import QtQuick.Layouts 1.1
2525
2626
=== modified file 'plugins/Ubuntu/Settings/Menus/StandardMenu.qml'
--- plugins/Ubuntu/Settings/Menus/StandardMenu.qml 2014-09-22 16:37:31 +0000
+++ plugins/Ubuntu/Settings/Menus/StandardMenu.qml 2015-06-23 12:15:30 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.0 as ListItems19import Ubuntu.Components.ListItems 1.0 as ListItems
20import QtQuick.Layouts 1.120import QtQuick.Layouts 1.1
2121
@@ -52,7 +52,7 @@
52 Icon {52 Icon {
53 id: iconVisual53 id: iconVisual
54 visible: source != ""54 visible: source != ""
55 color: Theme.palette.selected.backgroundText55 color: theme.palette.selected.backgroundText
5656
57 readonly property real size: Math.min(units.gu(3), parent.height - menu.__contentsMargins)57 readonly property real size: Math.min(units.gu(3), parent.height - menu.__contentsMargins)
5858
5959
=== modified file 'plugins/Ubuntu/Settings/Menus/SwitchMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SwitchMenu.qml 2014-09-16 12:49:38 +0000
+++ plugins/Ubuntu/Settings/Menus/SwitchMenu.qml 2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
18 */18 */
1919
20import QtQuick 2.020import QtQuick 2.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
2222
23StandardMenu {23StandardMenu {
24 id: menu24 id: menu
2525
=== modified file 'plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml 2014-11-12 10:49:22 +0000
+++ plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml 2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
19 */19 */
2020
21import QtQuick 2.021import QtQuick 2.0
22import Ubuntu.Components 1.122import Ubuntu.Components 1.3
23import Ubuntu.Settings.Components 0.1 as USC23import Ubuntu.Settings.Components 0.1 as USC
2424
25SimpleMessageMenu {25SimpleMessageMenu {
2626
=== modified file 'plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml 2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23StandardMenu {23StandardMenu {
2424
=== modified file 'plugins/Ubuntu/Settings/Menus/TransferMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TransferMenu.qml 2014-09-15 17:18:27 +0000
+++ plugins/Ubuntu/Settings/Menus/TransferMenu.qml 2015-06-23 12:15:30 +0000
@@ -16,7 +16,7 @@
1616
17import QtQuick 2.117import QtQuick 2.1
18import QtQuick.Layouts 1.118import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.0 as ListItem20import Ubuntu.Components.ListItems 1.0 as ListItem
21import Ubuntu.Settings.Components 0.121import Ubuntu.Settings.Components 0.1
2222
@@ -56,7 +56,7 @@
5656
57 color: {57 color: {
58 if (String(source).match(/^image:\/\/theme/)) {58 if (String(source).match(/^image:\/\/theme/)) {
59 return Theme.palette.selected.backgroundText;59 return theme.palette.selected.backgroundText;
60 }60 }
61 return Qt.rgba(0.0, 0.0, 0.0, 0.0);61 return Qt.rgba(0.0, 0.0, 0.0, 0.0);
62 }62 }
6363
=== modified file 'plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml 2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml 2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23StandardMenu {23StandardMenu {
@@ -34,7 +34,7 @@
34 height: checkMark.height + units.gu(1.5)34 height: checkMark.height + units.gu(1.5)
35 radius: width / 235 radius: width / 2
36 antialiasing: true36 antialiasing: true
37 color: Theme.palette.normal.backgroundText37 color: theme.palette.normal.backgroundText
38 visible: userSessionMenu.active38 visible: userSessionMenu.active
3939
40 Image {40 Image {
4141
=== modified file 'tests/qmltests/Components/tst_ServerPropertySynchroniser.qml'
--- tests/qmltests/Components/tst_ServerPropertySynchroniser.qml 2015-04-24 13:15:20 +0000
+++ tests/qmltests/Components/tst_ServerPropertySynchroniser.qml 2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
19import Ubuntu.Test 0.119import Ubuntu.Test 0.1
20import Ubuntu.Settings.Components 0.1 as USC20import Ubuntu.Settings.Components 0.1 as USC
21import Ubuntu.Settings.Menus 0.1 as USM21import Ubuntu.Settings.Menus 0.1 as USM
22import Ubuntu.Components 0.122import Ubuntu.Components 1.3
2323
24Item {24Item {
25 id: root25 id: root
2626
=== modified file 'tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml'
--- tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml 2015-03-20 14:04:36 +0000
+++ tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml 2015-06-23 12:15:30 +0000
@@ -16,7 +16,7 @@
1616
17import QtQuick 2.017import QtQuick 2.0
18import QtTest 1.018import QtTest 1.0
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Test 0.1 as UT20import Ubuntu.Test 0.1 as UT
2121
22TestCase {22TestCase {

Subscribers

People subscribed via source and target branches

to all changes: