From b19144d1464d02169b66b830c644eb758fd66744 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Mon, 28 May 2012 17:52:39 +0200
Subject: [PATCH] LogDialog: better icon for "show branches"

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/Resources/TortoiseProcENG.rc     |   1 +
 src/Resources/showbranches.ico       | Bin 0 -> 4286 bytes
 src/TortoiseProc/GitLogListBase.cpp  |   2 +-
 src/TortoiseProc/TortoiseProc.vcproj |   4 ++++
 src/TortoiseProc/resource.h          |   1 +
 5 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/Resources/showbranches.ico

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index a46cb1b4c..57ec8faff 100644
--- a/src/Resources/TortoiseProcENG.rc
+++ b/src/Resources/TortoiseProcENG.rc
@@ -93,6 +93,7 @@ IDI_ACTIONFETCHING      ICON                    "..\\resources\\actionfetching.i
 IDI_LIBRARY             ICON                    "Library.ico"
 IDI_RESTORE             ICON                    "restore.ico"
 IDI_RESTOREOVL          ICON                    "restoreovl.ico"
+IDI_SHOWBRANCHES        ICON                    "showbranches.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/src/Resources/showbranches.ico b/src/Resources/showbranches.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c3b711bbe076a1ff9eb6d1d4c9b67b0fbddcf17d
GIT binary patch
literal 4286
zcwW6%TT@e47~Rwv>DUMI)agT~@v;8`+s@e97K&D@ElAahfIvV{<Pt~-NGRY10~NJR
z%RPiZOeH9Y3J6hA5YbMVw$s|F<6CDkJo#X=`h7bb2b`0fBqEDh1ok;+ueHD10U_e(
zYvV@2--Sab#G68hcZswlHi_Um!>kigVa9DY5=~1qYTduuXgjbO-G<N5m79#8GB!i&
z{?$f%=0|W8Y(r1}R<vb)xaRsD*<0W&+>Tyid)AgU*Y7;|30y~Zq3`fcia`pzb@}gU
zJ+qqV%1OdNNh<n}eg#+Ym*_q8`Qlo7=*~-qyKJ}QKuMbPLit$Xfs%q38E(&L&|^q}
zr(zF0#yz-D{xvR?rNdpC24~TZ=N?|AzN26(E}Fg}?!(WO#EQM-CFp}{LV5_N|L<Q5
zZ-m=l3zTnoEt&9E9l&5!hV;TdI3^sAz9Tyq)$|`fm`>z=weNc$f&ZSZ*U||E?z>CJ
z4&qWxcCZdg)BG!ZP+rvZJE&JVc09lSp7X`5PkF|$H4m3-bL1Qtv>FoKrMvxJ3&q2{
zU*?5lK|T7s9=K=uIgTCAuit$muW9Lo0{8t$eE~+kHBi34ka=Yflz%_xB^ZlfT~L26
zy2{d1I&(giGlM<w%zCmgw@ynZ6kNr-FnYWQR~in<8KkT$9)_wjRpZa|g74?~`P<a+
zhHx6;!24V~S&XYE4uiccza~ADr~B3Pc~<n(yz0pQ7=PX!kGThU-i$Ss;QFbf@=PyY
zXAf%n!FiPmu7!nhZ_N4Uea3C&7&~2xe%f#OwI{#MZnE$H;Jli?^gwfpYvG^y+i{`x
z*8;^CH@>UHM6(eCw4bv6Xm*nNAXV1pa9y6NK9k=cf7}|4IsV+=Q>|u9o~fjmrb~S~
zH|Jf}#Ast7dB~SN8p^}thto0FzlZwj=J{$&ovi|E$~8;YF|G-vF1a_jKZmWkAw4j)
zwA8>e?$!^rxcPmJoOQg$=f7eznwR}uXqvFsTa=$y)5ArYannE6;kLb&=I!2ypO04G
zYc(VdRcB$ShDe_@JAHJ{_(5|9?zT5b4;%|#>&Z*@x#fE}*kja#NospW<H1RK^Uh|>
zJ6mwSw;A^xHt-tH`I(MJ+-a+q?;M9A#pgR`!DOom6D>yBmsf4Z>uP&4BGu<}^%d^$
zJ?wAA1J{`)A2!@*slaUK35r3Z>RGySlVqIK_GCn=&rm%4GH@2`LwcY%-0MDtna<-e
z)l{_ivj<lZdpIZKz`3~B-6Zun2a$S+^gcB#&jrU|&T$&ET_;24AR20ED^NUeP0sZ+
zE!98+{~zSj(s)^I1?+))K#9MDw3S-Z(t25K1*|t@HF#(~c+~3rRq3uJ0(xKt6NvG|
zb@2$q5yg6<Fa@bI1$6ZJ7V&N3J4>JZyG}BZs1N9$>dnHKU>22<V<M37NR;UPLg=3g
Nk@)O&el`w_{{d63Xf*%;

literal 0
HcwPel00001

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index a4e4ba4cf..a64bfd082 100644
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -1825,7 +1825,7 @@ void CGitLogListBase::OnContextMenu(CWnd* pWnd, CPoint point)
 			popup.AppendMenuIcon(ID_FINDENTRY, IDS_LOG_POPUP_FIND, IDI_FILTEREDIT);
 
 		if (GetSelectedCount() == 1 && m_ContextMenuMask & GetContextMenuBit(ID_SHOWBRANCHES) && !pSelLogEntry->m_CommitHash.IsEmpty())
-			popup.AppendMenuIcon(ID_SHOWBRANCHES, IDS_LOG_POPUP_SHOWBRANCHES, IDI_FILTEREDIT);
+			popup.AppendMenuIcon(ID_SHOWBRANCHES, IDS_LOG_POPUP_SHOWBRANCHES, IDI_SHOWBRANCHES);
 
 		int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
 //		DialogEnableWindow(IDOK, FALSE);
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 5a599afe3..572810f8a 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -970,6 +970,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\showbranches.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\TortoiseBlame\small.ico"
 				>
 			</File>
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 22b3a14dc..328f86fcd 100644
--- a/src/TortoiseProc/resource.h
+++ b/src/TortoiseProc/resource.h
@@ -135,6 +135,7 @@
 #define IDD_DIALOG2                     324
 #define IDR_ACC_COMMITDLG               325
 #define IDD_SYNC                        326
+#define IDI_SHOWBRANCHES                326
 #define IDD_PATCH_VIEW                  328
 #define IDD_SVNIGNORE                   329
 #define IDD_CREATEREPO                  330
-- 
2.11.4.GIT