diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-03 17:55:54 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-05 10:52:53 +0000 |
| commit | 15fbfaf2e94b72cfd54bb0bd6f2b9ab87b870795 (patch) | |
| tree | e0ec09f6b6b97f0a9b61fd3b27c379cc84d1f3ce /src/plugins/imageviewer | |
| parent | 5d6f5ff2c969046cd19c13a5b7bb0775c9925ea3 (diff) | |
Move icons to Utils
This way we can use them from libraries, not only from plugins.
Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/imageviewer')
| -rw-r--r-- | src/plugins/imageviewer/imageviewer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index cb735933a8..0e5f1c4ad8 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -30,7 +30,6 @@ #include "imageview.h" #include "ui_imageviewertoolbar.h" -#include <coreplugin/coreicons.h> #include <coreplugin/icore.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> @@ -101,16 +100,17 @@ void ImageViewer::ctor() // toolbar d->toolbar = new QWidget(); d->ui_toolbar.setupUi(d->toolbar); - d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"), - Core::Icons::SAVEFILE_TOOLBAR.icon())); + d->ui_toolbar.toolButtonExportImage->setIcon( + QIcon::fromTheme(QLatin1String("document-save"), + Utils::Icons::SAVEFILE_TOOLBAR.icon())); const Utils::Icon backgroundIcon({ - {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/utils/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}}); d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon()); - d->ui_toolbar.toolButtonOutline->setIcon(Core::Icons::BOUNDING_RECT.icon()); - d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon()); - d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon()); + d->ui_toolbar.toolButtonOutline->setIcon(Utils::Icons::BOUNDING_RECT.icon()); + d->ui_toolbar.toolButtonZoomIn->setIcon(Utils::Icons::PLUS.icon()); + d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::Icons::MINUS.icon()); d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::Icons::ZOOM_TOOLBAR.icon()); - d->ui_toolbar.toolButtonOriginalSize->setIcon(Core::Icons::EYE_OPEN_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")); updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, QLatin1String("zoom-out")); @@ -261,10 +261,10 @@ void ImageViewer::updatePauseAction() bool isMovie = d->file->type() == ImageViewerFile::TypeMovie; if (isMovie && !d->file->isPaused()) { d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Pause Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::INTERRUPT_SMALL_TOOLBAR.icon()); + d->ui_toolbar.toolButtonPlayPause->setIcon(Utils::Icons::INTERRUPT_SMALL_TOOLBAR.icon()); } else { d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Play Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon()); + d->ui_toolbar.toolButtonPlayPause->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon()); d->ui_toolbar.toolButtonPlayPause->setEnabled(isMovie); } } |