Merge lp:~zsombi/ubuntu-ui-toolkit/palette into lp:ubuntu-ui-toolkit/staging

Proposed by Zsombor Egri on 2015-12-03
Status: Merged
Approved by: Tim Peeters on 2016-01-15
Approved revision: 1775
Merged at revision: 1805
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/palette
Merge into: lp:ubuntu-ui-toolkit/staging
Prerequisite: lp:~zsombi/ubuntu-ui-toolkit/lambdaSegfault
Diff against target: 2104 lines (+700/-470)
57 files modified
components.api (+46/-1)
documentation/ubuntu-theming.qdoc (+0/-6)
examples/ubuntu-ui-toolkit-gallery/About.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Colors.qml (+39/-9)
examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Popover.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Template.qml (+2/-0)
src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+2/-2)
src/Ubuntu/Components/1.3/Icon.qdoc (+0/-87)
src/Ubuntu/Components/1.3/Icon.qml (+150/-0)
src/Ubuntu/Components/1.3/PageHeader.qml (+1/-1)
src/Ubuntu/Components/1.3/TextArea.qml (+1/-2)
src/Ubuntu/Components/1.3/TextField.qml (+1/-2)
src/Ubuntu/Components/1.3/Toolbar.qml (+1/-1)
src/Ubuntu/Components/1.3/UbuntuColors.qml (+65/-16)
src/Ubuntu/Components/ComponentModule.pro (+2/-1)
src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml (+9/-2)
src/Ubuntu/Components/Popups/1.3/Dialog.qml (+2/-2)
src/Ubuntu/Components/Themes/1.3/Palette.qml (+13/-1)
src/Ubuntu/Components/Themes/1.3/PaletteValues.qml (+77/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml (+47/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml (+2/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml (+10/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml (+10/-12)
src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml (+3/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml (+5/-4)
src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+3/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+28/-20)
src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml (+3/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml (+8/-8)
src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml (+26/-156)
src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml (+13/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml (+5/-0)
src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/qmldir (+1/-0)
src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml (+0/-25)
src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml (+0/-26)
src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml (+28/-20)
src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml (+47/-0)
src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro (+1/-2)
src/Ubuntu/Components/Themes/SuruDark/qmldir (+1/-0)
src/Ubuntu/Components/plugin/ucbottomedge.cpp (+1/-1)
src/Ubuntu/Components/plugin/uclabel.cpp (+1/-1)
src/Ubuntu/Components/plugin/uclistitem.cpp (+22/-22)
src/Ubuntu/Components/plugin/uclistitem_p.h (+1/-1)
src/Ubuntu/Components/qmldir (+2/-0)
tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml (+1/-1)
tests/unit_x11/tst_components/AppTheme/Palette.qml (+1/-1)
tests/unit_x11/tst_components/MockKeyboard.qml (+1/-1)
tests/unit_x11/tst_components/tst_listitem.qml (+3/-5)
tests/unit_x11/tst_components/tst_listitem13.qml (+3/-5)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/palette
Reviewer Review Type Date Requested Status
Tim Peeters Approve on 2016-01-15
PS Jenkins bot continuous-integration Approve on 2016-01-14
ubuntu-sdk-build-bot continuous-integration Needs Fixing on 2016-01-07
Christian Dywan (community) 2015-12-03 Needs Fixing on 2015-12-10
Review via email: mp+279430@code.launchpad.net

Commit message

Update Palette values for Ubuntu.Components 1.3 and apply the palette on components. First set of visual updates including ListItem, Text inputs, CheckBox, Switch, Slider, PageHeader, ActionBar and BottomEdge.

Description of the change

Update Palette values for Ubuntu.Components 1.3 and apply the palette on components. First set of visual updates including ListItem, Text inputs, CheckBox, Switch, Slider, PageHeader, ActionBar and BottomEdge.

To post a comment you must log in.
lp:~zsombi/ubuntu-ui-toolkit/palette updated on 2015-12-04
1756. By Zsombor Egri on 2015-12-04

documentation fixed

1757. By Zsombor Egri on 2015-12-04

update ListItem's divider when theme changes

lp:~zsombi/ubuntu-ui-toolkit/palette updated on 2015-12-08
1758. By Zsombor Egri on 2015-12-08

fix divider height in tests

1759. By Zsombor Egri on 2015-12-08

remove DISTFILES

lp:~zsombi/ubuntu-ui-toolkit/palette updated on 2015-12-08
1760. By Zsombor Egri on 2015-12-08

fix color issues in ListItem tests

Tim Peeters (tpeeters) wrote :

105 - * SuruDark theme overrides the Ambiance theme's ListItemStyle, therefore declares the
106 - * ListItemStyle.qml document, with the following content:
107 - * \snippet Themes/SuruDark/1.3/ListItemStyle.qml 0
108 + * SuruDark theme overrides the Ambiance theme's TabBarStyle, therefore declares the
109 + * TabBarStyle.qml document, with the following content:
110 + * \snippet Themes/SuruDark/1.3/TabBarStyle.qml 0

That is a really bad example. TabBarStyle is not used in 1.3 any more. It was used for the scrolling tab bar, but that was deprecated a long time ago.

Tim Peeters (tpeeters) wrote :

+ ---------------------------------------------------------------*/
319 + /*!
320 + Orange. Recommended for branded elements, display progress
321 + and intensity, textual links on light backgrounds.
322 + */
323 + readonly property color orange: "#E95420"

Please check this description with design. I think the goal is to use it only for focus/selection now.

Tim Peeters (tpeeters) wrote :

- color: theme.palette.normal.backgroundText
238 + color: "blue"//theme.palette.normal.base

forgot to uncomment the theme.palette.normal.base here?

Zsombor Egri (zsombi) wrote :

> 105 - * SuruDark theme overrides the Ambiance theme's ListItemStyle,
> therefore declares the
> 106 - * ListItemStyle.qml document, with the following content:
> 107 - * \snippet Themes/SuruDark/1.3/ListItemStyle.qml 0
> 108 + * SuruDark theme overrides the Ambiance theme's TabBarStyle,
> therefore declares the
> 109 + * TabBarStyle.qml document, with the following content:
> 110 + * \snippet Themes/SuruDark/1.3/TabBarStyle.qml 0
>
> That is a really bad example. TabBarStyle is not used in 1.3 any more. It was
> used for the scrolling tab bar, but that was deprecated a long time ago.

Then why the hell do we have it still?!

Christian Dywan (kalikiana) wrote :

+++ src/Ubuntu/Components/1.3/Icon.qml 2015-12-08 10:34:40 +0000

+ * Copyright (C) 2014 Canonical, Ltd.

It's 2015. And your name is missing from the header.

+ if (icon.hasOwnProperty("source"))
+ return icon.source;

This will always be true. It should just be source: icon.source.

+++ src/Ubuntu/Components/1.3/TextArea.qml 2015-12-08 10:34:40 +0000

- color: theme.palette.normal.backgroundText
238 + color: "blue"//theme.palette.normal.base

What's this?

+++ src/Ubuntu/Components/1.3/UbuntuColors.qml 2015-12-08 10:34:40 +0000

+ Orange. Recommended for branded elements, display progress
321 + and intensity, textual links on light backgrounds.

This is wrong. Orange should only be used for keyboard focus visuals now.

+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml 2015-12-08 10:34:40 +0000

+ // FIXME: introduce inactiveForegroundColor to PageHeaderStyle
810 foregroundColor: pageHeaderStyle.foregroundColor

Is design input missing here? Or is this depending on work in the header? A bug should be filed in any case.

+++ src/Ubuntu/Components/Themes/SuruDark/1.3/TabBarStyle.qml 2015-12-08 10:34:40 +0000

-
1428 +//![0]

What sorcery is this?

review: Needs Fixing
Zsombor Egri (zsombi) wrote :

> +++ src/Ubuntu/Components/1.3/Icon.qml 2015-12-08 10:34:40 +0000
>
> + * Copyright (C) 2014 Canonical, Ltd.
>
> It's 2015. And your name is missing from the header.
>
> + if (icon.hasOwnProperty("source"))
> + return icon.source;
>
> This will always be true. It should just be source: icon.source.

All true. Fixed.

>
> +++ src/Ubuntu/Components/1.3/TextArea.qml 2015-12-08 10:34:40 +0000
>
> - color: theme.palette.normal.backgroundText
> 238 + color: "blue"//theme.palette.normal.base
>
> What's this?

A bug :)

>
> +++ src/Ubuntu/Components/1.3/UbuntuColors.qml 2015-12-08 10:34:40 +0000
>
> + Orange. Recommended for branded elements, display progress
> 321 + and intensity, textual links on light backgrounds.
>
> This is wrong. Orange should only be used for keyboard focus visuals now.

Not only. Orange is used for selections too, with transparency.

>
> +++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml
> 2015-12-08 10:34:40 +0000
>
> + // FIXME: introduce inactiveForegroundColor to PageHeaderStyle
> 810 foregroundColor: pageHeaderStyle.foregroundColor
>
> Is design input missing here? Or is this depending on work in the header? A
> bug should be filed in any case.

I did not wanted to mess up with Tim's work, beside design needs to figure this out as well.

>
> +++ src/Ubuntu/Components/Themes/SuruDark/1.3/TabBarStyle.qml 2015-12-08
> 10:34:40 +0000
>
> -
> 1428 +//![0]
>
> What sorcery is this?

Learned from Merlin ;)

lp:~zsombi/ubuntu-ui-toolkit/palette updated on 2015-12-14
1761. By Zsombor Egri on 2015-12-14

1.3 Icon fix

1762. By Zsombor Egri on 2015-12-14

fixing alias bug and wrong hint coloring in TextArea

1763. By Zsombor Egri on 2015-12-14

remove reference to TabBarStyle

1764. By Zsombor Egri on 2015-12-14

fix UbuntuColors grey names

1765. By Zsombor Egri on 2015-12-14

staging sync

1766. By Zsombor Egri on 2015-12-14

fix Label's default color

review: Approve (continuous-integration)

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/7/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/7/console

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/22/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/22/console

review: Needs Fixing (continuous-integration)
lp:~zsombi/ubuntu-ui-toolkit/palette updated on 2016-01-13
1767. By Zsombor Egri on 2016-01-13

staging sync

1768. By Zsombor Egri on 2016-01-13

update colors

1769. By Zsombor Egri on 2016-01-13

small tweaks

1770. By Zsombor Egri on 2016-01-13

replace lightGreay and darkGrey colors

1771. By Zsombor Egri on 2016-01-13

fix Popups gallery page

lp:~zsombi/ubuntu-ui-toolkit/palette updated on 2016-01-13
1772. By Zsombor Egri on 2016-01-13

API fixed

1773. By Zsombor Egri on 2016-01-13

update BottomEdgeHint artwork

lp:~zsombi/ubuntu-ui-toolkit/palette updated on 2016-01-14
1774. By Zsombor Egri on 2016-01-14

adjust AppTheme palette to override Label's default coloring palette value

Tim Peeters (tpeeters) wrote :
review: Needs Information
Tim Peeters (tpeeters) wrote :

^the unselected Sections also became blue.

Tim Peeters (tpeeters) wrote :

So the old list items, Sections and the Labels in OverflowPanel need to have their color updated. Other than that, the MR looks good!

lp:~zsombi/ubuntu-ui-toolkit/palette updated on 2016-01-14
1775. By Zsombor Egri on 2016-01-14

ActionButton, Section and ListItem.LabelVisual color fixed

Tim Peeters (tpeeters) wrote :

Looks good, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components.api'
2--- components.api 2015-12-22 09:26:26 +0000
3+++ components.api 2016-01-14 15:11:00 +0000
4@@ -498,6 +498,11 @@
5 property string name
6 Ubuntu.Components.Icon 1.1: Icon
7 property url source
8+Ubuntu.Components.Icon 1.3: Item
9+ property color color
10+ property color keyColor
11+ property string name
12+ property url source
13 Ubuntu.Components.InverseMouse 1.0 0.1 UCInverseMouse: Mouse
14 Ubuntu.Components.InverseMouseArea 1.0 0.1 InverseMouseAreaType: MouseArea
15 function bool contains(QPointF point)
16@@ -831,8 +836,10 @@
17 property PaletteValues normal
18 property PaletteValues selected
19 Ubuntu.Components.Themes.Palette 1.3: QtObject
20+ property PaletteValues inactive
21 property PaletteValues normal
22 property PaletteValues selected
23+ property PaletteValues selectedInactive
24 Ubuntu.Components.Themes.PaletteValues 0.1: QtObject
25 property color background
26 property color backgroundText
27@@ -846,7 +853,11 @@
28 property color overlayText
29 property color selection
30 Ubuntu.Components.Themes.PaletteValues 1.3: QtObject
31+ property color activity
32+ property color activityText
33 property color background
34+ property color backgroundSecondaryText
35+ property color backgroundTertiaryText
36 property color backgroundText
37 property color base
38 property color baseText
39@@ -854,9 +865,18 @@
40 property color fieldText
41 property color foreground
42 property color foregroundText
43+ property color negative
44+ property color negativeText
45 property color overlay
46+ property color overlaySecondaryText
47 property color overlayText
48+ property color positive
49+ property color positiveText
50+ property color raised
51+ property color raisedSecondaryText
52+ property color raisedText
53 property color selection
54+ property color selectionText
55 Ubuntu.Components.Panel 1.0 0.1: Item
56 property int align
57 property bool animate
58@@ -965,7 +985,10 @@
59 property bool onScreen
60 property bool showProgressPercentage
61 property double value
62-Ubuntu.Components.ProgressionSlot 1.3: Icon
63+Ubuntu.Components.ProgressionSlot 1.3: Item
64+ property color color
65+ property color keyColor
66+ property string name
67 property url source
68 Ubuntu.Components.ProportionalShape 1.3 UCProportionalShape: UbuntuShape
69 Ubuntu.Components.PullToRefresh 1.1: StyledItem
70@@ -1561,6 +1584,28 @@
71 readonly property color purple
72 readonly property color red
73 readonly property color warmGrey
74+Ubuntu.Components.UbuntuColors 1.3: QtObject singleton
75+ readonly property color ash
76+ readonly property color blue
77+ readonly property color coolGrey
78+ readonly property color darkAubergine
79+ readonly property color darkGrey
80+ readonly property color graphite
81+ readonly property color green
82+ property Gradient greyGradient
83+ readonly property color inkstone
84+ readonly property color jet
85+ readonly property color lightAubergine
86+ readonly property color lightGrey
87+ readonly property color midAubergine
88+ readonly property color orange
89+ property Gradient orangeGradient
90+ readonly property color porcelain
91+ readonly property color purple
92+ readonly property color red
93+ readonly property color silk
94+ readonly property color slate
95+ readonly property color warmGrey
96 Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
97 property int expandedIndex
98 Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
99
100=== modified file 'documentation/ubuntu-theming.qdoc'
101--- documentation/ubuntu-theming.qdoc 2015-08-11 10:01:34 +0000
102+++ documentation/ubuntu-theming.qdoc 2016-01-14 15:11:00 +0000
103@@ -270,17 +270,11 @@
104 * The extended (or even overridden) style component documents must follow the naming
105 * convention, and must have the names implied by the components styled.
106 *
107- * SuruDark theme overrides the Ambiance theme's ListItemStyle, therefore declares the
108- * ListItemStyle.qml document, with the following content:
109- * \snippet Themes/SuruDark/1.3/ListItemStyle.qml 0
110- *
111 * The style imports the Ambiance theme module, and extends the Ambiance ListItemStyle
112 * component. The same is done in the other style components. However, Palette defines
113 * own values, and does not re-use Ambiance palette values.
114 * \snippet Themes/SuruDark/1.3/Palette.qml 0
115 *
116- * The same is done with TabBarStyle and OptionSelectorStyle components.
117- *
118 * \note If a theme derived from SuruDark wants to override style components not present
119 * in SuruDark, they must import the SuruDark's parent theme in the style component.
120 * As example, if FancyTheme would want to override the SwitchStyle, it would need to
121
122=== modified file 'examples/ubuntu-ui-toolkit-gallery/About.qml'
123--- examples/ubuntu-ui-toolkit-gallery/About.qml 2015-10-23 14:46:16 +0000
124+++ examples/ubuntu-ui-toolkit-gallery/About.qml 2016-01-14 15:11:00 +0000
125@@ -23,7 +23,7 @@
126 theme: ThemeSettings {
127 name: "Ubuntu.Components.Themes.SuruDark"
128 palette: Palette {
129- normal.background: UbuntuColors.darkGrey
130+ normal.background: UbuntuColors.slate
131 }
132 }
133 style: Rectangle {
134
135=== modified file 'examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml'
136--- examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml 2015-12-02 08:23:14 +0000
137+++ examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml 2016-01-14 15:11:00 +0000
138@@ -132,7 +132,7 @@
139 objectName: "CustomRegion1"
140 enabled: regionConfig.model >= 1
141 to: 0.3
142- property color baseColor: UbuntuColors.lightGrey
143+ property color baseColor: UbuntuColors.silk
144 },
145 BottomEdgeRegion {
146 objectName: "CustomRegion2"
147
148=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
149--- examples/ubuntu-ui-toolkit-gallery/Colors.qml 2015-07-22 13:14:43 +0000
150+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml 2016-01-14 15:11:00 +0000
151@@ -33,15 +33,45 @@
152 }
153 }
154 TemplateRow {
155- title: i18n.tr("Light grey")
156- UbuntuShape {
157- backgroundColor: UbuntuColors.lightGrey
158- }
159- }
160- TemplateRow {
161- title: i18n.tr("Dark grey")
162- UbuntuShape {
163- backgroundColor: UbuntuColors.darkGrey
164+ title: i18n.tr("Porcelain")
165+ UbuntuShape {
166+ backgroundColor: UbuntuColors.porcelain
167+ }
168+ }
169+ TemplateRow {
170+ title: i18n.tr("Silk")
171+ UbuntuShape {
172+ backgroundColor: UbuntuColors.silk
173+ }
174+ }
175+ TemplateRow {
176+ title: i18n.tr("Ash")
177+ UbuntuShape {
178+ backgroundColor: UbuntuColors.ash
179+ }
180+ }
181+ TemplateRow {
182+ title: i18n.tr("Graphite")
183+ UbuntuShape {
184+ backgroundColor: UbuntuColors.graphite
185+ }
186+ }
187+ TemplateRow {
188+ title: i18n.tr("Slate")
189+ UbuntuShape {
190+ backgroundColor: UbuntuColors.slate
191+ }
192+ }
193+ TemplateRow {
194+ title: i18n.tr("Inkstone")
195+ UbuntuShape {
196+ backgroundColor: UbuntuColors.inkstone
197+ }
198+ }
199+ TemplateRow {
200+ title: i18n.tr("Jet")
201+ UbuntuShape {
202+ backgroundColor: UbuntuColors.jet
203 }
204 }
205 TemplateRow {
206
207=== modified file 'examples/ubuntu-ui-toolkit-gallery/NewListItems.qml'
208--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml 2015-09-28 12:26:13 +0000
209+++ examples/ubuntu-ui-toolkit-gallery/NewListItems.qml 2016-01-14 15:11:00 +0000
210@@ -163,7 +163,7 @@
211 model: [ i18n.tr("Basic"), i18n.tr("Colored divider"), i18n.tr("Immutable"), i18n.tr("No divider") ]
212 delegate: ListItemWithLabel {
213 title.text: modelData
214- color: dragging ? "lightblue" : "transparent"
215+ color: dragging ? theme.palette.selected.base : "transparent"
216 divider {
217 colorFrom: modelData == i18n.tr("Colored divider") ? UbuntuColors.red : Qt.rgba(0.0, 0.0, 0.0, 0.0)
218 colorTo: modelData == i18n.tr("Colored divider") ? UbuntuColors.green : Qt.rgba(0.0, 0.0, 0.0, 0.0)
219
220=== modified file 'examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml'
221--- examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml 2015-12-15 15:08:49 +0000
222+++ examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml 2016-01-14 15:11:00 +0000
223@@ -81,7 +81,7 @@
224 width: label.width + units.gu(4)
225 height: parent.height
226 Rectangle {
227- color: UbuntuColors.darkGrey
228+ color: UbuntuColors.slate
229 opacity: 0.1
230 anchors.fill: parent
231 visible: button.pressed
232
233=== modified file 'examples/ubuntu-ui-toolkit-gallery/Popover.qml'
234--- examples/ubuntu-ui-toolkit-gallery/Popover.qml 2015-06-24 16:16:51 +0000
235+++ examples/ubuntu-ui-toolkit-gallery/Popover.qml 2016-01-14 15:11:00 +0000
236@@ -21,7 +21,7 @@
237 Template {
238 objectName: "popoversTemplate"
239
240- head.actions: [
241+ trailingActions: [
242 Action {
243 text: "Actions"
244 iconSource: "call_icon.png"
245
246=== modified file 'examples/ubuntu-ui-toolkit-gallery/Template.qml'
247--- examples/ubuntu-ui-toolkit-gallery/Template.qml 2015-12-16 15:02:33 +0000
248+++ examples/ubuntu-ui-toolkit-gallery/Template.qml 2016-01-14 15:11:00 +0000
249@@ -23,12 +23,14 @@
250 default property alias content: column.children
251 property alias spacing: column.spacing
252 property alias scrollable: templateFlickable.interactive
253+ property list<Action> trailingActions
254 flickable: templateFlickable
255
256 header: PageHeader {
257 title: template.title
258 flickable: layout.columns === 1 ? templateFlickable : null
259 onFlickableChanged: exposed = true;
260+ trailingActionBar.actions: trailingActions
261 }
262
263 ScrollView {
264
265=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
266--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml 2016-01-06 11:24:54 +0000
267+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml 2016-01-14 15:11:00 +0000
268@@ -810,7 +810,7 @@
269 rightMargin: dividerThickness
270 }
271 width: (column == (d.columns - 1)) || !pageWrapper ? 0 : units.dp(1)
272- color: theme.palette.selected.background
273+ color: theme.palette.normal.base
274 MouseArea {
275 id: resizerSensing
276 objectName: "Divider"
277@@ -835,7 +835,7 @@
278 when: resizerSensing.pressed
279 PropertyChanges {
280 target: verticalDivider
281- color: Qt.darker(theme.palette.normal.background, 1.5)
282+ color: Qt.darker(theme.palette.normal.background, 1.7)
283 }
284 }
285 transitions: Transition {
286
287=== removed file 'src/Ubuntu/Components/1.3/Icon.qdoc'
288--- src/Ubuntu/Components/1.3/Icon.qdoc 2015-04-25 08:54:58 +0000
289+++ src/Ubuntu/Components/1.3/Icon.qdoc 1970-01-01 00:00:00 +0000
290@@ -1,87 +0,0 @@
291-/*
292- * Copyright (C) 2014 Canonical, Ltd.
293- *
294- * This program is free software; you can redistribute it and/or modify
295- * it under the terms of the GNU General Public License as published by
296- * the Free Software Foundation; version 3.
297- *
298- * This program is distributed in the hope that it will be useful,
299- * but WITHOUT ANY WARRANTY; without even the implied warranty of
300- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
301- * GNU General Public License for more details.
302- *
303- * You should have received a copy of the GNU General Public License
304- * along with this program. If not, see <http://www.gnu.org/licenses/>.
305- */
306-
307-/*!
308- \qmltype Icon
309- \inqmlmodule Ubuntu.Components 1.1
310- \ingroup ubuntu
311- \brief The Icon component displays an icon from the icon theme.
312-
313- The icon theme contains a set of standard icons referred to by their name.
314- Using icons whenever possible enhances consistency accross applications.
315- Each icon has a name and can have different visual representations depending
316- on the size requested.
317-
318- Icons can also be colorized. Setting the \l color property will make all pixels
319- with the \l keyColor (by default #808080) colored.
320-
321- Example:
322- \qml
323- Icon {
324- width: 64
325- height: 64
326- name: "search"
327- }
328- \endqml
329-
330- Example of colorization:
331- \qml
332- Icon {
333- width: 64
334- height: 64
335- name: "search"
336- color: UbuntuColors.warmGrey
337- }
338- \endqml
339-
340- Icon themes are created following the
341- \l{http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}{Freedesktop Icon Theme Specification}.
342-*/
343-
344-/*!
345- The name of the icon to display.
346- \qmlproperty string Icon::name
347-
348- If both name and source are set, name will be ignored.
349-
350- \note The complete list of icons available in Ubuntu is not published yet.
351- For now please refer to the folders where the icon themes are installed:
352- \list
353- \li Ubuntu Touch: \l file:/usr/share/icons/suru
354- \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
355- \endlist
356- These 2 separate icon themes will be merged soon.
357-*/
358-
359-/*!
360- The source url of the icon to display. It has precedence over name.
361-
362- If both name and source are set, name will be ignored.
363-
364- \since Ubuntu.Components 1.1
365- \qmlproperty url Icon::source
366-*/
367-
368-/*!
369- The color that all pixels that originally are of color \l keyColor should take.
370- \qmlproperty color Icon::color
371-*/
372-
373-/*!
374- The color of the pixels that should be colorized.
375- By default it is set to #808080.
376- \qmlproperty color Icon::keyColor
377-*/
378
379=== added file 'src/Ubuntu/Components/1.3/Icon.qml'
380--- src/Ubuntu/Components/1.3/Icon.qml 1970-01-01 00:00:00 +0000
381+++ src/Ubuntu/Components/1.3/Icon.qml 2016-01-14 15:11:00 +0000
382@@ -0,0 +1,150 @@
383+/*
384+ * Copyright (C) 2015 Canonical, Ltd.
385+ *
386+ * This program is free software; you can redistribute it and/or modify
387+ * it under the terms of the GNU General Public License as published by
388+ * the Free Software Foundation; version 3.
389+ *
390+ * This program is distributed in the hope that it will be useful,
391+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
392+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
393+ * GNU General Public License for more details.
394+ *
395+ * You should have received a copy of the GNU General Public License
396+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
397+ *
398+ * Authors: Zsombor Egri <zsombor.egri@canonical.com>
399+ * Loic Molinari <loic.molinari@canonical.com>
400+ */
401+
402+import QtQuick 2.4
403+
404+/*!
405+ \qmltype Icon
406+ \inqmlmodule Ubuntu.Components 1.3
407+ \inherits Item
408+ \ingroup ubuntu
409+ \brief The Icon component displays an icon from the icon theme.
410+
411+ The icon theme contains a set of standard icons referred to by their name.
412+ Using icons whenever possible enhances consistency accross applications.
413+ Each icon has a name and can have different visual representations depending
414+ on the size requested.
415+
416+ Icons can also be colorized. Setting the \l color property will make all pixels
417+ with the \l keyColor (by default #808080) colored.
418+
419+ Example:
420+ \qml
421+ Icon {
422+ width: 64
423+ height: 64
424+ name: "search"
425+ }
426+ \endqml
427+
428+ Example of colorization:
429+ \qml
430+ Icon {
431+ width: 64
432+ height: 64
433+ name: "search"
434+ color: UbuntuColors.warmGrey
435+ }
436+ \endqml
437+
438+ Icon themes are created following the
439+ \l{http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}{Freedesktop Icon Theme Specification}.
440+*/
441+
442+Item {
443+ id: icon
444+
445+ /*!
446+ The name of the icon to display.
447+ \qmlproperty string Icon::name
448+
449+ If both name and source are set, name will be ignored.
450+
451+ \note The complete list of icons available in Ubuntu is not published yet.
452+ For now please refer to the folders where the icon themes are installed:
453+ \list
454+ \li Ubuntu Touch: \l file:/usr/share/icons/suru
455+ \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
456+ \endlist
457+ These 2 separate icon themes will be merged soon.
458+ */
459+ property string name
460+
461+ /*!
462+ The color that all pixels that originally are of color \l keyColor should take.
463+ \qmlproperty color Icon::color
464+ */
465+
466+ property alias color: colorizedImage.keyColorOut
467+
468+ /*!
469+ The color of the pixels that should be colorized.
470+ By default it is set to #808080.
471+ \qmlproperty color Icon::keyColor
472+ */
473+ property alias keyColor: colorizedImage.keyColorIn
474+
475+ /*!
476+ The source url of the icon to display. It has precedence over name.
477+
478+ If both name and source are set, name will be ignored.
479+
480+ \since Ubuntu.Components 1.1
481+ \qmlproperty url Icon::source
482+ */
483+
484+ property alias source: image.source
485+
486+ implicitWidth: image.implicitWidth
487+ implicitHeight: image.implicitHeight
488+
489+ Image {
490+ id: image
491+ objectName: "image"
492+ anchors.fill: parent
493+ fillMode: Image.PreserveAspectFit
494+
495+ sourceSize {
496+ width: icon.width
497+ height: icon.height
498+ }
499+
500+ source: icon.name ? "image://theme/%1".arg(icon.name) : ""
501+
502+ cache: true
503+ visible: !colorizedImage.visible
504+ }
505+
506+ ShaderEffect {
507+ id: colorizedImage
508+ objectName: "shader"
509+
510+ anchors.fill: parent
511+
512+ // Whether or not a color has been set.
513+ visible: image.status == Image.Ready && keyColorOut != Qt.rgba(0.0, 0.0, 0.0, 0.0)
514+
515+ property Image source: image
516+ property color keyColorOut: Qt.rgba(0.0, 0.0, 0.0, 0.0)
517+ property color keyColorIn: "#808080"
518+ property real threshold: 0.1
519+
520+ fragmentShader: "
521+ varying highp vec2 qt_TexCoord0;
522+ uniform sampler2D source;
523+ uniform highp vec4 keyColorOut;
524+ uniform highp vec4 keyColorIn;
525+ uniform lowp float threshold;
526+ uniform lowp float qt_Opacity;
527+ void main() {
528+ lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
529+ gl_FragColor = mix(keyColorOut * vec4(sourceColor.a), sourceColor, step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity;
530+ }"
531+ }
532+}
533
534=== modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
535--- src/Ubuntu/Components/1.3/PageHeader.qml 2015-12-15 14:20:33 +0000
536+++ src/Ubuntu/Components/1.3/PageHeader.qml 2016-01-14 15:11:00 +0000
537@@ -32,7 +32,7 @@
538 StyleHints {
539 foregroundColor: UbuntuColors.orange
540 backgroundColor: "black"
541- dividerColor: UbuntuColors.darkGrey
542+ dividerColor: UbuntuColors.slate
543 }
544 }
545 \endqml
546
547=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
548--- src/Ubuntu/Components/1.3/TextArea.qml 2015-12-14 15:15:46 +0000
549+++ src/Ubuntu/Components/1.3/TextArea.qml 2016-01-14 15:11:00 +0000
550@@ -757,7 +757,6 @@
551
552 //internals
553
554- opacity: enabled ? 1.0 : 0.3
555 activeFocusOnPress: true
556 activeFocusOnTab: true
557
558@@ -827,7 +826,7 @@
559 }
560 // hint is shown till user types something in the field
561 visible: (editor.text == "") && !editor.inputMethodComposing
562- color: theme.palette.normal.backgroundText
563+ color: theme.palette.normal.base
564 font: editor.font
565 elide: Text.ElideRight
566 wrapMode: Text.WordWrap
567
568=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
569--- src/Ubuntu/Components/1.3/TextField.qml 2015-12-22 09:56:19 +0000
570+++ src/Ubuntu/Components/1.3/TextField.qml 2016-01-14 15:11:00 +0000
571@@ -833,7 +833,6 @@
572
573 // internals
574
575- opacity: enabled ? 1.0 : 0.3
576 activeFocusOnPress: true
577 activeFocusOnTab: true
578
579@@ -977,7 +976,7 @@
580 }
581 // hint is shown till user types something in the field
582 visible: (editor.text == "") && !editor.inputMethodComposing
583- color: theme.palette.normal.backgroundText
584+ color: theme.palette.normal.base
585 font: editor.font
586 elide: Text.ElideRight
587 }
588
589=== modified file 'src/Ubuntu/Components/1.3/Toolbar.qml'
590--- src/Ubuntu/Components/1.3/Toolbar.qml 2015-12-15 15:08:49 +0000
591+++ src/Ubuntu/Components/1.3/Toolbar.qml 2016-01-14 15:11:00 +0000
592@@ -35,7 +35,7 @@
593 width: label.width + units.gu(4)
594 height: parent.height
595 Rectangle {
596- color: UbuntuColors.darkGrey
597+ color: UbuntuColors.slate
598 opacity: 0.1
599 anchors.fill: parent
600 visible: button.pressed
601
602=== modified file 'src/Ubuntu/Components/1.3/UbuntuColors.qml'
603--- src/Ubuntu/Components/1.3/UbuntuColors.qml 2015-04-25 08:54:58 +0000
604+++ src/Ubuntu/Components/1.3/UbuntuColors.qml 2016-01-14 15:11:00 +0000
605@@ -19,7 +19,7 @@
606
607 /*!
608 \qmltype UbuntuColors
609- \inqmlmodule Ubuntu.Components 1.1
610+ \inqmlmodule Ubuntu.Components 1.3
611 \ingroup ubuntu
612 \brief Singleton defining the Ubuntu color palette.
613
614@@ -37,13 +37,10 @@
615 \endqml
616 */
617 QtObject {
618- // old colors from UbuntuColors 1.0:
619
620- /*!
621- Orange. Recommended for branded elements, display progress
622- and intensity, textual links on light backgrounds.
623- */
624- readonly property color orange: "#DD4814"
625+ /*---------------------------------------------------------------
626+ Deprecated colors
627+ ---------------------------------------------------------------*/
628 /*!
629 \deprecated
630 Ubuntu supporting color: light aubergine
631@@ -72,7 +69,7 @@
632
633 /*!
634 Ubuntu orange gradient
635-
636+ \deprecated
637 \sa Button::gradient
638 */
639 property Gradient orangeGradient: Gradient {
640@@ -81,7 +78,7 @@
641 }
642 /*!
643 Ubuntu grey gradient
644-
645+ \deprecated
646 \sa Button::gradient
647 */
648 property Gradient greyGradient: Gradient {
649@@ -89,39 +86,61 @@
650 GradientStop { position: 1.0; color: "#BBBBBB" }
651 }
652
653- // New colors introduced in UbuntuColors 1.1:
654+ /*---------------------------------------------------------------
655+ Supported colors
656+ ---------------------------------------------------------------*/
657+ /*!
658+ Orange. Recommended for branded elements, display progress
659+ and intensity, textual links on light backgrounds.
660+ */
661+ readonly property color orange: "#E95420"
662
663 /*!
664+ \deprecated
665 Light grey. Recommended for neutral action buttons and
666 secondary text.
667 \since Ubuntu.Components 1.1
668 */
669- readonly property color lightGrey: "#929292"
670-
671- /*!
672+ readonly property color lightGrey: "#cdcdcd"
673+
674+ /*!
675+ Silk. Recommended for neutral action buttons and
676+ secondary text.
677+ \since Ubuntu.Components 1.3
678+ */
679+ readonly property color silk: "#cdcdcd"
680+
681+ /*!
682+ \deprecated
683 Dark grey. Recommended for text and action icons.
684 \since Ubuntu.Components 1.1
685 */
686 readonly property color darkGrey: "#5d5d5d"
687
688 /*!
689+ Slate. Recommended for text and action icons.
690+ \since Ubuntu.Components 1.3
691+ */
692+ readonly property color slate: "#5d5d5d"
693+
694+ /*!
695 Red. Recommended for negative and irreversible action
696 buttons, errors and alerts.
697 \since Ubuntu.Components 1.1
698 */
699- readonly property color red: "#f32c36"
700+ readonly property color red: "#ed3146"
701
702 /*!
703 Green. Recommended for positive action buttons.
704 \since Ubuntu.Components 1.1
705 */
706- readonly property color green: "#00a132"
707+ readonly property color green: "#3eb34f"
708
709 /*!
710 Blue. Recommended for text selection and text cursor.
711 \since Ubuntu.Components 1.1
712 */
713- readonly property color blue: "#12a3d8"
714+ readonly property color blue: "#19b6ee"
715
716 /*!
717 Purple. Recommended for proper nouns in
718@@ -129,4 +148,34 @@
719 \since Ubuntu.Components 1.1
720 */
721 readonly property color purple: "#762572"
722+
723+ /*!
724+ Porcelain. Recommended for foregrounds.
725+ \since Ubuntu.Components 1.3
726+ */
727+ readonly property color porcelain: "#f7f7f7"
728+
729+ /*!
730+ Ash. Recommended for subtitles and other tertiary content.
731+ \since Ubuntu.Components 1.3
732+ */
733+ readonly property color ash: "#888888"
734+
735+ /*!
736+ Graphite. Recommended for coloring dark themes' background.
737+ \since Ubuntu.Components 1.3
738+ */
739+ readonly property color graphite: "#666666"
740+
741+ /*!
742+ Inkstone. Recommended for foreground colors in dark themes.
743+ \since Ubuntu.Components 1.3
744+ */
745+ readonly property color inkstone: "#3b3b3b"
746+
747+ /*!
748+ Jet. Recommended for content coloring.
749+ \since Ubuntu.Components 1.3
750+ */
751+ readonly property color jet: "#292929"
752 }
753
754=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
755--- src/Ubuntu/Components/ComponentModule.pro 2015-12-17 13:48:23 +0000
756+++ src/Ubuntu/Components/ComponentModule.pro 2016-01-14 15:11:00 +0000
757@@ -131,7 +131,8 @@
758 1.3/PageColumnsLayout.qml \
759 1.3/ProgressionSlot.qml \
760 1.3/ScrollView.qml \
761- 1.3/PageHeader.qml
762+ 1.3/PageHeader.qml \
763+ 1.3/Icon.qml
764
765 OTHER_FILES+= qmldir \
766 1.3/CrossFadeImage.qdoc \
767
768=== modified file 'src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml'
769--- src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml 2015-09-07 10:05:58 +0000
770+++ src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml 2016-01-14 15:11:00 +0000
771@@ -31,7 +31,14 @@
772 }
773
774 elide: Text.ElideRight
775- color: selected ? UbuntuColors.orange : secondary ? overlay ? theme.palette.normal.overlayText : theme.palette.normal.backgroundText
776- : overlay ? theme.palette.selected.overlayText : theme.palette.selected.backgroundText
777+ color: selected
778+ ? UbuntuColors.orange
779+ : (secondary
780+ ? (overlay
781+ ? theme.palette.normal.overlayText
782+ : theme.palette.normal.backgroundText)
783+ : (overlay
784+ ? theme.palette.normal.overlayText
785+ : theme.palette.normal.backgroundText))
786 opacity: label.enabled ? 1.0 : 0.5
787 }
788
789=== modified file 'src/Ubuntu/Components/Popups/1.3/Dialog.qml'
790--- src/Ubuntu/Components/Popups/1.3/Dialog.qml 2015-12-22 14:42:59 +0000
791+++ src/Ubuntu/Components/Popups/1.3/Dialog.qml 2016-01-14 15:11:00 +0000
792@@ -194,14 +194,14 @@
793 maximumLineCount: 2
794 elide: Text.ElideRight
795 textSize: Label.Large
796- color: UbuntuColors.darkGrey
797+ color: UbuntuColors.slate
798 visible: (text !== "")
799 }
800
801 Label {
802 horizontalAlignment: Text.AlignHCenter
803 text: dialog.text
804- color: UbuntuColors.darkGrey
805+ color: UbuntuColors.slate
806 wrapMode: Text.Wrap
807 visible: (text !== "")
808 }
809
810=== modified file 'src/Ubuntu/Components/Themes/1.3/Palette.qml'
811--- src/Ubuntu/Components/Themes/1.3/Palette.qml 2015-04-24 14:34:39 +0000
812+++ src/Ubuntu/Components/Themes/1.3/Palette.qml 2016-01-14 15:11:00 +0000
813@@ -48,12 +48,24 @@
814 */
815 QtObject {
816 /*!
817- Color palette to use when the widget is not in any particular state.
818+ Color palette to use when the widget is in the default state.
819 */
820 property PaletteValues normal: PaletteValues{}
821+
822+ /*!
823+ Color palette to use when the widget is in the inactive (disabled) state.
824+ */
825+ property PaletteValues inactive: PaletteValues{}
826+
827 /*!
828 Color palette to use when the widget is selected, for example when
829 a tab is the current one.
830 */
831 property PaletteValues selected: PaletteValues{}
832+
833+ /*!
834+ Color palette values to use when the widget is selected and inactive.
835+ \since Ubuntu.Components.Themes 1.3
836+ */
837+ property PaletteValues selectedInactive: PaletteValues{}
838 }
839
840=== modified file 'src/Ubuntu/Components/Themes/1.3/PaletteValues.qml'
841--- src/Ubuntu/Components/Themes/1.3/PaletteValues.qml 2015-04-24 14:34:39 +0000
842+++ src/Ubuntu/Components/Themes/1.3/PaletteValues.qml 2016-01-14 15:11:00 +0000
843@@ -33,6 +33,17 @@
844 */
845 property color backgroundText
846 /*!
847+ Color applied to secondary content on the \l background color.
848+ \since Ubuntu.Components.Themes 1.3
849+ */
850+ property color backgroundSecondaryText
851+ /*!
852+ Color applied to tertiary content on the \l background color.
853+ \since Ubuntu.Components.Themes 1.3
854+ */
855+ property color backgroundTertiaryText
856+
857+ /*!
858 Color applied to the background of widgets.
859 */
860 property color base
861@@ -41,6 +52,7 @@
862 Typically used for labels and images.
863 */
864 property color baseText
865+
866 /*!
867 Color applied to widgets on top of the base colour.
868 */
869@@ -50,9 +62,26 @@
870 Typically used for labels and images.
871 */
872 property color foregroundText
873+
874+ /*!
875+ Color applied to widgets on top of any layer, background or base.
876+ \since Ubuntu.Components.Themes 1.3
877+ */
878+ property color raised
879+ /*!
880+ Color applied to elements placed on top of the \l raised color.
881+ \since Ubuntu.Components.Themes 1.3
882+ */
883+ property color raisedText
884+ /*!
885+ Color applied to seconday elements placed on top of the \l raised color.
886+ \since Ubuntu.Components.Themes 1.3
887+ */
888+ property color raisedSecondaryText
889+
890 /*!
891 Color applied to the background of widgets floating over other widgets.
892- For example: popovers, Toolbar.
893+ For example popovers, menus, dialogs.
894 */
895 property color overlay
896 /*!
897@@ -61,7 +90,13 @@
898 */
899 property color overlayText
900 /*!
901- Colour applied to the backgrouhnd of text input fields.
902+ Color applied to secondary elements placed on top of the \l overlay color.
903+ \since Ubuntu.Components.Themes 1.3
904+ */
905+ property color overlaySecondaryText
906+
907+ /*!
908+ Colour applied to the background of text input fields.
909 */
910 property color field
911 /*!
912@@ -69,8 +104,48 @@
913 Typically used for labels and images.
914 */
915 property color fieldText
916+
917+ /*!
918+ Colour applied to the positive actions.
919+ \since Ubuntu.Components.Themes 1.3
920+ */
921+ property color positive
922+ /*!
923+ Color applied to elements placed on top of the \l positive color.
924+ \since Ubuntu.Components.Themes 1.3
925+ */
926+ property color positiveText
927+
928+ /*!
929+ Colour applied to the negative actions.
930+ \since Ubuntu.Components.Themes 1.3
931+ */
932+ property color negative
933+ /*!
934+ Color applied to elements placed on top of the \l negative color.
935+ \since Ubuntu.Components.Themes 1.3
936+ */
937+ property color negativeText
938+
939+ /*!
940+ Colour applied to the activity colors. Typical example is progress indication,
941+ activity indication.
942+ \since Ubuntu.Components.Themes 1.3
943+ */
944+ property color activity
945+ /*!
946+ Color applied to elements placed on top of the \l activity color.
947+ \since Ubuntu.Components.Themes 1.3
948+ */
949+ property color activityText
950+
951 /*!
952 Color applied to selected text in editable components.
953 */
954 property color selection
955+ /*!
956+ Color applied to elements placed on top of the \l selection color.
957+ \since Ubuntu.Components.Themes 1.3
958+ */
959+ property color selectionText
960 }
961
962=== added file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml'
963--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml 1970-01-01 00:00:00 +0000
964+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml 2016-01-14 15:11:00 +0000
965@@ -0,0 +1,47 @@
966+/*
967+ * Copyright 2015 Canonical Ltd.
968+ *
969+ * This program is free software; you can redistribute it and/or modify
970+ * it under the terms of the GNU Lesser General Public License as published by
971+ * the Free Software Foundation; version 3.
972+ *
973+ * This program is distributed in the hope that it will be useful,
974+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
975+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
976+ * GNU Lesser General Public License for more details.
977+ *
978+ * You should have received a copy of the GNU Lesser General Public License
979+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
980+ */
981+
982+import QtQuick 2.4
983+import Ubuntu.Components 1.3
984+import Ubuntu.Components.Themes 1.3
985+
986+PaletteValues {
987+ background: "#FFFFFF"
988+ backgroundText: UbuntuColors.jet
989+ backgroundSecondaryText: UbuntuColors.slate
990+ backgroundTertiaryText: UbuntuColors.ash
991+ base: UbuntuColors.silk
992+ baseText: UbuntuColors.slate
993+ foreground: UbuntuColors.porcelain
994+ foregroundText: UbuntuColors.jet
995+ raised: "#FFFFFF"
996+ raisedText: UbuntuColors.slate
997+ raisedSecondaryText: UbuntuColors.silk
998+ overlay: "#FFFFFF"
999+ overlayText: UbuntuColors.slate
1000+ overlaySecondaryText: UbuntuColors.silk
1001+ field: "#FFFFFF"
1002+ fieldText: UbuntuColors.jet
1003+ selection: Qt.rgba(UbuntuColors.orange.r, UbuntuColors.orange.g, UbuntuColors.orange.b, 0.2)
1004+ selectionText: UbuntuColors.jet
1005+ positive: UbuntuColors.green
1006+ positiveText: "#FFFFFF"
1007+ negative: UbuntuColors.red
1008+ negativeText: "#FFFFFF"
1009+ activity: UbuntuColors.blue
1010+ activityText: "#FFFFFF"
1011+}
1012+
1013
1014=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml'
1015--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml 2015-11-06 06:29:11 +0000
1016+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml 2016-01-14 15:11:00 +0000
1017@@ -102,7 +102,8 @@
1018 centerIn: parent
1019 topMargin: styledItem.height
1020 }
1021- name: "up"
1022+ name: "toolkit_bottom-edge-hint"
1023+ color: theme.palette.normal.overlayText
1024 }
1025
1026 Rectangle {
1027
1028=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml'
1029--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml 2015-12-10 16:39:45 +0000
1030+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml 2016-01-14 15:11:00 +0000
1031@@ -27,7 +27,9 @@
1032 revealThreshold: bottomEdge.hint.height + units.gu(2)
1033
1034 // own styling properties
1035- property color backgroundColor: Qt.rgba(0, 0, 0, Math.min(0.25, (height - revealThreshold - panelItem.y) / (height - revealThreshold)))
1036+ property color backgroundColor: !panelItem.collapsing
1037+ ? Qt.rgba(0, 0, 0, Math.min(0.25, (height - revealThreshold - panelItem.y) / (height - revealThreshold)))
1038+ : "transparent"
1039 property color panelColor: theme.palette.normal.overlay
1040 property color shadowColor: "#000000"
1041
1042@@ -43,6 +45,7 @@
1043 Rectangle {
1044 id: panelItem
1045 objectName: "bottomedge_panel"
1046+ property bool collapsing: false
1047 anchors {
1048 left: parent.left
1049 right: parent.right
1050@@ -57,6 +60,12 @@
1051
1052 Behavior on anchors.topMargin { UbuntuNumberAnimation { id: panelBehavior } }
1053
1054+ Connections {
1055+ target: bottomEdge
1056+ onCollapseStarted: panelItem.collapsing = true
1057+ onCollapseCompleted: panelItem.collapsing = false
1058+ }
1059+
1060 state: bottomEdge.status > BottomEdge.Hidden ? "drop-hint" : ""
1061 states: [
1062 State {
1063
1064=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml'
1065--- src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml 2015-07-22 13:14:43 +0000
1066+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml 2016-01-14 15:11:00 +0000
1067@@ -28,7 +28,7 @@
1068 /*!
1069 The background color of the bubble.
1070 */
1071- property color color: square ? theme.palette.normal.background : theme.palette.normal.overlay
1072+ property color color: square ? theme.palette.normal.background : theme.palette.normal.raised
1073
1074 property point target
1075 property string direction: "down"
1076@@ -111,7 +111,7 @@
1077 UbuntuShape {
1078 anchors.fill: parent
1079 aspect: UbuntuShape.Flat
1080- backgroundColor: theme.palette.normal.overlay
1081+ backgroundColor: theme.palette.normal.raised
1082 source: bubbleShape.clipContent ? shapeSource : null
1083 visible: !square
1084 }
1085
1086=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml'
1087--- src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml 2015-12-09 14:45:54 +0000
1088+++ src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml 2016-01-14 15:11:00 +0000
1089@@ -23,19 +23,19 @@
1090 /*!
1091 The padding between the background shape and the outside border of the checkbox.
1092 */
1093- property real backgroundPadding: units.gu(0.33)
1094+ property real backgroundPadding: 0
1095
1096 /*!
1097 The background color when the checkbox is not checked.
1098 */
1099- property color uncheckedBackgroundColor: Qt.rgba(theme.palette.normal.foreground.r,
1100- theme.palette.normal.foreground.g,
1101- theme.palette.normal.foreground.b, 0.2)
1102+ property color uncheckedBackgroundColor: styledItem.enabled
1103+ ? theme.palette.normal.foreground
1104+ : theme.palette.inactive.foreground
1105
1106 /*!
1107 The background color when the checkbox is checked.
1108 */
1109- property color checkedBackgroundColor: UbuntuColors.green
1110+ property color checkedBackgroundColor: styledItem.enabled ? theme.palette.normal.positive : theme.palette.inactive.raised
1111
1112 /*!
1113 The image to show inside the checkbox when it is checked.
1114@@ -45,17 +45,15 @@
1115 /*!
1116 The color of the icon.
1117 */
1118- property color iconColor: theme.palette.normal.foregroundText
1119+ property color iconColor: styledItem.enabled ? theme.palette.normal.positiveText : theme.palette.inactive.raisedText
1120
1121 /*!
1122 The padding between the icon and the border of the thumb.
1123 */
1124- property real iconPadding: backgroundPadding
1125-
1126- opacity: enabled ? 1.0 : 0.5
1127-
1128- implicitWidth: units.gu(3)
1129- implicitHeight: units.gu(3)
1130+ property real iconPadding: units.gu(0.4)
1131+
1132+ implicitWidth: units.gu(2)
1133+ implicitHeight: units.gu(2)
1134
1135 FocusShape {
1136 }
1137
1138=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml'
1139--- src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml 2015-12-14 15:49:19 +0000
1140+++ src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml 2016-01-14 15:11:00 +0000
1141@@ -26,7 +26,9 @@
1142 /*!
1143 The color of the icons.
1144 */
1145- property color foregroundColor: "#808080"
1146+ property color foregroundColor: styledItem.enabled
1147+ ? theme.palette.normal.backgroundText
1148+ : theme.palette.inactive.backgroundText
1149
1150 /*!
1151 The background color of the button.
1152@@ -59,7 +61,6 @@
1153 height: iconButtonStyle.iconHeight
1154 source: styledItem.iconSource
1155 color: iconButtonStyle.foregroundColor
1156- opacity: styledItem.enabled ? 1.0 : 0.3
1157 }
1158
1159 Component {
1160@@ -67,7 +68,6 @@
1161 Label {
1162 objectName: styledItem.objectName + "_label"
1163 color: iconButtonStyle.foregroundColor
1164- opacity: styledItem.enabled ? 1.0 : 0.3
1165 text: styledItem.text
1166 textSize: Label.XxSmall
1167 }
1168
1169=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml'
1170--- src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml 2015-11-16 16:24:42 +0000
1171+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml 2016-01-14 15:11:00 +0000
1172@@ -25,10 +25,10 @@
1173 /*
1174 * Coloring properties
1175 */
1176- property color leadingPanelColor: UbuntuColors.red
1177- property color trailingPanelColor: "white"
1178- property color leadingForegroundColor: "white"
1179- property color trailingForegroundColor: theme.palette.normal.foreground
1180+ property color leadingPanelColor: theme.palette.normal.foreground
1181+ property color trailingPanelColor: theme.palette.normal.foreground
1182+ property color leadingForegroundColor: theme.palette.normal.negative
1183+ property color trailingForegroundColor: theme.palette.normal.foregroundText
1184
1185 // anchoring
1186 anchors {
1187@@ -189,6 +189,7 @@
1188 name: "view-grid-symbolic"
1189 opacity: 0.0
1190 scale: 0.5
1191+ color: theme.palette.normal.base
1192 }
1193 Binding {
1194 target: listItemStyle
1195
1196=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml'
1197--- src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml 2015-09-30 19:03:51 +0000
1198+++ src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml 2016-01-14 15:11:00 +0000
1199@@ -42,7 +42,7 @@
1200 /*!
1201 The foreground color (icon and text) of actions in the panel.
1202 */
1203- property color foregroundColor: theme.palette.selected.backgroundText
1204+ property color foregroundColor: theme.palette.normal.backgroundText
1205
1206 property bool square: true
1207 callerMargin: -units.gu(1) + units.dp(4)
1208
1209=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
1210--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml 2015-12-15 15:39:31 +0000
1211+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml 2016-01-14 15:11:00 +0000
1212@@ -21,9 +21,9 @@
1213 Style.PageHeaderStyle {
1214 id: pageHeaderStyle
1215
1216- foregroundColor: theme.palette.selected.backgroundText
1217+ foregroundColor: theme.palette.normal.backgroundText
1218 backgroundColor: theme.palette.normal.background
1219- dividerColor: Qt.rgba(0, 0, 0, 0.1)
1220+ dividerColor: theme.palette.normal.base
1221 property int fontWeight: Font.Light
1222 property int textSize: Label.Large
1223
1224@@ -44,6 +44,7 @@
1225 height: parent ? parent.height : undefined
1226 action: modelData
1227 StyleHints {
1228+ // FIXME: introduce inactiveForegroundColor to PageHeaderStyle
1229 foregroundColor: pageHeaderStyle.foregroundColor
1230 }
1231 }
1232
1233=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
1234--- src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml 2015-08-06 22:32:02 +0000
1235+++ src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml 2016-01-14 15:11:00 +0000
1236@@ -19,25 +19,33 @@
1237 import Ubuntu.Components.Themes 1.3
1238
1239 Palette {
1240- normal {
1241- background: "#FFFFFF"
1242- backgroundText: "#81888888"
1243- base: Qt.rgba(0, 0, 0, 0.1)
1244- baseText: UbuntuColors.lightGrey
1245- foreground: UbuntuColors.lightGrey
1246- foregroundText: "#FFFFFF"
1247- overlay: "#FDFDFD"
1248- overlayText: UbuntuColors.lightGrey
1249- field: "lightgray"
1250- fieldText: UbuntuColors.darkGrey
1251- }
1252- selected {
1253- background: Qt.rgba(0, 0, 0, 0.05)
1254- backgroundText: UbuntuColors.darkGrey
1255- selection: selected.foreground
1256- foreground: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
1257- foregroundText: UbuntuColors.darkGrey
1258- field: "#FFFFFF"
1259- fieldText: UbuntuColors.darkGrey
1260+ normal: AmbianceNormal {}
1261+ inactive: AmbianceNormal {
1262+ field: UbuntuColors.porcelain;
1263+ // inactive is 30% transparent normal
1264+ Component.onCompleted: {
1265+ for (var p in normal) {
1266+ // skip objectName and all change signals
1267+ if (p == "objectName" || p == "field" || p.indexOf("Changed") > 0) continue;
1268+ inactive[p] = Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3);
1269+ }
1270+ }
1271+ }
1272+
1273+ // selected differs from normal in background, base, foreground
1274+ selected: AmbianceNormal {
1275+ background: UbuntuColors.porcelain
1276+ backgroundText: UbuntuColors.blue
1277+ base: UbuntuColors.ash
1278+ baseText: UbuntuColors.blue
1279+ foreground: UbuntuColors.silk
1280+ foregroundText: UbuntuColors.blue
1281+ }
1282+
1283+ // selected differs from normal in background, base, foreground
1284+ selectedInactive: AmbianceNormal {
1285+ background: UbuntuColors.porcelain
1286+ base: UbuntuColors.porcelain
1287+ foreground: UbuntuColors.porcelain
1288 }
1289 }
1290
1291=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml'
1292--- src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml 2015-09-23 08:39:29 +0000
1293+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml 2016-01-14 15:11:00 +0000
1294@@ -24,7 +24,9 @@
1295 /*!
1296 Specifies the background color
1297 */
1298- property color backgroundColor: "#0A000000"
1299+ property color backgroundColor: styledItem.enabled
1300+ ? theme.palette.normal.foreground
1301+ : theme.palette.inactive.foreground
1302 /*!
1303 Background color for highlight.
1304 */
1305
1306=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml'
1307--- src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml 2015-09-07 10:05:58 +0000
1308+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml 2016-01-14 15:11:00 +0000
1309@@ -20,8 +20,8 @@
1310 Item {
1311 id: progressBarStyle
1312
1313- property color foregroundColor: UbuntuColors.orange
1314- property color foregroundTextColor: '#FFFFFF'
1315+ property color foregroundColor: theme.palette.normal.activity
1316+ property color foregroundTextColor: theme.palette.normal.activityText
1317 property color backgroundColor: theme.palette.normal.base
1318 property color backgroundTextColor: theme.palette.normal.baseText
1319
1320
1321=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml'
1322--- src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml 2015-09-22 14:39:47 +0000
1323+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml 2016-01-14 15:11:00 +0000
1324@@ -28,7 +28,7 @@
1325 /*!
1326 The foreground color of unselected sections.
1327 */
1328- property color sectionColor: theme.palette.selected.backgroundText
1329+ property color sectionColor: theme.palette.normal.backgroundText
1330
1331 /*!
1332 The foreground color of the selected section.
1333
1334=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml'
1335--- src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml 2015-09-21 14:44:13 +0000
1336+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml 2016-01-14 15:11:00 +0000
1337@@ -26,7 +26,7 @@
1338 Item {
1339 id: sliderStyle
1340
1341- property color foregroundColor: UbuntuColors.orange
1342+ property color foregroundColor: theme.palette.normal.activity
1343 property color backgroundColor: theme.palette.normal.base
1344
1345 property real thumbSpacing: units.gu(0)
1346@@ -43,8 +43,9 @@
1347 right: parent.right
1348 left: parent.left
1349 }
1350- height: units.dp(4)
1351+ height: units.dp(2)
1352 backgroundColor: sliderStyle.backgroundColor
1353+ aspect: UbuntuShape.Flat
1354 overlayColor: sliderStyle.foregroundColor
1355 overlayRect: Qt.application.layoutDirection == Qt.LeftToRight ?
1356 Qt.rect(0.0, 0.0, thumb.x / thumb.barMinusThumbWidth, 1.0) :
1357@@ -80,18 +81,17 @@
1358 }
1359 width: units.gu(2)
1360 height: units.gu(2)
1361- opacity: 0.97
1362- backgroundColor: theme.palette.normal.overlay
1363+ backgroundColor: theme.palette.normal.raised
1364 }
1365
1366 BubbleShape {
1367 id: bubbleShape
1368
1369- property real minimumWidth: units.gu(8)
1370+ property real minimumWidth: units.gu(6)
1371 property real horizontalPadding: units.gu(1)
1372
1373- width: Math.max(minimumWidth, label.implicitWidth + 2*horizontalPadding)
1374- height: units.gu(6)
1375+ width: label.implicitWidth + 2*horizontalPadding
1376+ height: label.implicitHeight + 2*horizontalPadding
1377
1378 // FIXME: very temporary implementation
1379 property real minX: 0.0
1380@@ -117,7 +117,7 @@
1381 anchors.centerIn: parent
1382 text: styledItem.formatValue(SliderUtils.liveValue(styledItem))
1383 textSize: Label.Large
1384- color: theme.palette.normal.overlayText
1385+ color: theme.palette.normal.raisedText
1386 }
1387 }
1388 }
1389
1390=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml'
1391--- src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml 2015-12-09 14:45:54 +0000
1392+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml 2016-01-14 15:11:00 +0000
1393@@ -23,53 +23,26 @@
1394 /*!
1395 The padding between the thumb and the outside border of the switch.
1396 */
1397- property real thumbPadding: units.gu(0.33)
1398-
1399- /*!
1400- The padding between the icon and the border of the thumb.
1401- */
1402- property real iconPadding: thumbPadding
1403-
1404- implicitWidth: units.gu(6)
1405- implicitHeight: units.gu(3)
1406- opacity: styledItem.enabled ? 1.0 : 0.5
1407+ property real thumbPadding: 0
1408+
1409+ implicitWidth: units.gu(5)
1410+ implicitHeight: units.gu(2.5)
1411 LayoutMirroring.enabled: false
1412 LayoutMirroring.childrenInherit: true
1413
1414 /*!
1415 The background color of the switch.
1416 */
1417- property color backgroundColor: theme.palette.normal.base
1418-
1419- /*!
1420- The background color of the thumb when the switch is checked.
1421- */
1422- property color checkedThumbColor: UbuntuColors.green
1423-
1424- /*!
1425- The background color of the thumb when the switch is not checked.
1426- */
1427- property color uncheckedThumbColor: Qt.rgba(0, 0, 0, 0.2)
1428-
1429- /*!
1430- The foreground color of the icon that is currently selected.
1431- */
1432- property color selectedIconColor: theme.palette.normal.foregroundText
1433-
1434- /*!
1435- The color of the icon that is not currently selected.
1436- */
1437- property color unselectedIconColor: theme.palette.normal.backgroundText
1438-
1439- /*!
1440- The source of the selected icon when the switch is checked.
1441- */
1442- property url checkedIconSource: "image://theme/tick"
1443-
1444- /*!
1445- The source of the selected icon when the switch is not checked.
1446- */
1447- property url uncheckedIconSource: "image://theme/close"
1448+ property color backgroundColor: styledItem.enabled ? theme.palette.normal.base : theme.palette.inactive.base
1449+
1450+ /*!
1451+ The background color of the checked switch.
1452+ */
1453+ property color checkedBackgroundColor: styledItem.enabled ? theme.palette.normal.positive : theme.palette.inactive.base
1454+ /*!
1455+ The background color of the thumb.
1456+ */
1457+ property color thumbColor: styledItem.enabled ? theme.palette.normal.raised : theme.palette.inactive.raised
1458
1459 FocusShape {
1460 }
1461@@ -86,19 +59,14 @@
1462 State {
1463 name: "checked"
1464 when: styledItem.checked
1465- PropertyChanges {
1466+ AnchorChanges {
1467 target: thumb
1468- x: rightThumbPosition.x
1469- backgroundColor: switchStyle.checkedThumbColor
1470+ anchors.left: undefined
1471+ anchors.right: parent.right
1472 }
1473- },
1474- State {
1475- name: "unchecked"
1476- when: !styledItem.checked
1477 PropertyChanges {
1478- target: thumb
1479- x: leftThumbPosition.x
1480- backgroundColor: switchStyle.uncheckedThumbColor
1481+ target: background
1482+ backgroundColor: switchStyle.checkedBackgroundColor
1483 }
1484 }
1485 ]
1486@@ -107,27 +75,12 @@
1487 // Avoid animations on width changes (during initialization)
1488 // by explicitly setting from and to for the Transitions.
1489 Transition {
1490- from: "unchecked"
1491+ from: "*"
1492 to: "checked"
1493- UbuntuNumberAnimation {
1494- target: thumb
1495- properties: "x"
1496- duration: UbuntuAnimation.FastDuration
1497- easing: UbuntuAnimation.StandardEasing
1498- }
1499- ColorAnimation {
1500- target: thumb
1501- properties: "backgroundColor"
1502- duration: UbuntuAnimation.FastDuration
1503- easing: UbuntuAnimation.StandardEasing
1504- }
1505- },
1506- Transition {
1507- from: "checked"
1508- to: "unchecked"
1509- UbuntuNumberAnimation {
1510- target: thumb
1511- properties: "x"
1512+ reversible: true
1513+ enabled: animated
1514+ AnchorAnimation {
1515+ targets: thumb
1516 duration: UbuntuAnimation.FastDuration
1517 easing: UbuntuAnimation.StandardEasing
1518 }
1519@@ -140,99 +93,16 @@
1520 }
1521 ]
1522
1523+ backgroundColor: switchStyle.thumbColor
1524 width: (background.width - switchStyle.thumbPadding * 3.0) / 2.0
1525 anchors {
1526 top: parent.top
1527 bottom: parent.bottom
1528+ left: parent.left
1529 topMargin: switchStyle.thumbPadding
1530 bottomMargin: switchStyle.thumbPadding
1531 }
1532
1533- property real iconSize: Math.min(width, height) - 2*switchStyle.iconPadding
1534-
1535- PartialColorize {
1536- anchors {
1537- verticalCenter: parent.verticalCenter
1538- right: parent.left
1539- rightMargin: switchStyle.iconPadding + switchStyle.thumbPadding
1540- }
1541- rightColor: switchStyle.unselectedIconColor
1542- source: Image {
1543- source: switchStyle.uncheckedIconSource
1544- sourceSize {
1545- width: thumb.iconSize
1546- height: thumb.iconSize
1547- }
1548- }
1549- }
1550-
1551- PartialColorize {
1552- anchors {
1553- verticalCenter: parent.verticalCenter
1554- left: parent.right
1555- leftMargin: switchStyle.iconPadding + switchStyle.thumbPadding
1556- }
1557- rightColor: switchStyle.unselectedIconColor
1558- source: Image {
1559- source: switchStyle.checkedIconSource
1560- sourceSize {
1561- width: thumb.iconSize
1562- height: thumb.iconSize
1563- }
1564- }
1565- }
1566- }
1567-
1568- Item {
1569- id: leftThumbPosition
1570- anchors {
1571- left: parent.left
1572- top: parent.top
1573- leftMargin: switchStyle.thumbPadding
1574- topMargin: switchStyle.thumbPadding
1575- }
1576- height: thumb.height
1577- width: thumb.width
1578-
1579- PartialColorize {
1580- anchors.centerIn: parent
1581- source: Image {
1582- source: switchStyle.uncheckedIconSource
1583- sourceSize {
1584- width: thumb.iconSize
1585- height: thumb.iconSize
1586- }
1587- }
1588- progress: MathUtils.clamp((thumb.x - parent.x - x) / width, 0.0, 1.0)
1589- leftColor: "transparent"
1590- rightColor: switchStyle.selectedIconColor
1591- }
1592- }
1593-
1594- Item {
1595- id: rightThumbPosition
1596- anchors {
1597- right: parent.right
1598- top: parent.top
1599- rightMargin: switchStyle.thumbPadding
1600- topMargin: switchStyle.thumbPadding
1601- }
1602- height: thumb.height
1603- width: thumb.width
1604-
1605- PartialColorize {
1606- anchors.centerIn: parent
1607- source: Image {
1608- source: switchStyle.checkedIconSource
1609- sourceSize {
1610- width: thumb.iconSize
1611- height: thumb.iconSize
1612- }
1613- }
1614- progress: MathUtils.clamp((thumb.x + thumb.width - parent.x - x) / width, 0.0, 1.0)
1615- leftColor: switchStyle.selectedIconColor
1616- rightColor: "transparent"
1617- }
1618 }
1619 }
1620 }
1621
1622=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml'
1623--- src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml 2015-07-22 13:14:43 +0000
1624+++ src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml 2016-01-14 15:11:00 +0000
1625@@ -25,14 +25,22 @@
1626 // FIXME: needs type checking in themes to define the proper type to be used
1627 // if color type is used, alpha value gets lost
1628
1629- property color color: (styledItem.activeFocus || styledItem.highlighted) ? theme.palette.selected.fieldText : theme.palette.normal.fieldText
1630- property color selectedTextColor: theme.palette.selected.foregroundText
1631- property color selectionColor: theme.palette.selected.foreground
1632+ property color color: styledItem.enabled
1633+ ? ((styledItem.activeFocus || styledItem.highlighted)
1634+ ? theme.palette.selected.fieldText
1635+ : theme.palette.normal.fieldText)
1636+ : theme.palette.inactive.fieldText
1637+ property color selectedTextColor: styledItem.enabled ? theme.palette.selected.selectionText : theme.palette.inactive.selectionText
1638+ property color selectionColor: styledItem.enabled ? theme.palette.selected.selection : theme.palette.inactive.selection
1639 /*!
1640 Background fill color
1641 */
1642- property color backgroundColor: (styledItem.activeFocus || styledItem.highlighted) ? theme.palette.selected.field : theme.palette.normal.field
1643- property color errorColor: UbuntuColors.orange
1644+ property color backgroundColor: styledItem.enabled
1645+ ? ((styledItem.activeFocus || styledItem.highlighted)
1646+ ? theme.palette.selected.field
1647+ : theme.palette.normal.field)
1648+ : theme.palette.inactive.field
1649+ property color errorColor: styledItem.enabled ? theme.palette.normal.negative : theme.palette.inactive.negative
1650
1651 /*!
1652 Spacing between the frame and the text editor area
1653
1654=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml'
1655--- src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml 2015-09-21 14:44:13 +0000
1656+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml 2016-01-14 15:11:00 +0000
1657@@ -31,6 +31,8 @@
1658 height: icon.height + label.height + label.anchors.topMargin
1659 opacity: styledItem.enabled ? 1.0 : 0.3
1660
1661+ // FIXME: is there a reason we are still using styledItem.iconSource instead of iconName
1662+ // so we coudl use the Icon?
1663 Image {
1664 id: icon
1665 anchors {
1666@@ -53,6 +55,9 @@
1667 width: paintedWidth
1668 text: styledItem.text
1669 textSize: Label.XSmall
1670+ color: styledItem.enabled
1671+ ? theme.palette.normal.raisedText
1672+ : theme.palette.inactive.raisedText
1673 }
1674 }
1675
1676
1677=== modified file 'src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
1678--- src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro 2015-12-16 10:01:07 +0000
1679+++ src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro 2016-01-14 15:11:00 +0000
1680@@ -73,6 +73,7 @@
1681 1.2/TextFieldStyle.qml \
1682 1.2/ToolbarButtonStyle.qml \
1683 1.2/DeprecatedToolbarStyle.qml \
1684+ 1.3/AmbianceNormal.qml \
1685 1.3/ActionBarStyle.qml \
1686 1.3/ActivityIndicatorStyle.qml \
1687 1.3/BubbleShape.qml \
1688
1689=== modified file 'src/Ubuntu/Components/Themes/Ambiance/qmldir'
1690--- src/Ubuntu/Components/Themes/Ambiance/qmldir 2015-12-16 10:01:07 +0000
1691+++ src/Ubuntu/Components/Themes/Ambiance/qmldir 2016-01-14 15:11:00 +0000
1692@@ -57,6 +57,7 @@
1693
1694 #################################################
1695 #version 1.3
1696+AmbianceNormal 1.3 ./1.3/AmbianceNormal.qml
1697 ActionBarStyle 1.3 ./1.3/ActionBarStyle.qml
1698 MainViewStyle 1.3 ./1.3/MainViewStyle.qml
1699 ListItemOptionSelector 1.3 ./1.3/ListItemOptionSelector.qml
1700
1701=== removed file 'src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml'
1702--- src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml 2015-07-13 22:16:37 +0000
1703+++ src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml 1970-01-01 00:00:00 +0000
1704@@ -1,25 +0,0 @@
1705-/*
1706- * Copyright 2015 Canonical Ltd.
1707- *
1708- * This program is free software; you can redistribute it and/or modify
1709- * it under the terms of the GNU Lesser General Public License as published by
1710- * the Free Software Foundation; version 3.
1711- *
1712- * This program is distributed in the hope that it will be useful,
1713- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1714- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1715- * GNU Lesser General Public License for more details.
1716- *
1717- * You should have received a copy of the GNU Lesser General Public License
1718- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1719- */
1720-
1721-import QtQuick 2.4
1722-import Ubuntu.Components.Themes.Ambiance 1.2 as Ambiance
1723-
1724-Ambiance.ListItemStyle {
1725- // 20% lighter that background color
1726- trailingPanelColor: Qt.lighter(theme.palette.normal.background, 1.2)
1727- // 40% lighter than foreground color
1728- trailingForegroundColor: Qt.lighter(theme.palette.normal.foreground, 1.4)
1729-}
1730
1731=== removed file 'src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml'
1732--- src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml 2015-08-11 10:01:34 +0000
1733+++ src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml 1970-01-01 00:00:00 +0000
1734@@ -1,26 +0,0 @@
1735-/*
1736- * Copyright 2015 Canonical Ltd.
1737- *
1738- * This program is free software; you can redistribute it and/or modify
1739- * it under the terms of the GNU Lesser General Public License as published by
1740- * the Free Software Foundation; version 3.
1741- *
1742- * This program is distributed in the hope that it will be useful,
1743- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1744- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1745- * GNU Lesser General Public License for more details.
1746- *
1747- * You should have received a copy of the GNU Lesser General Public License
1748- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1749- */
1750-//![0]
1751-import QtQuick 2.4
1752-import Ubuntu.Components.Themes.Ambiance 1.3 as Ambiance
1753-
1754-Ambiance.ListItemStyle {
1755- // 20% lighter that background color
1756- trailingPanelColor: Qt.lighter(theme.palette.normal.background, 1.2)
1757- // 40% lighter than foreground color
1758- trailingForegroundColor: Qt.lighter(theme.palette.normal.foreground, 1.4)
1759-}
1760-//![0]
1761
1762=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml'
1763--- src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml 2015-06-02 16:20:13 +0000
1764+++ src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml 2016-01-14 15:11:00 +0000
1765@@ -20,26 +20,34 @@
1766 import Ubuntu.Components.Themes 1.3
1767
1768 Palette {
1769- normal {
1770- background: "#221E1C"
1771- backgroundText: "#5D5D5D78"
1772- base: "#19000000"
1773- baseText: "#FFFFFF"
1774- foreground: "#888888"
1775- foregroundText: "#FFFFFF"
1776- overlay: "#F2F2F2"
1777- overlayText: "#888888"
1778- field: "#19000000"
1779- fieldText: "#7F7F7F7F"
1780- }
1781- selected {
1782- background: "#88D6D6D6"
1783- backgroundText: "#FFFFFF"
1784- selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
1785- foreground: UbuntuColors.orange
1786- foregroundText: UbuntuColors.darkGrey
1787- field: "#FFFFFF"
1788- fieldText: "#888888"
1789+ normal: SuruDarkNormal {}
1790+ inactive: SuruDarkNormal {
1791+ field: UbuntuColors.inkstone
1792+ // inactive is 30% transparent normal
1793+ Component.onCompleted: {
1794+ for (var p in normal) {
1795+ // skip objectName and all change signals
1796+ if (p == "objectName" || p == "field" || p.indexOf("Changed") > 0) continue;
1797+ inactive[p] = Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3);
1798+ }
1799+ }
1800+ }
1801+
1802+ // selected differs from normal in background, base, foreground
1803+ selected: SuruDarkNormal {
1804+ background: UbuntuColors.inkstone
1805+ backgroundText: UbuntuColors.blue
1806+ base: UbuntuColors.ash
1807+ baseText:UbuntuColors.blue
1808+ foreground: UbuntuColors.slate
1809+ foregroundText: UbuntuColors.blue
1810+ }
1811+
1812+ // selected differs from normal in background, base, foreground
1813+ selectedInactive: SuruDarkNormal {
1814+ background: UbuntuColors.inkstone
1815+ base: UbuntuColors.inkstone
1816+ foreground: UbuntuColors.inkstone
1817 }
1818 }
1819 //![0]
1820
1821=== added file 'src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml'
1822--- src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml 1970-01-01 00:00:00 +0000
1823+++ src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml 2016-01-14 15:11:00 +0000
1824@@ -0,0 +1,47 @@
1825+/*
1826+ * Copyright 2015 Canonical Ltd.
1827+ *
1828+ * This program is free software; you can redistribute it and/or modify
1829+ * it under the terms of the GNU Lesser General Public License as published by
1830+ * the Free Software Foundation; version 3.
1831+ *
1832+ * This program is distributed in the hope that it will be useful,
1833+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
1834+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1835+ * GNU Lesser General Public License for more details.
1836+ *
1837+ * You should have received a copy of the GNU Lesser General Public License
1838+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
1839+ */
1840+
1841+import QtQuick 2.4
1842+import Ubuntu.Components 1.3
1843+import Ubuntu.Components.Themes 1.3
1844+
1845+PaletteValues {
1846+ background: UbuntuColors.jet
1847+ backgroundText: "#FFFFFF"
1848+ backgroundSecondaryText: UbuntuColors.silk
1849+ backgroundTertiaryText: UbuntuColors.ash
1850+ base: UbuntuColors.graphite
1851+ baseText: UbuntuColors.silk
1852+ foreground: UbuntuColors.inkstone
1853+ foregroundText: "#FFFFFF"
1854+ raised: "#FFFFFF"
1855+ raisedText: UbuntuColors.slate
1856+ raisedSecondaryText: UbuntuColors.silk
1857+ overlay: UbuntuColors.inkstone
1858+ overlayText: "#FFFFFF"
1859+ overlaySecondaryText: UbuntuColors.slate
1860+ field: UbuntuColors.jet
1861+ fieldText: "#FFFFFF"
1862+ selection: Qt.rgba(UbuntuColors.orange.r, UbuntuColors.orange.g, UbuntuColors.orange.b, 0.4)
1863+ selectionText: "#FFFFFF"
1864+ positive: UbuntuColors.green
1865+ positiveText: "#FFFFFF"
1866+ negative: UbuntuColors.red
1867+ negativeText: "#FFFFFF"
1868+ activity: UbuntuColors.blue
1869+ activityText: "#FFFFFF"
1870+}
1871+
1872
1873=== modified file 'src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro'
1874--- src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro 2015-08-06 22:47:38 +0000
1875+++ src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro 2016-01-14 15:11:00 +0000
1876@@ -7,11 +7,10 @@
1877 1.2/OptionSelectorStyle.qml \
1878 1.2/Palette.qml \
1879 1.2/TabBarStyle.qml \
1880- 1.2/ListItemStyle.qml \
1881 1.3/OptionSelectorStyle.qml \
1882+ 1.3/SuruDarkNormal.qml \
1883 1.3/Palette.qml \
1884 1.3/TabBarStyle.qml \
1885- 1.3/ListItemStyle.qml \
1886 $$ARTWORK_FILES \
1887 $$PARENT_THEME_FILE
1888
1889
1890=== modified file 'src/Ubuntu/Components/Themes/SuruDark/qmldir'
1891--- src/Ubuntu/Components/Themes/SuruDark/qmldir 2015-04-24 14:48:00 +0000
1892+++ src/Ubuntu/Components/Themes/SuruDark/qmldir 2016-01-14 15:11:00 +0000
1893@@ -5,3 +5,4 @@
1894
1895 #version 1.3
1896 Palette 1.3 ./1.3/Palette.qml
1897+SuruDarkNormal 1.3 ./1.3/SuruDarkNormal.qml
1898
1899=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
1900--- src/Ubuntu/Components/plugin/ucbottomedge.cpp 2016-01-11 10:42:18 +0000
1901+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp 2016-01-14 15:11:00 +0000
1902@@ -588,7 +588,7 @@
1903 * BottomEdgeRegion {
1904 * from: 0.6
1905 * to: 1.0
1906- * property color color: UbuntuColors.lightGrey
1907+ * property color color: UbuntuColors.silk
1908 * }
1909 * ]
1910 * }
1911
1912=== modified file 'src/Ubuntu/Components/plugin/uclabel.cpp'
1913--- src/Ubuntu/Components/plugin/uclabel.cpp 2016-01-12 13:48:53 +0000
1914+++ src/Ubuntu/Components/plugin/uclabel.cpp 2016-01-14 15:11:00 +0000
1915@@ -110,7 +110,7 @@
1916 }
1917 UCTheme *theme = getTheme();
1918 if (theme) {
1919- setColor(theme->getPaletteColor("selected", "backgroundText"));
1920+ setColor(theme->getPaletteColor("normal", "baseText"));
1921 m_flags &= ~ColorSet;
1922 }
1923 }
1924
1925=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
1926--- src/Ubuntu/Components/plugin/uclistitem.cpp 2016-01-12 20:44:07 +0000
1927+++ src/Ubuntu/Components/plugin/uclistitem.cpp 2016-01-14 15:11:00 +0000
1928@@ -94,24 +94,20 @@
1929 void UCListItemDivider::paletteChanged()
1930 {
1931 Q_D(UCListItemDivider);
1932- QColor background;
1933- UCTheme *theme = d->listItem->getTheme();
1934- if (theme) {
1935- background = theme->getPaletteColor("normal", "background");
1936- if (!background.isValid()) {
1937+ if (!d->colorFromChanged || !d->colorToChanged) {
1938+ QColor themeColor;
1939+ UCTheme *theme = d->listItem->getTheme();
1940+ if (theme) {
1941+ themeColor = d->listItem->getTheme()->getPaletteColor("normal", "base");
1942+ }
1943+ if (!themeColor.isValid()) {
1944 return;
1945 }
1946- }
1947- // FIXME: we need a palette value for divider colors, till then base on the background
1948- // luminance
1949- if (!d->colorFromChanged || !d->colorToChanged) {
1950- qreal luminance = (background.red()*212 + background.green()*715 + background.blue()*73)/1000.0/255.0;
1951- bool lightBackground = (luminance > 0.85);
1952 if (!d->colorFromChanged) {
1953- d->colorFrom = lightBackground ? QColor("#26000000") : QColor("#26FFFFFF");
1954+ d->colorFrom = themeColor;
1955 }
1956 if (!d->colorToChanged) {
1957- d->colorTo = lightBackground ? QColor("#14FFFFFF") : QColor("#14000000");
1958+ d->colorTo = themeColor;
1959 }
1960 updateGradient();
1961 }
1962@@ -121,13 +117,13 @@
1963 {
1964 Q_D(UCListItemDivider);
1965 d->gradient.clear();
1966- d->gradient.append(QGradientStop(0.0, d->colorFrom));
1967- d->gradient.append(QGradientStop(0.49, d->colorFrom));
1968- d->gradient.append(QGradientStop(0.5, d->colorTo));
1969- d->gradient.append(QGradientStop(1.0, d->colorTo));
1970- if (d->listItem) {
1971- d->listItem->update();
1972+ if (height() > UCUnits::instance().dp(1)) {
1973+ d->gradient.append(QGradientStop(0.0, d->colorFrom));
1974+ d->gradient.append(QGradientStop(0.49, d->colorFrom));
1975+ d->gradient.append(QGradientStop(0.5, d->colorTo));
1976+ d->gradient.append(QGradientStop(1.0, d->colorTo));
1977 }
1978+ update();
1979 }
1980
1981 QSGNode *UCListItemDivider::updatePaintNode(QSGNode *node, UpdatePaintNodeData *data)
1982@@ -141,9 +137,13 @@
1983
1984 UCListItemPrivate *pListItem = UCListItemPrivate::get(d->listItem);
1985 bool lastItem = pListItem->countOwner ? (pListItem->index() == (pListItem->countOwner->property("count").toInt() - 1)): false;
1986- if (!lastItem && (d->gradient.size() > 0) && ((d->colorFrom.alphaF() >= (1.0f / 255.0f)) || (d->colorTo.alphaF() >= (1.0f / 255.0f)))) {
1987+ if (!lastItem && ((d->colorFrom.alphaF() >= (1.0f / 255.0f)) || (d->colorTo.alphaF() >= (1.0f / 255.0f)))) {
1988 dividerNode->setRect(boundingRect());
1989- dividerNode->setGradientStops(d->gradient);
1990+ if (d->gradient.size() > 0) {
1991+ dividerNode->setGradientStops(d->gradient);
1992+ } else {
1993+ dividerNode->setColor(d->colorFrom);
1994+ }
1995 dividerNode->update();
1996 return dividerNode;
1997 } else if (node) {
1998@@ -1654,7 +1654,7 @@
1999 d->customColor = false;
2000 UCTheme *theme = getTheme();
2001 if (theme) {
2002- d->highlightColor = theme->getPaletteColor("selected", "background");
2003+ d->highlightColor = theme->getPaletteColor("selected", "foreground");
2004 }
2005 update();
2006 Q_EMIT highlightColorChanged();
2007
2008=== modified file 'src/Ubuntu/Components/plugin/uclistitem_p.h'
2009--- src/Ubuntu/Components/plugin/uclistitem_p.h 2015-11-16 06:35:05 +0000
2010+++ src/Ubuntu/Components/plugin/uclistitem_p.h 2016-01-14 15:11:00 +0000
2011@@ -26,7 +26,7 @@
2012
2013 #define IMPLICIT_LISTITEM_WIDTH_GU 40
2014 #define IMPLICIT_LISTITEM_HEIGHT_GU 7
2015-#define DIVIDER_THICKNESS_DP 2
2016+#define DIVIDER_THICKNESS_DP 1
2017 #define DEFAULT_SWIPE_THRESHOLD_GU 1.5
2018
2019 class QQuickFlickable;
2020
2021=== modified file 'src/Ubuntu/Components/qmldir'
2022--- src/Ubuntu/Components/qmldir 2015-12-17 13:48:23 +0000
2023+++ src/Ubuntu/Components/qmldir 2016-01-14 15:11:00 +0000
2024@@ -138,3 +138,5 @@
2025 ScrollView 1.3 1.3/ScrollView.qml
2026 PageHeader 1.3 1.3/PageHeader.qml
2027 Toolbar 1.3 1.3/Toolbar.qml
2028+singleton UbuntuColors 1.3 1.3/UbuntuColors.qml
2029+Icon 1.3 1.3/Icon.qml
2030
2031=== modified file 'tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml'
2032--- tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml 2015-11-27 10:36:08 +0000
2033+++ tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml 2016-01-14 15:11:00 +0000
2034@@ -30,7 +30,7 @@
2035 contentComponent: Rectangle {
2036 width: bottomEdge.width
2037 height: bottomEdge.height
2038- color: UbuntuColors.lightGrey
2039+ color: UbuntuColors.silk
2040 }
2041
2042 BottomEdgeRegion {
2043
2044=== modified file 'tests/unit_x11/tst_components/AppTheme/Palette.qml'
2045--- tests/unit_x11/tst_components/AppTheme/Palette.qml 2015-04-24 14:34:39 +0000
2046+++ tests/unit_x11/tst_components/AppTheme/Palette.qml 2016-01-14 15:11:00 +0000
2047@@ -20,5 +20,5 @@
2048
2049 Suru.Palette {
2050 normal.background: "#A21E1C"
2051- selected.backgroundText: "lightblue"
2052+ normal.baseText: "lightblue"
2053 }
2054
2055=== modified file 'tests/unit_x11/tst_components/MockKeyboard.qml'
2056--- tests/unit_x11/tst_components/MockKeyboard.qml 2015-07-02 17:39:03 +0000
2057+++ tests/unit_x11/tst_components/MockKeyboard.qml 2016-01-14 15:11:00 +0000
2058@@ -32,7 +32,7 @@
2059 visible: inputMethod.visible
2060
2061 parent: QuickUtils.rootItem(inputMethod)
2062- color: UbuntuColors.lightGrey
2063+ color: UbuntuColors.silk
2064 opacity: 0.5
2065 // Always on top, even modal Dialog overlay
2066 z: 100
2067
2068=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
2069--- tests/unit_x11/tst_components/tst_listitem.qml 2015-10-01 06:42:47 +0000
2070+++ tests/unit_x11/tst_components/tst_listitem.qml 2016-01-14 15:11:00 +0000
2071@@ -254,11 +254,9 @@
2072 var mappedDividerPos = defaults.mapFromItem(defaults.divider, defaults.divider.x, defaults.divider.y);
2073 compare(mappedDividerPos.x, 0, "divider's left anchor is wrong");
2074 compare(mappedDividerPos.x + defaults.divider.width, defaults.width, "divider's right anchor is wrong");
2075- compare(defaults.divider.height, units.dp(2), "divider's thickness is wrong");
2076- compare(defaults.divider.colorFrom, "#000000", "colorFrom differs.");
2077- fuzzyCompare(defaults.divider.colorFrom.a, 0.14, 0.01, "colorFrom alpha differs");
2078- compare(defaults.divider.colorTo, "#ffffff", "colorTo differs.");
2079- fuzzyCompare(defaults.divider.colorTo.a, 0.07, 0.01, "colorTo alpha differs");
2080+ compare(defaults.divider.height, units.dp(1), "divider's thickness is wrong");
2081+ compare(defaults.divider.colorFrom, theme.palette.normal.base, "colorFrom differs.");
2082+ compare(defaults.divider.colorTo, theme.palette.normal.base, "colorTo differs.");
2083 compare(defaults.action, null, "No action by default.");
2084 compare(defaults.style, null, "Style is loaded upon first use.");
2085 compare(defaults.__styleInstance, null, "__styleInstance must be null.");
2086
2087=== modified file 'tests/unit_x11/tst_components/tst_listitem13.qml'
2088--- tests/unit_x11/tst_components/tst_listitem13.qml 2015-10-01 06:42:47 +0000
2089+++ tests/unit_x11/tst_components/tst_listitem13.qml 2016-01-14 15:11:00 +0000
2090@@ -254,11 +254,9 @@
2091 var mappedDividerPos = defaults.mapFromItem(defaults.divider, defaults.divider.x, defaults.divider.y);
2092 compare(mappedDividerPos.x, 0, "divider's left anchor is wrong");
2093 compare(mappedDividerPos.x + defaults.divider.width, defaults.width, "divider's right anchor is wrong");
2094- compare(defaults.divider.height, units.dp(2), "divider's thickness is wrong");
2095- compare(defaults.divider.colorFrom, "#000000", "colorFrom differs.");
2096- fuzzyCompare(defaults.divider.colorFrom.a, 0.14, 0.01, "colorFrom alpha differs");
2097- compare(defaults.divider.colorTo, "#ffffff", "colorTo differs.");
2098- fuzzyCompare(defaults.divider.colorTo.a, 0.07, 0.01, "colorTo alpha differs");
2099+ compare(defaults.divider.height, units.dp(1), "divider's thickness is wrong");
2100+ compare(defaults.divider.colorFrom, theme.palette.normal.base, "colorFrom differs.");
2101+ compare(defaults.divider.colorTo, theme.palette.normal.base, "colorTo differs.");
2102 compare(defaults.action, null, "No action by default.");
2103 compare(defaults.style, null, "Style is loaded upon first use.");
2104 compare(defaults.__styleInstance, null, "__styleInstance must be null.");

Subscribers

People subscribed via source and target branches