Merge lp:~fboucault/ubuntu-ui-toolkit/themed_list_items_progression into lp:ubuntu-ui-toolkit

Proposed by Florian Boucault
Status: Merged
Approved by: Zsombor Egri
Approved revision: 885
Merged at revision: 885
Proposed branch: lp:~fboucault/ubuntu-ui-toolkit/themed_list_items_progression
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 105 lines (+54/-26)
2 files modified
modules/Ubuntu/Components/ListItems/ProgressionVisual.qml (+3/-26)
modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml (+51/-0)
To merge this branch: bzr merge lp:~fboucault/ubuntu-ui-toolkit/themed_list_items_progression
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+198241@code.launchpad.net

Commit message

List item progression: use appropriate icon (same as Tabs' arrow) and fixes the issue of it being the wrong color in Dark and Gradient themes.

To post a comment you must log in.
Revision history for this message
Zsombor Egri (zsombi) wrote :

A nice one! Finally styled!!! Thank you!

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml'
2--- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml 2013-04-26 19:23:36 +0000
3+++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml 2013-12-09 12:25:49 +0000
4@@ -15,38 +15,15 @@
5 */
6
7 import QtQuick 2.0
8+import Ubuntu.Components 0.1
9
10 // Internal helper class for the visuals of
11 // the progression symbol.
12-Item {
13+StyledItem {
14 id: progressionVisual
15
16- width: progressIcon.width + (showSplit ? splitMargin + progressionDivider.width : 0)
17-
18 property bool showSplit: false
19 property real splitMargin
20
21- Image {
22- id: progressIcon
23- source: "artwork/ListItemProgressionArrow.png"
24- anchors {
25- verticalCenter: parent.verticalCenter
26- right: parent.right
27- }
28-
29- opacity: enabled ? 1.0 : 0.5
30- }
31-
32- Image {
33- id: progressionDivider
34- visible: progressionVisual.showSplit
35- anchors {
36- top: parent.top
37- bottom: parent.bottom
38- right: progressIcon.left
39- rightMargin: splitMargin
40- }
41- source: "artwork/ListItemDividerVertical.png"
42- opacity: enabled ? 1.0 : 0.5
43- }
44+ style: Theme.createStyleComponent("ProgressionVisualStyle.qml", progressionVisual)
45 }
46
47=== removed file 'modules/Ubuntu/Components/ListItems/artwork/ListItemProgressionArrow@8.png'
48Binary files modules/Ubuntu/Components/ListItems/artwork/ListItemProgressionArrow@8.png 2012-11-21 12:07:16 +0000 and modules/Ubuntu/Components/ListItems/artwork/ListItemProgressionArrow@8.png 1970-01-01 00:00:00 +0000 differ
49=== added file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml'
50--- modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml 1970-01-01 00:00:00 +0000
51+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml 2013-12-09 12:25:49 +0000
52@@ -0,0 +1,51 @@
53+/*
54+ * Copyright 2013 Canonical Ltd.
55+ *
56+ * This program is free software; you can redistribute it and/or modify
57+ * it under the terms of the GNU Lesser General Public License as published by
58+ * the Free Software Foundation; version 3.
59+ *
60+ * This program is distributed in the hope that it will be useful,
61+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
62+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
63+ * GNU Lesser General Public License for more details.
64+ *
65+ * You should have received a copy of the GNU Lesser General Public License
66+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
67+ */
68+
69+import QtQuick 2.0
70+import Ubuntu.Components 0.1
71+
72+Item {
73+ id: progressionVisualStyle
74+
75+ property url progressionDividerSource: "artwork/progression_divider.png"
76+ property url progressionIconSource: "artwork/chevron.png"
77+
78+ implicitWidth: progressIcon.width + (styledItem.showSplit ? styledItem.splitMargin + progressionDivider.width : 0)
79+
80+ Image {
81+ id: progressIcon
82+ source: progressionIconSource
83+ anchors {
84+ verticalCenter: parent.verticalCenter
85+ right: parent.right
86+ }
87+
88+ opacity: enabled ? 1.0 : 0.5
89+ }
90+
91+ Image {
92+ id: progressionDivider
93+ visible: styledItem.showSplit
94+ anchors {
95+ top: parent.top
96+ bottom: parent.bottom
97+ right: progressIcon.left
98+ rightMargin: styledItem.splitMargin
99+ }
100+ source: progressionDividerSource
101+ opacity: enabled ? 1.0 : 0.5
102+ }
103+}
104
105=== renamed file 'modules/Ubuntu/Components/ListItems/artwork/ListItemDividerVertical@18.png' => 'modules/Ubuntu/Components/Themes/Ambiance/artwork/progression_divider@18.png'

Subscribers

People subscribed via source and target branches

to status/vote changes: