git.iko.soy/unity8
on xenial help sign in
Add support for the colour palette.

Approved by PS Jenkins bot, Nicolas d'Offay.

commit7c4b34d298ca30c5ae292f20a59ef033ac83ce42 authorAndrea Cimitan <andrea.cimitan@canonical.com> dateWed 17 Jul 2013, 15:56 (13 years ago) parentb620e36b963df6
19 files changed+29−27
compare with xenial
unifiedsplit
Components/ApplicationScreenshot.qml+1−1 Components/FilterGrid.qml+2−2 Components/ListItems/Header.qml+1−1 Components/PageHeader.qml+1−1 Components/Tile.qml+1−1 Dash/Apps/RunningApplicationTile.qml+1−1 Dash/DashBar.qml+1−1 Dash/DashPreview.qml+1−1 Dash/Music/AlbumTile.qml+2−2 Dash/Video/VideoPreview.qml+3−3 Notifications/Notification.qml+4−4 Panel/IndicatorItem.qml+1−1 Panel/Indicators/DatetimeIndicatorPage.qml+2−2 Panel/Indicators/DatetimeIndicatorWidget.qml+1−1 Panel/Indicators/DefaultIndicatorWidget.qml+1−1 Panel/MenuContent.qml+1−1 Panel/Menus/Overview/FlightModeWidget.qml+1−1 Panel/Menus/Overview/OverviewGrid.qml+2−2 Shell.qml+2
Components/ApplicationScreenshot.qml+1−1
@@ -46,7 +46,7 @@ Item {
4646 Rectangle {
4747 id: background
4848 anchors.fill: parent
49− color: "white"
49+ color: "white" // FIXME should use normal background color of Suru theme
5050 visible: applicationScreenshot.withBackground
5151 }
5252
Components/FilterGrid.qml+2−2
@@ -99,7 +99,7 @@ Item {
9999
100100 UbuntuShape {
101101 anchors.fill: parent
102− color: "#33ffffff"
102+ color: "#33ffffff" // FIXME no palette
103103 radius: "small"
104104 }
105105
@@ -123,7 +123,7 @@ Item {
123123 }
124124 text: (filter) ? "+ View all (" + model.count + ")" : "- Show fewer"
125125 fontSize: "small"
126− color: "#f3f3e7"
126+ color: Theme.palette.selected.backgroundText
127127 opacity: 0.6
128128 style: Text.Raised
129129 styleColor: "black"
Components/ListItems/Header.qml+1−1
@@ -45,7 +45,7 @@ Item {
4545 verticalCenter: parent.verticalCenter
4646 }
4747
48− color: "#f3f3e7" //at 60%
48+ color: Theme.palette.selected.backgroundText //at 60%
4949 opacity: 0.6
5050 font.family: "Ubuntu"
5151 fontSize: "medium"
Components/PageHeader.qml+1−1
@@ -90,7 +90,7 @@ Item {
9090 verticalCenter: parent.verticalCenter
9191 }
9292
93− color: "#f3f3e7"
93+ color: Theme.palette.selected.backgroundText
9494 opacity: 0.8
9595 font.family: "Ubuntu"
9696 font.weight: Font.Light
Components/Tile.qml+1−1
@@ -75,7 +75,7 @@ AbstractButton {
7575 rightMargin: units.gu(1)
7676 }
7777
78− color: "#f3f3e7"
78+ color: Theme.palette.selected.backgroundText
7979 opacity: 0.9
8080 style: Text.Raised
8181 styleColor: "black"
Dash/Apps/RunningApplicationTile.qml+1−1
@@ -113,7 +113,7 @@ AbstractButton {
113113 }
114114 text: (application) ? application.name : ""
115115
116− color: "#f3f3e7"
116+ color: Theme.palette.selected.backgroundText
117117 opacity: 0.9
118118 style: Text.Raised
119119 styleColor: "black"
Dash/DashBar.qml+1−1
@@ -117,7 +117,7 @@ Item {
117117
118118 Rectangle {
119119 id: highlightLine
120− color: "#dd4814"
120+ color: Theme.palette.selected.foreground
121121 height: parent.height
122122 anchors.bottom: parent.bottom
123123 z: 1
Dash/DashPreview.qml+1−1
@@ -92,7 +92,7 @@ Rectangle {
9292 elide: Text.ElideRight
9393 fontSize: "x-large"
9494 font.weight: Font.Light
95− color: "#f3f3e7"
95+ color: Theme.palette.selected.backgroundText
9696 opacity: 0.9
9797 text: root.title
9898 style: Text.Raised
Dash/Music/AlbumTile.qml+2−2
@@ -69,7 +69,7 @@ AbstractButton {
6969 rightMargin: units.gu(1)
7070 }
7171
72− color: "#f3f3e7"
72+ color: Theme.palette.selected.backgroundText
7373 opacity: 0.9
7474 style: Text.Raised
7575 styleColor: "black"
@@ -97,7 +97,7 @@ AbstractButton {
9797 rightMargin: units.gu(1)
9898 }
9999
100− color: "#f3f3e7"
100+ color: Theme.palette.selected.backgroundText
101101 opacity: 0.9
102102 style: Text.Raised
103103 styleColor: "black"
Dash/Video/VideoPreview.qml+3−3
@@ -48,7 +48,7 @@ DashPreview {
4848 property int buttonWidth: Math.min(units.gu(22), (width - spacing) / 2)
4949 Button {
5050 width: parent.buttonWidth
51− color: "#dd4814"
51+ color: Theme.palette.selected.foreground
5252 text: nfo.ready && nfo.video.buyPrice != "" ? "Buy for " + nfo.video.buyPrice : ""
5353 visible: text != ""
5454 iconSource: "graphics/icon_button_amazon.png"
@@ -56,7 +56,7 @@ DashPreview {
5656 }
5757 Button {
5858 width: parent.buttonWidth
59− color: "#dd4814"
59+ color: Theme.palette.selected.foreground
6060 text: nfo.ready && nfo.video.buyPrice != "" ? "Rent for " + nfo.video.rentPrice : ""
6161 visible: text != ""
6262 iconSource: "graphics/icon_button_u1.png"
@@ -73,7 +73,7 @@ DashPreview {
7373
7474 Label {
7575 text: nfo.ready ? nfo.video.plot : ""
76− color: "#f3f3e7"
76+ color: Theme.palette.selected.backgroundText
7777 opacity: .6
7878 fontSize: "medium"
7979 width: parent.width
Notifications/Notification.qml+4−4
@@ -117,7 +117,7 @@ UbuntuShape {
117117 }
118118 fontSize: "medium"
119119 font.bold: true
120− color: "#f3f3e7"
120+ color: Theme.palette.selected.backgroundText
121121 elide: Text.ElideRight
122122 }
123123
@@ -131,7 +131,7 @@ UbuntuShape {
131131 }
132132 visible: body != ""
133133 fontSize: "small"
134− color: "#f3f3e7"
134+ color: Theme.palette.selected.backgroundText
135135 opacity: 0.6
136136 wrapMode: Text.WordWrap
137137 maximumLineCount: 10
@@ -194,7 +194,7 @@ UbuntuShape {
194194 top: parent.top
195195 bottom: parent.bottom
196196 }
197− color: "#d85317"
197+ color: "#d85317" // FIXME ??
198198 visible: width > 0
199199 onClicked: notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
200200 }
@@ -241,7 +241,7 @@ UbuntuShape {
241241
242242 text: loader.actionLabel
243243 height: units.gu(4)
244− color: "#cdcdcb"
244+ color: "#cdcdcb" // FIXME ?? which color?
245245 onClicked: notification.notification.invokeAction(loader.actionId)
246246 }
247247 }
Panel/IndicatorItem.qml+1−1
@@ -47,7 +47,7 @@ Item {
4747 }
4848
4949 Rectangle {
50− color: "#dd4814"
50+ color: Theme.palette.selected.foreground
5151 objectName: "highlight"
5252 height: units.dp(2)
5353 width: parent.width
Panel/Indicators/DatetimeIndicatorPage.qml+2−2
@@ -54,7 +54,7 @@ Flickable {
5454 }
5555
5656 text: ""
57− color: "#f3f3e7"
57+ color: Theme.palette.selected.backgroundText
5858 font.weight: Font.Light
5959 font.pixelSize: units.gu(6)
6060 }
@@ -69,7 +69,7 @@ Flickable {
6969 bottomMargin: units.gu(1.5)
7070 }
7171 text: ""
72− color: "#f3f3e7"
72+ color: Theme.palette.selected.backgroundText
7373 fontSize: "small"
7474 }
7575 }
Panel/Indicators/DatetimeIndicatorWidget.qml+1−1
@@ -31,7 +31,7 @@ Indicators.IndicatorWidget {
3131 Label {
3232 id: timeLabel
3333 objectName: "timeLabel"
34− color: "#f3f3e7"
34+ color: Theme.palette.selected.backgroundText
3535 opacity: 0.8
3636 font.family: "Ubuntu"
3737 fontSize: "medium"
Panel/Indicators/DefaultIndicatorWidget.qml+1−1
@@ -52,7 +52,7 @@ Indicators.IndicatorWidget {
5252 Label {
5353 id: itemLabel
5454 objectName: "itemLabel"
55− color: "#f3f3e7"
55+ color: Theme.palette.selected.backgroundText
5656 opacity: 0.8
5757 font.family: "Ubuntu"
5858 fontSize: "medium"
Panel/MenuContent.qml+1−1
@@ -29,7 +29,7 @@ Rectangle {
2929 property bool __shown: false
3030 property bool __contentActive: false
3131 property alias currentIndex : menus.currentIndex
32− property color backgroundColor: "#221e1c"
32+ property color backgroundColor: "#221e1c" // FIXME not in palette yet
3333 property int contentReleaseInterval: 20000
3434
3535 width: units.gu(40)
Panel/Menus/Overview/FlightModeWidget.qml+1−1
@@ -40,7 +40,7 @@ Item {
4040 verticalCenter: parent.verticalCenter
4141 }
4242 text: i18n.tr("Flight mode")
43− color: "#f3f3e7"
43+ color: Theme.palette.selected.backgroundText
4444 style: Text.Raised
4545 styleColor: "black"
4646 opacity: 0.6;
Panel/Menus/Overview/OverviewGrid.qml+2−2
@@ -29,7 +29,7 @@ Item {
2929 UbuntuShape {
3030 id: gridBackground
3131 anchors.fill: grid
32− color: "#282421"
32+ color: "#282421" // FIXME missing palette
3333 radius: "medium"
3434 }
3535
@@ -80,7 +80,7 @@ Item {
8080
8181 Label {
8282 text: title
83− color: "#f3f3e7"
83+ color: Theme.palette.selected.backgroundText
8484 fontSize: "small"
8585 anchors {
8686 left: parent.left
Shell.qml+2
@@ -62,6 +62,8 @@ FocusScope {
6262 property var applicationManager: ApplicationManagerWrapper {}
6363
6464 Component.onCompleted: {
65+ Theme.name = "Ubuntu.Components.Themes.SuruGradient"
66+
6567 applicationManager.sideStageEnabled = Qt.binding(function() { return sideStage.enabled })
6668
6769 // FIXME: if application focused before shell starts, shell draws on top of it only.