diff options
| author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2015-10-19 12:55:13 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2015-10-23 16:04:52 +0000 |
| commit | b8bdc6f669d0949292be217e84fe046ea8450e1c (patch) | |
| tree | adf7521912f2c28b3b571049938f81ce0146207e /src/plugins/imageviewer | |
| parent | e6d038364fe44d96b93fa2f5e40334e7ecad13c2 (diff) | |
| download | qt-creator-b8bdc6f669d0949292be217e84fe046ea8450e1c.tar.gz | |
Icon refresh: First step towards the new Qt Creator themes
http://blog.qt.io/blog/author/didesous/ announced new designs/themes
for Qt Creator. This patch replaces many of the existing toolbar icons
with recolorizable masks for better theming support.
Change-Id: I557aa485205fe2624f33724226f698c303342b40
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'src/plugins/imageviewer')
| -rw-r--r-- | src/plugins/imageviewer/images/fitinscreen.png | bin | 737 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/imageviewer/images/zoomin.png | bin | 541 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/imageviewer/images/zoomout.png | bin | 258 -> 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/imageviewertoolbar.ui | 13 |
6 files changed, 7 insertions, 16 deletions
diff --git a/src/plugins/imageviewer/images/fitinscreen.png b/src/plugins/imageviewer/images/fitinscreen.png Binary files differdeleted file mode 100644 index cbe2f31521..0000000000 --- a/src/plugins/imageviewer/images/fitinscreen.png +++ /dev/null diff --git a/src/plugins/imageviewer/images/zoomin.png b/src/plugins/imageviewer/images/zoomin.png Binary files differdeleted file mode 100644 index be8c961df1..0000000000 --- a/src/plugins/imageviewer/images/zoomin.png +++ /dev/null diff --git a/src/plugins/imageviewer/images/zoomout.png b/src/plugins/imageviewer/images/zoomout.png Binary files differdeleted file mode 100644 index 4466844662..0000000000 --- a/src/plugins/imageviewer/images/zoomout.png +++ /dev/null diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index 2d420a4b76..1614ea3032 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -41,6 +41,7 @@ #include <coreplugin/actionmanager/command.h> #include <utils/fileutils.h> #include <utils/qtcassert.h> +#include <utils/themehelper.h> #include <QMap> #include <QFileInfo> @@ -105,6 +106,12 @@ void ImageViewer::ctor() // toolbar d->toolbar = new QWidget(); d->ui_toolbar.setupUi(d->toolbar); + d->ui_toolbar.toolButtonZoomIn->setIcon(Utils::ThemeHelper::themedIcon( + QLatin1String(Core::Constants::ICON_PLUS))); + d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::ThemeHelper::themedIcon( + QLatin1String(Core::Constants::ICON_MINUS))); + d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::ThemeHelper::themedIcon( + QLatin1String(Core::Constants::ICON_ZOOM))); // icons update - try to use system theme updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in")); diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc index 662722baf7..e39039ade1 100644 --- a/src/plugins/imageviewer/imageviewer.qrc +++ b/src/plugins/imageviewer/imageviewer.qrc @@ -1,9 +1,6 @@ <RCC> <qresource prefix="/imageviewer"> <file>images/outline.png</file> - <file>images/zoomin.png</file> - <file>images/zoomout.png</file> - <file>images/fitinscreen.png</file> <file>images/originalsize.png</file> <file>images/background.png</file> <file>images/pause-small.png</file> diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui index df23c185fb..3c673fb871 100644 --- a/src/plugins/imageviewer/imageviewertoolbar.ui +++ b/src/plugins/imageviewer/imageviewertoolbar.ui @@ -56,10 +56,6 @@ <property name="toolTipBase"> <string>Fit to Screen</string> </property> - <property name="icon"> - <iconset resource="imageviewer.qrc"> - <normaloff>:/imageviewer/images/fitinscreen.png</normaloff>:/imageviewer/images/fitinscreen.png</iconset> - </property> <property name="checkable"> <bool>false</bool> </property> @@ -81,10 +77,6 @@ <property name="toolTipBase"> <string>Zoom In</string> </property> - <property name="icon"> - <iconset resource="imageviewer.qrc"> - <normaloff>:/imageviewer/images/zoomin.png</normaloff>:/imageviewer/images/zoomin.png</iconset> - </property> <property name="autoRepeat"> <bool>true</bool> </property> @@ -95,10 +87,6 @@ <property name="toolTipBase"> <string>Zoom Out</string> </property> - <property name="icon"> - <iconset resource="imageviewer.qrc"> - <normaloff>:/imageviewer/images/zoomout.png</normaloff>:/imageviewer/images/zoomout.png</iconset> - </property> <property name="autoRepeat"> <bool>true</bool> </property> @@ -153,7 +141,6 @@ </customwidgets> <resources> <include location="imageviewer.qrc"/> - <include location="../coreplugin/core.qrc"/> </resources> <connections/> </ui> |
