Skip to content

Commit

Permalink
Add support for viewing embedded license files
Browse files Browse the repository at this point in the history
  • Loading branch information
glopesdev committed Sep 3, 2024
1 parent 77afe42 commit 61aa039
Show file tree
Hide file tree
Showing 17 changed files with 389 additions and 59 deletions.
2 changes: 1 addition & 1 deletion Bonsai.Configuration/Bootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public RestorePackageManager(PackageSourceProvider packageSourceProvider, string

public bool RestorePackages { get; set; }

protected override bool AcceptLicenseAgreement(IEnumerable<IPackageSearchMetadata> licensePackages)
protected override bool AcceptLicenseAgreement(IEnumerable<RequiringLicenseAcceptancePackageInfo> licensePackages)
{
if (RestorePackages) return true;
else return base.AcceptLicenseAgreement(licensePackages);
Expand Down
1 change: 0 additions & 1 deletion Bonsai.NuGet.Design/GalleryDialog.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 7 additions & 17 deletions Bonsai.NuGet.Design/LicenseAcceptanceDialog.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Bonsai.NuGet.Design.Properties;
using NuGet.Protocol.Core.Types;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
using System.Windows.Forms;
Expand All @@ -11,7 +9,7 @@ namespace Bonsai.NuGet.Design
{
public partial class LicenseAcceptanceDialog : Form
{
public LicenseAcceptanceDialog(IEnumerable<IPackageSearchMetadata> licensePackages)
public LicenseAcceptanceDialog(IEnumerable<RequiringLicenseAcceptancePackageInfo> licensePackages)
{
if (licensePackages == null)
{
Expand All @@ -21,12 +19,14 @@ public LicenseAcceptanceDialog(IEnumerable<IPackageSearchMetadata> licensePackag
InitializeComponent();
SuspendLayout();
var bold = new Font(Font, FontStyle.Bold);
foreach (var package in licensePackages)
foreach (var packageInfo in licensePackages)
{
var package = packageInfo.Package;
var titleAuthorshipPanel = new FlowLayoutPanel();
var titleLabel = new Label();
var authorshipLabel = new Label();
var viewLicenseLabel = new LinkLabel();
viewLicenseLabel.AutoSize = true;
viewLicenseLabel.LinkClicked += viewLicenseLabel_LinkClicked;

titleLabel.Font = bold;
Expand All @@ -36,7 +36,7 @@ public LicenseAcceptanceDialog(IEnumerable<IPackageSearchMetadata> licensePackag
var authorsText = string.Join(CultureInfo.CurrentCulture.TextInfo.ListSeparator, package.Authors);
authorshipLabel.Text = string.Format(Resources.LicenseAuthorshipLabel, authorsText);
viewLicenseLabel.Text = Resources.LicenseViewLicenseLabel;
SetLinkLabelUri(viewLicenseLabel, package.LicenseUrl);
LicenseHelper.SetLicenseLinkLabel(viewLicenseLabel, package, packageInfo.SourceRepository);
titleAuthorshipPanel.Margin = new Padding(0, 3, 3, 3);
titleAuthorshipPanel.AutoSize = true;
titleAuthorshipPanel.Controls.Add(titleLabel);
Expand All @@ -47,19 +47,9 @@ public LicenseAcceptanceDialog(IEnumerable<IPackageSearchMetadata> licensePackag
ResumeLayout();
}

static void SetLinkLabelUri(LinkLabel linkLabel, Uri uri)
async void viewLicenseLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
linkLabel.Links[0].Description = uri != null && uri.IsAbsoluteUri ? uri.AbsoluteUri : null;
linkLabel.Links[0].LinkData = uri;
}

void viewLicenseLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
var linkUri = (Uri)e.Link.LinkData;
if (linkUri != null)
{
Process.Start(linkUri.AbsoluteUri);
}
await LicenseHelper.ShowLicenseAsync(e.Link, this);
}
}
}
69 changes: 69 additions & 0 deletions Bonsai.NuGet.Design/LicenseFileDialog.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions Bonsai.NuGet.Design/LicenseFileDialog.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
using System.Windows.Forms;

namespace Bonsai.NuGet.Design
{
public partial class LicenseFileDialog : Form
{
string licenseText;

public LicenseFileDialog()
{
InitializeComponent();
}

public string LicenseText
{
get => licenseText;
set
{
licenseText = value;
FormatTextBox();
}
}

private void FormatTextBox()
{
richTextBox.Text = licenseText;
richTextBox.SelectAll();
richTextBox.SelectionIndent += Margin.Left * 3;
richTextBox.SelectionRightIndent += Margin.Right * 3;
richTextBox.DeselectAll();
}
}
}
120 changes: 120 additions & 0 deletions Bonsai.NuGet.Design/LicenseFileDialog.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
Loading

0 comments on commit 61aa039

Please sign in to comment.