Permalink
Browse files

UI changes

use new git icon
add undo file changes to document tab context menu
  • Loading branch information...
1 parent 0db538e commit 5ae5eaa758d135a375910c70ab93d8fb68f92bb7 @yysun committed Oct 28, 2012
Showing with 30 additions and 10 deletions.
  1. +1 −0 BasicSccProvider.csproj
  2. +18 −9 PkgCmd.vsct
  3. +10 −0 Readme.htm
  4. BIN Resources/Images_32bit.png
  5. +1 −1 source.extension.vsixmanifest
@@ -150,6 +150,7 @@
<Content Include="Resources\Images_24bit.bmp" />
<Content Include="Resources\Images_32bit.bmp" />
<Resource Include="Resources\Loading.png" />
+ <Content Include="Resources\Images_32bit.png" />
<Content Include="Resources\SccGlyphs.bmp" />
<Content Include="solution explorer.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
View
@@ -115,23 +115,23 @@
</Button>
<Button guid="guidSccProviderCmdSet" id="icmdSccCommandCompare" priority="0x0101" type="Button">
- <Icon guid="guidSccProviderImages" id="iconCompare" />
+ <Icon guid="guidSccProviderImages" id="iconGitBash" />
<CommandFlag>DynamicVisibility</CommandFlag>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>IconAndText</CommandFlag>
<Strings>
- <ButtonText>Compare with last commit...</ButtonText>
+ <ButtonText>Git Compare with Last Commit...</ButtonText>
</Strings>
</Button>
<Button guid="guidSccProviderCmdSet" id="icmdSccCommandUndo" priority="0x0102" type="Button">
<Parent guid="guidSccProviderCmdSet" id="igrpSourceControlCommands"/>
- <Icon guid="guidSccProviderImages" id="iconUncheckout" />
+ <Icon guid="guidSccProviderImages" id="iconGitBash" />
<CommandFlag>DynamicVisibility</CommandFlag>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>IconAndText</CommandFlag>
<Strings>
- <ButtonText>Undo File Changes</ButtonText>
+ <ButtonText>Git Undo File Changes</ButtonText>
</Strings>
</Button>
@@ -148,7 +148,7 @@
<Button guid="guidSccProviderCmdSet" id="icmdSccCommandRefresh" priority="0x0104" type="Button">
<!--<Parent guid="guidSccProviderCmdSet" id="igrpSourceControlCommands"/>-->
- <Icon guid="guidSccProviderImages" id="iconRefresh" />
+ <Icon guid="guidSccProviderImages" id="iconGitBash" />
<CommandFlag>DynamicVisibility</CommandFlag>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>IconAndText</CommandFlag>
@@ -256,7 +256,7 @@
<Button guid="guidSccProviderCmdSet" id="icmdPendingChangesRefresh" priority="0x0007" type="Button">
<Parent guid="guidSccProviderCmdSet" id="igrpPendingChangesToolWindowToolbarGroup"/>
- <Icon guid="guidSccProviderImages" id="iconRefresh" />
+ <Icon guid="guidSccProviderImages" id="iconGitBash" />
<CommandFlag>DynamicVisibility</CommandFlag>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>IconAndText</CommandFlag>
@@ -268,7 +268,7 @@
</Buttons>
<Bitmaps>
- <Bitmap guid="guidSccProviderImages" href="Resources\Images_32bit.bmp"
+ <Bitmap guid="guidSccProviderImages" href="Resources\Images_32bit.png"
usedList="iconGitBash, iconGitExt, iconUncheckout, iconCompare, iconRefresh, iconOpenIgnoreFile, iconGitTor, iconGitInit"/>
</Bitmaps>
</Commands>
@@ -309,12 +309,21 @@
<CommandPlacement guid="guidSccProviderCmdSet" id="icmdSccCommandCompare" priority="0x0003">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_ITEM_SCC"/>
</CommandPlacement>
-
+ <CommandPlacement guid="guidSccProviderCmdSet" id="icmdSccCommandCompare" priority="0x0003">
+ <Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_SCC"/>
+ </CommandPlacement>
+ <CommandPlacement guid="guidSccProviderCmdSet" id="icmdSccCommandCompare" priority="0x0003">
+ <Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_SOLUTION_SCC"/>
+ </CommandPlacement>
+
<!-- Document Tab context menu | Compare -->
<CommandPlacement guid="guidSccProviderCmdSet" id="icmdSccCommandCompare" priority="0x0600">
<Parent guid="guidSccProviderCmdSet" id="igrpDocTabWnd"/>
</CommandPlacement>
-
+ <CommandPlacement guid="guidSccProviderCmdSet" id="icmdSccCommandUndo" priority="0x0601">
+ <Parent guid="guidSccProviderCmdSet" id="igrpDocTabWnd"/>
+ </CommandPlacement>
+
<!--<CommandPlacement guid="guidSccProviderCmdSet" id="icmdSccCommandAbout" priority="0x0004">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_ITEM_SCC"/>
</CommandPlacement>
View
@@ -23,6 +23,16 @@
<p>Since 1.7.10, <strong>Git for Windows</strong> supports UTF-8 encoding internally. If you are using non-ASCII file names,
please follow <a href="https://github.com/kblees/git/wiki">this page</a> to see how to update your Git settings and how to migrate your repositories.</p>
<h2>Change Logs</h2>
+ <strong>V1.0.0</strong>
+ <ul>
+ <li>Add support Visual Studio's diff window</li>
+ <li>Prompt user to save files before commit</li>
+ <li>Prompt user to set name and email for git, if not already</li>
+ <li>Support bulk file deletion</li>
+ <li>Merge pull requests, #27, #28, #32, #34 from github</li>
+ <li>Bug fix: <a href="http://gitscc.codeplex.com/workitem/17798">Allow commit of selected changes via Ctrl+Enter</a></li>
+ <li>Bug fix: <a href="http://gitscc.codeplex.com/workitem/17792">Git Refresh not working in Pending Changes when auto refresh is disabled</a></li>
+ </ul>
<strong>V 0.9.6.1 </strong>
<ul>
<li>Rebuild in release mode and write to error log file in Release mode</li>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -3,7 +3,7 @@
<Identifier Id="C4128D99-2000-41D1-A6C3-704E6C1A3DE2">
<Name>Git Source Control Provider</Name>
<Author>Yiyisun@hotmail.com</Author>
- <Version>0.9.6.2</Version>
+ <Version>0.9.6.7</Version>
<Description xml:space="preserve">Git Source Control Provider is a plug-in that integrates git with Visual Studio.</Description>
<Locale>1033</Locale>
<MoreInfoUrl>http://visualstudiogallery.msdn.microsoft.com/63a7e40d-4d71-4fbb-a23b-d262124b8f4c</MoreInfoUrl>

0 comments on commit 5ae5eaa

Please sign in to comment.