Merge branch 'ui-tweaks' of https://github.com/sharwell/Git-Source-Co…

…ntrol-Provider
sharwell · Feb 11, 2013 · 09dea16 · 09dea16
2 parents b967236 + 454546b
commit 09dea16
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/PendingChangesToolWindow.cs b/PendingChangesToolWindow.cs
@@ -94,7 +94,7 @@ internal void Refresh(GitFileStatusTracker tracker)
             try
             {
                 var repository = (tracker == null || !tracker.HasGitRepository) ? "" :
-                    string.Format(" - {0}", tracker.CurrentBranch, tracker.GitWorkingDirectory);
+                    string.Format(" ({0})", tracker.CurrentBranch, tracker.GitWorkingDirectory);
 
                 this.Caption = Resources.ResourceManager.GetString("PendingChangesToolWindowCaption") + repository;
 

diff --git a/PendingChangesView.xaml.cs b/PendingChangesView.xaml.cs
@@ -313,7 +313,7 @@ internal void Refresh(GitFileStatusTracker tracker)
                         ShowStatusMessage("");
 
                         var changed = changedFiles;
-                        this.label3.Content = string.Format("Changed files: ({0}) +{1} ~{2} -{3} !{4}", tracker.CurrentBranch,
+                        this.label3.Content = string.Format("Changed files (+{0} ~{1} -{2} !{3})",
                             changed.Where(f => f.Status == GitFileStatus.New || f.Status == GitFileStatus.Added).Count(),
                             changed.Where(f => f.Status == GitFileStatus.Modified || f.Status == GitFileStatus.Staged).Count(),
                             changed.Where(f => f.Status == GitFileStatus.Deleted || f.Status == GitFileStatus.Removed).Count(),

diff --git a/Resources.Designer.cs b/Resources.Designer.cs
diff --git a/Resources.resx b/Resources.resx
@@ -143,7 +143,7 @@
     <value>CIP0H8JCC9JAJMRZE8H3J2IPADZQI9QIRHMKQPH2E8EDPDPEHCJQPDZEZRI1J8D3D8KHZPRQCEEDIPK3MKDDA9IEAACCMIPAQ0JCEQPHD0RPHDZRZKC2RDHERTDCKDPM</value>
   </data>
   <data name="PendingChangesToolWindowCaption" xml:space="preserve">
-    <value>Git Pending Changes</value>
+    <value>Pending Changes</value>
   </data>
   <data name="HistoryToolWindowCaption" xml:space="preserve">
     <value>Git History</value>