[NuGet] Right align license metadata and show warnings as tooltip

Manage NuGet packages dialog changes:

Show license expression on the same line as the License label in the
Manage NuGet packages dialog.

Right align and wrap the license expression.

Move the license warnings to a tooltip for the warning icon instead
of showing the text directly in the dialog.

Move the warning icon so it is on the right hand side of the license
expression text.

License acceptance dialog changes:

Show license warnings in the warning icon tooltip instead of directly
on the dialog.

Show license warning icon on the same line as the license expression,
on the left hand side of the expression.

Fixes VSTS #1012071 - Right-align licenses to improve readability and
text wrapping

Fixes VSTS #1012079 - Use tooltip on warning icon to provide more
details

Author: mrward

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs

@@ -162,33 +162,28 @@ static void AddLicenseExpressionLabel (PackageLicenseViewModel package, VBox par
 			// Does not work. LabelBackend for Xamarin.Mac implementation does not ILabelEventSink.OnLinkClicked
 			licenseLabel.LinkClicked += (sender, e) => IdeServices.DesktopService.ShowUrl (e.Target.AbsoluteUri);
 
-			foreach (WarningText warning in builder.Warnings) {
-				AddLicenseWarningLabel (warning, parentVBox);
-			}
-
 			var hbox = new HBox ();
-			hbox.PackStart (licenseLabel, true);
 
-			parentVBox.PackStart (hbox);
-		}
+			if (builder.Warnings.Any ()) {
+				var warningTextBuilder = StringBuilderCache.Allocate ();
+				foreach (WarningText warning in builder.Warnings) {
+					warningTextBuilder.Append (warning.Text);
+					warningTextBuilder.Append (' ');
+				}
 
-		static void AddLicenseWarningLabel (WarningText warning, VBox parentVBox)
-		{
-			var hbox = new HBox ();
-			var image = new ImageView {
-				Image = ImageService.GetIcon ("md-warning", Gtk.IconSize.Menu),
-				VerticalPlacement = WidgetPlacement.Start,
-			};
-			image.Accessible.RoleDescription = GettextCatalog.GetString ("Warning Icon");
-
-			hbox.PackStart (image);
-
-			var label = new Label {
-				Text = warning.Text,
-				Wrap = WrapMode.None
-			};
-			image.Accessible.LabelWidget = label;
-			hbox.PackStart (label, true);
+				var warningWidget = new MonoDevelop.Components.InformationPopoverWidget ();
+				warningWidget.Severity = Ide.Tasks.TaskSeverity.Warning;
+				warningWidget.Message = StringBuilderCache.ReturnAndFree (warningTextBuilder).TrimEnd ();
+
+				// Disable focus. With focus enabled the info popup ends up being displayed and focused
+				// if it is the first package license on opening the dialog. Unable to set focus to a
+				// dialog button.
+				warningWidget.CanGetFocus = false;
+
+				hbox.PackStart (warningWidget);
+			}
+
+			hbox.PackStart (licenseLabel, true);
 
 			parentVBox.PackStart (hbox);
 		}

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.UI.cs

@@ -49,9 +49,8 @@ internal partial class ManagePackagesDialog : ExtendedTitleBarDialog
 		Label packageDownloads;
 		Label packageLicenseLabel;
 		LinkLabel packageLicenseLink;
-		VBox packageLicenseMetadataWarningsVBox;
-		HBox packageLicenseMetadataHBox;
-		Label packageLicenseMetadataLabel;
+		InformationPopoverWidget packageLicenseMetadataWarningInfoPopoverWidget;
+		Label packageLicenseMetadataLinkLabel;
 		LinkLabel packageProjectPageLink;
 		Label packageDependenciesList;
 		HBox packageDependenciesHBox;
@@ -329,27 +328,24 @@ void Build ()
 			packageLicenseLabel = new Label ();
 			packageLicenseLabel.Text = GettextCatalog.GetString ("License");
 			packageLicenseLabel.Font = packageInfoBoldFont;
-			packageLicenseHBox.PackStart (packageLicenseLabel);
+			packageLicenseHBox.PackStart (packageLicenseLabel, vpos: WidgetPlacement.Start);
 
 			packageLicenseLink = new LinkLabel ();
 			packageLicenseLink.Text = GettextCatalog.GetString ("View License");
 			packageLicenseLink.Font = packageInfoSmallFont;
-			packageLicenseHBox.PackEnd (packageLicenseLink);
-
-			packageLicenseMetadataWarningsVBox = new VBox ();
-			packageLicenseMetadataWarningsVBox.Visible = false;
-			packageInfoVBox.PackStart (packageLicenseMetadataWarningsVBox);
-
-			packageLicenseMetadataHBox = new HBox ();
-			packageLicenseMetadataHBox.Visible = false;
-			packageInfoVBox.PackStart (packageLicenseMetadataHBox);
-
-			packageLicenseMetadataLabel = new Label ();
-			packageLicenseMetadataLabel.Wrap = WrapMode.Word;
-			packageLicenseMetadataLabel.MarginLeft = 5;
-			packageLicenseMetadataLabel.Font = packageInfoSmallFont;
-			packageLicenseMetadataLabel.Accessible.LabelWidget = packageLicenseLabel;
-			packageLicenseMetadataHBox.PackStart (packageLicenseMetadataLabel, true);
+			packageLicenseLink.TextAlignment = Alignment.End;
+			packageLicenseHBox.PackStart (packageLicenseLink, true);
+
+			packageLicenseMetadataLinkLabel = new Label ();
+			packageLicenseMetadataLinkLabel.Wrap = WrapMode.Word;
+			packageLicenseMetadataLinkLabel.Font = packageInfoSmallFont;
+			packageLicenseMetadataLinkLabel.Accessible.LabelWidget = packageLicenseLabel;
+			packageLicenseMetadataLinkLabel.TextAlignment = Alignment.End;
+			packageLicenseHBox.PackStart (packageLicenseMetadataLinkLabel, true, vpos: WidgetPlacement.Start);
+
+			packageLicenseMetadataWarningInfoPopoverWidget = new InformationPopoverWidget ();
+			packageLicenseMetadataWarningInfoPopoverWidget.Severity = Ide.Tasks.TaskSeverity.Warning;
+			packageLicenseHBox.PackStart (packageLicenseMetadataWarningInfoPopoverWidget, vpos: WidgetPlacement.Start, hpos: WidgetPlacement.End);
 
 			// Package project page.
 			var packageProjectPageHBox = new HBox ();

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs

