diff options
| author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-04-14 14:15:38 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-04-14 13:27:18 +0000 |
| commit | 27383f0756f47ca241af630cdf73005835aa6936 (patch) | |
| tree | ba9244828ef98f59bd2920cc7a0d782e0adf9602 /src/plugins/imageviewer | |
| parent | 1037482506e104a5ee16457d477a1b06768085d9 (diff) | |
Moving desktopdevicesmall.png from projectexplorer to core
It is also needed by imageviewer
Change-Id: Idd489ebc71768e293790e4b8f8ae9f5ede38e80d
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'src/plugins/imageviewer')
| -rw-r--r-- | src/plugins/imageviewer/images/background.png | bin | 1050 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/imageviewer/imageviewer.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/imageviewer/imageviewer.qrc | 1 | ||||
| -rw-r--r-- | src/plugins/imageviewer/imageviewertoolbar.ui | 4 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/imageviewer/images/background.png b/src/plugins/imageviewer/images/background.png Binary files differdeleted file mode 100644 index 93a092ab13..0000000000 --- a/src/plugins/imageviewer/images/background.png +++ /dev/null diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index ed47e06c43..4122794176 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -102,6 +102,9 @@ void ImageViewer::ctor() d->ui_toolbar.setupUi(d->toolbar); d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"), Core::Icons::SAVEFILE.icon())); + const Utils::Icon backgroundIcon({ + {QLatin1String(":/core/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()); diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc index 23266219fd..c62bf29a21 100644 --- a/src/plugins/imageviewer/imageviewer.qrc +++ b/src/plugins/imageviewer/imageviewer.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/imageviewer"> - <file>images/background.png</file> <file>ImageViewer.mimetypes.xml</file> </qresource> </RCC> diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui index 0ca8fe689a..0a230946d3 100644 --- a/src/plugins/imageviewer/imageviewertoolbar.ui +++ b/src/plugins/imageviewer/imageviewertoolbar.ui @@ -29,10 +29,6 @@ <property name="toolTipBase"> <string>Show Background</string> </property> - <property name="icon"> - <iconset resource="imageviewer.qrc"> - <normaloff>:/imageviewer/images/background.png</normaloff>:/imageviewer/images/background.png</iconset> - </property> <property name="checkable"> <bool>true</bool> </property> |
