From ffc480cf674eaede8ec33efc8a2d08e8fd4f1a03 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 9 Feb 2013 15:43:26 -0600
Subject: [PATCH] Visual Studio 2012 gets its own set of "lighter" glyphs

---
 BasicSccProvider.csproj      |   2 +
 GitApi/GitFileStatus.cs      |   1 +
 GitSccOptions.cs             |  23 ++++-
 Resources.Designer.cs        |  12 ++-
 Resources.resx               |   3 +
 Resources/SccGlyphs2012.png  | Bin 0 -> 3072 bytes
 SccGlyphsHelper.cs           | 163 +++++++++++++++++++++++++++++++++++
 SccProviderOptionsControl.cs |   3 +-
 SccProviderService.cs        |  65 +++-----------
 9 files changed, 215 insertions(+), 57 deletions(-)
 create mode 100644 Resources/SccGlyphs2012.png
 create mode 100644 SccGlyphsHelper.cs

diff --git a/BasicSccProvider.csproj b/BasicSccProvider.csproj
index 258be4c..41bfdb1 100644
--- a/BasicSccProvider.csproj
+++ b/BasicSccProvider.csproj
@@ -134,6 +134,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="SccGlyphsHelper.cs" />
     <Compile Include="SccOnIdleEvent.cs" />
     <Compile Include="SccProviderOptions.cs">
       <SubType>Component</SubType>
@@ -181,6 +182,7 @@
     </Content>
     <Content Include="Resources\Images_24bit.bmp" />
     <Content Include="Resources\Images_32bit.bmp" />
+    <Content Include="Resources\SccGlyphs2012.png" />
     <Resource Include="Resources\Loading.png" />
     <Content Include="Resources\Images_32bit.png" />
     <Content Include="Resources\SccGlyphs.bmp" />
diff --git a/GitApi/GitFileStatus.cs b/GitApi/GitFileStatus.cs
index ed457d3..c4a7d26 100644
--- a/GitApi/GitFileStatus.cs
+++ b/GitApi/GitFileStatus.cs
@@ -16,6 +16,7 @@ public enum GitFileStatus
         Added,
         Deleted,
         Conflict,
+        Merged,
         Ignored,
         Renamed,
         Copied
diff --git a/GitSccOptions.cs b/GitSccOptions.cs
index 38b40f8..e4d3bcc 100644
--- a/GitSccOptions.cs
+++ b/GitSccOptions.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Diagnostics;
 using System.IO;
 using System.Xml.Serialization;
 using Microsoft.VisualStudio.Shell;
