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

[Michal Predotka]

Use iconName instead of iconSource for rotation action

Use iconName instead of iconSource for rotation action. Remove [e-mail] from assets.

[Florian Boucault (fboucault)]

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

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

=== modified file 'modules/Ubuntu/Components/Extras/PhotoEditor.qml'
--- modules/Ubuntu/Components/Extras/PhotoEditor.qml	2015-03-02 20:25:09 +0000
+++ modules/Ubuntu/Components/Extras/PhotoEditor.qml	2016-07-14 15:36:16 +0000
@@ -50,7 +50,7 @@
         Action {
             objectName: "rotateButton"
             text: i18n.tr("Rotate")
-            iconSource: Qt.resolvedUrl("PhotoEditor/assets/edit_rotate_left.png")
+            iconName: "rotate-right"
             onTriggered: {
                 photoData.isLongOperation = false;
                 photoData.rotateRight()

=== removed file 'modules/Ubuntu/Components/Extras/PhotoEditor/assets/[e-mail]'
Binary files modules/Ubuntu/Components/Extras/PhotoEditor/assets/[e-mail]	2015-02-03 16:38:18 +0000 and modules/Ubuntu/Components/Extras/PhotoEditor/assets/[e-mail]	1970-01-01 00:00:00 +0000 differ