1
=== modified file 'components.api'
2
--- components.api	2016-04-25 10:45:41 +0000
3
+++ components.api	2016-05-03 04:48:27 +0000
4
@@ -872,6 +872,7 @@
5
872
    property PaletteValues selected
872
    property PaletteValues selected
6
873
Ubuntu.Components.Themes.Palette 1.3: QtObject
873
Ubuntu.Components.Themes.Palette 1.3: QtObject
7
874
    property PaletteValues disabled
874
    property PaletteValues disabled
8
875
    property PaletteValues focused
9
875
    property PaletteValues highlighted
876
    property PaletteValues highlighted
10
876
    property PaletteValues normal
877
    property PaletteValues normal
11
877
    property PaletteValues selected
878
    property PaletteValues selected
12
878
879
13
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
14
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2016-03-01 15:08:08 +0000
15
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2016-05-03 04:48:27 +0000
16
@@ -29,7 +29,7 @@
17
29
        className: "Palette"
29
        className: "Palette"
18
30
        documentation: "qml-palette.html"
30
        documentation: "qml-palette.html"
19
31
31
21
32
        property var palettes: ["normal", "disabled", "selected", "selectedDisabled", "highlighted"]
32
        property var palettes: ["normal", "disabled", "selected", "selectedDisabled", "highlighted", "focused"]
22
33
        property var paletteValues: [["background", ["backgroundText", "backgroundSecondaryText", "backgroundTertiaryText"]],
33
        property var paletteValues: [["background", ["backgroundText", "backgroundSecondaryText", "backgroundTertiaryText"]],
23
34
            ["base", ["baseText"]],
34
            ["base", ["baseText"]],
24
35
            ["foreground", ["foregroundText"]],
35
            ["foreground", ["foregroundText"]],
25
@@ -75,7 +75,7 @@
26
75
                                property string mainColor: modelData[0]
75
                                property string mainColor: modelData[0]
27
76
                                property var textColors: modelData[1]
76
                                property var textColors: modelData[1]
28
77
                                property bool previewed: paletteFlow.previewed == paletteColor
77
                                property bool previewed: paletteFlow.previewed == paletteColor
30
78
                                width: units.gu(4)
78
                                width: units.gu(8)
31
79
                                height: units.gu(5)
79
                                height: units.gu(5)
32
80
                                z: previewed ? 10 : 0
80
                                z: previewed ? 10 : 0
33
81
81
34
@@ -106,7 +106,7 @@
35
106
106
36
107
                                    Rectangle {
107
                                    Rectangle {
37
108
                                        anchors.fill: parent
108
                                        anchors.fill: parent
39
109
                                        color: palette[mainColor]
109
                                        color: palette ? palette[mainColor] : "transparent"
40
110
                                        border.width: color == theme.palette.normal.background ? units.dp(1) : 0
110
                                        border.width: color == theme.palette.normal.background ? units.dp(1) : 0
41
111
                                        border.color: theme.palette.normal.backgroundText
111
                                        border.color: theme.palette.normal.backgroundText
42
112
                                    }
112
                                    }
43
@@ -124,8 +124,8 @@
44
124
                                            model: textColors
124
                                            model: textColors
45
125
                                            Label {
125
                                            Label {
46
126
                                                width: previewed ? implicitWidth : parent.width
126
                                                width: previewed ? implicitWidth : parent.width
49
127
                                                text: previewed ? modelData : modelData.slice(0, 4)
127
                                                text: previewed ? modelData : modelData.slice(0, 10)
50
128
                                                color: palette[modelData]
128
                                                color: palette ? palette[modelData] : "transparent"
51
129
                                                textSize: previewed ? Label.Medium : Label.XSmall
129
                                                textSize: previewed ? Label.Medium : Label.XSmall
52
130
                                                elide: Text.ElideRight
130
                                                elide: Text.ElideRight
53
131
                                            }
131
                                            }
54
132
132
55
=== modified file 'src/Ubuntu/Components/1.3/UbuntuListView.qml'
56
--- src/Ubuntu/Components/1.3/UbuntuListView.qml	2016-03-01 14:53:44 +0000
57
+++ src/Ubuntu/Components/1.3/UbuntuListView.qml	2016-05-03 04:48:27 +0000
58
@@ -196,7 +196,9 @@
59
196
196
60
197
    // highlight current item
197
    // highlight current item
61
198
    highlight: Rectangle {
198
    highlight: Rectangle {
63
199
        color: theme.palette.selected.background
199
        color: root.activeFocus
64
200
               ? theme.palette.focused.background
65
201
               : theme.palette.selected.background
66
200
    }
202
    }
67
201
    highlightMoveDuration: 0
203
    highlightMoveDuration: 0
68
202
}
204
}
69
203
205
70
=== modified file 'src/Ubuntu/Components/Themes/1.3/Palette.qml'
71
--- src/Ubuntu/Components/Themes/1.3/Palette.qml	2016-03-01 15:06:38 +0000
72
+++ src/Ubuntu/Components/Themes/1.3/Palette.qml	2016-05-03 04:48:27 +0000
73
@@ -60,6 +60,11 @@
74
60
    property PaletteValues disabled: PaletteValues{}
60
    property PaletteValues disabled: PaletteValues{}
75
61
61
76
62
    /*!
62
    /*!
77
63
       Color palette to use when the widget is focused.
78
64
    */
79
65
    property PaletteValues focused: PaletteValues{}
80
66
81
67
    /*!
82
63
       Color palette to use when the widget is selected, for example when
68
       Color palette to use when the widget is selected, for example when
83
64
       a tab is the current one.
69
       a tab is the current one.
84
65
    */
70
    */
85
66
71
86
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml'
87
--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml	2016-04-26 05:33:41 +0000
88
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml	2016-05-03 04:48:27 +0000
89
@@ -24,7 +24,7 @@
90
24
    backgroundSecondaryText: UbuntuColors.slate
24
    backgroundSecondaryText: UbuntuColors.slate
91
25
    backgroundTertiaryText: UbuntuColors.ash
25
    backgroundTertiaryText: UbuntuColors.ash
92
26
    base: UbuntuColors.silk
26
    base: UbuntuColors.silk
94
27
    baseText: UbuntuColors.ash
27
    baseText: UbuntuColors.graphite
95
28
    foreground: UbuntuColors.porcelain
28
    foreground: UbuntuColors.porcelain
96
29
    foregroundText: UbuntuColors.jet
29
    foregroundText: UbuntuColors.jet
97
30
    raised: "#FFFFFF"
30
    raised: "#FFFFFF"
98
31
31
99
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml'
100
--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml	2016-03-01 15:06:38 +0000
101
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml	2016-05-03 04:48:27 +0000
102
@@ -19,9 +19,8 @@
103
19
19
104
20
AmbianceNormal {
20
AmbianceNormal {
105
21
    background: UbuntuColors.porcelain
21
    background: UbuntuColors.porcelain
106
22
    backgroundText: UbuntuColors.blue
107
23
    backgroundTertiaryText: UbuntuColors.blue
108
24
    base: UbuntuColors.ash
22
    base: UbuntuColors.ash
110
25
    baseText: UbuntuColors.blue
23
    baseText: UbuntuColors.inkstone
111
26
    foreground: UbuntuColors.ash
24
    foreground: UbuntuColors.ash
112
25
    overlay: UbuntuColors.porcelain
113
27
}
26
}
114
28
27
115
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml'
116
--- src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-01-28 11:54:29 +0000
117
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-05-03 04:48:27 +0000
118
@@ -26,7 +26,7 @@
119
26
    color: styledItem.enabled
26
    color: styledItem.enabled
120
27
                ? theme.palette.normal.focus
27
                ? theme.palette.normal.focus
121
28
                : theme.palette.disabled.focus
28
                : theme.palette.disabled.focus
123
29
    thickness: units.gu(0.21)
29
    thickness: units.dp(1)
124
30
    radius: units.gu(1.7)
30
    radius: units.gu(1.7)
125
31
    visible: styledItem.keyNavigationFocus
31
    visible: styledItem.keyNavigationFocus
126
32
32
127
33
33
128
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
129
--- src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-04-26 05:33:41 +0000
130
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-05-03 04:48:27 +0000
131
@@ -26,15 +26,18 @@
132
26
            // specific disabled colors
26
            // specific disabled colors
133
27
            var diff = {
27
            var diff = {
134
28
                field: UbuntuColors.porcelain,
28
                field: UbuntuColors.porcelain,
137
29
                positiveText: normal.positiveText,
29
                selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.1),
138
30
                negativeText: normal.negativeText,
30
                positiveText: "#FFFFFF",
139
31
                negativeText: "#FFFFFF",
140
32
                activityText: "#FFFFFF",
141
33
                focusText: "#FFFFFF"
142
31
            };
