Fixes #13 go diagram license (#14)

Open-Systems-Pharmacology · Mar 21, 2017 · f75c2b2 · f75c2b2
1 parent 64a792f
commit f75c2b2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/src/OSPSuite.Assets/OSPSuite.Assets.nuspec b/src/OSPSuite.Assets/OSPSuite.Assets.nuspec
@@ -9,7 +9,7 @@
     <owners>Open-Systems-Pharmacology</owners>
     <projectUrl>https://github.com/Open-Systems-Pharmacology/$id$</projectUrl>
     <licenseUrl>https://github.com/Open-Systems-Pharmacology/$id$/blob/master/LICENSE</licenseUrl>
-    <iconUrl>https://github.com/Open-Systems-Pharmacology/Suite/blob/master/logo.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/Open-Systems-Pharmacology/Suite/master/logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright © 2017 - Open Systems Pharmacology Community</copyright>
     <tags>open-systems-pharmacology</tags>

diff --git a/src/OSPSuite.Core/OSPSuite.Core.nuspec b/src/OSPSuite.Core/OSPSuite.Core.nuspec
@@ -9,7 +9,7 @@
     <owners>Open-Systems-Pharmacology</owners>
     <projectUrl>https://github.com/Open-Systems-Pharmacology/$id$</projectUrl>
     <licenseUrl>https://github.com/Open-Systems-Pharmacology/$id$/blob/master/LICENSE</licenseUrl>
-    <iconUrl>https://github.com/Open-Systems-Pharmacology/Suite/blob/master/logo.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/Open-Systems-Pharmacology/Suite/master/logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright © 2017 - Open Systems Pharmacology Community</copyright>
     <tags>open-systems-pharmacology</tags>

diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.nuspec b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.nuspec
@@ -9,7 +9,7 @@
     <owners>Open-Systems-Pharmacology</owners>
     <projectUrl>https://github.com/Open-Systems-Pharmacology/$id$</projectUrl>
     <licenseUrl>https://github.com/Open-Systems-Pharmacology/$id$/blob/master/LICENSE</licenseUrl>
-    <iconUrl>https://github.com/Open-Systems-Pharmacology/Suite/blob/master/logo.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/Open-Systems-Pharmacology/Suite/master/logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright © 2017 - Open Systems Pharmacology Community</copyright>
     <tags>open-systems-pharmacology</tags>

diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.nuspec b/src/OSPSuite.Presentation/OSPSuite.Presentation.nuspec
@@ -9,7 +9,7 @@
     <owners>Open-Systems-Pharmacology</owners>
     <projectUrl>https://github.com/Open-Systems-Pharmacology/$id$</projectUrl>
     <licenseUrl>https://github.com/Open-Systems-Pharmacology/$id$/blob/master/LICENSE</licenseUrl>
-    <iconUrl>https://github.com/Open-Systems-Pharmacology/Suite/blob/master/logo.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/Open-Systems-Pharmacology/Suite/master/logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright © 2017 - Open Systems Pharmacology Community</copyright>
     <tags>open-systems-pharmacology</tags>

diff --git a/src/OSPSuite.UI/OSPSuite.UI.nuspec b/src/OSPSuite.UI/OSPSuite.UI.nuspec
@@ -9,7 +9,7 @@
     <owners>Open-Systems-Pharmacology</owners>
     <projectUrl>https://github.com/Open-Systems-Pharmacology/$id$</projectUrl>
     <licenseUrl>https://github.com/Open-Systems-Pharmacology/$id$/blob/master/LICENSE</licenseUrl>
-    <iconUrl>https://github.com/Open-Systems-Pharmacology/Suite/blob/master/logo.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/Open-Systems-Pharmacology/Suite/master/logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright © 2017 - Open Systems Pharmacology Community</copyright>
     <tags>open-systems-pharmacology</tags>

diff --git a/src/OSPSuite.UI/UIRegister.cs b/src/OSPSuite.UI/UIRegister.cs
@@ -1,4 +1,5 @@
 using DevExpress.XtraRichEdit;
+using Northwoods.Go;
 using OSPSuite.Core.Serialization.Diagram;
 using OSPSuite.Presentation.Services;
 using OSPSuite.Presentation.Views;
@@ -37,5 +38,13 @@ public override void RegisterInContainer(IContainer container)
          //Register open types
          container.Register(typeof(PathElementsBinder<>), typeof(PathElementsBinder<>));
       }
+
+      /// <summary>
+      /// This needs to be set as early as possible (before GoDiagram component is being instantiated)
+      /// </summary>
+      public static string GoDiagramKey
+      {
+         set { GoView.LicenseKey = value; }
+      }
    }
 }
diff --git a/tests/OSPSuite.Starter/TestProgram.cs b/tests/OSPSuite.Starter/TestProgram.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using OSPSuite.Utility.Container;
 using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Data;
 using OSPSuite.Starter.Bootstrapping;
 using OSPSuite.Starter.Presenters;
+using OSPSuite.Utility.Container;
 
 namespace OSPSuite.Starter
 {
@@ -32,7 +32,6 @@ public static IList<string> DisplayQuantityPathDefinition(DataColumn column)
          return path;
       }
 
-
       public static string IdentificationKeyDefintion(DataColumn col)
       {
          const int quantityPathLevelForIdentification = 1;
@@ -68,7 +67,7 @@ public static void Main()
       {
          ApplicationStartup.Initialize();
 
-           Application.Run(IoC.Resolve<ITestPresenter>().View as Form);
+         Application.Run(IoC.Resolve<ITestPresenter>().View as Form);
       }
    }