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

[Cris Dywan]

Use iconSource for actions in the overflow panel

[Nekhelesh Ramananthan (nik90)]

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

review: Approve (testing)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1183
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/745/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3199/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/577/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/577/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/577/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4444/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2783/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/745/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

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

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

> 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)]

> > 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.

[Cris Dywan (kalikiana)]

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

[Tim Peeters (tpeeters)]

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

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/sourceOverflow]

1184. By Cris Dywan on 2014-08-26

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

[Tim Peeters (tpeeters)]

thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1184
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/909/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/741
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/741
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/741/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/741

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/909/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-08-22 21:29:46 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-08-26 10:46:15 +0000
@@ -396,7 +396,7 @@
 
                                 Icon {
                                     id: actionIcon
-                                    name: action.iconName
+                                    source: action.iconSource
                                     color: Theme.palette.selected.backgroundText
                                     anchors {
                                         verticalCenter: parent.verticalCenter
 
=== modified file 'tests/resources/navigation/MyCustomPage.qml'
--- tests/resources/navigation/MyCustomPage.qml	2014-06-24 11:15:30 +0000
+++ tests/resources/navigation/MyCustomPage.qml	2014-08-26 10:46:15 +0000
@@ -51,7 +51,7 @@
         ToolbarButton {
             action: Action {
                 text: "another one"
-                iconName: "contact"
+                iconSource: "call_icon.png"
             }
         }