Skip to content

Commit

Permalink
Merge pull request DynamoDS#8550 from pboyer/deleteshapeways
Browse files Browse the repository at this point in the history
Delete ShapewaysClient
  • Loading branch information
pboyer authored Feb 9, 2018
2 parents b4a2071 + e848da7 commit ba74473
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 244 deletions.
6 changes: 0 additions & 6 deletions src/Dynamo.All.sln
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonNodeModels", "Librari
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfVisualizationTests", "VisualizationTests\WpfVisualizationTests.csproj", "{C4964946-B367-44EE-9ED2-451FF2A83D32}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShapewaysClient", "ShapewaysClient\ShapewaysClient.csproj", "{756CEBA5-4E20-4403-8448-C3C47957975B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Watch3DNodeModels", "Libraries\Watch3DNodeModels\Watch3DNodeModels.csproj", "{31183026-DE70-49CB-BC7C-0DFD0A088F62}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamoManipulation", "DynamoManipulation\DynamoManipulation.csproj", "{33F88E8C-CC3C-4237-8AA9-CC891EFCABFA}"
Expand Down Expand Up @@ -471,10 +469,6 @@ Global
{C4964946-B367-44EE-9ED2-451FF2A83D32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4964946-B367-44EE-9ED2-451FF2A83D32}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4964946-B367-44EE-9ED2-451FF2A83D32}.Release|Any CPU.Build.0 = Release|Any CPU
{756CEBA5-4E20-4403-8448-C3C47957975B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{756CEBA5-4E20-4403-8448-C3C47957975B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{756CEBA5-4E20-4403-8448-C3C47957975B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{756CEBA5-4E20-4403-8448-C3C47957975B}.Release|Any CPU.Build.0 = Release|Any CPU
{31183026-DE70-49CB-BC7C-0DFD0A088F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{31183026-DE70-49CB-BC7C-0DFD0A088F62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31183026-DE70-49CB-BC7C-0DFD0A088F62}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
5 changes: 0 additions & 5 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -1247,11 +1247,6 @@
<Name>DynamoServices</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\ShapewaysClient\ShapewaysClient.csproj">
<Project>{756ceba5-4e20-4403-8448-c3c47957975b}</Project>
<Name>ShapewaysClient</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Resource Include="UI\Images\StartPage\icon-customnode.png" />
Expand Down
48 changes: 0 additions & 48 deletions src/DynamoCoreWpf/Services/LoginService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Windows;
using System.Windows.Controls;
using System.Reflection;
using Shapeways=ShapewaysClient.ShapewaysClient;
using Dynamo.Wpf.Properties;

namespace Dynamo.Wpf.Authentication
Expand Down Expand Up @@ -66,52 +65,5 @@ public bool ShowLogin(object o)

return navigateSuccess;
}

internal void ShowShapewaysLogin(Shapeways client)
{
context.Send((_) =>
{

var window = new BrowserWindow(new Uri(client.LoginUrl))
{
Title = "Shapeways",
Owner = parent,
WindowStartupLocation = WindowStartupLocation.CenterOwner,
Height = 500,
Width = 1000
};

window.Browser.LoadCompleted += (sender, args) =>
{
if (args.Uri.AbsolutePath == "/callbackDynamoShapeways")
{
client.SetToken(args.Uri.PathAndQuery);
window.Close();
}
};

window.Browser.Loaded += (sender, args) =>
{
HideScriptErrors(window.Browser, true);
};

window.ShowDialog();

}, null);
}

/// <summary>
/// Hides or allows displaying of script errors in WebBrowser control
/// </summary>
/// <param name="wb">WebBrowser object</param>
/// <param name="Hide">Indicates whether scripts will be displayed or not</param>
private void HideScriptErrors(WebBrowser wb, bool Hide)
{
FieldInfo fiComWebBrowser = typeof(WebBrowser).GetField("_axIWebBrowser2", BindingFlags.Instance | BindingFlags.NonPublic);
if (fiComWebBrowser == null) return;
object objComWebBrowser = fiComWebBrowser.GetValue(wb);
if (objComWebBrowser == null) return;
objComWebBrowser.GetType().InvokeMember("Silent", BindingFlags.SetProperty, null, objComWebBrowser, new object[] { Hide });
}
}
}
14 changes: 0 additions & 14 deletions src/ShapewaysClient/Properties/AssemblyInfo.cs

This file was deleted.

92 changes: 0 additions & 92 deletions src/ShapewaysClient/ShapewaysClient.cs

This file was deleted.

74 changes: 0 additions & 74 deletions src/ShapewaysClient/ShapewaysClient.csproj

This file was deleted.

5 changes: 0 additions & 5 deletions src/ShapewaysClient/packages.config

This file was deleted.

0 comments on commit ba74473

Please sign in to comment.