diff options
author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-04-11 09:48:46 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-04-11 07:53:16 +0000 |
commit | 9bc60e0b9dc9864145015f5cbfa3e323ed0d409d (patch) | |
tree | 1ca8eec60ce888adc39d0ec173b0a9405afbd9ea /src/plugins/imageviewer | |
parent | d13d1795241602ca0cf150b216b282cfb15e406d (diff) | |
download | qt-creator-9bc60e0b9dc9864145015f5cbfa3e323ed0d409d.tar.gz |
Bounding Rect Icon: Move from qmldesigner to core
..and re-use it in the imageviewer plugin
Change-Id: I230bdf6917203c9f4e5ed08a0fdd13dfca8b9749
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
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/imageviewer.cpp | 1 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewer.qrc | 1 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewertoolbar.ui | 4 |
4 files changed, 1 insertions, 5 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/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index a3809b3519..5710174a1d 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -102,6 +102,7 @@ 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_TOOLBAR.icon()); diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc index 9adc10e090..60678a9ced 100644 --- a/src/plugins/imageviewer/imageviewer.qrc +++ b/src/plugins/imageviewer/imageviewer.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/imageviewer"> - <file>images/outline.png</file> <file>images/originalsize.png</file> <file>images/background.png</file> <file>ImageViewer.mimetypes.xml</file> 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> |