Merge lp:~mzanetti/component-store/iconSource into lp:component-store

Proposed by Michael Zanetti on 2015-02-12
Status: Merged
Approved by: Nekhelesh Ramananthan on 2015-02-23
Approved revision: 41
Merged at revision: 41
Proposed branch: lp:~mzanetti/component-store/iconSource
Merge into: lp:component-store
Diff against target: 19 lines (+2/-0)
1 file modified
ComponentStore/ListItemWithActions/ListItemWithActions.qml (+2/-0)
To merge this branch: bzr merge lp:~mzanetti/component-store/iconSource
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) 2015-02-17 Approve on 2015-02-23
Nekhelesh Ramananthan 2015-02-12 Approve on 2015-02-17
Review via email: mp+249587@code.launchpad.net

Commit Message

make use of Action's iconSource property

This allows using icons that are not in the theme

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

Thnx for the MP. LGTM! Just waiting on renato to give his approval as well.

review: Approve

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ComponentStore/ListItemWithActions/ListItemWithActions.qml'
2--- ComponentStore/ListItemWithActions/ListItemWithActions.qml 2014-11-11 16:33:41 +0000
3+++ ComponentStore/ListItemWithActions/ListItemWithActions.qml 2015-02-12 23:40:16 +0000
4@@ -201,6 +201,7 @@
5 horizontalCenterOffset: actionThreshold / 2
6 }
7 name: leftSideAction && _showActions ? leftSideAction.iconName : ""
8+ source: leftSideAction && _showActions ? leftSideAction.iconSource : ""
9 color: Theme.palette.selected.field
10 height: units.gu(3)
11 width: units.gu(3)
12@@ -245,6 +246,7 @@
13 width: units.gu(3)
14 height: units.gu(3)
15 name: modelData.iconName
16+ source: modelData.iconSource
17 color: root.activeAction === modelData ? UbuntuColors.lightAubergine : UbuntuColors.lightGrey
18 }
19 }

Subscribers

People subscribed via source and target branches