diff options
| author | Alan McGovern <alan.mcgovern@gmail.com> | 2012-03-01 18:01:29 +0400 |
|---|---|---|
| committer | Alan McGovern <alan.mcgovern@gmail.com> | 2012-03-01 18:01:29 +0400 |
| commit | d0b07b033aaa1af8e89f7afef44601e871786d80 (patch) | |
| tree | a70cc6b6bb3bc6c2e45a6aed7a5f77951a5d62b4 /main/src/addins/VersionControl | |
| parent | c9082e54608b44d25f940806ed57e78022b1f62f (diff) | |
[VersionControl] Remove some redundant overlay icons
Folders within a version controlled solution should not display the
'Versioned' overlay icon. The default for files and folders should be
that no icon == versioned and unmodified. Fixes part of bug #2080.
Diffstat (limited to 'main/src/addins/VersionControl')
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs index 1250bad1b6..17505e2a04 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs @@ -51,7 +51,7 @@ namespace MonoDevelop.VersionControl ClearDirCache (ce.BaseDirectory);
Repository rep = VersionControlService.GetRepository (ce); if (rep != null) - AddFolderOverlay (rep, ce.BaseDirectory, ref icon, ref closedIcon);
+ AddFolderOverlay (rep, ce.BaseDirectory, ref icon, ref closedIcon, false);
return; } else if (dataObject is ProjectFolder) { ProjectFolder ce = (ProjectFolder) dataObject;
@@ -59,7 +59,7 @@ namespace MonoDevelop.VersionControl ClearDirCache (ce.Path);
Repository rep = VersionControlService.GetRepository (ce.ParentWorkspaceObject); if (rep != null) - AddFolderOverlay (rep, ce.Path, ref icon, ref closedIcon);
+ AddFolderOverlay (rep, ce.Path, ref icon, ref closedIcon, true);
} return; } @@ -93,14 +93,15 @@ namespace MonoDevelop.VersionControl AddOverlay (ref icon, overlay);
}
- void AddFolderOverlay (Repository rep, string folder, ref Gdk.Pixbuf icon, ref Gdk.Pixbuf closedIcon) + void AddFolderOverlay (Repository rep, string folder, ref Gdk.Pixbuf icon, ref Gdk.Pixbuf closedIcon, bool skipVersionedOverlay) { Gdk.Pixbuf overlay = null; VersionInfo vinfo = rep.GetVersionInfo (folder, false); if (vinfo == null || !vinfo.IsVersioned) { overlay = VersionControlService.LoadOverlayIconForStatus (VersionStatus.Unversioned); - } else if (vinfo.IsVersioned && !vinfo.HasLocalChanges) { - overlay = VersionControlService.overlay_controled; + } else if (vinfo.IsVersioned && !vinfo.HasLocalChanges) {
+ if (!skipVersionedOverlay) + overlay = VersionControlService.overlay_controled; } else { overlay = VersionControlService.LoadOverlayIconForStatus (vinfo.Status); } |