Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/canIhazOrange into lp:ubuntu-ui-toolkit/staging

  1. canIhazOrange
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Tim Peeters
Approved revision: 1305
Merged at revision: 1310
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/canIhazOrange
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 120 lines (+20/-12)
5 files modified
modules/Ubuntu/Components/TextArea.qml (+1/-1)
modules/Ubuntu/Components/TextField.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/Palette.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml (+11/-6)
modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml (+5/-2)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/canIhazOrange
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
Review via email: [email protected]

Commit message

Explicitly use Orange in Slider and ProgressBar

To post a comment you must log in.
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/canIhazOrange updated
1305. By Cris Dywan

Explicitly use Orange in Slider and ProgressBar

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1305
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1166/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/999
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/998
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/998/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/998
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7443
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7443/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15030

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1166/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

looks good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/TextArea.qml'
2--- modules/Ubuntu/Components/TextArea.qml 2014-10-01 18:04:10 +0000
3+++ modules/Ubuntu/Components/TextArea.qml 2014-10-23 19:57:53 +0000
4@@ -852,7 +852,7 @@
5 }
6 color: control.__styleInstance.color
7 selectedTextColor: Theme.palette.selected.foregroundText
8- selectionColor: Theme.palette.selected.selection
9+ selectionColor: Theme.palette.selected.foreground
10 font.pixelSize: FontUtils.sizeToPixels("medium")
11 // forward keys to the root element so it can be captured outside of it
12 // as well as to InputHandler to handle PageUp/PageDown keys
13
14=== modified file 'modules/Ubuntu/Components/TextField.qml'
15--- modules/Ubuntu/Components/TextField.qml 2014-10-02 20:08:52 +0000
16+++ modules/Ubuntu/Components/TextField.qml 2014-10-23 19:57:53 +0000
17@@ -981,7 +981,7 @@
18 }
19 color: control.__styleInstance.color
20 selectedTextColor: Theme.palette.selected.foregroundText
21- selectionColor: Theme.palette.selected.selection
22+ selectionColor: Theme.palette.selected.foreground
23 font.pixelSize: FontUtils.sizeToPixels("medium")
24 passwordCharacter: "\u2022"
25 // forward keys to the root element so it can be captured outside of it
26
27=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Palette.qml'
28--- modules/Ubuntu/Components/Themes/Ambiance/Palette.qml 2014-08-25 07:37:28 +0000
29+++ modules/Ubuntu/Components/Themes/Ambiance/Palette.qml 2014-10-23 19:57:53 +0000
30@@ -34,8 +34,8 @@
31 selected: PaletteValues {
32 background: Qt.rgba(0, 0, 0, 0.05)
33 backgroundText: UbuntuColors.darkGrey
34- selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
35- foreground: UbuntuColors.orange
36+ selection: foreground // unused
37+ foreground: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
38 foregroundText: UbuntuColors.darkGrey
39 field: "#FFFFFF"
40 fieldText: UbuntuColors.darkGrey
41
42=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml'
43--- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml 2014-06-27 09:59:43 +0000
44+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml 2014-10-23 19:57:53 +0000
45@@ -20,6 +20,11 @@
46 Item {
47 id: progressBarStyle
48
49+ property color foregroundColor: UbuntuColors.orange
50+ property color foregroundTextColor: '#FFFFFF'
51+ property color backgroundColor: Theme.palette.normal.base
52+ property color backgroundTextColor: Theme.palette.normal.baseText
53+
54 property var progressBar: styledItem
55
56 implicitWidth: units.gu(38)
57@@ -31,7 +36,7 @@
58 /* The color must be white for PartialColorizeUbuntuShape to accurately
59 replace the white with leftColor and rightColor
60 */
61- color: progressBar.indeterminate ? Theme.palette.normal.base : "white"
62+ color: progressBar.indeterminate ? backgroundColor : "#FFFFFF"
63 }
64
65 property real progress: progressBar.indeterminate ? 0.0
66@@ -44,8 +49,8 @@
67 anchors.fill: background
68 sourceItem: progressBar.indeterminate ? null : background
69 progress: progressBarStyle.progress
70- leftColor: Theme.palette.selected.foreground
71- rightColor: Theme.palette.normal.base
72+ leftColor: foregroundColor
73+ rightColor: backgroundColor
74 mirror: Qt.application.layoutDirection == Qt.RightToLeft
75 }
76
77@@ -53,7 +58,7 @@
78 id: valueLabel
79 anchors.centerIn: background
80 fontSize: "medium"
81- color: Theme.palette.normal.baseText
82+ color: backgroundTextColor
83 text: progressBar.indeterminate ? i18n.tr("In Progress")
84 : "%1%".arg(Number(progressBarStyle.progress * 100.0).toFixed(0))
85 visible: !progressBar.hasOwnProperty("showProgressPercentage") || progressBar.showProgressPercentage
86@@ -73,8 +78,8 @@
87 PartialColorize {
88 anchors.fill: valueLabel
89 sourceItem: progressBar.indeterminate ? null : valueLabel
90- leftColor: Theme.palette.selected.foregroundText
91- rightColor: Theme.palette.normal.baseText
92+ leftColor: foregroundTextColor
93+ rightColor: backgroundTextColor
94 progress: (progressBarStyle.progress * background.width - valueLabel.x) / valueLabel.width
95 mirror: Qt.application.layoutDirection == Qt.RightToLeft
96 visible: !progressBar.hasOwnProperty("showProgressPercentage") || progressBar.showProgressPercentage
97
98=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
99--- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml 2014-07-25 11:27:58 +0000
100+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml 2014-10-23 19:57:53 +0000
101@@ -26,6 +26,9 @@
102 Item {
103 id: sliderStyle
104
105+ property color foregroundColor: UbuntuColors.orange
106+ property color backgroundColor: Theme.palette.normal.base
107+
108 property real thumbSpacing: units.gu(0)
109 property Item bar: background
110 property Item thumb: thumb
111@@ -49,8 +52,8 @@
112 anchors.fill: background
113 sourceItem: background
114 progress: thumb.x / thumb.barMinusThumbWidth
115- leftColor: Theme.palette.selected.foreground
116- rightColor: Theme.palette.normal.base
117+ leftColor: foregroundColor
118+ rightColor: backgroundColor
119 mirror: Qt.application.layoutDirection == Qt.RightToLeft
120 }
121

Subscribers

People subscribed via source and target branches