aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/imageviewer
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@theqtcompany.com>2016-04-10 20:32:28 +0200
committerAlessandro Portale <alessandro.portale@theqtcompany.com>2016-04-12 13:57:08 +0000
commita84fe0b762b00f6e6fadc0b807ebff3b702114a8 (patch)
tree062d8fcbfd95ac5551a589717ecbc4614ea1af07 /src/plugins/imageviewer
parent5c67b798da7b50368135d77992fe4cc8b59e8f19 (diff)
Icons: Removing several duplicates and variations of the eye_open icon
Change-Id: I598005ac81bd847d3d5e88c3d78a0e945c8026c5 Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/imageviewer')
-rw-r--r--src/plugins/imageviewer/images/originalsize.pngbin593 -> 0 bytes
-rw-r--r--src/plugins/imageviewer/imageviewer.cpp1
-rw-r--r--src/plugins/imageviewer/imageviewer.qrc1
-rw-r--r--src/plugins/imageviewer/imageviewertoolbar.ui4
4 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/imageviewer/images/originalsize.png b/src/plugins/imageviewer/images/originalsize.png
deleted file mode 100644
index 133378a8e7..0000000000
--- a/src/plugins/imageviewer/images/originalsize.png
+++ /dev/null
Binary files differ
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 5710174a1d..ed47e06c43 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -106,6 +106,7 @@ void ImageViewer::ctor()
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_TOOLBAR.icon());
+ d->ui_toolbar.toolButtonOriginalSize->setIcon(Core::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"));
diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc
index 60678a9ced..23266219fd 100644
--- a/src/plugins/imageviewer/imageviewer.qrc
+++ b/src/plugins/imageviewer/imageviewer.qrc
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/imageviewer">
- <file>images/originalsize.png</file>
<file>images/background.png</file>
<file>ImageViewer.mimetypes.xml</file>
</qresource>
diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui
index 4dec6dc66e..0ca8fe689a 100644
--- a/src/plugins/imageviewer/imageviewertoolbar.ui
+++ b/src/plugins/imageviewer/imageviewertoolbar.ui
@@ -69,10 +69,6 @@
<property name="toolTipBase">
<string>Original Size</string>
</property>
- <property name="icon">
- <iconset resource="imageviewer.qrc">
- <normaloff>:/imageviewer/images/originalsize.png</normaloff>:/imageviewer/images/originalsize.png</iconset>
- </property>
</widget>
</item>
<item>