Merge lp:~mpredotka/ubuntu-ui-extras/rotate-icon-fix into lp:ubuntu-ui-extras

Proposed by Michal Predotka on 2016-07-14
Status: Needs review
Proposed branch: lp:~mpredotka/ubuntu-ui-extras/rotate-icon-fix
Merge into: lp:ubuntu-ui-extras
Diff against target: 15 lines (+1/-1)
1 file modified
modules/Ubuntu/Components/Extras/PhotoEditor.qml (+1/-1)
To merge this branch: bzr merge lp:~mpredotka/ubuntu-ui-extras/rotate-icon-fix
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2016-07-14 Pending
Review via email: mp+300095@code.launchpad.net

Commit message

Use iconName instead of iconSource for rotation action

Description of the change

Use iconName instead of iconSource for rotation action. Remove edit_rotate_left@27.png from assets.

To post a comment you must log in.
Florian Boucault (fboucault) wrote :

Thanks Michal. Unfortunately the icon appears as grey and a little too thin. A better fix was included in trunk and will be released soon. Thanks again!

Michal Predotka (mpredotka) wrote :

Thanks Florian. I just went for the easiest fix. I wasn't able to check what I've done to be honest :-)

Unmerged revisions

107. By Michal Predotka on 2016-07-14

Use iconName instead of iconSource for rotation icon

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Extras/PhotoEditor.qml'
2--- modules/Ubuntu/Components/Extras/PhotoEditor.qml 2015-03-02 20:25:09 +0000
3+++ modules/Ubuntu/Components/Extras/PhotoEditor.qml 2016-07-14 15:36:16 +0000
4@@ -50,7 +50,7 @@
5 Action {
6 objectName: "rotateButton"
7 text: i18n.tr("Rotate")
8- iconSource: Qt.resolvedUrl("PhotoEditor/assets/edit_rotate_left.png")
9+ iconName: "rotate-right"
10 onTriggered: {
11 photoData.isLongOperation = false;
12 photoData.rotateRight()
13
14=== removed file 'modules/Ubuntu/Components/Extras/PhotoEditor/assets/edit_rotate_left@27.png'
15Binary files modules/Ubuntu/Components/Extras/PhotoEditor/assets/edit_rotate_left@27.png 2015-02-03 16:38:18 +0000 and modules/Ubuntu/Components/Extras/PhotoEditor/assets/edit_rotate_left@27.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches