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>

5 files changed, 24 insertions, 2 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
index 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
new file mode 100644
index 0000000000..903acddbd8
--- /dev/null
+++ b/src/plugins/bookmarks/images/bookmark@2x.png
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 68647b9c9e..f9055648a5 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3106,7 +3106,7 @@
          style="fill:#ffffff;fill-opacity:1" />
       <polygon
          transform="translate(402,208)"
-         id="polygon6780-6"
+         id="bookmarkribbon"
          points="555,374 555,362 561,362 561,374 558,370 "
          style="fill:#000000;fill-opacity:1" />
     </g>
@@ -3146,6 +3146,25 @@
          cy="576"
          r="6" />
     </g>
+    <g
+       id="src/plugins/bookmarks/images/bookmark">
+      <rect
+         style="display:inline;fill:#ffffff;fill-opacity:1"
+         x="1016"
+         y="568"
+         width="16"
+         height="16"
+         id="rect6782-96-0" />
+      <use
+         transform="translate(61,0)"
+         height="100%"
+         width="100%"
+         id="use4979"
+         xlink:href="#bookmarkribbon"
+         y="0"
+         x="0"
+         style="display:inline" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"