@@ -1172,8 +1172,7 @@ void ShowLicense (ManagePackagesSearchResultViewModel packageViewModel)
 			if (packageViewModel.HasLicenseMetadata) {
 				ShowLicenseMetadata (packageViewModel);
 			} else {
-				packageLicenseMetadataHBox.Visible = false;
-				packageLicenseMetadataWarningsVBox.Visible = false;
+				packageLicenseMetadataLinkLabel.Visible = false;
 				ShowUri (packageLicenseLink, packageViewModel.LicenseUrl, GettextCatalog.GetString ("View License"));
 			}
 		}
@@ -1190,20 +1189,18 @@ void PackageLicenseNavigateToUrl (object sender, NavigateToUrlEventArgs e)
 
 		void ShowLicenseMetadata (ManagePackagesSearchResultViewModel packageViewModel)
 		{
-			var textLinks = packageViewModel.GetLicenseLinks ();
+			packageLicenseLink.Visible = false;
+			packageLicenseMetadataLinkLabel.Visible = false;
+			packageLicenseMetadataWarningInfoPopoverWidget.Visible = false;
 
+			var textLinks = packageViewModel.GetLicenseLinks ();
 			if (textLinks.Count == 0) {
-				packageLicenseLink.Visible = false;
-				packageLicenseMetadataHBox.Visible = false;
-				packageLicenseMetadataWarningsVBox.Visible = false;
 				return;
 			}
 
 			// Single link - show this on the same line as the License label.
 			if (textLinks.Count == 1) {
 				packageLicenseLink.Visible = true;
-				packageLicenseMetadataHBox.Visible = false;
-				packageLicenseMetadataWarningsVBox.Visible = false;
 
 				IText textLink = textLinks [0];
 				if (textLink is LicenseText licenseText) {
@@ -1222,48 +1219,25 @@ void ShowLicenseMetadata (ManagePackagesSearchResultViewModel packageViewModel)
 
 			// Multiple text links. We need to allow these to wrap so show these below the license label.
 			var markupBuilder = new LicenseLinkMarkupBuilder ();
-			packageLicenseMetadataLabel.Markup = markupBuilder.GetMarkup (textLinks);
-
-			packageLicenseLink.Visible = false;
-			packageLicenseMetadataHBox.Visible = true;
+			packageLicenseMetadataLinkLabel.Markup = markupBuilder.GetMarkup (textLinks);
+			packageLicenseMetadataLinkLabel.Visible = true;
 
 			if (markupBuilder.Warnings.Any ()) {
 				AddWarnings (markupBuilder.Warnings);
 			} else {
-				packageLicenseMetadataWarningsVBox.Visible = false;
+				packageLicenseMetadataWarningInfoPopoverWidget.Visible = false;
 			}
 		}
 
 		void AddWarnings (IEnumerable<WarningText> warnings)
 		{
-			foreach (Widget child in packageLicenseMetadataWarningsVBox.Children.ToArray ()) {
-				packageLicenseMetadataWarningsVBox.Remove (child);
-				child.Dispose ();
-			}
-
+			var warningTextBuilder = StringBuilderCache.Allocate ();
 			foreach (WarningText warning in warnings) {
-				var hbox = new HBox ();
-				var image = new ImageView {
-					Image = ImageService.GetIcon ("md-warning", Gtk.IconSize.Menu),
-					MarginLeft = packageLicenseMetadataLabel.MarginLeft,
-					VerticalPlacement = WidgetPlacement.Start,
-				};
-				image.Accessible.RoleDescription = GettextCatalog.GetString ("Warning Icon");
-				hbox.PackStart (image);
-
-				var label = new Label {
-					Text = warning.Text,
-					Font = packageLicenseMetadataLabel.Font,
-					Wrap = WrapMode.Word
-				};
-				image.Accessible.LabelWidget = label;
-				label.Accessible.LabelWidget = packageLicenseLabel;
-				hbox.PackStart (label, true, true);
-
-				packageLicenseMetadataWarningsVBox.PackStart (hbox);
-			}
-
-			packageLicenseMetadataWarningsVBox.Visible = true;
+				warningTextBuilder.Append (warning.Text);
+				warningTextBuilder.Append (' ');
+			}
+			packageLicenseMetadataWarningInfoPopoverWidget.Message = StringBuilderCache.ReturnAndFree (warningTextBuilder).TrimEnd ();
+			packageLicenseMetadataWarningInfoPopoverWidget.Visible = true;
 		}
 	}
 }