a8e9a4a · unity8 · git.iko.soy

qml/Components/Dialogs.qml−3

compare with xenial

unifiedsplit

@@ -177,7 +177,6 @@ Item {

177 onClicked: {

178 rebootDialog.hide();

179 }

180− color: UbuntuColors.lightGrey

181 }

180 }

182 Button {

181 Button {

183 text: i18n.tr("Yes")

182 text: i18n.tr("Yes")

@@ -213,14 +212,12 @@ Item {

213 unitySessionService.reboot();

212 unitySessionService.reboot();

214 powerDialog.hide();

213 powerDialog.hide();

215 }

214 }

216− color: UbuntuColors.lightGrey

217 }

215 }

218 Button {

216 Button {

219 text: i18n.tr("Cancel")

217 text: i18n.tr("Cancel")

220 onClicked: {

218 onClicked: {

221 powerDialog.hide();

219 powerDialog.hide();

222 }

220 }

223− color: UbuntuColors.lightGrey

224 }

221 }

225 }

222 }

226 }

223 }

qml/Components/PanelState/PanelState.qml+1−1

@@ -24,7 +24,7 @@ QtObject {

24 property bool buttonsVisible: false

25 property bool closeButtonShown: true

26 property bool dropShadow: false

27− property int panelHeight: units.gu(3)

27+ property int panelHeight: 0

28

29 signal close()

30 signal minimize()

qml/Components/UbuntuShapeForItem.qml+1

@@ -28,6 +28,7 @@ Item {

28

29 property alias radius: shape.radius

30 property alias image: source.sourceItem

31+ property alias aspect: shape.aspect

31

32

32 ShaderEffectSource {

33 ShaderEffectSource {

33 id: source

34 id: source

qml/Components/WindowControlButtons.qml+6−6

@@ -43,7 +43,7 @@ Row {

43 width: units.gu(2)

44 height: units.gu(2)

45 radius: height / 2

46− color: "#ed3146"

46+ color: UbuntuColors.red

47 visible: parent.containsMouse

48 }

49 Icon {

@@ -51,7 +51,7 @@ Row {

51 height: parent.height *.5

52 anchors.centerIn: parent

53 source: "graphics/window-close.svg"

54− color: root.active ? "white" : "#5d5d5d"

54+ color: root.active ? "white" : UbuntuColors.slate

55 keyColor: "black"

56 }

57 }

@@ -69,7 +69,7 @@ Row {

69 width: units.gu(2)

70 height: units.gu(2)

71 radius: height / 2

72− color: "#888888"

72+ color: root.active ? UbuntuColors.graphite : UbuntuColors.ash

73 visible: parent.containsMouse

74 }

75 Icon {

@@ -77,7 +77,7 @@ Row {

77 height: parent.height *.5

78 anchors.centerIn: parent

79 source: "graphics/window-minimize.svg"

80− color: root.active ? "white" : "#5d5d5d"

80+ color: root.active ? "white" : UbuntuColors.slate

81 keyColor: "black"

82 }

83 }

@@ -95,7 +95,7 @@ Row {

95 width: units.gu(2)

96 height: units.gu(2)

97 radius: height / 2

98− color: "#888888"

98+ color: root.active ? UbuntuColors.graphite : UbuntuColors.ash

99 visible: parent.containsMouse

100 }

101 Icon {

@@ -103,7 +103,7 @@ Row {

103 height: parent.height *.5

104 anchors.centerIn: parent

105 source: "graphics/window-maximize.svg"

106− color: root.active ? "white" : "#5d5d5d"

106+ color: root.active ? "white" : UbuntuColors.slate

107 keyColor: "black"

108 }

109 }

qml/Launcher/Launcher.qml−1

@@ -19,7 +19,6 @@ import "../Components"

19import Ubuntu.Components 1.3

20import Ubuntu.Gestures 0.1

21import Unity.Launcher 0.1

22−import GlobalShortcut 1.0

23

22

24FocusScope {

23FocusScope {

25 id: root

24 id: root

qml/Launcher/LauncherDelegate.qml+9−11

@@ -164,7 +164,7 @@ Item {

164 }

165 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))

166 height: units.gu(2)

167− backgroundColor: UbuntuColors.orange

167+ backgroundColor: UbuntuColors.green

168 visible: root.countVisible

169 aspect: UbuntuShape.Flat

170

@@ -173,9 +173,6 @@ Item {

173 objectName: "countLabel"

174 text: root.count

175 anchors.centerIn: parent

176− // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine

177− // property for Text: https://bugreports.qt-project.org/browse/QTBUG-40479

178− anchors.verticalCenterOffset: -units.dp(.5)

179 width: root.itemWidth - units.gu(1)

176 width: root.itemWidth - units.gu(1)

180 horizontalAlignment: Text.AlignHCenter

177 horizontalAlignment: Text.AlignHCenter

181 elide: Text.ElideRight

178 elide: Text.ElideRight

@@ -190,9 +187,9 @@ Item {

190

187

191 anchors.centerIn: parent

188 anchors.centerIn: parent

192 width: root.itemWidth * .8

189 width: root.itemWidth * .8

193− height: units.gu(1)

190+ height: units.dp(3)

194 visible: root.progress > -1

191 visible: root.progress > -1

195− backgroundColor: UbuntuColors.darkGrey

192+ backgroundColor: "white"

196 borderSource: "none"

193 borderSource: "none"

197

194

198 Item {

195 Item {

@@ -210,7 +207,7 @@ Item {

210 top: parent.top

207 top: parent.top

211 bottom: parent.bottom

208 bottom: parent.bottom

212 }

209 }

213− backgroundColor: "white"

210+ backgroundColor: UbuntuColors.blue

214 borderSource: "none"

211 borderSource: "none"

215 width: progressOverlay.width

212 width: progressOverlay.width

216 }

213 }

@@ -247,18 +244,19 @@ Item {

247 visible: root.itemFocused

244 visible: root.itemFocused

248 }

245 }

249

246

250− Rectangle {

247+ UbuntuShape {

251 objectName: "shortcutHint"

248 objectName: "shortcutHint"

252 anchors.centerIn: parent

249 anchors.centerIn: parent

253− width: units.gu(3)

250+ width: units.gu(2.5)

254 height: width

251 height: width

255− color: "#E0292929"

252+ backgroundColor: "#F2111111"

256 visible: root.shortcutHintShown

253 visible: root.shortcutHintShown

254+ aspect: UbuntuShape.Flat

257 Label {

255 Label {

258 anchors.centerIn: parent

256 anchors.centerIn: parent

259 text: (itemIndex + 1) % 10

257 text: (itemIndex + 1) % 10

260 color: "white"

258 color: "white"

261− font.weight: Font.DemiBold

259+ font.weight: Font.Light

262 }

260 }

263 }

261 }

264 }

262 }

qml/Launcher/LauncherPanel.qml+25−13

@@ -16,16 +16,14 @@

16

17import QtQuick 2.4

18import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 1.3 as ListItems

20import Unity.Launcher 0.1

19import Unity.Launcher 0.1

21import Ubuntu.Components.Popups 1.3

20import Ubuntu.Components.Popups 1.3

22−import GlobalShortcut 1.0

23import "../Components/ListItems"

21import "../Components/ListItems"

24import "../Components/"

22import "../Components/"

25

23

26Rectangle {

24Rectangle {

27 id: root

25 id: root

28− color: "#E0292929"

26+ color: "#F2111111"

29

27

30 rotation: inverted ? 180 : 0

28 rotation: inverted ? 180 : 0

31

29

@@ -634,9 +632,10 @@ Rectangle {

634 id: quickListShape

632 id: quickListShape

635 objectName: "quickListShape"

633 objectName: "quickListShape"

636 anchors.fill: quickList

634 anchors.fill: quickList

637− opacity: quickList.state === "open" ? 0.8 : 0

635+ opacity: quickList.state === "open" ? 0.95 : 0

638 visible: opacity > 0

636 visible: opacity > 0

639 rotation: root.rotation

637 rotation: root.rotation

638+ aspect: UbuntuShape.Flat

640

639

641 Behavior on opacity {

640 Behavior on opacity {

642 UbuntuNumberAnimation {}

641 UbuntuNumberAnimation {}

@@ -697,7 +696,7 @@ Rectangle {

697 Rectangle {

696 Rectangle {

698 id: quickList

697 id: quickList

699 objectName: "quickList"

698 objectName: "quickList"

700− color: "#f5f5f5"

699+ color: theme.palette.normal.background

701 // Because we're setting left/right anchors depending on orientation, it will break the

700 // Because we're setting left/right anchors depending on orientation, it will break the

702 // width setting after rotating twice. This makes sure we also re-apply width on rotation

701 // width setting after rotating twice. This makes sure we also re-apply width on rotation

703 width: root.inverted ? units.gu(30) : units.gu(30)

702 width: root.inverted ? units.gu(30) : units.gu(30)

@@ -768,14 +767,10 @@ Rectangle {

768 quickList.state = "open";

767 quickList.state = "open";

769 }

768 }

770

769

771− StyledItem {

770+ Item {

772 width: parent.width

771 width: parent.width

773 height: quickListColumn.height

772 height: quickListColumn.height

774

773

775− theme: ThemeSettings {

776− name: "Ubuntu.Components.Themes.Ambiance"

777− }

778−

779 Column {

774 Column {

780 id: quickListColumn

775 id: quickListColumn

781 width: parent.width

776 width: parent.width

@@ -785,11 +780,28 @@ Rectangle {

785 id: popoverRepeater

780 id: popoverRepeater

786 model: quickList.model

781 model: quickList.model

787

782

788− ListItems.Standard {

783+ ListItem {

789 objectName: "quickListEntry" + index

784 objectName: "quickListEntry" + index

790− text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")

791− highlightWhenPressed: model.clickable

792 selected: index === quickList.selectedIndex

785 selected: index === quickList.selectedIndex

786+ height: label.implicitHeight + label.anchors.topMargin + label.anchors.bottomMargin

787+ color: model.clickable ? (selected ? theme.palette.highlighted.background : "transparent") : theme.palette.disabled.background

788+ highlightColor: !model.clickable ? quickList.color : undefined // make disabled items visually unclickable

789+ divider.colorFrom: UbuntuColors.inkstone

790+ divider.colorTo: UbuntuColors.inkstone

791+

792+ Label {

793+ id: label

794+ anchors.fill: parent

795+ anchors.leftMargin: units.gu(3) // 2 GU for checkmark, 3 GU total

796+ anchors.rightMargin: units.gu(2)

797+ anchors.topMargin: units.gu(2)

798+ anchors.bottomMargin: units.gu(2)

799+ verticalAlignment: Label.AlignVCenter

800+ text: model.label

801+ fontSize: index == 0 ? "medium" : "small"

802+ font.weight: index == 0 ? Font.Medium : Font.Light

803+ color: model.clickable ? theme.palette.normal.backgroundText : theme.palette.disabled.backgroundText

804+ }

793

805

794 onClicked: {

806 onClicked: {

795 if (!model.clickable) {

807 if (!model.clickable) {

qml/Launcher/graphics/quicklist_tooltip@30.png

Binary file not shown.

qml/Panel/Indicators/client/IndicatorsClient.qml+1−1

@@ -22,7 +22,7 @@ import Ubuntu.Components 1.3

22import Ubuntu.Components.ListItems 1.3 as ListItem

23

24Rectangle {

25− color: "#292929"

25+ color: theme.palette.normal.background

26 id: root

27

28 Component.onCompleted: {

qml/Panel/Panel.qml+2−2

@@ -177,12 +177,12 @@ Item {

177 topMargin: units.gu(0.5)

178 bottomMargin: units.gu(0.5)

179 }

180− color: PanelState.buttonsVisible ? "#ffffff" : "#5d5d5d"

180+ color: "white"

181 height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin

182 visible: !windowControlButtons.visible && !root.locked && !callHint.visible

183 verticalAlignment: Text.AlignVCenter

184 fontSize: "medium"

185− font.weight: Font.Normal

185+ font.weight: PanelState.buttonsVisible ? Font.Light : Font.Medium

186 text: PanelState.title

187 elide: Text.ElideRight

188 maximumLineCount: 1

qml/Stages/DecoratedWindow.qml+1−1

@@ -73,7 +73,7 @@ FocusScope {

73 }

74 source: "graphics/dropshadow2gu.sci"

75 opacity: root.shadowOpacity * .3

76− enabled: !fullscreen

76+ visible: !fullscreen

77 }

78

79 WindowDecoration {

qml/Stages/WindowDecoration.qml+2−2

@@ -93,12 +93,12 @@ MouseArea {

93 Label {

94 id: titleLabel

95 objectName: "windowDecorationTitle"

96− color: root.active ? "white" : "#5d5d5d"

96+ color: root.active ? "white" : UbuntuColors.slate

97 height: parent.height

98 width: parent.width - buttons.width - parent.anchors.rightMargin - parent.anchors.leftMargin

99 verticalAlignment: Text.AlignVCenter

100 fontSize: "medium"

101− font.weight: root.active ? Font.Light : Font.Normal

101+ font.weight: root.active ? Font.Light : Font.Medium

102 elide: Text.ElideRight

103 }

104 }

tests/qmltests/Components/tst_Dialogs.qml+4−2

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -27,6 +27,8 @@ Rectangle {

27 width: units.gu(70)

28 height: fakeShell.longestDimension

29

30+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark" // use the same theme as the real shell

31+

30 QtObject {

32 QtObject {

31 id: fakeUnitySession

33 id: fakeUnitySession

32 signal logoutRequested

34 signal logoutRequested

@@ -69,7 +71,7 @@ Rectangle {

69 }

71 }

70

72

71 Rectangle {

73 Rectangle {

72− color: "white"

74+ color: theme.palette.normal.background

73 x: fakeShell.shortestDimension

75 x: fakeShell.shortestDimension

74 width: root.width - x

76 width: root.width - x

75 anchors {

77 anchors {

tests/qmltests/Launcher/tst_Launcher.qml+5−2

@@ -26,10 +26,13 @@ import Utils 0.1 // For EdgeBarrierSettings

26

27/* Nothing is shown at first. If you drag from left edge you will bring up the

28 launcher. */

29−Item {

29+Rectangle {

30 id: root

31 width: units.gu(140)

32 height: units.gu(70)

33+ color: UbuntuColors.graphite // something neither white nor black

34+

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

33

36

34 Loader {

37 Loader {

35 id: launcherLoader

38 id: launcherLoader

@@ -868,7 +871,7 @@ Item {

868

871

869 // Doing longpress

872 // Doing longpress

870 mousePress(draggedItem);

873 mousePress(draggedItem);

871− tryCompare(quickListShape, "opacity", 0.8);

874+ tryCompare(quickListShape, "opacity", 0.95);

872 mouseRelease(draggedItem);

875 mouseRelease(draggedItem);

873

876

874 verify(quickList.y >= units.gu(1));

877 verify(quickList.y >= units.gu(1));

tests/qmltests/Stages/ApplicationCheckBox.qml−1

@@ -96,7 +96,6 @@ Column {

96 Label {

97 id: appIdLabel

98 text: root.appId

99− color: "white"

100 anchors.verticalCenter: parent.verticalCenter

99 anchors.verticalCenter: parent.verticalCenter

101 }

100 }

102 Rectangle {

101 Rectangle {

tests/qmltests/Stages/SurfaceManagerControls.qml+6−7

@@ -20,14 +20,13 @@ import Unity.Application 0.1

20

21Column {

22 id: root

23− property color textColor: "black"

24

23

25 Label {text: "Size hints for new surface:"; color: root.textColor; font.bold: true}

24 Label {text: "Size hints for new surface:"; color: root.textColor; font.bold: true}

26

25

27− SurfaceManagerField { text: "min width"; propertyName: "newSurfaceMinimumWidth"; textColor: root.textColor }

26+ SurfaceManagerField { text: "min width"; propertyName: "newSurfaceMinimumWidth"; }

28− SurfaceManagerField { text: "max width"; propertyName: "newSurfaceMaximumWidth"; textColor: root.textColor }

27+ SurfaceManagerField { text: "max width"; propertyName: "newSurfaceMaximumWidth"; }

29− SurfaceManagerField { text: "min height"; propertyName: "newSurfaceMinimumHeight"; textColor: root.textColor }

28+ SurfaceManagerField { text: "min height"; propertyName: "newSurfaceMinimumHeight"; }

30− SurfaceManagerField { text: "max height"; propertyName: "newSurfaceMaximumHeight"; textColor: root.textColor }

29+ SurfaceManagerField { text: "max height"; propertyName: "newSurfaceMaximumHeight"; }

31− SurfaceManagerField { text: "width increment"; propertyName: "newSurfaceWidthIncrement"; textColor: root.textColor }

30+ SurfaceManagerField { text: "width increment"; propertyName: "newSurfaceWidthIncrement"; }

32− SurfaceManagerField { text: "height increment"; propertyName: "newSurfaceHeightIncrement"; textColor: root.textColor }

31+ SurfaceManagerField { text: "height increment"; propertyName: "newSurfaceHeightIncrement"; }

33}

32}

tests/qmltests/Stages/tst_DesktopStage.qml+6−5

@@ -41,7 +41,10 @@ Item {

41 value: false

42 }

43

44− Component.onCompleted: resetGeometry()

44+ Component.onCompleted: {

45+ theme.name = "Ubuntu.Components.Themes.SuruDark";

46+ resetGeometry();

47+ }

45

48

46 function resetGeometry() {

49 function resetGeometry() {

47 // ensures apps which are tested decorations are in view.

50 // ensures apps which are tested decorations are in view.

@@ -71,7 +74,6 @@ Item {

71 property bool itemDestroyed: false

74 property bool itemDestroyed: false

72 sourceComponent: Component {

75 sourceComponent: Component {

73 DesktopStage {

76 DesktopStage {

74− color: "white"

75 anchors.fill: parent

77 anchors.fill: parent

76 background: "../../../qml/graphics/tablet_background.jpg"

78 background: "../../../qml/graphics/tablet_background.jpg"

77 focus: true

79 focus: true

@@ -91,8 +93,8 @@ Item {

91

93

92 Rectangle {

94 Rectangle {

93 id: controls

95 id: controls

94− color: "darkgrey"

95 width: units.gu(30)

96 width: units.gu(30)

97+ color: theme.palette.normal.background

96 anchors {

98 anchors {

97 top: parent.top

99 top: parent.top

98 bottom: parent.bottom

100 bottom: parent.bottom

@@ -107,7 +109,6 @@ Item {

107 spacing: units.gu(1)

109 spacing: units.gu(1)

108

110

109 Button {

111 Button {

110− color: "white"

111 text: "Make surface slow to resize"

112 text: "Make surface slow to resize"

112 activeFocusOnPress: false

113 activeFocusOnPress: false

113 onClicked: {

114 onClicked: {

@@ -134,7 +135,7 @@ Item {

134 }

135 }

136 }

136

137

137− SurfaceManagerControls { textColor: "white" }

138+ SurfaceManagerControls { }

138 }

139 }

140 }

141 }

tests/qmltests/tst_Shell.qml−1

@@ -226,7 +226,6 @@ Rectangle {

226 MouseTouchEmulationCheckbox {

227 id: mouseEmulation

228 checked: true

229− color: "white"

230 }

229 }

231 ListItem.ItemSelector {

230 ListItem.ItemSelector {

232 id: ctrlModifier

231 id: ctrlModifier