From: Frank Li Date: Thu, 12 Mar 2009 14:28:21 +0000 (+0800) Subject: Show stash flag at log dialog X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=7e599788eb1780208ff800c1167a22fab184b614 Show stash flag at log dialog Signed-off-by: Frank Li --- diff --git a/src/TortoiseProc/Colors.cpp b/src/TortoiseProc/Colors.cpp index 312418c..cc98a5f 100644 --- a/src/TortoiseProc/Colors.cpp +++ b/src/TortoiseProc/Colors.cpp @@ -38,6 +38,7 @@ CColors::COLOR_DATA CColors::m_ColorArray[]= {LocalBranch,_T("Software\\TortoiseGit\\Colors\\LocalBranch"), RGB(0, 195, 0)}, {RemoteBranch,_T("Software\\TortoiseGit\\Colors\\RemoteBranch"), RGB(255, 221, 170)}, {Tag,_T("Software\\TortoiseGit\\Colors\\Tag"), RGB(255, 255, 0)}, + {Stash,_T("Software\\TortoiseGit\\Colors\\Stash"), RGB(128, 128, 128)}, {BranchLine1,_T("Software\\TortoiseGit\\Colors\\BranchLine1"), RGB(0,0,0)}, {BranchLine2,_T("Software\\TortoiseGit\\Colors\\BranchLine2"), RGB(0xFF,0,0)}, {BranchLine3,_T("Software\\TortoiseGit\\Colors\\BranchLine3"), RGB(0,0xFF,0)}, diff --git a/src/TortoiseProc/Colors.h b/src/TortoiseProc/Colors.h index 035949a..3a2a7fb 100644 --- a/src/TortoiseProc/Colors.h +++ b/src/TortoiseProc/Colors.h @@ -48,6 +48,7 @@ public: LocalBranch, RemoteBranch, Tag, + Stash, BranchLine1, BranchLine2, BranchLine3, diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index 77d6527..2bcb049 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -411,6 +411,12 @@ void CGitLogListBase::DrawTagBranch(HDC hdc,CRect &rect,INT_PTR index) { brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::Tag)); } + else if(GetShortName(str,shortname,_T("refs/stash"))) + { + brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::Stash)); + shortname=_T("stash"); + } + if(!shortname.IsEmpty()) {