1 files changed, 36 insertions, 13 deletions
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNode.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNode.cs
index 84928ce419..915328acfd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNode.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNode.cs
@@ -27,8 +27,8 @@
 using System;
 using System.Runtime.Versioning;
 using MonoDevelop.Core;
-using MonoDevelop.Core.Serialization;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Tasks;
 using NuGet;
 
 namespace MonoDevelop.PackageManagement.NodeBuilders
@@ -91,15 +91,10 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 		public string GetLabel ()
 		{
 			if (UpdatedVersion != null) {
-				return GetIdText () + GetUpdatedVersionLabelText ();
+				return Id + GetUpdatedVersionLabelText ();
 			}
-			return GetIdText ();
-		}
-
-		string GetIdText ()
-		{
-			if (!Installed || IsReinstallNeeded) {
-				return "<span color='#c99c00'>" + Id + "</span>";
+			if (IsInstallPending) {
+				return Id + GetInstallingLabelText ();
 			}
 			return Id;
 		}
@@ -111,19 +106,47 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 				GettextCatalog.GetString ("available"));
 		}
 
+		string GetInstallingLabelText ()
+		{
+			return String.Format (" ({0})", GettextCatalog.GetString ("installing"));
+		}
+
 		public IconId GetIconId ()
 		{
+			return Stock.Reference;
+		}
+
+		public string GetPackageVersionLabel ()
+		{
+			return GettextCatalog.GetString ("Version {0}", Version);
+		}
+
+		public TaskSeverity? GetStatusSeverity ()
+		{
 			if (!Installed || IsReinstallNeeded) {
 				if (!IsInstallPending) {
-					return Stock.ReferenceWarning;
+					return TaskSeverity.Warning;
 				}
 			}
-			return Stock.Reference;
+
+			return null;
 		}
 
-		public string GetPackageVersionLabel ()
+		public string GetStatusMessage ()
 		{
-			return GettextCatalog.GetString ("Version {0}", Version);
+			if (IsInstallPending) {
+				return null;
+			} else if (!Installed) {
+				return GettextCatalog.GetString ("Package is not restored");
+			} else if (IsReinstallNeeded) {
+				return GettextCatalog.GetString ("Package needs retargeting");
+			}
+			return null;
+		}
+
+		public bool IsDisabled ()
+		{
+			return (!Installed || IsInstallPending);
 		}
 	}
 }