From 7339761c6a80e3667965c0c6b0e06385b846cb3c Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@theqtcompany.com>
Date: Fri, 15 Apr 2016 23:16:50 +0200
Subject: [PATCH] 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>
---
 src/plugins/bookmarks/bookmarkmanager.cpp    |   4 +++-
 src/plugins/bookmarks/bookmarks.qrc          |   1 +
 src/plugins/bookmarks/images/bookmark.png    | Bin 913 -> 131 bytes
 src/plugins/bookmarks/images/bookmark@2x.png | Bin 0 -> 162 bytes
 src/tools/icons/qtcreatoricons.svg           |  21 ++++++++++++++++++-
 5 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 src/plugins/bookmarks/images/bookmark@2x.png

diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index ec9c2f7f49c..ee92b9ab8e1 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 f0a890bf374..764b398555c 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 7b2e5fd0cefcf2a980989d6cbb044739f9652d06..05f4eec54138f041fbe49a8375119aa6ec34a948 100644
GIT binary patch
delta 114
zcmbQp-pn{bBAbPofq~)e-A6$T3=9$hJ|V6Q3=G`d+*(>%2?+`F=g+@#<;s^YU;h99
zueCiQhJk@W&C|s(gd;jxqn(M3rMa=O(TXQoqgm6J@sNNne~ZDL)7}?!TA3I;GIjf>
UyX&7}U|?YIboFyt=akR{0Cngl5dZ)H

delta 902
zcmZo>oX9>wqMn0|fq_B(^Z!H!1_qXNM_)$<hHE#j_(vEqFfd4#xJHx&=ckpFCl;kL
zIHu$$r7C#lCZ?wbr6#6S7M@JCVPIfZ_H=O!skl`V?Cm2QC}R6L$|^YR)=FJ2S3#%T
zo*EO!#i4<Z+cU06B$c?T816FIHK|v6o12jMx*k1~1fQPzbs~#?c>Zzv^Km0n(=yT4
zCI#L3m+DWSsc=^?RJr#g=ict;dy4J*GiSB^Unp4MX?iw2@b@c4hVIJuteKg7hwTr}
z{hjgrRn76&(|6BWS9mAG?18?4>N=+>{FUv84*&lC*6w)d{dG?)&K)_+-m_b(R`u_`
z4=)1@w)S%_D{4ORxcpsx)Ri-QN|PDQ+V3SVIMe)Wp5*P5%%Z&fR`>QV*`CGe=+xD?
z(Q5L6`O{O1D_45A-CT1hdJngv(&;dT-LEZGb~jYt4PJ3V`S7BpO&zW*f#qj~7H+gI
zo6UK0O4H2<wvQJ?>ek%jS<kkDX+zc?dDkp~`)-##)E{d^<W3CSvwX^qw7vCNW)<Hr
zxz9d2V@9xPiXoqwvGbLeZu9qYOx9Eg51k<YqD|>k#`pHZ1v6qqLMz2&ByOgpXV1xe
zndfPuG&4*wx<aB-xNcW@f`(7zlziC=R&Pf>xi7~8W=?0Dw)VD5%FF|=g9D5&o)F&4
zvzKM|6xP*Z?kh^vYeLxE-F)}z2fQ$-fADkzo4P#f=JgTHI-BS2ICS6em>N^RjG5d;
z7q+GZg?vqyyK+AyoX<Eg2|GvR%Q(--JGSg`!BY(;ufDtszdwX8c>ZXk-NiF!FT^<n
zz7S>azf+p$v(r4u#&7b1IqTQ@FI3h2&@Pfwe1_rY?d=yfZrR~c?Blt$`{ot)qKRP=
zcE9T%SEPS^a9zgog0a2n<FHV9uAc^-lh#g6t$ukUFGk=(&_<8!dqqDtd_QgS_Pu|I
zwXuffivyGS4){i1%3y!BdkzPSEaw@P8jfwHLi*W(3>O9e2T$vmd-LJV;=fZq#AZuR
z-!c28)`?}OJu(bk4jHn{i_Ld>-fKR^?=$1o#=^sk9O^&3{d*$i_~C;u_kEj|ud04Z
zuAYO(r?&3mqLq@4bL0x$z81DJ-^)<@7nRSMIK!Y*bs={Yhu)#EL)()2On0n2;<Vtb
z?f+HxY+frJ+~MM&=)!Tb^}N%!t0HR;O;mi)#eBiteEH`u>(?BYXJliDy%G4&qH5O>
Q1_lNOPgg&ebxsLQ0K(Cr^Z)<=

diff --git a/src/plugins/bookmarks/images/bookmark@2x.png b/src/plugins/bookmarks/images/bookmark@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..903acddbd8a25fd93199fc417f9616ff46f287ca
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT85&=FTt_%ze+}zw+T3QJS
z3G?UAzjEcumoH!b|NpPGJtBsIfx*?&#W6(Ve6of+GfxVqLBqin3{DL<8GIddIYS!^
z_k=LGHZ0w9htc)Go;`acA{#XK?%CtR=;<Kh!mh-*qxpr<sYODf3=Gn7+bqQcK5H{D
PFfe$!`njxgN@xNAmDV!G

literal 0
HcmV?d00001

diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 68647b9c9e0..f9055648a59 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"