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

Proposed by Christian Dywan on 2014-08-07
Status: Merged
Approved by: Tim Peeters on 2014-08-26
Approved revision: 1184
Merged at revision: 1217
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/sourceOverflow
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 24 lines (+2/-2)
2 files modified
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+1/-1)
tests/resources/navigation/MyCustomPage.qml (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/sourceOverflow
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-08-26
Tim Peeters 2014-08-07 Approve on 2014-08-26
Nekhelesh Ramananthan (community) testing Approve on 2014-08-07
Review via email: mp+229960@code.launchpad.net

Commit message

Use iconSource for actions in the overflow panel

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

Tested this MP against my personal app Flashback and the icons are now shown correctly.

review: Approve (testing)
Tim Peeters (tpeeters) wrote :

This MR does not fix either of the two linked bugs. Why are they attached here?

review: Needs Fixing
Nekhelesh Ramananthan (nik90) wrote :

> This MR does not fix either of the two linked bugs. Why are they attached
> here?

hmm that's strange. It helped fix the black square icons that sometime showed up in the overflow panel.

Tim Peeters (tpeeters) wrote :

> > This MR does not fix either of the two linked bugs. Why are they attached
> > here?
>
> hmm that's strange. It helped fix the black square icons that sometime showed
> up in the overflow panel.

It fixes the icons if you define the source of the Action, but the bug is about actions without an icon{Name,Source} set.

The MR makes sense, it just does not fix the bugs that are linked to it.

Christian Dywan (kalikiana) wrote :

It does fix both bugs with regard to icons - note that bug 1354036 is unfortunately a collection of unrelated issues.

Tim Peeters (tpeeters) wrote :

Ok. The linked bugs are rubbish (describing different unrelated issues in a single bug), but the changes proposed are good. Please sync with staging.

1184. By Christian Dywan on 2014-08-26

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

Tim Peeters (tpeeters) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
2--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2014-08-22 21:29:46 +0000
3+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2014-08-26 10:46:15 +0000
4@@ -396,7 +396,7 @@
5
6 Icon {
7 id: actionIcon
8- name: action.iconName
9+ source: action.iconSource
10 color: Theme.palette.selected.backgroundText
11 anchors {
12 verticalCenter: parent.verticalCenter
13
14=== modified file 'tests/resources/navigation/MyCustomPage.qml'
15--- tests/resources/navigation/MyCustomPage.qml 2014-06-24 11:15:30 +0000
16+++ tests/resources/navigation/MyCustomPage.qml 2014-08-26 10:46:15 +0000
17@@ -51,7 +51,7 @@
18 ToolbarButton {
19 action: Action {
20 text: "another one"
21- iconName: "contact"
22+ iconSource: "call_icon.png"
23 }
24 }
25

Subscribers

People subscribed via source and target branches