on xenial help sign in
Fixed colours palette value set. Moved ModemItem to USC.

Approved by: Michał Sawicz

commite22fb85116c7c5c7e68e4b0b16f4e81492e94f90 authorNick Dedekind <nick.dedekind@canonical.com> dateTue 8 Mar 2016, 20:59 (11 years ago) parent5c11c1171e6e16
2 files changed+18−16
debian/control+2−2 tests/qmltests/Panel/tst_IndicatorItem.qml+16−14
debian/control+2−2
@@ -54,7 +54,7 @@ Build-Depends: cmake,
5454 qtdeclarative5-private-dev (>= 5.4),
5555 qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
5656 qtdeclarative5-ubuntu-content1,
57− qtdeclarative5-ubuntu-settings-components (>= 0.6),
57+ qtdeclarative5-ubuntu-settings-components (>= 0.7),
5858 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
5959 qtdeclarative5-ubuntu-web-plugin,
6060 ttf-ubuntu-font-family,
@@ -126,7 +126,7 @@ Description: Unity 8 shell
126126Package: unity8-common
127127Architecture: all
128128Depends: qml-module-qtquick-layouts,
129− qtdeclarative5-ubuntu-settings-components (>= 0.6),
129+ qtdeclarative5-ubuntu-settings-components (>= 0.7),
130130 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
131131 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
132132 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
tests/qmltests/Panel/tst_IndicatorItem.qml+16−14
@@ -24,7 +24,9 @@ import "../../../qml/Panel"
2424Rectangle {
2525 width: units.gu(80)
2626 height: units.gu(30)
27− color: "white"
27+ color: theme.palette.normal.background
28+
29+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark"
2830
2931 RowLayout {
3032 anchors.fill: parent
@@ -37,7 +39,7 @@ Rectangle {
3739 Layout.fillHeight: true
3840
3941 Rectangle {
40− color: "black"
42+ color: theme.palette.normal.background
4143 anchors.fill: indicatorItem
4244 }
4345
@@ -181,25 +183,25 @@ Rectangle {
181183 }
182184
183185 function test_select() {
184− tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");
186+ tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
185187 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
186− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");
187− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");
188− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");
188+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
189+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
190+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
189191
190192 indicatorItem.expanded = true;
191− tryCompare(findChild(indicatorItem, "icon0"), "color", "#888888");
193+ tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.disabled.backgroundText);
192194 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 0.6);
193− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#888888");
194− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#888888");
195− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#888888");
195+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.disabled.backgroundText);
196+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.disabled.backgroundText);
197+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.disabled.backgroundText);
196198
197199 indicatorItem.selected = true;
198− tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");
200+ tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
199201 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
200− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");
201− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");
202− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");
202+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
203+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
204+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
203205 }
204206 }
205207}