diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2016-10-26 00:07:34 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2016-10-25 22:12:05 +0000 |
| commit | 2428135319128e75c35f0e7b37605ea6227c7a5e (patch) | |
| tree | db9d9d04c7b5a41791068bc20c0c8d314d4353ff | |
| parent | d466dc916a9194efd8d19e4cf48196c2224a1c36 (diff) | |
ImageViewer, ScxmlEditor: Use the new "Fit to view" iconv4.2.0-beta1
Change-Id: I4261e2a91b2c2b310b571ac2657998dcc0756be6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/imageviewer/imageviewer.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/scxmleditor/common/common.qrc | 1 | ||||
| -rw-r--r-- | src/plugins/scxmleditor/common/images/icon-fit-screen.png | bin | 244 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/scxmleditor/plugin_interface/actionhandler.cpp | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index 069e1a3622..b891524d1c 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 36cdafe241..78c35d708e 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 Binary files differdeleted file mode 100644 index d5d5a33956..0000000000 --- a/src/plugins/scxmleditor/common/images/icon-fit-screen.png +++ /dev/null diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp index 026e442557..9a2ff761c2 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 }, |
