feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ImageViewer, ScxmlEditor: Use the new "Fit to view" icon

Browse Source 
Change-Id: I4261e2a91b2c2b310b571ac2657998dcc0756be6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2016-10-26 00:07:34 +02:00
parent d466dc916a
commit 2428135319
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/imageviewer/imageviewer.cpp
View File

@@ -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"));

1
src/plugins/scxmleditor/common/common.qrc
View File

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

BIN
src/plugins/scxmleditor/common/images/icon-fit-screen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 244 B

2
src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
View File

@@ -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 },