diff options
Diffstat (limited to 'src/plugins/imageviewer')
-rw-r--r-- | src/plugins/imageviewer/images/outline.png | bin | 593 -> 0 bytes | |||
-rw-r--r-- | src/plugins/imageviewer/images/pause-small.png | bin | 399 -> 0 bytes | |||
-rw-r--r-- | src/plugins/imageviewer/images/play-small.png | bin | 630 -> 0 bytes | |||
-rw-r--r-- | src/plugins/imageviewer/imageviewer.cpp | 7 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewer.qrc | 3 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewerplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewertoolbar.ui | 4 |
7 files changed, 5 insertions, 11 deletions
diff --git a/src/plugins/imageviewer/images/outline.png b/src/plugins/imageviewer/images/outline.png Binary files differdeleted file mode 100644 index aaa9464535..0000000000 --- a/src/plugins/imageviewer/images/outline.png +++ /dev/null diff --git a/src/plugins/imageviewer/images/pause-small.png b/src/plugins/imageviewer/images/pause-small.png Binary files differdeleted file mode 100644 index 66d1f46d3d..0000000000 --- a/src/plugins/imageviewer/images/pause-small.png +++ /dev/null diff --git a/src/plugins/imageviewer/images/play-small.png b/src/plugins/imageviewer/images/play-small.png Binary files differdeleted file mode 100644 index 3a7a99fb24..0000000000 --- a/src/plugins/imageviewer/images/play-small.png +++ /dev/null diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index 44f86c44b9..5710174a1d 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -102,9 +102,10 @@ void ImageViewer::ctor() d->ui_toolbar.setupUi(d->toolbar); d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"), Core::Icons::SAVEFILE.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.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM.icon()); + d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM_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")); @@ -253,10 +254,10 @@ void ImageViewer::updatePauseAction() if (isMovie) { if (d->file->isPaused()) { d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Play Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(QPixmap(QLatin1String(":/imageviewer/images/play-small.png"))); + d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::RUN_SMALL.pixmap()); } else { d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Pause Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(QPixmap(QLatin1String(":/imageviewer/images/pause-small.png"))); + d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::INTERRUPT_SMALL.pixmap()); } } } diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc index e39039ade1..60678a9ced 100644 --- a/src/plugins/imageviewer/imageviewer.qrc +++ b/src/plugins/imageviewer/imageviewer.qrc @@ -1,10 +1,7 @@ <RCC> <qresource prefix="/imageviewer"> - <file>images/outline.png</file> <file>images/originalsize.png</file> <file>images/background.png</file> - <file>images/pause-small.png</file> - <file>images/play-small.png</file> <file>ImageViewer.mimetypes.xml</file> </qresource> </RCC> diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp index 12d0f86524..2193c5c43c 100644 --- a/src/plugins/imageviewer/imageviewerplugin.cpp +++ b/src/plugins/imageviewer/imageviewerplugin.cpp @@ -86,7 +86,7 @@ void ImageViewerPlugin::extensionsInitialized() iv->resetToOriginalSize(); }); - a = registerNewAction(Constants::ACTION_FIT_TO_SCREEN, tr("Fit To Screen"), + a = registerNewAction(Constants::ACTION_FIT_TO_SCREEN, tr("Fit to Screen"), QKeySequence(tr("Ctrl+="))); connect(a, &QAction::triggered, this, [this]() { if (ImageViewer *iv = currentImageViewer()) diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui index 0c86a3e585..4dec6dc66e 100644 --- a/src/plugins/imageviewer/imageviewertoolbar.ui +++ b/src/plugins/imageviewer/imageviewertoolbar.ui @@ -46,10 +46,6 @@ <property name="toolTipBase"> <string>Show Outline</string> </property> - <property name="icon"> - <iconset resource="imageviewer.qrc"> - <normaloff>:/imageviewer/images/outline.png</normaloff>:/imageviewer/images/outline.png</iconset> - </property> <property name="checkable"> <bool>true</bool> </property> |