diff options
author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-04-15 23:16:50 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-04-18 10:02:36 +0000 |
commit | 7339761c6a80e3667965c0c6b0e06385b846cb3c (patch) | |
tree | 1db35084164ae6c03bda38a9f3702409442bbd01 /src/plugins/bookmarks | |
parent | b7fabb290bdae023bb0a26e07e3ddba1c2d9d6d5 (diff) | |
download | qt-creator-7339761c6a80e3667965c0c6b0e06385b846cb3c.tar.gz |
Bookmarks: New Bookmark icon
Using Theme::Bookmarks_TextMarkColor so that it is consistent with the
scrollbar markers.
Change-Id: I2cd6b787a61c2a5bf3a7f684c026006ca0417591
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'src/plugins/bookmarks')
-rw-r--r-- | src/plugins/bookmarks/bookmarkmanager.cpp | 4 | ||||
-rw-r--r-- | src/plugins/bookmarks/bookmarks.qrc | 1 | ||||
-rw-r--r-- | src/plugins/bookmarks/images/bookmark.png | bin | 913 -> 131 bytes | |||
-rw-r--r-- | src/plugins/bookmarks/images/bookmark@2x.png | bin | 0 -> 162 bytes |
4 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index ec9c2f7f49..ee92b9ab8e 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -37,6 +37,7 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/session.h> #include <texteditor/texteditor.h> +#include <utils/icon.h> #include <utils/tooltip/tooltip.h> #include <utils/qtcassert.h> #include <utils/checkablemessagebox.h> @@ -318,7 +319,8 @@ void BookmarkView::gotoBookmark(const QModelIndex &index) //// BookmarkManager::BookmarkManager() : - m_bookmarkIcon(QLatin1String(":/bookmarks/images/bookmark.png")), + m_bookmarkIcon(Utils::Icon({{QLatin1String(":/bookmarks/images/bookmark.png"), + Theme::Bookmarks_TextMarkColor}}, Icon::Tint).pixmap()), m_selectionModel(new QItemSelectionModel(this, this)) { connect(ICore::instance(), &ICore::contextChanged, diff --git a/src/plugins/bookmarks/bookmarks.qrc b/src/plugins/bookmarks/bookmarks.qrc index f0a890bf37..764b398555 100644 --- a/src/plugins/bookmarks/bookmarks.qrc +++ b/src/plugins/bookmarks/bookmarks.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/bookmarks" > <file>images/bookmark.png</file> + <file>images/bookmark@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/bookmarks/images/bookmark.png b/src/plugins/bookmarks/images/bookmark.png Binary files differindex 7b2e5fd0ce..05f4eec541 100644 --- a/src/plugins/bookmarks/images/bookmark.png +++ b/src/plugins/bookmarks/images/bookmark.png diff --git a/src/plugins/bookmarks/images/bookmark@2x.png b/src/plugins/bookmarks/images/bookmark@2x.png Binary files differnew file mode 100644 index 0000000000..903acddbd8 --- /dev/null +++ b/src/plugins/bookmarks/images/bookmark@2x.png |