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

ImageViewer, ScxmlEditor: Use the new "Zoom In"/"Zoom Out" icons

Browse Source 
Change-Id: Ib01060918924644b57d35083a4269614fba900c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2016-10-24 17:13:49 +02:00
parent ee8cb08e2c
commit d6c8a97429
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,8 +107,8 @@ void ImageViewer::ctor()
{QLatin1String(":/utils/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}}); {QLatin1String(":/utils/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}});
d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon()); d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon());
d->ui_toolbar.toolButtonOutline->setIcon(Utils::Icons::BOUNDING_RECT.icon()); d->ui_toolbar.toolButtonOutline->setIcon(Utils::Icons::BOUNDING_RECT.icon());
d->ui_toolbar.toolButtonZoomIn->setIcon(Utils::Icons::PLUS_TOOLBAR.icon()); d->ui_toolbar.toolButtonZoomIn->setIcon(Utils::Icons::ZOOMIN_TOOLBAR.icon());
d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::Icons::MINUS.icon()); d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::Icons::ZOOMIN_TOOLBAR.icon());
d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::Icons::ZOOM_TOOLBAR.icon()); d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::Icons::ZOOM_TOOLBAR.icon());
d->ui_toolbar.toolButtonOriginalSize->setIcon(Utils::Icons::EYE_OPEN_TOOLBAR.icon()); d->ui_toolbar.toolButtonOriginalSize->setIcon(Utils::Icons::EYE_OPEN_TOOLBAR.icon());
// icons update - try to use system theme // icons update - try to use system theme

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

@@ -18,8 +18,6 @@
<file>images/icon-export-canvas@2x.png</file> <file>images/icon-export-canvas@2x.png</file>
<file>images/icon-fit-screen.png</file> <file>images/icon-fit-screen.png</file>
<file>images/icon-pan.png</file> <file>images/icon-pan.png</file>
<file>images/icon-zoom-in.png</file>
<file>images/icon-zoom-out.png</file>
<file>images/initial.png</file> <file>images/initial.png</file>
<file>images/more_colors.png</file> <file>images/more_colors.png</file>
<file>images/navigator.png</file> <file>images/navigator.png</file>

BIN
src/plugins/scxmleditor/common/images/icon-zoom-in.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/plugins/scxmleditor/common/images/icon-zoom-out.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

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

@@ -44,8 +44,8 @@ ActionHandler::ActionHandler(QObject *parent)
const char *keyseq; const char *keyseq;
bool checkable; bool checkable;
} actionInfos[] = { } actionInfos[] = {
{ Utils::Icon(":/scxmleditor/images/icon-zoom-in.png"), AH::tr("Zoom In"), AH::tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false }, { Utils::Icons::ZOOMIN_TOOLBAR, AH::tr("Zoom In"), AH::tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false },
{ Utils::Icon(":/scxmleditor/images/icon-zoom-out.png"), AH::tr("Zoom Out"), AH::tr("Zoom Out (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::Icon(":/scxmleditor/images/icon-fit-screen.png"), 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::Icon(":/scxmleditor/images/icon-pan.png"), AH::tr("Panning"), AH::tr("Panning (Shift)"), "Shift", true },