From 2428135319128e75c35f0e7b37605ea6227c7a5e Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 26 Oct 2016 00:07:34 +0200
Subject: [PATCH] ImageViewer, ScxmlEditor: Use the new "Fit to view" icon

Change-Id: I4261e2a91b2c2b310b571ac2657998dcc0756be6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/imageviewer/imageviewer.cpp           |   4 ++--
 src/plugins/scxmleditor/common/common.qrc         |   1 -
 .../scxmleditor/common/images/icon-fit-screen.png | Bin 244 -> 0 bytes
 .../plugin_interface/actionhandler.cpp            |   2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 src/plugins/scxmleditor/common/images/icon-fit-screen.png

diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 069e1a36225..b891524d1c7 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -108,8 +108,8 @@ void ImageViewer::ctor()
     d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon());
     d->ui_toolbar.toolButtonOutline->setIcon(Utils::Icons::BOUNDING_RECT.icon());
     d->ui_toolbar.toolButtonZoomIn->setIcon(Utils::Icons::ZOOMIN_TOOLBAR.icon());
-    d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::Icons::ZOOMIN_TOOLBAR.icon());
-    d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::Icons::ZOOM_TOOLBAR.icon());
+    d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::Icons::ZOOMOUT_TOOLBAR.icon());
+    d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::Icons::FITTOVIEW_TOOLBAR.icon());
     d->ui_toolbar.toolButtonOriginalSize->setIcon(Utils::Icons::EYE_OPEN_TOOLBAR.icon());
     // icons update - try to use system theme
     updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in"));
diff --git a/src/plugins/scxmleditor/common/common.qrc b/src/plugins/scxmleditor/common/common.qrc
index 36cdafe2414..78c35d708e9 100644
--- a/src/plugins/scxmleditor/common/common.qrc
+++ b/src/plugins/scxmleditor/common/common.qrc
@@ -25,7 +25,6 @@
         <file>images/history.png</file>
         <file>images/icon-export-canvas.png</file>
         <file>images/icon-export-canvas@2x.png</file>
-        <file>images/icon-fit-screen.png</file>
         <file>images/icon-pan.png</file>
         <file>images/initial.png</file>
         <file>images/more_colors.png</file>
diff --git a/src/plugins/scxmleditor/common/images/icon-fit-screen.png b/src/plugins/scxmleditor/common/images/icon-fit-screen.png
deleted file mode 100644
index d5d5a3395635c1549e4649bd4077d69aaf4906ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 244
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|7G?$p2BAoW(+ms@>H$6>uK)l4X9I(o`#5JG
z;Gcg;e9;lPrN`7x-)lVgpyT4B36~#FyZUtYCOe@`3=9lRB|(0{4Ab)e|Mp~HV5stR
zaSV~ToSblgw`Ix{76}Q7sZ&H6W#$^Ei%3Y!I5)?V<w?f-dn}U}gB<#<X}NBA724gf
z<e3ViKzm@Z(1a@iEmBullvosG++5kRm_-&}O`Imi$hlReqxj0Ch9y}VM;0!0bO<_n
ul=BIz0_zhEY3XL0^qicQceybP3`e9zoce$HO<`bQVDNPHb6Mw<&;$UJl2=*)

diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
index 026e442557a..9a2ff761c22 100644
--- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
@@ -46,7 +46,7 @@ ActionHandler::ActionHandler(QObject *parent)
     } actionInfos[] = {
         { Utils::Icons::ZOOMIN_TOOLBAR, AH::tr("Zoom In"), AH::tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false },
         { Utils::Icons::ZOOMOUT_TOOLBAR, AH::tr("Zoom Out"), AH::tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false },
-        { Utils::Icon(":/scxmleditor/images/icon-fit-screen.png"), AH::tr("Fit to View"), AH::tr("Fit to View (F11)"), "F11", false },
+        { Utils::Icons::FITTOVIEW_TOOLBAR, AH::tr("Fit to View"), AH::tr("Fit to View (F11)"), "F11", false },
         { Utils::Icon(":/scxmleditor/images/icon-pan.png"), AH::tr("Panning"), AH::tr("Panning (Shift)"), "Shift", true },
 
         { Utils::Icons::ZOOM_TOOLBAR, AH::tr("Magnifier"), AH::tr("Magnifier Tool (Alt)"), "Alt", true },