34
            };
143
32
            for (var p in normal) {
35
            for (var p in normal) {
144
33
                // skip objectName and all change signals
36
                // skip objectName and all change signals
145
34
                if (p === "objectName" || p.indexOf("Changed") > 0) continue;
37
                if (p === "objectName" || p.indexOf("Changed") > 0) continue;
146
35
                disabled[p] = diff[p] || (
38
                disabled[p] = diff[p] || (
147
36
                    // if not specific, colors are 30% opaque normal
39
                    // if not specific, colors are 30% opaque normal
149
37
                    Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3)
40
                    Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.5)
150
38
                );
41
                );
151
39
            }
42
            }
152
40
        }
43
        }
153
@@ -51,13 +54,18 @@
154
51
                background: UbuntuColors.porcelain,
54
                background: UbuntuColors.porcelain,
155
52
                base: UbuntuColors.porcelain,
55
                base: UbuntuColors.porcelain,
156
53
                foreground: UbuntuColors.porcelain,
56
                foreground: UbuntuColors.porcelain,
157
57
                selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.1),
158
58
                positiveText: "#FFFFFF",
159
59
                negativeText: "#FFFFFF",
160
60
                activityText: "#FFFFFF",
161
61
                focusText: "#FFFFFF"
162
54
            };
62
            };
163
55
            for (var p in selected) {
63
            for (var p in selected) {
164
56
                // skip objectName and all change signals
64
                // skip objectName and all change signals
165
57
                if (p === "objectName" || p.indexOf("Changed") > 0) continue;
65
                if (p === "objectName" || p.indexOf("Changed") > 0) continue;
166
58
                selectedDisabled[p] = diff[p] || (
66
                selectedDisabled[p] = diff[p] || (
167
59
                    // if not specific, colors are 30% opaque normal
67
                    // if not specific, colors are 30% opaque normal
169
60
                    Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.3)
68
                    Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.5)
170
61
                );
69
                );
171
62
            }
70
            }
172
63
        }
71
        }
173
@@ -65,7 +73,15 @@
174
65
73
175
66
    highlighted: AmbianceNormal {
74
    highlighted: AmbianceNormal {
176
67
        background: UbuntuColors.silk
75
        background: UbuntuColors.silk
178
68
        base: UbuntuColors.jet
76
        base: UbuntuColors.ash
179
77
        baseText: UbuntuColors.inkstone
180
69
        foreground: UbuntuColors.silk
78
        foreground: UbuntuColors.silk
181
79
        raised: UbuntuColors.silk
182
80
        raisedText: UbuntuColors.inkstone
183
81
        raisedSecondaryText: UbuntuColors.ash
184
82
    }
185
83
186
84
    focused: AmbianceNormal {
187
85
        background: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
188
70
    }
86
    }
189
71
}
87
}
190
72
88
191
=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml'
192
--- src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2016-03-10 08:46:03 +0000
193
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2016-05-03 04:48:27 +0000
194
@@ -22,14 +22,23 @@
195
22
Palette {
22
Palette {
196
23
    normal: SuruDarkNormal {}
23
    normal: SuruDarkNormal {}
197
24
    disabled: SuruDarkNormal {
24
    disabled: SuruDarkNormal {
198
25
        field: UbuntuColors.inkstone
199
26
        // inactive is 30% transparent normal
200
27
        Component.onCompleted: {
25
        Component.onCompleted: {
201
26
            // specific disabled colors
202
27
            var diff = {
203
28
                foreground: UbuntuColors.inkstone,
204
29
                field: UbuntuColors.inkstone,
205
30
                positiveText: UbuntuColors.porcelain,
206
31
                negativeText: UbuntuColors.porcelain,
207
32
                activityText: UbuntuColors.porcelain,
208
33
                focusText: UbuntuColors.porcelain
209
34
            };
210
28
            for (var p in normal) {
35
            for (var p in normal) {
211
29
                // skip objectName and all change signals
36
                // skip objectName and all change signals
215
30
                if (p == "objectName"|| p.indexOf("Changed") > 0
37
                if (p == "objectName"|| p.indexOf("Changed") > 0) continue;
216
31
                         || p == "field"  || p == "foreground" ) continue;
38
                disabled[p] = diff[p] || (
217
32
                disabled[p] = Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3);
39
                    // if not specific, colors are 30% opaque normal
218
40
                    Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.5)
219
41
                );
220
33
            }
42
            }
221
34
        }
43
        }
222
35
    }
44
    }
