e22fb85 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fixed colours palette value set. Moved ModemItem to USC.

e22fb85Nick Dedekind11 years ago

debian/control+2−2

compare with xenial

unifiedsplit

@@ -54,7 +54,7 @@ Build-Depends: cmake,

54 qtdeclarative5-private-dev (>= 5.4),

55 qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),

56 qtdeclarative5-ubuntu-content1,

57− qtdeclarative5-ubuntu-settings-components (>= 0.6),

57+ qtdeclarative5-ubuntu-settings-components (>= 0.7),

58 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),

59 qtdeclarative5-ubuntu-web-plugin,

60 ttf-ubuntu-font-family,

@@ -126,7 +126,7 @@ Description: Unity 8 shell

126Package: unity8-common

127Architecture: all

128Depends: qml-module-qtquick-layouts,

129− qtdeclarative5-ubuntu-settings-components (>= 0.6),

129+ qtdeclarative5-ubuntu-settings-components (>= 0.7),

130 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

131 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),

132 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"

24Rectangle {

25 width: units.gu(80)

26 height: units.gu(30)

27− color: "white"

27+ color: theme.palette.normal.background

28+

29+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark"

29 RowLayout {

31 RowLayout {

30 anchors.fill: parent

32 anchors.fill: parent

@@ -37,7 +39,7 @@ Rectangle {

37 Layout.fillHeight: true

39 Layout.fillHeight: true

39 Rectangle {

41 Rectangle {

40− color: "black"

42+ color: theme.palette.normal.background

41 anchors.fill: indicatorItem

43 anchors.fill: indicatorItem

42 }

44 }

@@ -181,25 +183,25 @@ Rectangle {

181 }

183 }

182

184

183 function test_select() {

185 function test_select() {

184− tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");

186+ tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);

185 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);

187 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);

186− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");

188+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);

187− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");

189+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);

188− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");

190+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);

189

191

190 indicatorItem.expanded = true;

192 indicatorItem.expanded = true;

191− tryCompare(findChild(indicatorItem, "icon0"), "color", "#888888");

193+ tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.disabled.backgroundText);

192 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 0.6);

194 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 0.6);

193− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#888888");

195+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.disabled.backgroundText);

194− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#888888");

196+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.disabled.backgroundText);

195− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#888888");

197+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.disabled.backgroundText);

196

198

197 indicatorItem.selected = true;

199 indicatorItem.selected = true;

198− tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");

200+ tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);

199 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);

201 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);

200− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");

202+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);

201− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");

203+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);

202− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");

204+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);

203 }

205 }

204 }

206 }

205}

207}