@@ -31,6 +29,7 @@ public class GitSccOptions
 
         private static GitSccOptions gitSccOptions;
 
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
         public static GitSccOptions Current
         {
             get
@@ -43,6 +42,24 @@ public static GitSccOptions Current
             }
         }
 
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        public static bool IsVisualStudio2010
+        {
+            get
+            {
+                return !IsVisualStudio2012 && BasicSccProvider.GetGlobalService(typeof(SVsSolution)) is IVsSolution4;
+            }
+        }
+
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        public static bool IsVisualStudio2012
+        {
+            get
+            {
+                return BasicSccProvider.GetGlobalService(typeof(SVsDifferenceService)) != null;
+            }
+        }
+
         private GitSccOptions()
         {
             
diff --git a/Resources.Designer.cs b/Resources.Designer.cs
index 344d98c..a0bd55b 100644
--- a/Resources.Designer.cs
+++ b/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18034
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -153,5 +153,15 @@ internal static System.Drawing.Bitmap SccGlyphs {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SccGlyphs2012 {
+            get {
+                object obj = ResourceManager.GetObject("SccGlyphs2012", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/Resources.resx b/Resources.resx
index e750893..ddb67a9 100644
--- a/Resources.resx
+++ b/Resources.resx
@@ -148,4 +148,7 @@
   <data name="HistoryToolWindowCaption" xml:space="preserve">
     <value>Git History</value>
   </data>
+  <data name="SccGlyphs2012" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\SccGlyphs2012.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Resources/SccGlyphs2012.png b/Resources/SccGlyphs2012.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9f709dbef8a27b8cfeb4386a5af21bdfef504f9
GIT binary patch
literal 3072
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
O0000<MNUMnLSTXnU$jyH

literal 0
HcmV?d00001

diff --git a/SccGlyphsHelper.cs b/SccGlyphsHelper.cs
new file mode 100644
index 0000000..1d72e5d
--- /dev/null
+++ b/SccGlyphsHelper.cs
@@ -0,0 +1,163 @@
+namespace GitScc
+{
+    using Color = System.Drawing.Color;
+    using Image = System.Drawing.Image;
+    using ImageList = System.Windows.Forms.ImageList;
+    using Size = System.Drawing.Size;
+    using VsStateIcon = Microsoft.VisualStudio.Shell.Interop.VsStateIcon;
+
+    internal static class SccGlyphsHelper
+    {
+        // Remember the base index where our custom scc glyph start
+        private static uint _customSccGlyphBaseIndex = 0;
+
+        // Our custom image list
+        private static ImageList _customSccGlyphsImageList;
+
+        // Indexes of icons in our custom image list
+        private enum CustomSccGlyphs2010
+        {
+            Untracked = 0,
+            Staged = 1,
+            Modified = 2,
+            Tracked = 3,
+        };
+
+        // Indexes of icons in our custom image list
+        private enum CustomSccGlyphs2012
+        {
+            New = 0,
+            Staged = 1,
+            Conflicted = 2,
+            Merged = 3,
+        };
+
+        public static VsStateIcon Tracked
+        {
+            get
+            {
+                if (GitSccOptions.IsVisualStudio2010 && GitSccOptions.Current.UseTGitIconSet)
+                    return (VsStateIcon)(_customSccGlyphBaseIndex + (uint)CustomSccGlyphs2010.Tracked);
+
+                return VsStateIcon.STATEICON_CHECKEDIN;
+            }
+        }
+
+        public static VsStateIcon Modified
+        {
+            get
+            {
+                if (GitSccOptions.IsVisualStudio2010 && GitSccOptions.Current.UseTGitIconSet)
+                    return (VsStateIcon)(_customSccGlyphBaseIndex + (uint)CustomSccGlyphs2010.Modified);
+
+                return VsStateIcon.STATEICON_CHECKEDOUT;
+            }
+        }
+
+        public static VsStateIcon New
+        {
+            get
+            {
+                if (GitSccOptions.IsVisualStudio2010)
+                    return (VsStateIcon)(_customSccGlyphBaseIndex + (uint)CustomSccGlyphs2010.Untracked);
+
+                return (VsStateIcon)(_customSccGlyphBaseIndex + (uint)CustomSccGlyphs2012.New);
+            }
+        }
+
+        public static VsStateIcon Added
+        {
+            get
+            {
+                return Staged;
+            }
+        }
+
+        public static VsStateIcon Staged
+        {
+            get
+            {
+                if (GitSccOptions.IsVisualStudio2010)
+                    return (VsStateIcon)(_customSccGlyphBaseIndex + (uint)CustomSccGlyphs2010.Staged);
+
+                return (VsStateIcon)(_customSccGlyphBaseIndex + (uint)CustomSccGlyphs2012.Staged);
+            }
+        }
+
+        public static VsStateIcon NotControlled
+        {
+            get
+            {
+                return VsStateIcon.STATEICON_NOSTATEICON;
+            }
+        }
+
+        public static VsStateIcon Ignored
+        {
+            get
+            {
+                return VsStateIcon.STATEICON_EXCLUDEDFROMSCC;
+            }
+        }
+
+        public static VsStateIcon Conflict
+        {
+            get
+            {
+                if (GitSccOptions.IsVisualStudio2010)
+                    return VsStateIcon.STATEICON_DISABLED;
+
+                return (VsStateIcon)(_customSccGlyphBaseIndex + (uint)CustomSccGlyphs2012.Conflicted);
+            }
+        }
+
+        public static VsStateIcon Merged
+        {
+            get
+            {
+                if (GitSccOptions.IsVisualStudio2010)
+                    return Modified;
+
+                return (VsStateIcon)(_customSccGlyphBaseIndex + (uint)CustomSccGlyphs2012.Merged);
+            }
+        }
+
+        public static VsStateIcon Default
+        {
+            get
+            {
+                return VsStateIcon.STATEICON_NOSTATEICON;
+            }
+        }
+
+        public static uint GetCustomGlyphList(uint baseIndex)
+        {
+            // If this is the first time we got called, construct the image list, remember the index, etc
+            if (_customSccGlyphsImageList == null)
+            {
+                // The shell calls this function when the provider becomes active to get our custom glyphs
+                // and to tell us what's the first index we can use for our glyphs
+                // Remember the index in the scc glyphs (VsStateIcon) where our custom glyphs will start
+                _customSccGlyphBaseIndex = baseIndex;
+
+                // Create a new imagelist
+                _customSccGlyphsImageList = new ImageList();
+
+                // Set the transparent color for the imagelist (the SccGlyphs.bmp uses magenta for background)
+                _customSccGlyphsImageList.TransparentColor = Color.FromArgb(255, 0, 255);
+
+                // Set the corret imagelist size (7x16 pixels, otherwise the system will either stretch the image or fill in with black blocks)
+                _customSccGlyphsImageList.ImageSize = new Size(7, 16);
+
+                // Add the custom scc glyphs we support to the list
+                // NOTE: VS2005 and VS2008 are limited to 4 custom scc glyphs (let's hope this will change in future versions)
+                Image sccGlyphs = GitSccOptions.IsVisualStudio2010 ? Resources.SccGlyphs : Resources.SccGlyphs2012;
+                _customSccGlyphsImageList.Images.AddStrip(sccGlyphs);
+            }
+
+            // Return a Win32 HIMAGELIST handle to our imagelist to the shell (by keeping the ImageList a member of the class we guarantee the Win32 object is still valid when the shell needs it)
+            return (uint)_customSccGlyphsImageList.Handle;
+
+        }
+    }
+}
diff --git a/SccProviderOptionsControl.cs b/SccProviderOptionsControl.cs
index 6ec1f84..4a57f14 100644
--- a/SccProviderOptionsControl.cs
+++ b/SccProviderOptionsControl.cs
@@ -357,6 +357,7 @@ private void SccProviderOptionsControl_Load(object sender, EventArgs e)
             this.checkBox1.Checked = GitSccOptions.Current.NotExpandGitExtensions;
             this.checkBox2.Checked = GitSccOptions.Current.NotExpandTortoiseGit;
             this.checkBox3.Checked = GitSccOptions.Current.UseTGitIconSet;
+            this.checkBox3.Enabled = GitSccOptions.IsVisualStudio2010;
             this.checkBox4.Checked = GitSccOptions.Current.DisableAutoRefresh;
             this.checkBox5.Checked = GitSccOptions.Current.DisableAutoLoad;
             this.checkBox6.Checked = GitSccOptions.Current.NotUseUTF8FileNames;
@@ -402,7 +403,7 @@ internal void Save()
             GitSccOptions.Current.TortoiseGitPath  = this.textBox4.Text;
             GitSccOptions.Current.NotExpandGitExtensions = this.checkBox1.Checked;
             GitSccOptions.Current.NotExpandTortoiseGit = this.checkBox2.Checked;
-            GitSccOptions.Current.UseTGitIconSet = this.checkBox3.Checked;
+            GitSccOptions.Current.UseTGitIconSet = GitSccOptions.IsVisualStudio2010 && this.checkBox3.Checked;
             GitSccOptions.Current.DisableAutoRefresh = this.checkBox4.Checked;
             GitSccOptions.Current.DisableAutoLoad = this.checkBox5.Checked;
             GitSccOptions.Current.NotUseUTF8FileNames = this.checkBox6.Checked;
diff --git a/SccProviderService.cs b/SccProviderService.cs
index fd82ad8..71bde1b 100644
--- a/SccProviderService.cs
+++ b/SccProviderService.cs
@@ -183,45 +183,46 @@ public int GetSccGlyph([InAttribute] int cFiles, [InAttribute] string[] rgpszFul
                 switch (status)
                 {
                     case GitFileStatus.Tracked:
-                        rgsiGlyphs[i] = GitSccOptions.Current.UseTGitIconSet ?
-                                        (VsStateIcon)(this._customSccGlyphBaseIndex + (uint)CustomSccGlyphs.Tracked) :
-                                        VsStateIcon.STATEICON_CHECKEDIN;
+                        rgsiGlyphs[i] = SccGlyphsHelper.Tracked;
                         sccStatus = __SccStatus.SCC_STATUS_CONTROLLED;
                         break;
 
                     case GitFileStatus.Modified:
-                        rgsiGlyphs[i] = GitSccOptions.Current.UseTGitIconSet ?
-                                        (VsStateIcon)(this._customSccGlyphBaseIndex + (uint)CustomSccGlyphs.Modified) :
-                                        VsStateIcon.STATEICON_CHECKEDOUT;
+                        rgsiGlyphs[i] = SccGlyphsHelper.Modified;
                         sccStatus = __SccStatus.SCC_STATUS_CONTROLLED | __SccStatus.SCC_STATUS_CHECKEDOUT | __SccStatus.SCC_STATUS_OUTBYUSER;
                         break;
 
                     case GitFileStatus.New:
-                        rgsiGlyphs[i] = (VsStateIcon)(this._customSccGlyphBaseIndex + (uint)CustomSccGlyphs.Untracked);
+                        rgsiGlyphs[i] = SccGlyphsHelper.New;
                         sccStatus = __SccStatus.SCC_STATUS_CONTROLLED | __SccStatus.SCC_STATUS_CHECKEDOUT | __SccStatus.SCC_STATUS_OUTBYUSER;
                         break;
 
                     case GitFileStatus.Added:
                     case GitFileStatus.Staged:
-                        rgsiGlyphs[i] = (VsStateIcon)(this._customSccGlyphBaseIndex + (uint)CustomSccGlyphs.Staged);
+                        rgsiGlyphs[i] = status == GitFileStatus.Added ? SccGlyphsHelper.Added : SccGlyphsHelper.Staged;
                         sccStatus = __SccStatus.SCC_STATUS_CONTROLLED | __SccStatus.SCC_STATUS_CHECKEDOUT | __SccStatus.SCC_STATUS_OUTBYUSER;
                         break;
 
                     case GitFileStatus.NotControlled:
-                        rgsiGlyphs[i] = VsStateIcon.STATEICON_NOSTATEICON;
+                        rgsiGlyphs[i] = SccGlyphsHelper.NotControlled;
                         sccStatus = __SccStatus.SCC_STATUS_NOTCONTROLLED;
                         break;
 
                     case GitFileStatus.Ignored:
-                        rgsiGlyphs[i] = VsStateIcon.STATEICON_EXCLUDEDFROMSCC;
+                        rgsiGlyphs[i] = SccGlyphsHelper.Ignored;
                         sccStatus = __SccStatus.SCC_STATUS_NOTCONTROLLED;
                         break;
 
                     case GitFileStatus.Conflict:
-                        rgsiGlyphs[i] = VsStateIcon.STATEICON_DISABLED;
+                        rgsiGlyphs[i] = SccGlyphsHelper.Conflict;
                         sccStatus = __SccStatus.SCC_STATUS_CONTROLLED | __SccStatus.SCC_STATUS_CHECKEDOUT | __SccStatus.SCC_STATUS_OUTBYUSER | __SccStatus.SCC_STATUS_MERGED;
                         break;
 
+                    case GitFileStatus.Merged:
+                        rgsiGlyphs[i] = SccGlyphsHelper.Merged;
+                        sccStatus = __SccStatus.SCC_STATUS_CONTROLLED | __SccStatus.SCC_STATUS_CHECKEDOUT | __SccStatus.SCC_STATUS_OUTBYUSER;
+                        break;
+
                     default:
                         sccStatus = __SccStatus.SCC_STATUS_INVALID;
                         break;
@@ -361,50 +362,10 @@ public int OnAfterMergeSolution([InAttribute] Object pUnkReserved)
 
         #region IVsSccGlyphs Members
 
-        // Remember the base index where our custom scc glyph start
-        private uint _customSccGlyphBaseIndex = 0;
-        // Our custom image list
-        ImageList _customSccGlyphsImageList;
-        // Indexes of icons in our custom image list
-        enum CustomSccGlyphs
-        {
-            Untracked = 0,
-            Staged = 1,
-            Modified = 2,
-            Tracked = 3,
-        };
-
         public int GetCustomGlyphList(uint BaseIndex, out uint pdwImageListHandle)
         {
-            // If this is the first time we got called, construct the image list, remember the index, etc
-            if (this._customSccGlyphsImageList == null)
-            {
-                // The shell calls this function when the provider becomes active to get our custom glyphs
-                // and to tell us what's the first index we can use for our glyphs
-                // Remember the index in the scc glyphs (VsStateIcon) where our custom glyphs will start
-                this._customSccGlyphBaseIndex = BaseIndex;
-
-                // Create a new imagelist
-                this._customSccGlyphsImageList = new ImageList();
-
-                // Set the transparent color for the imagelist (the SccGlyphs.bmp uses magenta for background)
-                this._customSccGlyphsImageList.TransparentColor = Color.FromArgb(255, 0, 255);
-
-                // Set the corret imagelist size (7x16 pixels, otherwise the system will either stretch the image or fill in with black blocks)
-                this._customSccGlyphsImageList.ImageSize = new Size(7, 16);
-
-                // Add the custom scc glyphs we support to the list
-                // NOTE: VS2005 and VS2008 are limited to 4 custom scc glyphs (let's hope this will change in future versions)
-                Image sccGlyphs = (Image)Resources.SccGlyphs;
-                this._customSccGlyphsImageList.Images.AddStrip(sccGlyphs);
-            }
-
-            // Return a Win32 HIMAGELIST handle to our imagelist to the shell (by keeping the ImageList a member of the class we guarantee the Win32 object is still valid when the shell needs it)
-            pdwImageListHandle = (uint)this._customSccGlyphsImageList.Handle;
-
-            // Return success (If you don't want to have custom glyphs return VSConstants.E_NOTIMPL)
+            pdwImageListHandle = SccGlyphsHelper.GetCustomGlyphList(BaseIndex);
             return VSConstants.S_OK;
-
         }
 
         #endregion