223
@@ -39,24 +48,39 @@
224
39
48
225
40
    // selected differs from normal in background, base, foreground
49
    // selected differs from normal in background, base, foreground
226
41
    selectedDisabled: SuruDarkSelected {
50
    selectedDisabled: SuruDarkSelected {
227
42
        background: UbuntuColors.inkstone
228
43
        base: UbuntuColors.inkstone
229
44
        foreground: UbuntuColors.inkstone
230
45
        // inactive is 30% transparent normal
231
46
        Component.onCompleted: {
51
        Component.onCompleted: {
232
52
            var diff = {
233
53
                background: UbuntuColors.inkstone,
234
54
                base: UbuntuColors.inkstone,
235
55
                foreground: UbuntuColors.inkstone,
236
56
                positiveText: UbuntuColors.porcelain,
237
57
                negativeText: UbuntuColors.porcelain,
238
58
                activityText: UbuntuColors.porcelain,
239
59
                focusText: UbuntuColors.porcelain
240
60
            };
241
47
            for (var p in selected) {
61
            for (var p in selected) {
242
48
                // skip objectName and all change signals
62
                // skip objectName and all change signals
246
49
                if (p == "objectName"|| p.indexOf("Changed") > 0
63
                if (p == "objectName"|| p.indexOf("Changed") > 0) continue;
247
50
                         || p == "field"  || p == "foreground" ) continue;
64
                selectedDisabled[p] = diff[p] || (
248
51
                selectedDisabled[p] = Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.3);
65
                    // if not specific, colors are 30% opaque normal
249
66
                    Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.5)
250
67
                );
251
52
            }
68
            }
252
53
        }
69
        }
253
54
    }
70
    }
254
55
71
255
56
    highlighted: SuruDarkNormal {
72
    highlighted: SuruDarkNormal {
256
57
        background: UbuntuColors.slate
73
        background: UbuntuColors.slate
258
58
        base: UbuntuColors.graphite
74
        base: UbuntuColors.slate
259
75
        baseText: UbuntuColors.silk
260
59
        foreground: UbuntuColors.slate
76
        foreground: UbuntuColors.slate
261
77
        raised: UbuntuColors.silk
262
78
        raisedText: UbuntuColors.inkstone
263
79
        raisedSecondaryText: UbuntuColors.ash
264
80
    }
265
81
266
82
    focused: SuruDarkNormal {
267
83
        background: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.4)
268
60
    }
84
    }
269
61
}
85
}
270
62
//![0]
86
//![0]
271
63
87
272
=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml'
273
--- src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml	2016-04-26 05:33:41 +0000
274
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml	2016-05-03 04:48:27 +0000
275
@@ -24,7 +24,7 @@
276
24
    backgroundSecondaryText: UbuntuColors.silk
24
    backgroundSecondaryText: UbuntuColors.silk
277
25
    backgroundTertiaryText: UbuntuColors.ash
25
    backgroundTertiaryText: UbuntuColors.ash
278
26
    base: UbuntuColors.graphite
26
    base: UbuntuColors.graphite
280
27
    baseText: UbuntuColors.ash
27
    baseText: UbuntuColors.silk
281
28
    foreground: UbuntuColors.inkstone
28
    foreground: UbuntuColors.inkstone
282
29
    foregroundText: "#FFFFFF"
29
    foregroundText: "#FFFFFF"
283
30
    raised: "#FFFFFF"
30
    raised: "#FFFFFF"
284
31
31
285
=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml'
286
--- src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml	2016-03-01 15:06:38 +0000
287
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml	2016-05-03 04:48:27 +0000
288
@@ -20,10 +20,8 @@
289
20
20
290
21
SuruDarkNormal {
21
SuruDarkNormal {
291
22
    background: UbuntuColors.inkstone
22
    background: UbuntuColors.inkstone
296
23
    backgroundText: UbuntuColors.blue
23
    base: UbuntuColors.inkstone
297
24
    backgroundTertiaryText: UbuntuColors.blue
24
    baseText: UbuntuColors.ash
294
25
    base: UbuntuColors.ash
295
26
    baseText:UbuntuColors.blue
298
27
    foreground: UbuntuColors.slate
25
    foreground: UbuntuColors.slate
299
26
    overlay: UbuntuColors.slate
300
28
}
27
}
301
29
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-05-03
Cris Dywan		2016-03-09	Approve on 2016-05-03
Review via email: mp+288545@code.launchpad.net