diff --git a/App.config b/App.config index d772c4ab7..787dcbecc 100644 --- a/App.config +++ b/App.config @@ -1,29 +1,6 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/ConfigurationPage/ThemeSelectorWindow.cs b/ConfigurationPage/ThemeSelectorWindow.cs deleted file mode 100644 index b683f9c80..000000000 --- a/ConfigurationPage/ThemeSelectorWindow.cs +++ /dev/null @@ -1,153 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.IO; -using System.Text; - -using MatterHackers.Agg; -using MatterHackers.Agg.UI; -using MatterHackers.VectorMath; -using MatterHackers.MatterControl.CustomWidgets; -using MatterHackers.Agg.Image; -using MatterHackers.MatterControl.DataStorage; -using MatterHackers.Localizations; -using MatterHackers.MatterControl.SlicerConfiguration; -using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling; -using MatterHackers.Agg.VertexSource; - -namespace MatterHackers.MatterControl -{ - public class ThemeSelectorWindow : SystemWindow - { - GuiWidget currentColorTheme; - Button closeButton; - Button saveButton; - TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory(); - public ThemeSelectorWindow() - :base(400, 200) - { - Title = LocalizedString.Get("Theme Selector").Localize(); - - FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom); - topToBottom.AnchorAll(); - topToBottom.Padding = new BorderDouble(3, 0, 3, 5); - - //Create Header - FlowLayoutWidget headerRow = new FlowLayoutWidget(FlowDirection.LeftToRight); - headerRow.HAnchor = HAnchor.ParentLeftRight; - headerRow.Margin = new BorderDouble(0, 3, 0, 0); - headerRow.Padding = new BorderDouble(0, 3, 0, 3); - - //Create 'Theme Change' label and add it to Header - string themeChangeHeader = LocalizedString.Get("Select Theme".Localize()); - TextWidget elementHeader = new TextWidget(string.Format("{0}:", themeChangeHeader), pointSize: 14); - elementHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor; - elementHeader.HAnchor = HAnchor.ParentLeftRight; - elementHeader.VAnchor = Agg.UI.VAnchor.ParentBottom; - - //Add label to header - headerRow.AddChild(elementHeader); - //Add Header - topToBottom.AddChild(headerRow); - - - //Theme Selector widget container and add themeselector - FlowLayoutWidget themeChangeWidgetContainer = new FlowLayoutWidget(); - themeChangeWidgetContainer.Padding = new BorderDouble(3); - themeChangeWidgetContainer.HAnchor |= Agg.UI.HAnchor.ParentLeftRight; - - GuiWidget currentColorTheme = new GuiWidget(); - currentColorTheme.HAnchor = HAnchor.ParentLeftRight; - currentColorTheme.VAnchor = VAnchor.ParentBottomTop; - currentColorTheme.BackgroundColor = ActiveTheme.Instance.PrimaryAccentColor; - - - ThemeColorSelectorWidget themeSelector = new ThemeColorSelectorWidget(colorToChangeTo: currentColorTheme); - themeSelector.Margin = new BorderDouble(right: 5); - themeChangeWidgetContainer.AddChild(themeSelector); - - - //Create CurrentColorTheme GUI Widgets - GuiWidget currentColorThemeBorder = new GuiWidget(); - currentColorThemeBorder.HAnchor = Agg.UI.HAnchor.ParentLeftRight; - currentColorThemeBorder.VAnchor = VAnchor.ParentBottomTop; - currentColorThemeBorder.Margin = new BorderDouble (top: 2, bottom: 2); - currentColorThemeBorder.Padding = new BorderDouble(4); - currentColorThemeBorder.BackgroundColor = RGBA_Bytes.White; - - - - - FlowLayoutWidget presetsFormContainer = new FlowLayoutWidget(FlowDirection.TopToBottom); - - { - presetsFormContainer.HAnchor = HAnchor.ParentLeftRight; - presetsFormContainer.VAnchor = VAnchor.ParentBottomTop; - presetsFormContainer.Padding = new BorderDouble(3); - presetsFormContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor; - } - - FlowLayoutWidget currentColorLabelContainer = new FlowLayoutWidget(FlowDirection.LeftToRight); - currentColorLabelContainer.HAnchor = HAnchor.ParentLeftRight; - currentColorLabelContainer.Margin = new BorderDouble(0, 3, 0, 0); - currentColorLabelContainer.Padding = new BorderDouble(0, 3, 0, 3); - - string currentColorThemeLabelText = LocalizedString.Get("Currently Selected Theme".Localize()); - TextWidget currentColorThemeHeader = new TextWidget(string.Format("{0}:", currentColorThemeLabelText), pointSize: 14); - currentColorThemeHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor; - currentColorThemeHeader.HAnchor = HAnchor.ParentLeftRight; - currentColorThemeHeader.VAnchor = Agg.UI.VAnchor.ParentBottom; - currentColorLabelContainer.AddChild(currentColorThemeHeader); - - - // - FlowLayoutWidget currentColorContainer = new FlowLayoutWidget(FlowDirection.TopToBottom); - currentColorContainer.HAnchor = HAnchor.ParentLeftRight; - currentColorContainer.VAnchor = VAnchor.ParentBottomTop; - currentColorContainer.Padding = new BorderDouble(3); - currentColorContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor; - - currentColorContainer.AddChild(currentColorThemeBorder); - currentColorThemeBorder.AddChild(currentColorTheme); - - - presetsFormContainer.AddChild(themeChangeWidgetContainer); - topToBottom.AddChild(presetsFormContainer); - topToBottom.AddChild(currentColorLabelContainer); - - topToBottom.AddChild(currentColorContainer); - BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor; - - FlowLayoutWidget buttonRow = new FlowLayoutWidget(); - buttonRow.HAnchor = HAnchor.ParentLeftRight; - buttonRow.Padding = new BorderDouble(0, 3); - - closeButton = textImageButtonFactory.Generate("Close"); - closeButton.Click += (sender, e) => - { - UiThread.RunOnIdle((state) => - { - Close(); - }); - }; - - saveButton = textImageButtonFactory.Generate("Save"); - saveButton.Click += (sender, e) => - { - UserSettings.Instance.set("ActiveThemeIndex",((GuiWidget)sender).Name); - ActiveTheme.Instance.LoadThemeSettings(int.Parse(((GuiWidget)sender).Name));//GUIWIDGET - }; - - - buttonRow.AddChild(saveButton); - buttonRow.AddChild(new HorizontalSpacer()); - buttonRow.AddChild(closeButton); - topToBottom.AddChild(buttonRow); - AddChild(topToBottom); - - - ShowAsSystemWindow(); - } - } -} - diff --git a/MatterControl.Winforms/MatterControl.Winforms.csproj b/MatterControl.Winforms/MatterControl.Winforms.csproj index d1e0f3726..16cb19064 100644 --- a/MatterControl.Winforms/MatterControl.Winforms.csproj +++ b/MatterControl.Winforms/MatterControl.Winforms.csproj @@ -53,9 +53,9 @@ - - {0b8d6f56-bd7f-4426-b858-d9292b084656} - MatterControl + + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD} + MatterControlLib {865172a0-a1a9-49c2-9386-f2fdb4e141b7} diff --git a/MatterControl.cs b/MatterControl.cs new file mode 100644 index 000000000..4bacaf9c6 --- /dev/null +++ b/MatterControl.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MatterControl +{ + class Program + { + [STAThread] + static void Main(string[] args) + { + MatterHackers.MatterControl.MatterControlLib.Main(); + } + } +} diff --git a/MatterControl.csproj b/MatterControl.csproj index c95ecffe3..8260f478a 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -1,100 +1,70 @@ - - + + + - netstandard2.0 - MatterHackers Inc. + Debug + AnyCPU + {B2B001EE-A142-4E20-ACF8-AE4A9CB984F8} + WinExe + MatterControl + MatterControl + v4.7.1 + 512 + + true + PackageReference + true - - - - Off + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false - - - + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + + {f1653f20-d47d-4f29-8c55-3c835542af5f} + Community.CsharpSqlite + + + {93bebfdf-b81a-4344-ab82-0dbf58b234cd} + MatterControlLib + - - - - PdfSharp.dll - - - - + + \ No newline at end of file diff --git a/MatterControl.sln b/MatterControl.sln index 08b36b986..d46fcd6f2 100644 --- a/MatterControl.sln +++ b/MatterControl.sln @@ -3,25 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterControl.csproj", "{0B8D6F56-BD7F-4426-B858-D9292B084656}" - ProjectSection(ProjectDependencies) = postProject - {545B6912-77FF-4B34-BA76-6C3D6A32BE6A} = {545B6912-77FF-4B34-BA76-6C3D6A32BE6A} - {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} = {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} - {F1653F20-D47D-4F29-8C55-3C835542AF5F} = {F1653F20-D47D-4F29-8C55-3C835542AF5F} - {3DF4CB3D-9A03-4256-9A81-70523AAD828B} = {3DF4CB3D-9A03-4256-9A81-70523AAD828B} - {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} = {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} - {74F6BB6C-9D02-4512-A59A-21940E35C532} = {74F6BB6C-9D02-4512-A59A-21940E35C532} - {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} = {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} - {9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {9B062971-A88E-4A3D-B3C9-12B78D15FA66} - {CA96058C-1A37-465D-A357-D6D695B13D25} = {CA96058C-1A37-465D-A357-D6D695B13D25} - {036BCCBA-52D8-457C-84AE-8821F209FE4A} = {036BCCBA-52D8-457C-84AE-8821F209FE4A} - {7E61A5BD-E78F-4B80-88C9-3821B4FA062E} = {7E61A5BD-E78F-4B80-88C9-3821B4FA062E} - {DF6845CD-64C6-4263-8357-DA8066855739} = {DF6845CD-64C6-4263-8357-DA8066855739} - {1E01ABE0-B494-4FE4-B0D6-540133286887} = {1E01ABE0-B494-4FE4-B0D6-540133286887} - {86F6AAF2-9B50-40B8-A427-1897D76471C5} = {86F6AAF2-9B50-40B8-A427-1897D76471C5} - {670BDDFF-927B-425D-9DD1-22ACB14356EB} = {670BDDFF-927B-425D-9DD1-22ACB14356EB} - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tesselate", "Submodules\agg-sharp\Tesselate\Tesselate.csproj", "{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlatformWin32", "Submodules\agg-sharp\PlatformWin32\PlatformWin32.csproj", "{670BDDFF-927B-425D-9DD1-22ACB14356EB}" @@ -43,7 +24,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolygonMesh", "Submodules\a EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Agg", "Submodules\agg-sharp\agg\Agg.csproj", "{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Community.CsharpSqlite", "Community.CsharpSqlite\Community.CsharpSqlite.csproj", "{F1653F20-D47D-4F29-8C55-3C835542AF5F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Community.CsharpSqlite", "Community.CsharpSqlite\Community.CsharpSqlite.csproj", "{F1653F20-D47D-4F29-8C55-3C835542AF5F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RayTracer", "Submodules\agg-sharp\RayTracer\RayTracer.csproj", "{1E01ABE0-B494-4FE4-B0D6-540133286887}" EndProject @@ -53,9 +34,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageProcessing", "Submodul EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clipper_library", "Submodules\agg-sharp\clipper_library\clipper_library.csproj", "{9B062971-A88E-4A3D-B3C9-12B78D15FA66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarchingSquares", "Submodules\agg-sharp\MarchingSquares\MarchingSquares.csproj", "{DF6845CD-64C6-4263-8357-DA8066855739}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarchingSquares", "Submodules\agg-sharp\MarchingSquares\MarchingSquares.csproj", "{DF6845CD-64C6-4263-8357-DA8066855739}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControlPluginSystem", "PluginSystem\MatterControlPluginSystem.csproj", "{865172A0-A1A9-49C2-9386-F2FDB4E141B7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControlPluginSystem", "PluginSystem\MatterControlPluginSystem.csproj", "{865172A0-A1A9-49C2-9386-F2FDB4E141B7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher", "Launcher\Launcher.csproj", "{3DF4CB3D-9A03-4256-9A81-70523AAD828B}" EndProject @@ -91,11 +72,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuadTree", "Submodules\Matt EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSClipperLib", "Submodules\MatterSlice\MSClipperLib\MSClipperLib.csproj", "{2C564BE1-352D-4DDB-8226-F0981F983C60}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeshThumbnails", "Submodules\agg-sharp\MeshThumbnails\MeshThumbnails\MeshThumbnails.csproj", "{1A901129-C885-425F-8D4B-86698F98A2B4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeshThumbnails", "Submodules\agg-sharp\MeshThumbnails\MeshThumbnails\MeshThumbnails.csproj", "{1A901129-C885-425F-8D4B-86698F98A2B4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.OpenGL", "MatterControl.OpenGL\MatterControl.OpenGL.csproj", "{CBDEEC31-D688-417B-9BF2-F0DB2E4FB268}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.OpenGL", "MatterControl.OpenGL\MatterControl.OpenGL.csproj", "{CBDEEC31-D688-417B-9BF2-F0DB2E4FB268}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.Printing", "MatterControl.Printing\MatterControl.Printing.csproj", "{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.Printing", "MatterControl.Printing\MatterControl.Printing.csproj", "{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.GlyphLayout", "Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.csproj", "{DE958333-2467-409D-904D-92C9CCD0BA52}" EndProject @@ -109,6 +90,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterSliceLib", "Submodule EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterSlice", "Submodules\MatterSlice\MatterSlice.csproj", "{B0AED568-8796-42B9-BAA9-EBC796134E78}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControlLib", "MatterControlLib\MatterControlLib.csproj", "{93BEBFDF-B81A-4344-AB82-0DBF58B234CD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterControl.csproj", "{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4 @@ -121,14 +106,6 @@ Global Release|Mixed Platforms = Release|Mixed Platforms EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Any CPU.Build.0 = Release|Any CPU - {0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Mixed Platforms.Build.0 = Release|Any CPU {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|Any CPU.Build.0 = Debug|Any CPU {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -425,6 +402,22 @@ Global {B0AED568-8796-42B9-BAA9-EBC796134E78}.Release|Any CPU.Build.0 = Release|Any CPU {B0AED568-8796-42B9-BAA9-EBC796134E78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {B0AED568-8796-42B9-BAA9-EBC796134E78}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Release|Any CPU.Build.0 = Release|Any CPU + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Any CPU.Build.0 = Release|Any CPU + {B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AboutPage/AboutPage.cs b/MatterControlLib/AboutPage/AboutPage.cs similarity index 100% rename from AboutPage/AboutPage.cs rename to MatterControlLib/AboutPage/AboutPage.cs diff --git a/AboutPage/CacheDirectory.cs b/MatterControlLib/AboutPage/CacheDirectory.cs similarity index 100% rename from AboutPage/CacheDirectory.cs rename to MatterControlLib/AboutPage/CacheDirectory.cs diff --git a/AboutPage/CheckForUpdatesPage.cs b/MatterControlLib/AboutPage/CheckForUpdatesPage.cs similarity index 100% rename from AboutPage/CheckForUpdatesPage.cs rename to MatterControlLib/AboutPage/CheckForUpdatesPage.cs diff --git a/AboutPage/ContactFormPage.cs b/MatterControlLib/AboutPage/ContactFormPage.cs similarity index 100% rename from AboutPage/ContactFormPage.cs rename to MatterControlLib/AboutPage/ContactFormPage.cs diff --git a/AboutPage/UpdateControlData.cs b/MatterControlLib/AboutPage/UpdateControlData.cs similarity index 100% rename from AboutPage/UpdateControlData.cs rename to MatterControlLib/AboutPage/UpdateControlData.cs diff --git a/AboutPage/UpdateControlView.cs b/MatterControlLib/AboutPage/UpdateControlView.cs similarity index 100% rename from AboutPage/UpdateControlView.cs rename to MatterControlLib/AboutPage/UpdateControlView.cs diff --git a/ActionBar/PrinterSelector.cs b/MatterControlLib/ActionBar/PrinterSelector.cs similarity index 100% rename from ActionBar/PrinterSelector.cs rename to MatterControlLib/ActionBar/PrinterSelector.cs diff --git a/ActionBar/TemperatureWidgetBase.cs b/MatterControlLib/ActionBar/TemperatureWidgetBase.cs similarity index 100% rename from ActionBar/TemperatureWidgetBase.cs rename to MatterControlLib/ActionBar/TemperatureWidgetBase.cs diff --git a/ActionBar/TemperatureWidgetBed.cs b/MatterControlLib/ActionBar/TemperatureWidgetBed.cs similarity index 100% rename from ActionBar/TemperatureWidgetBed.cs rename to MatterControlLib/ActionBar/TemperatureWidgetBed.cs diff --git a/ActionBar/TemperatureWidgetExtruder.cs b/MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs similarity index 100% rename from ActionBar/TemperatureWidgetExtruder.cs rename to MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs diff --git a/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs similarity index 99% rename from ApplicationView/ApplicationController.cs rename to MatterControlLib/ApplicationView/ApplicationController.cs index 81c699617..bcf46a90a 100644 --- a/ApplicationView/ApplicationController.cs +++ b/MatterControlLib/ApplicationView/ApplicationController.cs @@ -1219,7 +1219,7 @@ namespace MatterHackers.MatterControl objectEditorsByType = new Dictionary>(); // Initialize plugins, passing the MatterControl assembly as the only non-dll instance - PluginFinder.Initialize(Assembly.GetExecutingAssembly()); + //PluginFinder.Initialize(Assembly.GetExecutingAssembly()); foreach (IObject3DEditor editor in PluginFinder.CreateInstancesOf()) { diff --git a/ApplicationView/LogoSpinner.cs b/MatterControlLib/ApplicationView/LogoSpinner.cs similarity index 100% rename from ApplicationView/LogoSpinner.cs rename to MatterControlLib/ApplicationView/LogoSpinner.cs diff --git a/ApplicationView/OemProfileDictionary.cs b/MatterControlLib/ApplicationView/OemProfileDictionary.cs similarity index 100% rename from ApplicationView/OemProfileDictionary.cs rename to MatterControlLib/ApplicationView/OemProfileDictionary.cs diff --git a/ApplicationView/PrinterModels.cs b/MatterControlLib/ApplicationView/PrinterModels.cs similarity index 100% rename from ApplicationView/PrinterModels.cs rename to MatterControlLib/ApplicationView/PrinterModels.cs diff --git a/ApplicationView/ThemeConfig.cs b/MatterControlLib/ApplicationView/ThemeConfig.cs similarity index 100% rename from ApplicationView/ThemeConfig.cs rename to MatterControlLib/ApplicationView/ThemeConfig.cs diff --git a/ApplicationView/ThumbnailsConfig.cs b/MatterControlLib/ApplicationView/ThumbnailsConfig.cs similarity index 100% rename from ApplicationView/ThumbnailsConfig.cs rename to MatterControlLib/ApplicationView/ThumbnailsConfig.cs diff --git a/ApplicationView/WidescreenPanel.cs b/MatterControlLib/ApplicationView/WidescreenPanel.cs similarity index 100% rename from ApplicationView/WidescreenPanel.cs rename to MatterControlLib/ApplicationView/WidescreenPanel.cs diff --git a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs b/MatterControlLib/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs similarity index 100% rename from ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs rename to MatterControlLib/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs diff --git a/ConfigurationPage/ApplicationSettings/SettingsItem.cs b/MatterControlLib/ConfigurationPage/ApplicationSettings/SettingsItem.cs similarity index 100% rename from ConfigurationPage/ApplicationSettings/SettingsItem.cs rename to MatterControlLib/ConfigurationPage/ApplicationSettings/SettingsItem.cs diff --git a/ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs b/MatterControlLib/ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs similarity index 100% rename from ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs rename to MatterControlLib/ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs diff --git a/ConfigurationPage/LanguageSelector.cs b/MatterControlLib/ConfigurationPage/LanguageSelector.cs similarity index 100% rename from ConfigurationPage/LanguageSelector.cs rename to MatterControlLib/ConfigurationPage/LanguageSelector.cs diff --git a/ConfigurationPage/PrintLeveling/LevelWizard100PointRadial.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizard100PointRadial.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelWizard100PointRadial.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizard100PointRadial.cs diff --git a/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs diff --git a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelWizard3Point.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs diff --git a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs diff --git a/ConfigurationPage/PrintLeveling/LevelWizardCustom.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizardCustom.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelWizardCustom.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizardCustom.cs diff --git a/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelWizardMesh.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs diff --git a/ConfigurationPage/PrintLeveling/LevelingFunctions.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingFunctions.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelingFunctions.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelingFunctions.cs diff --git a/ConfigurationPage/PrintLeveling/LevelingPlan.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingPlan.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelingPlan.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelingPlan.cs diff --git a/ConfigurationPage/PrintLeveling/LevelingStrings.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingStrings.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelingStrings.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelingStrings.cs diff --git a/ConfigurationPage/PrintLeveling/LevelingWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingWizard.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelingWizard.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelingWizard.cs diff --git a/ConfigurationPage/PrintLeveling/LevelingWizardPage.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingWizardPage.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelingWizardPage.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelingWizardPage.cs diff --git a/ConfigurationPage/PrintLeveling/LevelingWizardRootPage.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingWizardRootPage.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/LevelingWizardRootPage.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/LevelingWizardRootPage.cs diff --git a/ConfigurationPage/PrintLeveling/PrintLevelingData.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/PrintLevelingData.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/PrintLevelingData.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/PrintLevelingData.cs diff --git a/ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs diff --git a/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPagelInstructions.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPagelInstructions.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPagelInstructions.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPagelInstructions.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/GetFineBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetFineBedHeight.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/GetFineBedHeight.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetFineBedHeight.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/SelectMaterialPage.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/SelectMaterialPage.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/SelectMaterialPage.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/SelectMaterialPage.cs diff --git a/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs similarity index 100% rename from ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs rename to MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs diff --git a/ConfigurationPage/RunningMacroPage.cs b/MatterControlLib/ConfigurationPage/RunningMacroPage.cs similarity index 100% rename from ConfigurationPage/RunningMacroPage.cs rename to MatterControlLib/ConfigurationPage/RunningMacroPage.cs diff --git a/ControlElements/AttentionGetter.cs b/MatterControlLib/ControlElements/AttentionGetter.cs similarity index 100% rename from ControlElements/AttentionGetter.cs rename to MatterControlLib/ControlElements/AttentionGetter.cs diff --git a/ControlElements/MHNumberEdit.cs b/MatterControlLib/ControlElements/MHNumberEdit.cs similarity index 100% rename from ControlElements/MHNumberEdit.cs rename to MatterControlLib/ControlElements/MHNumberEdit.cs diff --git a/ControlElements/MHPasswordTextEditWidget.cs b/MatterControlLib/ControlElements/MHPasswordTextEditWidget.cs similarity index 100% rename from ControlElements/MHPasswordTextEditWidget.cs rename to MatterControlLib/ControlElements/MHPasswordTextEditWidget.cs diff --git a/ControlElements/MHTextEditWidget.cs b/MatterControlLib/ControlElements/MHTextEditWidget.cs similarity index 100% rename from ControlElements/MHTextEditWidget.cs rename to MatterControlLib/ControlElements/MHTextEditWidget.cs diff --git a/ControlElements/StyledMessageBoxWindow.cs b/MatterControlLib/ControlElements/StyledMessageBoxWindow.cs similarity index 100% rename from ControlElements/StyledMessageBoxWindow.cs rename to MatterControlLib/ControlElements/StyledMessageBoxWindow.cs diff --git a/CustomWidgets/BoundDropList.cs b/MatterControlLib/CustomWidgets/BoundDropList.cs similarity index 100% rename from CustomWidgets/BoundDropList.cs rename to MatterControlLib/CustomWidgets/BoundDropList.cs diff --git a/CustomWidgets/ColorPicker/RadialColorPicker.cs b/MatterControlLib/CustomWidgets/ColorPicker/RadialColorPicker.cs similarity index 100% rename from CustomWidgets/ColorPicker/RadialColorPicker.cs rename to MatterControlLib/CustomWidgets/ColorPicker/RadialColorPicker.cs diff --git a/CustomWidgets/ConfigurePrinterWidget.cs b/MatterControlLib/CustomWidgets/ConfigurePrinterWidget.cs similarity index 100% rename from CustomWidgets/ConfigurePrinterWidget.cs rename to MatterControlLib/CustomWidgets/ConfigurePrinterWidget.cs diff --git a/CustomWidgets/DataViewGraph.cs b/MatterControlLib/CustomWidgets/DataViewGraph.cs similarity index 100% rename from CustomWidgets/DataViewGraph.cs rename to MatterControlLib/CustomWidgets/DataViewGraph.cs diff --git a/CustomWidgets/DockingTabControl.cs b/MatterControlLib/CustomWidgets/DockingTabControl.cs similarity index 100% rename from CustomWidgets/DockingTabControl.cs rename to MatterControlLib/CustomWidgets/DockingTabControl.cs diff --git a/CustomWidgets/DoubleSolidSlider.cs b/MatterControlLib/CustomWidgets/DoubleSolidSlider.cs similarity index 100% rename from CustomWidgets/DoubleSolidSlider.cs rename to MatterControlLib/CustomWidgets/DoubleSolidSlider.cs diff --git a/CustomWidgets/EditableNumberDisplay.cs b/MatterControlLib/CustomWidgets/EditableNumberDisplay.cs similarity index 100% rename from CustomWidgets/EditableNumberDisplay.cs rename to MatterControlLib/CustomWidgets/EditableNumberDisplay.cs diff --git a/CustomWidgets/ExportPrintItemPage.cs b/MatterControlLib/CustomWidgets/ExportPrintItemPage.cs similarity index 100% rename from CustomWidgets/ExportPrintItemPage.cs rename to MatterControlLib/CustomWidgets/ExportPrintItemPage.cs diff --git a/CustomWidgets/FlowSpacers.cs b/MatterControlLib/CustomWidgets/FlowSpacers.cs similarity index 100% rename from CustomWidgets/FlowSpacers.cs rename to MatterControlLib/CustomWidgets/FlowSpacers.cs diff --git a/CustomWidgets/HelpArticleHeader.cs b/MatterControlLib/CustomWidgets/HelpArticleHeader.cs similarity index 100% rename from CustomWidgets/HelpArticleHeader.cs rename to MatterControlLib/CustomWidgets/HelpArticleHeader.cs diff --git a/CustomWidgets/InlineEditControl.cs b/MatterControlLib/CustomWidgets/InlineEditControl.cs similarity index 100% rename from CustomWidgets/InlineEditControl.cs rename to MatterControlLib/CustomWidgets/InlineEditControl.cs diff --git a/CustomWidgets/InlineListItemEdit.cs b/MatterControlLib/CustomWidgets/InlineListItemEdit.cs similarity index 100% rename from CustomWidgets/InlineListItemEdit.cs rename to MatterControlLib/CustomWidgets/InlineListItemEdit.cs diff --git a/CustomWidgets/InlineStringEdit.cs b/MatterControlLib/CustomWidgets/InlineStringEdit.cs similarity index 100% rename from CustomWidgets/InlineStringEdit.cs rename to MatterControlLib/CustomWidgets/InlineStringEdit.cs diff --git a/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs b/MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs similarity index 100% rename from CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs rename to MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs diff --git a/CustomWidgets/LinkLabel.cs b/MatterControlLib/CustomWidgets/LinkLabel.cs similarity index 100% rename from CustomWidgets/LinkLabel.cs rename to MatterControlLib/CustomWidgets/LinkLabel.cs diff --git a/CustomWidgets/NamedAction.cs b/MatterControlLib/CustomWidgets/NamedAction.cs similarity index 100% rename from CustomWidgets/NamedAction.cs rename to MatterControlLib/CustomWidgets/NamedAction.cs diff --git a/CustomWidgets/PrintingWindow/BedStatusWidget.cs b/MatterControlLib/CustomWidgets/PrintingWindow/BedStatusWidget.cs similarity index 100% rename from CustomWidgets/PrintingWindow/BedStatusWidget.cs rename to MatterControlLib/CustomWidgets/PrintingWindow/BedStatusWidget.cs diff --git a/CustomWidgets/PrintingWindow/ExtruderStatusWidget.cs b/MatterControlLib/CustomWidgets/PrintingWindow/ExtruderStatusWidget.cs similarity index 100% rename from CustomWidgets/PrintingWindow/ExtruderStatusWidget.cs rename to MatterControlLib/CustomWidgets/PrintingWindow/ExtruderStatusWidget.cs diff --git a/CustomWidgets/PrintingWindow/ProgressDial.cs b/MatterControlLib/CustomWidgets/PrintingWindow/ProgressDial.cs similarity index 100% rename from CustomWidgets/PrintingWindow/ProgressDial.cs rename to MatterControlLib/CustomWidgets/PrintingWindow/ProgressDial.cs diff --git a/CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs b/MatterControlLib/CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs similarity index 100% rename from CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs rename to MatterControlLib/CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs diff --git a/CustomWidgets/RadioImageWidget.cs b/MatterControlLib/CustomWidgets/RadioImageWidget.cs similarity index 100% rename from CustomWidgets/RadioImageWidget.cs rename to MatterControlLib/CustomWidgets/RadioImageWidget.cs diff --git a/CustomWidgets/RadioPanelWidget.cs b/MatterControlLib/CustomWidgets/RadioPanelWidget.cs similarity index 100% rename from CustomWidgets/RadioPanelWidget.cs rename to MatterControlLib/CustomWidgets/RadioPanelWidget.cs diff --git a/CustomWidgets/ResizeContainer/BottomResizeContainer.cs b/MatterControlLib/CustomWidgets/ResizeContainer/BottomResizeContainer.cs similarity index 100% rename from CustomWidgets/ResizeContainer/BottomResizeContainer.cs rename to MatterControlLib/CustomWidgets/ResizeContainer/BottomResizeContainer.cs diff --git a/CustomWidgets/ResizeContainer/LeftResizeContainer.cs b/MatterControlLib/CustomWidgets/ResizeContainer/LeftResizeContainer.cs similarity index 100% rename from CustomWidgets/ResizeContainer/LeftResizeContainer.cs rename to MatterControlLib/CustomWidgets/ResizeContainer/LeftResizeContainer.cs diff --git a/CustomWidgets/SavePartsSheetFeedbackWindow.cs b/MatterControlLib/CustomWidgets/SavePartsSheetFeedbackWindow.cs similarity index 100% rename from CustomWidgets/SavePartsSheetFeedbackWindow.cs rename to MatterControlLib/CustomWidgets/SavePartsSheetFeedbackWindow.cs diff --git a/CustomWidgets/SimpleButton.cs b/MatterControlLib/CustomWidgets/SimpleButton.cs similarity index 100% rename from CustomWidgets/SimpleButton.cs rename to MatterControlLib/CustomWidgets/SimpleButton.cs diff --git a/CustomWidgets/SlidePanelWidget.cs b/MatterControlLib/CustomWidgets/SlidePanelWidget.cs similarity index 100% rename from CustomWidgets/SlidePanelWidget.cs rename to MatterControlLib/CustomWidgets/SlidePanelWidget.cs diff --git a/CustomWidgets/SlideWidget.cs b/MatterControlLib/CustomWidgets/SlideWidget.cs similarity index 100% rename from CustomWidgets/SlideWidget.cs rename to MatterControlLib/CustomWidgets/SlideWidget.cs diff --git a/CustomWidgets/SolidSlider.cs b/MatterControlLib/CustomWidgets/SolidSlider.cs similarity index 100% rename from CustomWidgets/SolidSlider.cs rename to MatterControlLib/CustomWidgets/SolidSlider.cs diff --git a/CustomWidgets/SvgWidget.cs b/MatterControlLib/CustomWidgets/SvgWidget.cs similarity index 100% rename from CustomWidgets/SvgWidget.cs rename to MatterControlLib/CustomWidgets/SvgWidget.cs diff --git a/CustomWidgets/ThemeColorSelectorWidget.cs b/MatterControlLib/CustomWidgets/ThemeColorSelectorWidget.cs similarity index 100% rename from CustomWidgets/ThemeColorSelectorWidget.cs rename to MatterControlLib/CustomWidgets/ThemeColorSelectorWidget.cs diff --git a/CustomWidgets/TreeView/TreeNode.cs b/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs similarity index 100% rename from CustomWidgets/TreeView/TreeNode.cs rename to MatterControlLib/CustomWidgets/TreeView/TreeNode.cs diff --git a/CustomWidgets/TreeView/TreeView.cs b/MatterControlLib/CustomWidgets/TreeView/TreeView.cs similarity index 100% rename from CustomWidgets/TreeView/TreeView.cs rename to MatterControlLib/CustomWidgets/TreeView/TreeView.cs diff --git a/CustomWidgets/TwoSidedStack.cs b/MatterControlLib/CustomWidgets/TwoSidedStack.cs similarity index 100% rename from CustomWidgets/TwoSidedStack.cs rename to MatterControlLib/CustomWidgets/TwoSidedStack.cs diff --git a/DataStorage/ApplicationDataStorage.cs b/MatterControlLib/DataStorage/ApplicationDataStorage.cs similarity index 100% rename from DataStorage/ApplicationDataStorage.cs rename to MatterControlLib/DataStorage/ApplicationDataStorage.cs diff --git a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs b/MatterControlLib/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs similarity index 100% rename from DataStorage/Classic/ClassicSqlitePrinterProfiles.cs rename to MatterControlLib/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs diff --git a/DataStorage/Datastore.cs b/MatterControlLib/DataStorage/Datastore.cs similarity index 100% rename from DataStorage/Datastore.cs rename to MatterControlLib/DataStorage/Datastore.cs diff --git a/DataStorage/Models.cs b/MatterControlLib/DataStorage/Models.cs similarity index 100% rename from DataStorage/Models.cs rename to MatterControlLib/DataStorage/Models.cs diff --git a/DataStorage/SQLiteAndroid.cs b/MatterControlLib/DataStorage/SQLiteAndroid.cs similarity index 100% rename from DataStorage/SQLiteAndroid.cs rename to MatterControlLib/DataStorage/SQLiteAndroid.cs diff --git a/DataStorage/SQLiteAsync.cs b/MatterControlLib/DataStorage/SQLiteAsync.cs similarity index 100% rename from DataStorage/SQLiteAsync.cs rename to MatterControlLib/DataStorage/SQLiteAsync.cs diff --git a/DataStorage/SQLiteCommon.cs b/MatterControlLib/DataStorage/SQLiteCommon.cs similarity index 100% rename from DataStorage/SQLiteCommon.cs rename to MatterControlLib/DataStorage/SQLiteCommon.cs diff --git a/DataStorage/SQLiteUnix.cs b/MatterControlLib/DataStorage/SQLiteUnix.cs similarity index 100% rename from DataStorage/SQLiteUnix.cs rename to MatterControlLib/DataStorage/SQLiteUnix.cs diff --git a/DataStorage/SQLiteWin32.cs b/MatterControlLib/DataStorage/SQLiteWin32.cs similarity index 100% rename from DataStorage/SQLiteWin32.cs rename to MatterControlLib/DataStorage/SQLiteWin32.cs diff --git a/DesignTools/Attributes/IconsAttribute.cs b/MatterControlLib/DesignTools/Attributes/IconsAttribute.cs similarity index 100% rename from DesignTools/Attributes/IconsAttribute.cs rename to MatterControlLib/DesignTools/Attributes/IconsAttribute.cs diff --git a/DesignTools/Attributes/ShowAsListAttribute.cs b/MatterControlLib/DesignTools/Attributes/ShowAsListAttribute.cs similarity index 100% rename from DesignTools/Attributes/ShowAsListAttribute.cs rename to MatterControlLib/DesignTools/Attributes/ShowAsListAttribute.cs diff --git a/DesignTools/Attributes/ShowSearchFieldAttribute.cs b/MatterControlLib/DesignTools/Attributes/ShowSearchFieldAttribute.cs similarity index 100% rename from DesignTools/Attributes/ShowSearchFieldAttribute.cs rename to MatterControlLib/DesignTools/Attributes/ShowSearchFieldAttribute.cs diff --git a/DesignTools/Attributes/ShowUpdateButtonAttribute.cs b/MatterControlLib/DesignTools/Attributes/ShowUpdateButtonAttribute.cs similarity index 100% rename from DesignTools/Attributes/ShowUpdateButtonAttribute.cs rename to MatterControlLib/DesignTools/Attributes/ShowUpdateButtonAttribute.cs diff --git a/DesignTools/Attributes/SortableAttribute.cs b/MatterControlLib/DesignTools/Attributes/SortableAttribute.cs similarity index 100% rename from DesignTools/Attributes/SortableAttribute.cs rename to MatterControlLib/DesignTools/Attributes/SortableAttribute.cs diff --git a/DesignTools/Attributes/UnlockLinkAttribute.cs b/MatterControlLib/DesignTools/Attributes/UnlockLinkAttribute.cs similarity index 100% rename from DesignTools/Attributes/UnlockLinkAttribute.cs rename to MatterControlLib/DesignTools/Attributes/UnlockLinkAttribute.cs diff --git a/DesignTools/Attributes/WebPageLinkAttribute.cs b/MatterControlLib/DesignTools/Attributes/WebPageLinkAttribute.cs similarity index 100% rename from DesignTools/Attributes/WebPageLinkAttribute.cs rename to MatterControlLib/DesignTools/Attributes/WebPageLinkAttribute.cs diff --git a/DesignTools/Braille/BrailleCardObject3D.cs b/MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs similarity index 100% rename from DesignTools/Braille/BrailleCardObject3D.cs rename to MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs diff --git a/DesignTools/Braille/BrailleGrade2.cs b/MatterControlLib/DesignTools/Braille/BrailleGrade2.cs similarity index 100% rename from DesignTools/Braille/BrailleGrade2.cs rename to MatterControlLib/DesignTools/Braille/BrailleGrade2.cs diff --git a/DesignTools/Braille/BrailleGrade2Mapping.cs b/MatterControlLib/DesignTools/Braille/BrailleGrade2Mapping.cs similarity index 100% rename from DesignTools/Braille/BrailleGrade2Mapping.cs rename to MatterControlLib/DesignTools/Braille/BrailleGrade2Mapping.cs diff --git a/DesignTools/Braille/BrailleObject3D.cs b/MatterControlLib/DesignTools/Braille/BrailleObject3D.cs similarity index 100% rename from DesignTools/Braille/BrailleObject3D.cs rename to MatterControlLib/DesignTools/Braille/BrailleObject3D.cs diff --git a/DesignTools/EditableTypes/DirectionAxis.cs b/MatterControlLib/DesignTools/EditableTypes/DirectionAxis.cs similarity index 100% rename from DesignTools/EditableTypes/DirectionAxis.cs rename to MatterControlLib/DesignTools/EditableTypes/DirectionAxis.cs diff --git a/DesignTools/EditableTypes/DirectionVector.cs b/MatterControlLib/DesignTools/EditableTypes/DirectionVector.cs similarity index 100% rename from DesignTools/EditableTypes/DirectionVector.cs rename to MatterControlLib/DesignTools/EditableTypes/DirectionVector.cs diff --git a/DesignTools/Interfaces/IEditorDraw.cs b/MatterControlLib/DesignTools/Interfaces/IEditorDraw.cs similarity index 100% rename from DesignTools/Interfaces/IEditorDraw.cs rename to MatterControlLib/DesignTools/Interfaces/IEditorDraw.cs diff --git a/DesignTools/Interfaces/IPropertyGridModifier.cs b/MatterControlLib/DesignTools/Interfaces/IPropertyGridModifier.cs similarity index 100% rename from DesignTools/Interfaces/IPropertyGridModifier.cs rename to MatterControlLib/DesignTools/Interfaces/IPropertyGridModifier.cs diff --git a/DesignTools/Lithophane.cs b/MatterControlLib/DesignTools/Lithophane.cs similarity index 100% rename from DesignTools/Lithophane.cs rename to MatterControlLib/DesignTools/Lithophane.cs diff --git a/DesignTools/LithophaneObject3D.cs b/MatterControlLib/DesignTools/LithophaneObject3D.cs similarity index 100% rename from DesignTools/LithophaneObject3D.cs rename to MatterControlLib/DesignTools/LithophaneObject3D.cs diff --git a/DesignTools/Obsolete/FitToBoundsObject3D.cs b/MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs similarity index 100% rename from DesignTools/Obsolete/FitToBoundsObject3D.cs rename to MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs diff --git a/DesignTools/Obsolete/RotateObject3D.cs b/MatterControlLib/DesignTools/Obsolete/RotateObject3D.cs similarity index 100% rename from DesignTools/Obsolete/RotateObject3D.cs rename to MatterControlLib/DesignTools/Obsolete/RotateObject3D.cs diff --git a/DesignTools/Operations/Align2D.cs b/MatterControlLib/DesignTools/Operations/Align2D.cs similarity index 100% rename from DesignTools/Operations/Align2D.cs rename to MatterControlLib/DesignTools/Operations/Align2D.cs diff --git a/DesignTools/Operations/AlignObject3D.cs b/MatterControlLib/DesignTools/Operations/AlignObject3D.cs similarity index 100% rename from DesignTools/Operations/AlignObject3D.cs rename to MatterControlLib/DesignTools/Operations/AlignObject3D.cs diff --git a/DesignTools/Operations/ArrayAdvancedObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs similarity index 100% rename from DesignTools/Operations/ArrayAdvancedObject3D.cs rename to MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs diff --git a/DesignTools/Operations/ArrayLinearObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs similarity index 100% rename from DesignTools/Operations/ArrayLinearObject3D.cs rename to MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs diff --git a/DesignTools/Operations/ArrayRadialObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs similarity index 100% rename from DesignTools/Operations/ArrayRadialObject3D.cs rename to MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs diff --git a/DesignTools/Operations/CurveObject3D.cs b/MatterControlLib/DesignTools/Operations/CurveObject3D.cs similarity index 100% rename from DesignTools/Operations/CurveObject3D.cs rename to MatterControlLib/DesignTools/Operations/CurveObject3D.cs diff --git a/DesignTools/Operations/FitToBoundsObject3D_2.cs b/MatterControlLib/DesignTools/Operations/FitToBoundsObject3D_2.cs similarity index 100% rename from DesignTools/Operations/FitToBoundsObject3D_2.cs rename to MatterControlLib/DesignTools/Operations/FitToBoundsObject3D_2.cs diff --git a/DesignTools/Operations/GroupObject3D.cs b/MatterControlLib/DesignTools/Operations/GroupObject3D.cs similarity index 100% rename from DesignTools/Operations/GroupObject3D.cs rename to MatterControlLib/DesignTools/Operations/GroupObject3D.cs diff --git a/DesignTools/Operations/Image/ImageToPathObject3D.cs b/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D.cs similarity index 100% rename from DesignTools/Operations/Image/ImageToPathObject3D.cs rename to MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D.cs diff --git a/DesignTools/Operations/Image/LinearExtrudeObject3D.cs b/MatterControlLib/DesignTools/Operations/Image/LinearExtrudeObject3D.cs similarity index 100% rename from DesignTools/Operations/Image/LinearExtrudeObject3D.cs rename to MatterControlLib/DesignTools/Operations/Image/LinearExtrudeObject3D.cs diff --git a/DesignTools/Operations/MirrorObject3D.cs b/MatterControlLib/DesignTools/Operations/MirrorObject3D.cs similarity index 100% rename from DesignTools/Operations/MirrorObject3D.cs rename to MatterControlLib/DesignTools/Operations/MirrorObject3D.cs diff --git a/DesignTools/Operations/Object3DExtensions.cs b/MatterControlLib/DesignTools/Operations/Object3DExtensions.cs similarity index 100% rename from DesignTools/Operations/Object3DExtensions.cs rename to MatterControlLib/DesignTools/Operations/Object3DExtensions.cs diff --git a/DesignTools/Operations/OperationSourceObject3D.cs b/MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs similarity index 100% rename from DesignTools/Operations/OperationSourceObject3D.cs rename to MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs diff --git a/DesignTools/Operations/Path/InflatePathObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs similarity index 100% rename from DesignTools/Operations/Path/InflatePathObject3D.cs rename to MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs diff --git a/DesignTools/Operations/Path/SmoothPathObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/SmoothPathObject3D.cs similarity index 100% rename from DesignTools/Operations/Path/SmoothPathObject3D.cs rename to MatterControlLib/DesignTools/Operations/Path/SmoothPathObject3D.cs diff --git a/DesignTools/Operations/PinchObject3D.cs b/MatterControlLib/DesignTools/Operations/PinchObject3D.cs similarity index 100% rename from DesignTools/Operations/PinchObject3D.cs rename to MatterControlLib/DesignTools/Operations/PinchObject3D.cs diff --git a/DesignTools/Operations/RotateObject3D_2.cs b/MatterControlLib/DesignTools/Operations/RotateObject3D_2.cs similarity index 100% rename from DesignTools/Operations/RotateObject3D_2.cs rename to MatterControlLib/DesignTools/Operations/RotateObject3D_2.cs diff --git a/DesignTools/Operations/ScaleObject3D.cs b/MatterControlLib/DesignTools/Operations/ScaleObject3D.cs similarity index 100% rename from DesignTools/Operations/ScaleObject3D.cs rename to MatterControlLib/DesignTools/Operations/ScaleObject3D.cs diff --git a/DesignTools/Operations/SetCenterObject3D.cs b/MatterControlLib/DesignTools/Operations/SetCenterObject3D.cs similarity index 100% rename from DesignTools/Operations/SetCenterObject3D.cs rename to MatterControlLib/DesignTools/Operations/SetCenterObject3D.cs diff --git a/DesignTools/Operations/TransformWrapperObject3D.cs b/MatterControlLib/DesignTools/Operations/TransformWrapperObject3D.cs similarity index 100% rename from DesignTools/Operations/TransformWrapperObject3D.cs rename to MatterControlLib/DesignTools/Operations/TransformWrapperObject3D.cs diff --git a/DesignTools/Operations/TranslateObject3D.cs b/MatterControlLib/DesignTools/Operations/TranslateObject3D.cs similarity index 100% rename from DesignTools/Operations/TranslateObject3D.cs rename to MatterControlLib/DesignTools/Operations/TranslateObject3D.cs diff --git a/DesignTools/Primitives/BaseObject3D.cs b/MatterControlLib/DesignTools/Primitives/BaseObject3D.cs similarity index 100% rename from DesignTools/Primitives/BaseObject3D.cs rename to MatterControlLib/DesignTools/Primitives/BaseObject3D.cs diff --git a/DesignTools/Primitives/ComponentObject3D.cs b/MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs similarity index 100% rename from DesignTools/Primitives/ComponentObject3D.cs rename to MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs diff --git a/DesignTools/Primitives/ConeObject3D.cs b/MatterControlLib/DesignTools/Primitives/ConeObject3D.cs similarity index 100% rename from DesignTools/Primitives/ConeObject3D.cs rename to MatterControlLib/DesignTools/Primitives/ConeObject3D.cs diff --git a/DesignTools/Primitives/CubeObject3D.cs b/MatterControlLib/DesignTools/Primitives/CubeObject3D.cs similarity index 100% rename from DesignTools/Primitives/CubeObject3D.cs rename to MatterControlLib/DesignTools/Primitives/CubeObject3D.cs diff --git a/DesignTools/Primitives/CylinderObject3D.cs b/MatterControlLib/DesignTools/Primitives/CylinderObject3D.cs similarity index 100% rename from DesignTools/Primitives/CylinderObject3D.cs rename to MatterControlLib/DesignTools/Primitives/CylinderObject3D.cs diff --git a/DesignTools/Primitives/HalfCylinderObject3D.cs b/MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs similarity index 100% rename from DesignTools/Primitives/HalfCylinderObject3D.cs rename to MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs diff --git a/DesignTools/Primitives/HalfSphereObject3D.cs b/MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs similarity index 100% rename from DesignTools/Primitives/HalfSphereObject3D.cs rename to MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs diff --git a/DesignTools/Primitives/HalfWedgeObject3D.cs b/MatterControlLib/DesignTools/Primitives/HalfWedgeObject3D.cs similarity index 100% rename from DesignTools/Primitives/HalfWedgeObject3D.cs rename to MatterControlLib/DesignTools/Primitives/HalfWedgeObject3D.cs diff --git a/DesignTools/Primitives/HexGridObject3D.cs b/MatterControlLib/DesignTools/Primitives/HexGridObject3D.cs similarity index 100% rename from DesignTools/Primitives/HexGridObject3D.cs rename to MatterControlLib/DesignTools/Primitives/HexGridObject3D.cs diff --git a/DesignTools/Primitives/ImageObject3D.cs b/MatterControlLib/DesignTools/Primitives/ImageObject3D.cs similarity index 100% rename from DesignTools/Primitives/ImageObject3D.cs rename to MatterControlLib/DesignTools/Primitives/ImageObject3D.cs diff --git a/DesignTools/Primitives/PyramidObject3D.cs b/MatterControlLib/DesignTools/Primitives/PyramidObject3D.cs similarity index 100% rename from DesignTools/Primitives/PyramidObject3D.cs rename to MatterControlLib/DesignTools/Primitives/PyramidObject3D.cs diff --git a/DesignTools/Primitives/RingObject3D.cs b/MatterControlLib/DesignTools/Primitives/RingObject3D.cs similarity index 100% rename from DesignTools/Primitives/RingObject3D.cs rename to MatterControlLib/DesignTools/Primitives/RingObject3D.cs diff --git a/DesignTools/Primitives/SphereObject3D.cs b/MatterControlLib/DesignTools/Primitives/SphereObject3D.cs similarity index 100% rename from DesignTools/Primitives/SphereObject3D.cs rename to MatterControlLib/DesignTools/Primitives/SphereObject3D.cs diff --git a/DesignTools/Primitives/TextObject3D.cs b/MatterControlLib/DesignTools/Primitives/TextObject3D.cs similarity index 100% rename from DesignTools/Primitives/TextObject3D.cs rename to MatterControlLib/DesignTools/Primitives/TextObject3D.cs diff --git a/DesignTools/Primitives/TorusObject3D.cs b/MatterControlLib/DesignTools/Primitives/TorusObject3D.cs similarity index 100% rename from DesignTools/Primitives/TorusObject3D.cs rename to MatterControlLib/DesignTools/Primitives/TorusObject3D.cs diff --git a/DesignTools/Primitives/WedgeObject3D.cs b/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs similarity index 100% rename from DesignTools/Primitives/WedgeObject3D.cs rename to MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs diff --git a/DesignTools/PublicPropertyEditor.cs b/MatterControlLib/DesignTools/PublicPropertyEditor.cs similarity index 100% rename from DesignTools/PublicPropertyEditor.cs rename to MatterControlLib/DesignTools/PublicPropertyEditor.cs diff --git a/EeProm/EePromMarlinSettings.cs b/MatterControlLib/EeProm/EePromMarlinSettings.cs similarity index 100% rename from EeProm/EePromMarlinSettings.cs rename to MatterControlLib/EeProm/EePromMarlinSettings.cs diff --git a/EeProm/EePromMarlinWindow.cs b/MatterControlLib/EeProm/EePromMarlinWindow.cs similarity index 100% rename from EeProm/EePromMarlinWindow.cs rename to MatterControlLib/EeProm/EePromMarlinWindow.cs diff --git a/EeProm/EePromRepetierParameter.cs b/MatterControlLib/EeProm/EePromRepetierParameter.cs similarity index 100% rename from EeProm/EePromRepetierParameter.cs rename to MatterControlLib/EeProm/EePromRepetierParameter.cs diff --git a/EeProm/EePromRepetierStorage.cs b/MatterControlLib/EeProm/EePromRepetierStorage.cs similarity index 100% rename from EeProm/EePromRepetierStorage.cs rename to MatterControlLib/EeProm/EePromRepetierStorage.cs diff --git a/EeProm/EePromRepetierWindow.cs b/MatterControlLib/EeProm/EePromRepetierWindow.cs similarity index 100% rename from EeProm/EePromRepetierWindow.cs rename to MatterControlLib/EeProm/EePromRepetierWindow.cs diff --git a/History/PrintHistoryData.cs b/MatterControlLib/History/PrintHistoryData.cs similarity index 100% rename from History/PrintHistoryData.cs rename to MatterControlLib/History/PrintHistoryData.cs diff --git a/History/PrintHistoryListItem.cs b/MatterControlLib/History/PrintHistoryListItem.cs similarity index 100% rename from History/PrintHistoryListItem.cs rename to MatterControlLib/History/PrintHistoryListItem.cs diff --git a/Library/ContentProviders/GCodeContentProvider.cs b/MatterControlLib/Library/ContentProviders/GCodeContentProvider.cs similarity index 100% rename from Library/ContentProviders/GCodeContentProvider.cs rename to MatterControlLib/Library/ContentProviders/GCodeContentProvider.cs diff --git a/Library/ContentProviders/IContentProvider.cs b/MatterControlLib/Library/ContentProviders/IContentProvider.cs similarity index 100% rename from Library/ContentProviders/IContentProvider.cs rename to MatterControlLib/Library/ContentProviders/IContentProvider.cs diff --git a/Library/ContentProviders/ImageContentProvider.cs b/MatterControlLib/Library/ContentProviders/ImageContentProvider.cs similarity index 100% rename from Library/ContentProviders/ImageContentProvider.cs rename to MatterControlLib/Library/ContentProviders/ImageContentProvider.cs diff --git a/Library/ContentProviders/MeshContentProvider.cs b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs similarity index 100% rename from Library/ContentProviders/MeshContentProvider.cs rename to MatterControlLib/Library/ContentProviders/MeshContentProvider.cs diff --git a/Library/DynamicContentStore.cs b/MatterControlLib/Library/DynamicContentStore.cs similarity index 100% rename from Library/DynamicContentStore.cs rename to MatterControlLib/Library/DynamicContentStore.cs diff --git a/Library/Export/FolderExport.cs b/MatterControlLib/Library/Export/FolderExport.cs similarity index 100% rename from Library/Export/FolderExport.cs rename to MatterControlLib/Library/Export/FolderExport.cs diff --git a/Library/Export/GCodeExport.cs b/MatterControlLib/Library/Export/GCodeExport.cs similarity index 100% rename from Library/Export/GCodeExport.cs rename to MatterControlLib/Library/Export/GCodeExport.cs diff --git a/Library/Export/IExportPlugin.cs b/MatterControlLib/Library/Export/IExportPlugin.cs similarity index 100% rename from Library/Export/IExportPlugin.cs rename to MatterControlLib/Library/Export/IExportPlugin.cs diff --git a/Library/Export/MeshExport.cs b/MatterControlLib/Library/Export/MeshExport.cs similarity index 100% rename from Library/Export/MeshExport.cs rename to MatterControlLib/Library/Export/MeshExport.cs diff --git a/Library/Export/StlExport.cs b/MatterControlLib/Library/Export/StlExport.cs similarity index 100% rename from Library/Export/StlExport.cs rename to MatterControlLib/Library/Export/StlExport.cs diff --git a/Library/Export/ZipExport.cs b/MatterControlLib/Library/Export/ZipExport.cs similarity index 100% rename from Library/Export/ZipExport.cs rename to MatterControlLib/Library/Export/ZipExport.cs diff --git a/Library/ExtensionMethods.cs b/MatterControlLib/Library/ExtensionMethods.cs similarity index 100% rename from Library/ExtensionMethods.cs rename to MatterControlLib/Library/ExtensionMethods.cs diff --git a/Library/InMemoryLibraryItem.cs b/MatterControlLib/Library/InMemoryLibraryItem.cs similarity index 100% rename from Library/InMemoryLibraryItem.cs rename to MatterControlLib/Library/InMemoryLibraryItem.cs diff --git a/Library/Interfaces/ILibraryContainer.cs b/MatterControlLib/Library/Interfaces/ILibraryContainer.cs similarity index 100% rename from Library/Interfaces/ILibraryContainer.cs rename to MatterControlLib/Library/Interfaces/ILibraryContainer.cs diff --git a/Library/Interfaces/ILibraryContainerLink.cs b/MatterControlLib/Library/Interfaces/ILibraryContainerLink.cs similarity index 100% rename from Library/Interfaces/ILibraryContainerLink.cs rename to MatterControlLib/Library/Interfaces/ILibraryContainerLink.cs diff --git a/Library/Interfaces/ILibraryItem.cs b/MatterControlLib/Library/Interfaces/ILibraryItem.cs similarity index 100% rename from Library/Interfaces/ILibraryItem.cs rename to MatterControlLib/Library/Interfaces/ILibraryItem.cs diff --git a/Library/Interfaces/IThumbnail.cs b/MatterControlLib/Library/Interfaces/IThumbnail.cs similarity index 100% rename from Library/Interfaces/IThumbnail.cs rename to MatterControlLib/Library/Interfaces/IThumbnail.cs diff --git a/Library/Interfaces/KnownLengthStream.cs b/MatterControlLib/Library/Interfaces/KnownLengthStream.cs similarity index 100% rename from Library/Interfaces/KnownLengthStream.cs rename to MatterControlLib/Library/Interfaces/KnownLengthStream.cs diff --git a/Library/Interfaces/LibraryExtensionMethods.cs b/MatterControlLib/Library/Interfaces/LibraryExtensionMethods.cs similarity index 100% rename from Library/Interfaces/LibraryExtensionMethods.cs rename to MatterControlLib/Library/Interfaces/LibraryExtensionMethods.cs diff --git a/Library/LibraryProviders.cd b/MatterControlLib/Library/LibraryProviders.cd similarity index 100% rename from Library/LibraryProviders.cd rename to MatterControlLib/Library/LibraryProviders.cd diff --git a/Library/Providers/CreateFolderItem.cs b/MatterControlLib/Library/Providers/CreateFolderItem.cs similarity index 100% rename from Library/Providers/CreateFolderItem.cs rename to MatterControlLib/Library/Providers/CreateFolderItem.cs diff --git a/Library/Providers/DynamicContainerLink.cs b/MatterControlLib/Library/Providers/DynamicContainerLink.cs similarity index 100% rename from Library/Providers/DynamicContainerLink.cs rename to MatterControlLib/Library/Providers/DynamicContainerLink.cs diff --git a/Library/Providers/FileSystem/FileSystemContainer.cs b/MatterControlLib/Library/Providers/FileSystem/FileSystemContainer.cs similarity index 100% rename from Library/Providers/FileSystem/FileSystemContainer.cs rename to MatterControlLib/Library/Providers/FileSystem/FileSystemContainer.cs diff --git a/Library/Providers/FileSystem/FileSystemFileItem.cs b/MatterControlLib/Library/Providers/FileSystem/FileSystemFileItem.cs similarity index 100% rename from Library/Providers/FileSystem/FileSystemFileItem.cs rename to MatterControlLib/Library/Providers/FileSystem/FileSystemFileItem.cs diff --git a/Library/Providers/FileSystem/FileSystemItem.cs b/MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs similarity index 100% rename from Library/Providers/FileSystem/FileSystemItem.cs rename to MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs diff --git a/Library/Providers/FileSystem/McxContainer.cs b/MatterControlLib/Library/Providers/FileSystem/McxContainer.cs similarity index 100% rename from Library/Providers/FileSystem/McxContainer.cs rename to MatterControlLib/Library/Providers/FileSystem/McxContainer.cs diff --git a/Library/Providers/FileSystem/SceneReplacementFileItem.cs b/MatterControlLib/Library/Providers/FileSystem/SceneReplacementFileItem.cs similarity index 100% rename from Library/Providers/FileSystem/SceneReplacementFileItem.cs rename to MatterControlLib/Library/Providers/FileSystem/SceneReplacementFileItem.cs diff --git a/Library/Providers/GeneratorItem.cs b/MatterControlLib/Library/Providers/GeneratorItem.cs similarity index 100% rename from Library/Providers/GeneratorItem.cs rename to MatterControlLib/Library/Providers/GeneratorItem.cs diff --git a/Library/Providers/GraphConfig.cs b/MatterControlLib/Library/Providers/GraphConfig.cs similarity index 100% rename from Library/Providers/GraphConfig.cs rename to MatterControlLib/Library/Providers/GraphConfig.cs diff --git a/Library/Providers/LibraryConfig.cs b/MatterControlLib/Library/Providers/LibraryConfig.cs similarity index 100% rename from Library/Providers/LibraryConfig.cs rename to MatterControlLib/Library/Providers/LibraryConfig.cs diff --git a/Library/Providers/LibraryContainer.cs b/MatterControlLib/Library/Providers/LibraryContainer.cs similarity index 100% rename from Library/Providers/LibraryContainer.cs rename to MatterControlLib/Library/Providers/LibraryContainer.cs diff --git a/Library/Providers/LibraryProviderHelpers.cs b/MatterControlLib/Library/Providers/LibraryProviderHelpers.cs similarity index 100% rename from Library/Providers/LibraryProviderHelpers.cs rename to MatterControlLib/Library/Providers/LibraryProviderHelpers.cs diff --git a/Library/Providers/MatterControl/CalibrationPartsContainer.cs b/MatterControlLib/Library/Providers/MatterControl/CalibrationPartsContainer.cs similarity index 100% rename from Library/Providers/MatterControl/CalibrationPartsContainer.cs rename to MatterControlLib/Library/Providers/MatterControl/CalibrationPartsContainer.cs diff --git a/Library/Providers/MatterControl/LibraryCollectionContainer.cs b/MatterControlLib/Library/Providers/MatterControl/LibraryCollectionContainer.cs similarity index 100% rename from Library/Providers/MatterControl/LibraryCollectionContainer.cs rename to MatterControlLib/Library/Providers/MatterControl/LibraryCollectionContainer.cs diff --git a/Library/Providers/MatterControl/PartHistoryContainer.cs b/MatterControlLib/Library/Providers/MatterControl/PartHistoryContainer.cs similarity index 100% rename from Library/Providers/MatterControl/PartHistoryContainer.cs rename to MatterControlLib/Library/Providers/MatterControl/PartHistoryContainer.cs diff --git a/Library/Providers/MatterControl/PlatingHistoryContainer.cs b/MatterControlLib/Library/Providers/MatterControl/PlatingHistoryContainer.cs similarity index 100% rename from Library/Providers/MatterControl/PlatingHistoryContainer.cs rename to MatterControlLib/Library/Providers/MatterControl/PlatingHistoryContainer.cs diff --git a/Library/Providers/MatterControl/PrintHistoryContainer.cs b/MatterControlLib/Library/Providers/MatterControl/PrintHistoryContainer.cs similarity index 100% rename from Library/Providers/MatterControl/PrintHistoryContainer.cs rename to MatterControlLib/Library/Providers/MatterControl/PrintHistoryContainer.cs diff --git a/Library/Providers/MatterControl/PrintHistoryItem.cs b/MatterControlLib/Library/Providers/MatterControl/PrintHistoryItem.cs similarity index 100% rename from Library/Providers/MatterControl/PrintHistoryItem.cs rename to MatterControlLib/Library/Providers/MatterControl/PrintHistoryItem.cs diff --git a/Library/Providers/MatterControl/PrintQueueContainer.cs b/MatterControlLib/Library/Providers/MatterControl/PrintQueueContainer.cs similarity index 100% rename from Library/Providers/MatterControl/PrintQueueContainer.cs rename to MatterControlLib/Library/Providers/MatterControl/PrintQueueContainer.cs diff --git a/Library/Providers/MatterControl/RootHistoryContainer.cs b/MatterControlLib/Library/Providers/MatterControl/RootHistoryContainer.cs similarity index 100% rename from Library/Providers/MatterControl/RootHistoryContainer.cs rename to MatterControlLib/Library/Providers/MatterControl/RootHistoryContainer.cs diff --git a/Library/Providers/MatterControl/SqliteLibraryContainer.cs b/MatterControlLib/Library/Providers/MatterControl/SqliteLibraryContainer.cs similarity index 100% rename from Library/Providers/MatterControl/SqliteLibraryContainer.cs rename to MatterControlLib/Library/Providers/MatterControl/SqliteLibraryContainer.cs diff --git a/Library/Providers/MessageItem.cs b/MatterControlLib/Library/Providers/MessageItem.cs similarity index 100% rename from Library/Providers/MessageItem.cs rename to MatterControlLib/Library/Providers/MessageItem.cs diff --git a/Library/Providers/RootLibraryContainer.cs b/MatterControlLib/Library/Providers/RootLibraryContainer.cs similarity index 100% rename from Library/Providers/RootLibraryContainer.cs rename to MatterControlLib/Library/Providers/RootLibraryContainer.cs diff --git a/Library/Providers/SDCard/SDCardContainer.cs b/MatterControlLib/Library/Providers/SDCard/SDCardContainer.cs similarity index 100% rename from Library/Providers/SDCard/SDCardContainer.cs rename to MatterControlLib/Library/Providers/SDCard/SDCardContainer.cs diff --git a/Library/Providers/SDCard/SDCardFileItem.cs b/MatterControlLib/Library/Providers/SDCard/SDCardFileItem.cs similarity index 100% rename from Library/Providers/SDCard/SDCardFileItem.cs rename to MatterControlLib/Library/Providers/SDCard/SDCardFileItem.cs diff --git a/Library/Providers/WritableContainer.cs b/MatterControlLib/Library/Providers/WritableContainer.cs similarity index 100% rename from Library/Providers/WritableContainer.cs rename to MatterControlLib/Library/Providers/WritableContainer.cs diff --git a/Library/Providers/Zip/LocalZipContainerLink.cs b/MatterControlLib/Library/Providers/Zip/LocalZipContainerLink.cs similarity index 100% rename from Library/Providers/Zip/LocalZipContainerLink.cs rename to MatterControlLib/Library/Providers/Zip/LocalZipContainerLink.cs diff --git a/Library/Providers/Zip/ZipMemoryContainer.cs b/MatterControlLib/Library/Providers/Zip/ZipMemoryContainer.cs similarity index 100% rename from Library/Providers/Zip/ZipMemoryContainer.cs rename to MatterControlLib/Library/Providers/Zip/ZipMemoryContainer.cs diff --git a/Library/Providers/Zip/ZipMemoryItem.cs b/MatterControlLib/Library/Providers/Zip/ZipMemoryItem.cs similarity index 100% rename from Library/Providers/Zip/ZipMemoryItem.cs rename to MatterControlLib/Library/Providers/Zip/ZipMemoryItem.cs diff --git a/Library/ReadOnlyStreamItem.cs b/MatterControlLib/Library/ReadOnlyStreamItem.cs similarity index 100% rename from Library/ReadOnlyStreamItem.cs rename to MatterControlLib/Library/ReadOnlyStreamItem.cs diff --git a/Library/Widgets/ExpandCheckboxButton.cs b/MatterControlLib/Library/Widgets/ExpandCheckboxButton.cs similarity index 100% rename from Library/Widgets/ExpandCheckboxButton.cs rename to MatterControlLib/Library/Widgets/ExpandCheckboxButton.cs diff --git a/Library/Widgets/InsertionGroupObject3D.cs b/MatterControlLib/Library/Widgets/InsertionGroupObject3D.cs similarity index 100% rename from Library/Widgets/InsertionGroupObject3D.cs rename to MatterControlLib/Library/Widgets/InsertionGroupObject3D.cs diff --git a/Library/Widgets/ListView.cd b/MatterControlLib/Library/Widgets/ListView.cd similarity index 100% rename from Library/Widgets/ListView.cd rename to MatterControlLib/Library/Widgets/ListView.cd diff --git a/Library/Widgets/ListView/IListContentView.cs b/MatterControlLib/Library/Widgets/ListView/IListContentView.cs similarity index 100% rename from Library/Widgets/ListView/IListContentView.cs rename to MatterControlLib/Library/Widgets/ListView/IListContentView.cs diff --git a/Library/Widgets/ListView/IconListView.cs b/MatterControlLib/Library/Widgets/ListView/IconListView.cs similarity index 100% rename from Library/Widgets/ListView/IconListView.cs rename to MatterControlLib/Library/Widgets/ListView/IconListView.cs diff --git a/Library/Widgets/ListView/ListView.cs b/MatterControlLib/Library/Widgets/ListView/ListView.cs similarity index 100% rename from Library/Widgets/ListView/ListView.cs rename to MatterControlLib/Library/Widgets/ListView/ListView.cs diff --git a/Library/Widgets/ListView/ListViewItem.cs b/MatterControlLib/Library/Widgets/ListView/ListViewItem.cs similarity index 100% rename from Library/Widgets/ListView/ListViewItem.cs rename to MatterControlLib/Library/Widgets/ListView/ListViewItem.cs diff --git a/Library/Widgets/ListView/ListViewItemBase.cs b/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs similarity index 100% rename from Library/Widgets/ListView/ListViewItemBase.cs rename to MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs diff --git a/Library/Widgets/ListView/PrintItemAction.cs b/MatterControlLib/Library/Widgets/ListView/PrintItemAction.cs similarity index 100% rename from Library/Widgets/ListView/PrintItemAction.cs rename to MatterControlLib/Library/Widgets/ListView/PrintItemAction.cs diff --git a/Library/Widgets/ListView/RowListView.cs b/MatterControlLib/Library/Widgets/ListView/RowListView.cs similarity index 100% rename from Library/Widgets/ListView/RowListView.cs rename to MatterControlLib/Library/Widgets/ListView/RowListView.cs diff --git a/Library/Widgets/PrintLibraryWidget.cs b/MatterControlLib/Library/Widgets/PrintLibraryWidget.cs similarity index 100% rename from Library/Widgets/PrintLibraryWidget.cs rename to MatterControlLib/Library/Widgets/PrintLibraryWidget.cs diff --git a/MatterControlApplication.cs b/MatterControlLib/MatterControlApplication.cs similarity index 100% rename from MatterControlApplication.cs rename to MatterControlLib/MatterControlApplication.cs diff --git a/MatterControlLib/MatterControlLib.csproj b/MatterControlLib/MatterControlLib.csproj new file mode 100644 index 000000000..a3e3fbe1d --- /dev/null +++ b/MatterControlLib/MatterControlLib.csproj @@ -0,0 +1,103 @@ + + + + netstandard2.0 + MatterHackers Inc. + + + + TRACE;DEBUG;USE_OPENGL;IS_WINDOWS;IS_WINDOWS_FORMS + + + + TRACE;USE_OPENGL;IS_WINDOWS;IS_WINDOWS_FORMS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PdfSharp.dll + + + + + + + + diff --git a/PartPreviewWindow/BedSettings.cs b/MatterControlLib/PartPreviewWindow/BedSettings.cs similarity index 100% rename from PartPreviewWindow/BedSettings.cs rename to MatterControlLib/PartPreviewWindow/BedSettings.cs diff --git a/PartPreviewWindow/CreateDiscreteMeshes.cs b/MatterControlLib/PartPreviewWindow/CreateDiscreteMeshes.cs similarity index 100% rename from PartPreviewWindow/CreateDiscreteMeshes.cs rename to MatterControlLib/PartPreviewWindow/CreateDiscreteMeshes.cs diff --git a/PartPreviewWindow/GCode2DWidget.cs b/MatterControlLib/PartPreviewWindow/GCode2DWidget.cs similarity index 100% rename from PartPreviewWindow/GCode2DWidget.cs rename to MatterControlLib/PartPreviewWindow/GCode2DWidget.cs diff --git a/PartPreviewWindow/GCode3DWidget.cs b/MatterControlLib/PartPreviewWindow/GCode3DWidget.cs similarity index 100% rename from PartPreviewWindow/GCode3DWidget.cs rename to MatterControlLib/PartPreviewWindow/GCode3DWidget.cs diff --git a/PartPreviewWindow/GCodeDetails/BoolOption.cs b/MatterControlLib/PartPreviewWindow/GCodeDetails/BoolOption.cs similarity index 100% rename from PartPreviewWindow/GCodeDetails/BoolOption.cs rename to MatterControlLib/PartPreviewWindow/GCodeDetails/BoolOption.cs diff --git a/PartPreviewWindow/GCodeDetails/GCodeDetails.cs b/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeDetails.cs similarity index 100% rename from PartPreviewWindow/GCodeDetails/GCodeDetails.cs rename to MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeDetails.cs diff --git a/PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs b/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs similarity index 100% rename from PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs rename to MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs diff --git a/PartPreviewWindow/GCodeDetails/GCodeLayerDetailsView.cs b/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeLayerDetailsView.cs similarity index 100% rename from PartPreviewWindow/GCodeDetails/GCodeLayerDetailsView.cs rename to MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeLayerDetailsView.cs diff --git a/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs b/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs similarity index 100% rename from PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs rename to MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs diff --git a/PartPreviewWindow/GCodeDetails/IToggleOption.cs b/MatterControlLib/PartPreviewWindow/GCodeDetails/IToggleOption.cs similarity index 100% rename from PartPreviewWindow/GCodeDetails/IToggleOption.cs rename to MatterControlLib/PartPreviewWindow/GCodeDetails/IToggleOption.cs diff --git a/PartPreviewWindow/LeftClipFlowLayoutWidget.cs b/MatterControlLib/PartPreviewWindow/LeftClipFlowLayoutWidget.cs similarity index 100% rename from PartPreviewWindow/LeftClipFlowLayoutWidget.cs rename to MatterControlLib/PartPreviewWindow/LeftClipFlowLayoutWidget.cs diff --git a/PartPreviewWindow/LibraryBrowserPage.cs b/MatterControlLib/PartPreviewWindow/LibraryBrowserPage.cs similarity index 100% rename from PartPreviewWindow/LibraryBrowserPage.cs rename to MatterControlLib/PartPreviewWindow/LibraryBrowserPage.cs diff --git a/PartPreviewWindow/MarkdownEditPage.cs b/MatterControlLib/PartPreviewWindow/MarkdownEditPage.cs similarity index 100% rename from PartPreviewWindow/MarkdownEditPage.cs rename to MatterControlLib/PartPreviewWindow/MarkdownEditPage.cs diff --git a/PartPreviewWindow/MaterialControls.cs b/MatterControlLib/PartPreviewWindow/MaterialControls.cs similarity index 100% rename from PartPreviewWindow/MaterialControls.cs rename to MatterControlLib/PartPreviewWindow/MaterialControls.cs diff --git a/PartPreviewWindow/ModelOptionsPanel.cs b/MatterControlLib/PartPreviewWindow/ModelOptionsPanel.cs similarity index 100% rename from PartPreviewWindow/ModelOptionsPanel.cs rename to MatterControlLib/PartPreviewWindow/ModelOptionsPanel.cs diff --git a/PartPreviewWindow/MoveItemPage.cs b/MatterControlLib/PartPreviewWindow/MoveItemPage.cs similarity index 100% rename from PartPreviewWindow/MoveItemPage.cs rename to MatterControlLib/PartPreviewWindow/MoveItemPage.cs diff --git a/PartPreviewWindow/NewTabButton.cs b/MatterControlLib/PartPreviewWindow/NewTabButton.cs similarity index 100% rename from PartPreviewWindow/NewTabButton.cs rename to MatterControlLib/PartPreviewWindow/NewTabButton.cs diff --git a/PartPreviewWindow/Object3DTreeBuilder.cs b/MatterControlLib/PartPreviewWindow/Object3DTreeBuilder.cs similarity index 100% rename from PartPreviewWindow/Object3DTreeBuilder.cs rename to MatterControlLib/PartPreviewWindow/Object3DTreeBuilder.cs diff --git a/PartPreviewWindow/PartPreviewContent.cs b/MatterControlLib/PartPreviewWindow/PartPreviewContent.cs similarity index 100% rename from PartPreviewWindow/PartPreviewContent.cs rename to MatterControlLib/PartPreviewWindow/PartPreviewContent.cs diff --git a/PartPreviewWindow/PartTabPage.cs b/MatterControlLib/PartPreviewWindow/PartTabPage.cs similarity index 100% rename from PartPreviewWindow/PartTabPage.cs rename to MatterControlLib/PartPreviewWindow/PartTabPage.cs diff --git a/PartPreviewWindow/PlatingHelper.cs b/MatterControlLib/PartPreviewWindow/PlatingHelper.cs similarity index 100% rename from PartPreviewWindow/PlatingHelper.cs rename to MatterControlLib/PartPreviewWindow/PlatingHelper.cs diff --git a/PartPreviewWindow/PopupButton.cs b/MatterControlLib/PartPreviewWindow/PopupButton.cs similarity index 100% rename from PartPreviewWindow/PopupButton.cs rename to MatterControlLib/PartPreviewWindow/PopupButton.cs diff --git a/PartPreviewWindow/PopupMenu.cs b/MatterControlLib/PartPreviewWindow/PopupMenu.cs similarity index 100% rename from PartPreviewWindow/PopupMenu.cs rename to MatterControlLib/PartPreviewWindow/PopupMenu.cs diff --git a/PartPreviewWindow/PopupMenuButton.cs b/MatterControlLib/PartPreviewWindow/PopupMenuButton.cs similarity index 100% rename from PartPreviewWindow/PopupMenuButton.cs rename to MatterControlLib/PartPreviewWindow/PopupMenuButton.cs diff --git a/PartPreviewWindow/PrinterTabPage.cs b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs similarity index 100% rename from PartPreviewWindow/PrinterTabPage.cs rename to MatterControlLib/PartPreviewWindow/PrinterTabPage.cs diff --git a/PartPreviewWindow/ResizableSectionWidget.cs b/MatterControlLib/PartPreviewWindow/ResizableSectionWidget.cs similarity index 100% rename from PartPreviewWindow/ResizableSectionWidget.cs rename to MatterControlLib/PartPreviewWindow/ResizableSectionWidget.cs diff --git a/PartPreviewWindow/RoundedToggleSwitch.cs b/MatterControlLib/PartPreviewWindow/RoundedToggleSwitch.cs similarity index 100% rename from PartPreviewWindow/RoundedToggleSwitch.cs rename to MatterControlLib/PartPreviewWindow/RoundedToggleSwitch.cs diff --git a/PartPreviewWindow/RunningTaskRow.cs b/MatterControlLib/PartPreviewWindow/RunningTaskRow.cs similarity index 100% rename from PartPreviewWindow/RunningTaskRow.cs rename to MatterControlLib/PartPreviewWindow/RunningTaskRow.cs diff --git a/PartPreviewWindow/RunningTasksWidget.cs b/MatterControlLib/PartPreviewWindow/RunningTasksWidget.cs similarity index 100% rename from PartPreviewWindow/RunningTasksWidget.cs rename to MatterControlLib/PartPreviewWindow/RunningTasksWidget.cs diff --git a/PartPreviewWindow/SaveAsPage.cs b/MatterControlLib/PartPreviewWindow/SaveAsPage.cs similarity index 100% rename from PartPreviewWindow/SaveAsPage.cs rename to MatterControlLib/PartPreviewWindow/SaveAsPage.cs diff --git a/PartPreviewWindow/SearchableSectionWidget.cs b/MatterControlLib/PartPreviewWindow/SearchableSectionWidget.cs similarity index 100% rename from PartPreviewWindow/SearchableSectionWidget.cs rename to MatterControlLib/PartPreviewWindow/SearchableSectionWidget.cs diff --git a/PartPreviewWindow/SectionWidget.cs b/MatterControlLib/PartPreviewWindow/SectionWidget.cs similarity index 100% rename from PartPreviewWindow/SectionWidget.cs rename to MatterControlLib/PartPreviewWindow/SectionWidget.cs diff --git a/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs similarity index 100% rename from PartPreviewWindow/SelectedObjectPanel.cs rename to MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs diff --git a/PartPreviewWindow/SliceLayerSelector.cs b/MatterControlLib/PartPreviewWindow/SliceLayerSelector.cs similarity index 100% rename from PartPreviewWindow/SliceLayerSelector.cs rename to MatterControlLib/PartPreviewWindow/SliceLayerSelector.cs diff --git a/PartPreviewWindow/SpeedsLegend.cs b/MatterControlLib/PartPreviewWindow/SpeedsLegend.cs similarity index 100% rename from PartPreviewWindow/SpeedsLegend.cs rename to MatterControlLib/PartPreviewWindow/SpeedsLegend.cs diff --git a/PartPreviewWindow/StartPage/ExploreItem.cs b/MatterControlLib/PartPreviewWindow/StartPage/ExploreItem.cs similarity index 100% rename from PartPreviewWindow/StartPage/ExploreItem.cs rename to MatterControlLib/PartPreviewWindow/StartPage/ExploreItem.cs diff --git a/PartPreviewWindow/StartPage/ExplorePanel.cs b/MatterControlLib/PartPreviewWindow/StartPage/ExplorePanel.cs similarity index 100% rename from PartPreviewWindow/StartPage/ExplorePanel.cs rename to MatterControlLib/PartPreviewWindow/StartPage/ExplorePanel.cs diff --git a/PartPreviewWindow/StartPage/ExploreSection.cs b/MatterControlLib/PartPreviewWindow/StartPage/ExploreSection.cs similarity index 100% rename from PartPreviewWindow/StartPage/ExploreSection.cs rename to MatterControlLib/PartPreviewWindow/StartPage/ExploreSection.cs diff --git a/PartPreviewWindow/StartPage/ExplorerBar.cs b/MatterControlLib/PartPreviewWindow/StartPage/ExplorerBar.cs similarity index 100% rename from PartPreviewWindow/StartPage/ExplorerBar.cs rename to MatterControlLib/PartPreviewWindow/StartPage/ExplorerBar.cs diff --git a/PartPreviewWindow/StartPage/FeedData.cs b/MatterControlLib/PartPreviewWindow/StartPage/FeedData.cs similarity index 100% rename from PartPreviewWindow/StartPage/FeedData.cs rename to MatterControlLib/PartPreviewWindow/StartPage/FeedData.cs diff --git a/PartPreviewWindow/StartPage/FeedItemData.cs b/MatterControlLib/PartPreviewWindow/StartPage/FeedItemData.cs similarity index 100% rename from PartPreviewWindow/StartPage/FeedItemData.cs rename to MatterControlLib/PartPreviewWindow/StartPage/FeedItemData.cs diff --git a/PartPreviewWindow/StartPage/FeedSectionData.cs b/MatterControlLib/PartPreviewWindow/StartPage/FeedSectionData.cs similarity index 100% rename from PartPreviewWindow/StartPage/FeedSectionData.cs rename to MatterControlLib/PartPreviewWindow/StartPage/FeedSectionData.cs diff --git a/PartPreviewWindow/StartPage/StartTabPage.cs b/MatterControlLib/PartPreviewWindow/StartPage/StartTabPage.cs similarity index 100% rename from PartPreviewWindow/StartPage/StartTabPage.cs rename to MatterControlLib/PartPreviewWindow/StartPage/StartTabPage.cs diff --git a/PartPreviewWindow/SystemWindowExtension.cs b/MatterControlLib/PartPreviewWindow/SystemWindowExtension.cs similarity index 100% rename from PartPreviewWindow/SystemWindowExtension.cs rename to MatterControlLib/PartPreviewWindow/SystemWindowExtension.cs diff --git a/PartPreviewWindow/Tabs.cs b/MatterControlLib/PartPreviewWindow/Tabs.cs similarity index 100% rename from PartPreviewWindow/Tabs.cs rename to MatterControlLib/PartPreviewWindow/Tabs.cs diff --git a/PartPreviewWindow/Toolbar.cs b/MatterControlLib/PartPreviewWindow/Toolbar.cs similarity index 100% rename from PartPreviewWindow/Toolbar.cs rename to MatterControlLib/PartPreviewWindow/Toolbar.cs diff --git a/PartPreviewWindow/View3D/Actions/CombineObject3D.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D.cs similarity index 100% rename from PartPreviewWindow/View3D/Actions/CombineObject3D.cs rename to MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D.cs diff --git a/PartPreviewWindow/View3D/Actions/ImageEditor.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/ImageEditor.cs similarity index 100% rename from PartPreviewWindow/View3D/Actions/ImageEditor.cs rename to MatterControlLib/PartPreviewWindow/View3D/Actions/ImageEditor.cs diff --git a/PartPreviewWindow/View3D/Actions/IntersectionObject3D.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/IntersectionObject3D.cs similarity index 100% rename from PartPreviewWindow/View3D/Actions/IntersectionObject3D.cs rename to MatterControlLib/PartPreviewWindow/View3D/Actions/IntersectionObject3D.cs diff --git a/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs similarity index 100% rename from PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs rename to MatterControlLib/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs diff --git a/PartPreviewWindow/View3D/Actions/ModifiedMeshObject3D.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/ModifiedMeshObject3D.cs similarity index 100% rename from PartPreviewWindow/View3D/Actions/ModifiedMeshObject3D.cs rename to MatterControlLib/PartPreviewWindow/View3D/Actions/ModifiedMeshObject3D.cs diff --git a/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs similarity index 100% rename from PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs rename to MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs diff --git a/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs similarity index 100% rename from PartPreviewWindow/View3D/Actions/SubtractObject3D.cs rename to MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs diff --git a/PartPreviewWindow/View3D/BedMeshGenerator.cs b/MatterControlLib/PartPreviewWindow/View3D/BedMeshGenerator.cs similarity index 100% rename from PartPreviewWindow/View3D/BedMeshGenerator.cs rename to MatterControlLib/PartPreviewWindow/View3D/BedMeshGenerator.cs diff --git a/PartPreviewWindow/View3D/ColorSwatchSelector.cs b/MatterControlLib/PartPreviewWindow/View3D/ColorSwatchSelector.cs similarity index 100% rename from PartPreviewWindow/View3D/ColorSwatchSelector.cs rename to MatterControlLib/PartPreviewWindow/View3D/ColorSwatchSelector.cs diff --git a/PartPreviewWindow/View3D/DebugBvh.cs b/MatterControlLib/PartPreviewWindow/View3D/DebugBvh.cs similarity index 100% rename from PartPreviewWindow/View3D/DebugBvh.cs rename to MatterControlLib/PartPreviewWindow/View3D/DebugBvh.cs diff --git a/PartPreviewWindow/View3D/DragDropLoadProgress.cs b/MatterControlLib/PartPreviewWindow/View3D/DragDropLoadProgress.cs similarity index 100% rename from PartPreviewWindow/View3D/DragDropLoadProgress.cs rename to MatterControlLib/PartPreviewWindow/View3D/DragDropLoadProgress.cs diff --git a/PartPreviewWindow/View3D/GridOptionsPanel.cs b/MatterControlLib/PartPreviewWindow/View3D/GridOptionsPanel.cs similarity index 100% rename from PartPreviewWindow/View3D/GridOptionsPanel.cs rename to MatterControlLib/PartPreviewWindow/View3D/GridOptionsPanel.cs diff --git a/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs b/MatterControlLib/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs similarity index 100% rename from PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs rename to MatterControlLib/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs diff --git a/PartPreviewWindow/View3D/Gui3D/SelectionShadow.cs b/MatterControlLib/PartPreviewWindow/View3D/Gui3D/SelectionShadow.cs similarity index 100% rename from PartPreviewWindow/View3D/Gui3D/SelectionShadow.cs rename to MatterControlLib/PartPreviewWindow/View3D/Gui3D/SelectionShadow.cs diff --git a/PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs b/MatterControlLib/PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs similarity index 100% rename from PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs rename to MatterControlLib/PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs diff --git a/PartPreviewWindow/View3D/IObject3DEditor.cs b/MatterControlLib/PartPreviewWindow/View3D/IObject3DEditor.cs similarity index 100% rename from PartPreviewWindow/View3D/IObject3DEditor.cs rename to MatterControlLib/PartPreviewWindow/View3D/IObject3DEditor.cs diff --git a/PartPreviewWindow/View3D/InteractionLayer.cs b/MatterControlLib/PartPreviewWindow/View3D/InteractionLayer.cs similarity index 100% rename from PartPreviewWindow/View3D/InteractionLayer.cs rename to MatterControlLib/PartPreviewWindow/View3D/InteractionLayer.cs diff --git a/PartPreviewWindow/View3D/InteractionVolume.cs b/MatterControlLib/PartPreviewWindow/View3D/InteractionVolume.cs similarity index 100% rename from PartPreviewWindow/View3D/InteractionVolume.cs rename to MatterControlLib/PartPreviewWindow/View3D/InteractionVolume.cs diff --git a/PartPreviewWindow/View3D/MeshViewerWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs similarity index 100% rename from PartPreviewWindow/View3D/MeshViewerWidget.cs rename to MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs diff --git a/PartPreviewWindow/View3D/MouseEvent3DArgs.cs b/MatterControlLib/PartPreviewWindow/View3D/MouseEvent3DArgs.cs similarity index 100% rename from PartPreviewWindow/View3D/MouseEvent3DArgs.cs rename to MatterControlLib/PartPreviewWindow/View3D/MouseEvent3DArgs.cs diff --git a/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs similarity index 100% rename from PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs rename to MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs diff --git a/PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs similarity index 100% rename from PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs rename to MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs diff --git a/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs similarity index 100% rename from PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs rename to MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs diff --git a/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs similarity index 100% rename from PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs rename to MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs diff --git a/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs similarity index 100% rename from PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs rename to MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs diff --git a/PartPreviewWindow/View3D/PrinterBar/SliceButton.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/SliceButton.cs similarity index 100% rename from PartPreviewWindow/View3D/PrinterBar/SliceButton.cs rename to MatterControlLib/PartPreviewWindow/View3D/PrinterBar/SliceButton.cs diff --git a/PartPreviewWindow/View3D/SceneActions.cs b/MatterControlLib/PartPreviewWindow/View3D/SceneActions.cs similarity index 100% rename from PartPreviewWindow/View3D/SceneActions.cs rename to MatterControlLib/PartPreviewWindow/View3D/SceneActions.cs diff --git a/PartPreviewWindow/View3D/SliceProgressReporter.cs b/MatterControlLib/PartPreviewWindow/View3D/SliceProgressReporter.cs similarity index 100% rename from PartPreviewWindow/View3D/SliceProgressReporter.cs rename to MatterControlLib/PartPreviewWindow/View3D/SliceProgressReporter.cs diff --git a/PartPreviewWindow/View3D/TumbleCubeControl.cs b/MatterControlLib/PartPreviewWindow/View3D/TumbleCubeControl.cs similarity index 100% rename from PartPreviewWindow/View3D/TumbleCubeControl.cs rename to MatterControlLib/PartPreviewWindow/View3D/TumbleCubeControl.cs diff --git a/PartPreviewWindow/View3D/UndoCommands/ChangeColor.cs b/MatterControlLib/PartPreviewWindow/View3D/UndoCommands/ChangeColor.cs similarity index 100% rename from PartPreviewWindow/View3D/UndoCommands/ChangeColor.cs rename to MatterControlLib/PartPreviewWindow/View3D/UndoCommands/ChangeColor.cs diff --git a/PartPreviewWindow/View3D/UndoCommands/DeleteCommand.cs b/MatterControlLib/PartPreviewWindow/View3D/UndoCommands/DeleteCommand.cs similarity index 100% rename from PartPreviewWindow/View3D/UndoCommands/DeleteCommand.cs rename to MatterControlLib/PartPreviewWindow/View3D/UndoCommands/DeleteCommand.cs diff --git a/PartPreviewWindow/View3D/UndoCommands/InsertCommand.cs b/MatterControlLib/PartPreviewWindow/View3D/UndoCommands/InsertCommand.cs similarity index 100% rename from PartPreviewWindow/View3D/UndoCommands/InsertCommand.cs rename to MatterControlLib/PartPreviewWindow/View3D/UndoCommands/InsertCommand.cs diff --git a/PartPreviewWindow/View3D/UndoCommands/MakeSupport.cs b/MatterControlLib/PartPreviewWindow/View3D/UndoCommands/MakeSupport.cs similarity index 100% rename from PartPreviewWindow/View3D/UndoCommands/MakeSupport.cs rename to MatterControlLib/PartPreviewWindow/View3D/UndoCommands/MakeSupport.cs diff --git a/PartPreviewWindow/View3D/UndoCommands/TransformCommand.cs b/MatterControlLib/PartPreviewWindow/View3D/UndoCommands/TransformCommand.cs similarity index 100% rename from PartPreviewWindow/View3D/UndoCommands/TransformCommand.cs rename to MatterControlLib/PartPreviewWindow/View3D/UndoCommands/TransformCommand.cs diff --git a/PartPreviewWindow/View3D/UndoCommands/UngroupCommand.cs b/MatterControlLib/PartPreviewWindow/View3D/UndoCommands/UngroupCommand.cs similarity index 100% rename from PartPreviewWindow/View3D/UndoCommands/UngroupCommand.cs rename to MatterControlLib/PartPreviewWindow/View3D/UndoCommands/UngroupCommand.cs diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs similarity index 100% rename from PartPreviewWindow/View3D/View3DWidget.cs rename to MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs diff --git a/PartPreviewWindow/ViewControls3D.cs b/MatterControlLib/PartPreviewWindow/ViewControls3D.cs similarity index 100% rename from PartPreviewWindow/ViewControls3D.cs rename to MatterControlLib/PartPreviewWindow/ViewControls3D.cs diff --git a/PdfSharp.dll b/MatterControlLib/PdfSharp.dll similarity index 100% rename from PdfSharp.dll rename to MatterControlLib/PdfSharp.dll diff --git a/PrinterCommunication/Drivers/Emulator/Emulator.cs b/MatterControlLib/PrinterCommunication/Drivers/Emulator/Emulator.cs similarity index 100% rename from PrinterCommunication/Drivers/Emulator/Emulator.cs rename to MatterControlLib/PrinterCommunication/Drivers/Emulator/Emulator.cs diff --git a/PrinterCommunication/Drivers/Emulator/EmulatorPortFactory.cs b/MatterControlLib/PrinterCommunication/Drivers/Emulator/EmulatorPortFactory.cs similarity index 100% rename from PrinterCommunication/Drivers/Emulator/EmulatorPortFactory.cs rename to MatterControlLib/PrinterCommunication/Drivers/Emulator/EmulatorPortFactory.cs diff --git a/PrinterCommunication/Drivers/Emulator/Heater.cs b/MatterControlLib/PrinterCommunication/Drivers/Emulator/Heater.cs similarity index 100% rename from PrinterCommunication/Drivers/Emulator/Heater.cs rename to MatterControlLib/PrinterCommunication/Drivers/Emulator/Heater.cs diff --git a/PrinterCommunication/Drivers/TCPIP/TcpipSerialPort.cs b/MatterControlLib/PrinterCommunication/Drivers/TCPIP/TcpipSerialPort.cs similarity index 100% rename from PrinterCommunication/Drivers/TCPIP/TcpipSerialPort.cs rename to MatterControlLib/PrinterCommunication/Drivers/TCPIP/TcpipSerialPort.cs diff --git a/PrinterCommunication/Drivers/TCPIP/TcpipSerialPortFactory.cs b/MatterControlLib/PrinterCommunication/Drivers/TCPIP/TcpipSerialPortFactory.cs similarity index 100% rename from PrinterCommunication/Drivers/TCPIP/TcpipSerialPortFactory.cs rename to MatterControlLib/PrinterCommunication/Drivers/TCPIP/TcpipSerialPortFactory.cs diff --git a/PrinterCommunication/Drivers/X3G/X3GCrc.cs b/MatterControlLib/PrinterCommunication/Drivers/X3G/X3GCrc.cs similarity index 100% rename from PrinterCommunication/Drivers/X3G/X3GCrc.cs rename to MatterControlLib/PrinterCommunication/Drivers/X3G/X3GCrc.cs diff --git a/PrinterCommunication/Drivers/X3G/X3GExport.cs b/MatterControlLib/PrinterCommunication/Drivers/X3G/X3GExport.cs similarity index 100% rename from PrinterCommunication/Drivers/X3G/X3GExport.cs rename to MatterControlLib/PrinterCommunication/Drivers/X3G/X3GExport.cs diff --git a/PrinterCommunication/Drivers/X3G/X3GPrinterDetails.cs b/MatterControlLib/PrinterCommunication/Drivers/X3G/X3GPrinterDetails.cs similarity index 100% rename from PrinterCommunication/Drivers/X3G/X3GPrinterDetails.cs rename to MatterControlLib/PrinterCommunication/Drivers/X3G/X3GPrinterDetails.cs diff --git a/PrinterCommunication/Drivers/X3G/X3GReader.cs b/MatterControlLib/PrinterCommunication/Drivers/X3G/X3GReader.cs similarity index 100% rename from PrinterCommunication/Drivers/X3G/X3GReader.cs rename to MatterControlLib/PrinterCommunication/Drivers/X3G/X3GReader.cs diff --git a/PrinterCommunication/Drivers/X3G/X3GSerialPortFactory.cs b/MatterControlLib/PrinterCommunication/Drivers/X3G/X3GSerialPortFactory.cs similarity index 100% rename from PrinterCommunication/Drivers/X3G/X3GSerialPortFactory.cs rename to MatterControlLib/PrinterCommunication/Drivers/X3G/X3GSerialPortFactory.cs diff --git a/PrinterCommunication/Drivers/X3G/X3GSerialPortWrapper.cs b/MatterControlLib/PrinterCommunication/Drivers/X3G/X3GSerialPortWrapper.cs similarity index 100% rename from PrinterCommunication/Drivers/X3G/X3GSerialPortWrapper.cs rename to MatterControlLib/PrinterCommunication/Drivers/X3G/X3GSerialPortWrapper.cs diff --git a/PrinterCommunication/Drivers/X3G/X3GWriter.cs b/MatterControlLib/PrinterCommunication/Drivers/X3G/X3GWriter.cs similarity index 100% rename from PrinterCommunication/Drivers/X3G/X3GWriter.cs rename to MatterControlLib/PrinterCommunication/Drivers/X3G/X3GWriter.cs diff --git a/PrinterCommunication/Io/BabyStepsStream.cs b/MatterControlLib/PrinterCommunication/Io/BabyStepsStream.cs similarity index 100% rename from PrinterCommunication/Io/BabyStepsStream.cs rename to MatterControlLib/PrinterCommunication/Io/BabyStepsStream.cs diff --git a/PrinterCommunication/Io/ExtrusionMultiplyerStream.cs b/MatterControlLib/PrinterCommunication/Io/ExtrusionMultiplyerStream.cs similarity index 100% rename from PrinterCommunication/Io/ExtrusionMultiplyerStream.cs rename to MatterControlLib/PrinterCommunication/Io/ExtrusionMultiplyerStream.cs diff --git a/PrinterCommunication/Io/FeedRateMultiplyerStream.cs b/MatterControlLib/PrinterCommunication/Io/FeedRateMultiplyerStream.cs similarity index 100% rename from PrinterCommunication/Io/FeedRateMultiplyerStream.cs rename to MatterControlLib/PrinterCommunication/Io/FeedRateMultiplyerStream.cs diff --git a/PrinterCommunication/Io/GCodeFileStream.cs b/MatterControlLib/PrinterCommunication/Io/GCodeFileStream.cs similarity index 100% rename from PrinterCommunication/Io/GCodeFileStream.cs rename to MatterControlLib/PrinterCommunication/Io/GCodeFileStream.cs diff --git a/PrinterCommunication/Io/GCodeStream.cs b/MatterControlLib/PrinterCommunication/Io/GCodeStream.cs similarity index 100% rename from PrinterCommunication/Io/GCodeStream.cs rename to MatterControlLib/PrinterCommunication/Io/GCodeStream.cs diff --git a/PrinterCommunication/Io/GCodeStreamProxy.cs b/MatterControlLib/PrinterCommunication/Io/GCodeStreamProxy.cs similarity index 100% rename from PrinterCommunication/Io/GCodeStreamProxy.cs rename to MatterControlLib/PrinterCommunication/Io/GCodeStreamProxy.cs diff --git a/PrinterCommunication/Io/MacroProcessingStream.cs b/MatterControlLib/PrinterCommunication/Io/MacroProcessingStream.cs similarity index 100% rename from PrinterCommunication/Io/MacroProcessingStream.cs rename to MatterControlLib/PrinterCommunication/Io/MacroProcessingStream.cs diff --git a/PrinterCommunication/Io/MaxLengthStream.cs b/MatterControlLib/PrinterCommunication/Io/MaxLengthStream.cs similarity index 100% rename from PrinterCommunication/Io/MaxLengthStream.cs rename to MatterControlLib/PrinterCommunication/Io/MaxLengthStream.cs diff --git a/PrinterCommunication/Io/NotPrintingStream.cs b/MatterControlLib/PrinterCommunication/Io/NotPrintingStream.cs similarity index 100% rename from PrinterCommunication/Io/NotPrintingStream.cs rename to MatterControlLib/PrinterCommunication/Io/NotPrintingStream.cs diff --git a/PrinterCommunication/Io/OffsetStream.cs b/MatterControlLib/PrinterCommunication/Io/OffsetStream.cs similarity index 100% rename from PrinterCommunication/Io/OffsetStream.cs rename to MatterControlLib/PrinterCommunication/Io/OffsetStream.cs diff --git a/PrinterCommunication/Io/PauseHandlingStream.cs b/MatterControlLib/PrinterCommunication/Io/PauseHandlingStream.cs similarity index 100% rename from PrinterCommunication/Io/PauseHandlingStream.cs rename to MatterControlLib/PrinterCommunication/Io/PauseHandlingStream.cs diff --git a/PrinterCommunication/Io/PrintLevelingStream.cs b/MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs similarity index 100% rename from PrinterCommunication/Io/PrintLevelingStream.cs rename to MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs diff --git a/PrinterCommunication/Io/PrintRecoveryStream.cs b/MatterControlLib/PrinterCommunication/Io/PrintRecoveryStream.cs similarity index 100% rename from PrinterCommunication/Io/PrintRecoveryStream.cs rename to MatterControlLib/PrinterCommunication/Io/PrintRecoveryStream.cs diff --git a/PrinterCommunication/Io/PrinterMove.cs b/MatterControlLib/PrinterCommunication/Io/PrinterMove.cs similarity index 100% rename from PrinterCommunication/Io/PrinterMove.cs rename to MatterControlLib/PrinterCommunication/Io/PrinterMove.cs diff --git a/PrinterCommunication/Io/ProcessWriteRegExStream.cs b/MatterControlLib/PrinterCommunication/Io/ProcessWriteRegExStream.cs similarity index 100% rename from PrinterCommunication/Io/ProcessWriteRegExStream.cs rename to MatterControlLib/PrinterCommunication/Io/ProcessWriteRegExStream.cs diff --git a/PrinterCommunication/Io/QueuedCommandsStream.cs b/MatterControlLib/PrinterCommunication/Io/QueuedCommandsStream.cs similarity index 100% rename from PrinterCommunication/Io/QueuedCommandsStream.cs rename to MatterControlLib/PrinterCommunication/Io/QueuedCommandsStream.cs diff --git a/PrinterCommunication/Io/RelativeToAbsoluteStream.cs b/MatterControlLib/PrinterCommunication/Io/RelativeToAbsoluteStream.cs similarity index 100% rename from PrinterCommunication/Io/RelativeToAbsoluteStream.cs rename to MatterControlLib/PrinterCommunication/Io/RelativeToAbsoluteStream.cs diff --git a/PrinterCommunication/Io/RequestTemperaturesStream.cs b/MatterControlLib/PrinterCommunication/Io/RequestTemperaturesStream.cs similarity index 100% rename from PrinterCommunication/Io/RequestTemperaturesStream.cs rename to MatterControlLib/PrinterCommunication/Io/RequestTemperaturesStream.cs diff --git a/PrinterCommunication/Io/SendProgressStream.cs b/MatterControlLib/PrinterCommunication/Io/SendProgressStream.cs similarity index 100% rename from PrinterCommunication/Io/SendProgressStream.cs rename to MatterControlLib/PrinterCommunication/Io/SendProgressStream.cs diff --git a/PrinterCommunication/Io/TrackPrinterPosition.cs b/MatterControlLib/PrinterCommunication/Io/TrackPrinterPosition.cs similarity index 100% rename from PrinterCommunication/Io/TrackPrinterPosition.cs rename to MatterControlLib/PrinterCommunication/Io/TrackPrinterPosition.cs diff --git a/PrinterCommunication/Io/WaitForTempStream.cs b/MatterControlLib/PrinterCommunication/Io/WaitForTempStream.cs similarity index 100% rename from PrinterCommunication/Io/WaitForTempStream.cs rename to MatterControlLib/PrinterCommunication/Io/WaitForTempStream.cs diff --git a/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs similarity index 100% rename from PrinterCommunication/PrinterConnection.cs rename to MatterControlLib/PrinterCommunication/PrinterConnection.cs diff --git a/PrinterControls/ControlWidgets/AdjustmentControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/AdjustmentControls.cs similarity index 100% rename from PrinterControls/ControlWidgets/AdjustmentControls.cs rename to MatterControlLib/PrinterControls/ControlWidgets/AdjustmentControls.cs diff --git a/PrinterControls/ControlWidgets/CalibrationControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs similarity index 100% rename from PrinterControls/ControlWidgets/CalibrationControls.cs rename to MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs diff --git a/PrinterControls/ControlWidgets/FanControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/FanControls.cs similarity index 100% rename from PrinterControls/ControlWidgets/FanControls.cs rename to MatterControlLib/PrinterControls/ControlWidgets/FanControls.cs diff --git a/PrinterControls/ControlWidgets/MacroControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs similarity index 100% rename from PrinterControls/ControlWidgets/MacroControls.cs rename to MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs diff --git a/PrinterControls/ControlWidgets/MovementControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs similarity index 100% rename from PrinterControls/ControlWidgets/MovementControls.cs rename to MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs diff --git a/PrinterControls/ControlWidgets/PowerControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/PowerControls.cs similarity index 100% rename from PrinterControls/ControlWidgets/PowerControls.cs rename to MatterControlLib/PrinterControls/ControlWidgets/PowerControls.cs diff --git a/PrinterControls/EditLevelingSettingsPage.cs b/MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs similarity index 100% rename from PrinterControls/EditLevelingSettingsPage.cs rename to MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs diff --git a/PrinterControls/JogControls.cs b/MatterControlLib/PrinterControls/JogControls.cs similarity index 100% rename from PrinterControls/JogControls.cs rename to MatterControlLib/PrinterControls/JogControls.cs diff --git a/PrinterControls/MacroDetailPage.cs b/MatterControlLib/PrinterControls/MacroDetailPage.cs similarity index 100% rename from PrinterControls/MacroDetailPage.cs rename to MatterControlLib/PrinterControls/MacroDetailPage.cs diff --git a/PrinterControls/MacroListPage.cs b/MatterControlLib/PrinterControls/MacroListPage.cs similarity index 100% rename from PrinterControls/MacroListPage.cs rename to MatterControlLib/PrinterControls/MacroListPage.cs diff --git a/PrinterControls/ManualPrinterControls.cs b/MatterControlLib/PrinterControls/ManualPrinterControls.cs similarity index 100% rename from PrinterControls/ManualPrinterControls.cs rename to MatterControlLib/PrinterControls/ManualPrinterControls.cs diff --git a/PrinterControls/MovementSpeedsPage.cs b/MatterControlLib/PrinterControls/MovementSpeedsPage.cs similarity index 100% rename from PrinterControls/MovementSpeedsPage.cs rename to MatterControlLib/PrinterControls/MovementSpeedsPage.cs diff --git a/PrinterControls/PrintLevelingPlane.cs b/MatterControlLib/PrinterControls/PrintLevelingPlane.cs similarity index 100% rename from PrinterControls/PrintLevelingPlane.cs rename to MatterControlLib/PrinterControls/PrintLevelingPlane.cs diff --git a/PrinterControls/PrinterConnections/PrinterSetup.cs b/MatterControlLib/PrinterControls/PrinterConnections/PrinterSetup.cs similarity index 100% rename from PrinterControls/PrinterConnections/PrinterSetup.cs rename to MatterControlLib/PrinterControls/PrinterConnections/PrinterSetup.cs diff --git a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs b/MatterControlLib/PrinterControls/PrinterConnections/SetupStepBaudRate.cs similarity index 100% rename from PrinterControls/PrinterConnections/SetupStepBaudRate.cs rename to MatterControlLib/PrinterControls/PrinterConnections/SetupStepBaudRate.cs diff --git a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs b/MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortManual.cs similarity index 100% rename from PrinterControls/PrinterConnections/SetupStepComPortManual.cs rename to MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortManual.cs diff --git a/PrinterControls/PrinterConnections/SetupStepComPortOne.cs b/MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortOne.cs similarity index 100% rename from PrinterControls/PrinterConnections/SetupStepComPortOne.cs rename to MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortOne.cs diff --git a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs b/MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs similarity index 100% rename from PrinterControls/PrinterConnections/SetupStepComPortTwo.cs rename to MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs diff --git a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs b/MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs similarity index 100% rename from PrinterControls/PrinterConnections/SetupStepMakeModelName.cs rename to MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs diff --git a/PrinterControls/PrinterConnections/ShowAuthPanel.cs b/MatterControlLib/PrinterControls/PrinterConnections/ShowAuthPanel.cs similarity index 100% rename from PrinterControls/PrinterConnections/ShowAuthPanel.cs rename to MatterControlLib/PrinterControls/PrinterConnections/ShowAuthPanel.cs diff --git a/PrinterControls/TerminalWindow/TerminalLog.cs b/MatterControlLib/PrinterControls/TerminalWindow/TerminalLog.cs similarity index 100% rename from PrinterControls/TerminalWindow/TerminalLog.cs rename to MatterControlLib/PrinterControls/TerminalWindow/TerminalLog.cs diff --git a/PrinterControls/TerminalWindow/TerminalWidget.cs b/MatterControlLib/PrinterControls/TerminalWindow/TerminalWidget.cs similarity index 100% rename from PrinterControls/TerminalWindow/TerminalWidget.cs rename to MatterControlLib/PrinterControls/TerminalWindow/TerminalWidget.cs diff --git a/PrinterControls/TerminalWindow/TextScrolBar.cs b/MatterControlLib/PrinterControls/TerminalWindow/TextScrolBar.cs similarity index 100% rename from PrinterControls/TerminalWindow/TextScrolBar.cs rename to MatterControlLib/PrinterControls/TerminalWindow/TextScrolBar.cs diff --git a/PrinterControls/TerminalWindow/TextScrollWidget.cs b/MatterControlLib/PrinterControls/TerminalWindow/TextScrollWidget.cs similarity index 100% rename from PrinterControls/TerminalWindow/TextScrollWidget.cs rename to MatterControlLib/PrinterControls/TerminalWindow/TextScrollWidget.cs diff --git a/Program.cs b/MatterControlLib/Program.cs similarity index 99% rename from Program.cs rename to MatterControlLib/Program.cs index 54e16c5c0..aec7c6334 100644 --- a/Program.cs +++ b/MatterControlLib/Program.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.Configuration; namespace MatterHackers.MatterControl { - static class Program + public static class MatterControlLib { private const int RaygunMaxNotifications = 15; @@ -28,7 +28,6 @@ namespace MatterHackers.MatterControl /// /// The main entry point for the application. /// - [STAThread] public static void Main() { // this sets the global culture for the app and all new threads diff --git a/Queue/OptionsMenu/PartsSheetCreator.cs b/MatterControlLib/Queue/OptionsMenu/PartsSheetCreator.cs similarity index 100% rename from Queue/OptionsMenu/PartsSheetCreator.cs rename to MatterControlLib/Queue/OptionsMenu/PartsSheetCreator.cs diff --git a/Queue/PrintItemWrapper.cs b/MatterControlLib/Queue/PrintItemWrapper.cs similarity index 100% rename from Queue/PrintItemWrapper.cs rename to MatterControlLib/Queue/PrintItemWrapper.cs diff --git a/Queue/QueueData.cs b/MatterControlLib/Queue/QueueData.cs similarity index 100% rename from Queue/QueueData.cs rename to MatterControlLib/Queue/QueueData.cs diff --git a/RootSystemWindow.cs b/MatterControlLib/RootSystemWindow.cs similarity index 100% rename from RootSystemWindow.cs rename to MatterControlLib/RootSystemWindow.cs diff --git a/SettingsManagement/ApplicationSettings.cs b/MatterControlLib/SettingsManagement/ApplicationSettings.cs similarity index 100% rename from SettingsManagement/ApplicationSettings.cs rename to MatterControlLib/SettingsManagement/ApplicationSettings.cs diff --git a/SettingsManagement/OemSettings.cs b/MatterControlLib/SettingsManagement/OemSettings.cs similarity index 100% rename from SettingsManagement/OemSettings.cs rename to MatterControlLib/SettingsManagement/OemSettings.cs diff --git a/SettingsManagement/UserSettings.cs b/MatterControlLib/SettingsManagement/UserSettings.cs similarity index 100% rename from SettingsManagement/UserSettings.cs rename to MatterControlLib/SettingsManagement/UserSettings.cs diff --git a/SettingsManagement/UserSettingsFields.cs b/MatterControlLib/SettingsManagement/UserSettingsFields.cs similarity index 100% rename from SettingsManagement/UserSettingsFields.cs rename to MatterControlLib/SettingsManagement/UserSettingsFields.cs diff --git a/SetupWizard/AndroidConnectDevicePage.cs b/MatterControlLib/SetupWizard/AndroidConnectDevicePage.cs similarity index 100% rename from SetupWizard/AndroidConnectDevicePage.cs rename to MatterControlLib/SetupWizard/AndroidConnectDevicePage.cs diff --git a/SetupWizard/AndroidNetworkTroubleshootingPage.cs b/MatterControlLib/SetupWizard/AndroidNetworkTroubleshootingPage.cs similarity index 100% rename from SetupWizard/AndroidNetworkTroubleshootingPage.cs rename to MatterControlLib/SetupWizard/AndroidNetworkTroubleshootingPage.cs diff --git a/SetupWizard/CopyGuestProfilesToUser.cs b/MatterControlLib/SetupWizard/CopyGuestProfilesToUser.cs similarity index 100% rename from SetupWizard/CopyGuestProfilesToUser.cs rename to MatterControlLib/SetupWizard/CopyGuestProfilesToUser.cs diff --git a/SetupWizard/DialogPage.cs b/MatterControlLib/SetupWizard/DialogPage.cs similarity index 100% rename from SetupWizard/DialogPage.cs rename to MatterControlLib/SetupWizard/DialogPage.cs diff --git a/SetupWizard/DialogWindow.cs b/MatterControlLib/SetupWizard/DialogWindow.cs similarity index 100% rename from SetupWizard/DialogWindow.cs rename to MatterControlLib/SetupWizard/DialogWindow.cs diff --git a/SetupWizard/HelpPage.cs b/MatterControlLib/SetupWizard/HelpPage.cs similarity index 100% rename from SetupWizard/HelpPage.cs rename to MatterControlLib/SetupWizard/HelpPage.cs diff --git a/SetupWizard/ImportSettingsPage.cs b/MatterControlLib/SetupWizard/ImportSettingsPage.cs similarity index 100% rename from SetupWizard/ImportSettingsPage.cs rename to MatterControlLib/SetupWizard/ImportSettingsPage.cs diff --git a/SetupWizard/InputBoxPage.cs b/MatterControlLib/SetupWizard/InputBoxPage.cs similarity index 100% rename from SetupWizard/InputBoxPage.cs rename to MatterControlLib/SetupWizard/InputBoxPage.cs diff --git a/SetupWizard/LicenseAgreementPage.cs b/MatterControlLib/SetupWizard/LicenseAgreementPage.cs similarity index 100% rename from SetupWizard/LicenseAgreementPage.cs rename to MatterControlLib/SetupWizard/LicenseAgreementPage.cs diff --git a/SetupWizard/PrinterProfileHistoryPage.cs b/MatterControlLib/SetupWizard/PrinterProfileHistoryPage.cs similarity index 100% rename from SetupWizard/PrinterProfileHistoryPage.cs rename to MatterControlLib/SetupWizard/PrinterProfileHistoryPage.cs diff --git a/SetupWizard/SetupWizardTroubleshooting.cs b/MatterControlLib/SetupWizard/SetupWizardTroubleshooting.cs similarity index 100% rename from SetupWizard/SetupWizardTroubleshooting.cs rename to MatterControlLib/SetupWizard/SetupWizardTroubleshooting.cs diff --git a/SetupWizard/SetupWizardWifi.cs b/MatterControlLib/SetupWizard/SetupWizardWifi.cs similarity index 100% rename from SetupWizard/SetupWizardWifi.cs rename to MatterControlLib/SetupWizard/SetupWizardWifi.cs diff --git a/SetupWizard/SyncingPrintersPage.cs b/MatterControlLib/SetupWizard/SyncingPrintersPage.cs similarity index 100% rename from SetupWizard/SyncingPrintersPage.cs rename to MatterControlLib/SetupWizard/SyncingPrintersPage.cs diff --git a/SlicerConfiguration/MatterSliceInfo.cs b/MatterControlLib/SlicerConfiguration/MatterSliceInfo.cs similarity index 95% rename from SlicerConfiguration/MatterSliceInfo.cs rename to MatterControlLib/SlicerConfiguration/MatterSliceInfo.cs index fbdf19aed..8b37399ff 100644 --- a/SlicerConfiguration/MatterSliceInfo.cs +++ b/MatterControlLib/SlicerConfiguration/MatterSliceInfo.cs @@ -1,51 +1,51 @@ -using System; -using System.IO; -using MatterHackers.Agg.Platform; -using MatterHackers.MatterControl.DataStorage; - -namespace MatterHackers.MatterControl.SlicerConfiguration -{ - public static class MatterSliceInfo - { - public static string DisplayName { get; } = "MatterSlice"; - - public static string GetEnginePath() - { - switch (AggContext.OperatingSystem) - { - case OSType.Windows: - return getWindowsPath(); - - case OSType.Mac: - return getMacPath(); - - case OSType.X11: - return getLinuxPath(); - - case OSType.Android: - return null; - - default: - throw new NotImplementedException(); - } - } - - private static string getWindowsPath() - { - string matterSliceRelativePath = Path.Combine(".", "MatterSlice.exe"); - return Path.GetFullPath(matterSliceRelativePath); - } - - private static string getMacPath() - { - string applicationPath = Path.Combine(ApplicationDataStorage.Instance.ApplicationPath, "MatterSlice"); - return applicationPath; - } - - private static string getLinuxPath() - { - string matterSliceRelativePath = Path.Combine(".", "MatterSlice.exe"); - return Path.GetFullPath(matterSliceRelativePath); - } - } -} +using System; +using System.IO; +using MatterHackers.Agg.Platform; +using MatterHackers.MatterControl.DataStorage; + +namespace MatterHackers.MatterControl.SlicerConfiguration +{ + public static class MatterSliceInfo + { + public static string DisplayName { get; } = "MatterSlice"; + + public static string GetEnginePath() + { + switch (AggContext.OperatingSystem) + { + case OSType.Windows: + return getWindowsPath(); + + case OSType.Mac: + return getMacPath(); + + case OSType.X11: + return getLinuxPath(); + + case OSType.Android: + return null; + + default: + throw new NotImplementedException(); + } + } + + private static string getWindowsPath() + { + string matterSliceRelativePath = Path.Combine(".", "MatterSlice.exe"); + return Path.GetFullPath(matterSliceRelativePath); + } + + private static string getMacPath() + { + string applicationPath = Path.Combine(ApplicationDataStorage.Instance.ApplicationPath, "MatterSlice"); + return applicationPath; + } + + private static string getLinuxPath() + { + string matterSliceRelativePath = Path.Combine(".", "MatterSlice.exe"); + return Path.GetFullPath(matterSliceRelativePath); + } + } +} diff --git a/SlicerConfiguration/PresetSelectorWidget.cs b/MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs similarity index 100% rename from SlicerConfiguration/PresetSelectorWidget.cs rename to MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs diff --git a/SlicerConfiguration/PresetsToolbar.cs b/MatterControlLib/SlicerConfiguration/PresetsToolbar.cs similarity index 100% rename from SlicerConfiguration/PresetsToolbar.cs rename to MatterControlLib/SlicerConfiguration/PresetsToolbar.cs diff --git a/SlicerConfiguration/Settings/ActiveSliceSettings.cs b/MatterControlLib/SlicerConfiguration/Settings/ActiveSliceSettings.cs similarity index 100% rename from SlicerConfiguration/Settings/ActiveSliceSettings.cs rename to MatterControlLib/SlicerConfiguration/Settings/ActiveSliceSettings.cs diff --git a/SlicerConfiguration/Settings/GCodeMacro.cs b/MatterControlLib/SlicerConfiguration/Settings/GCodeMacro.cs similarity index 100% rename from SlicerConfiguration/Settings/GCodeMacro.cs rename to MatterControlLib/SlicerConfiguration/Settings/GCodeMacro.cs diff --git a/SlicerConfiguration/Settings/PrinterSettings.cs b/MatterControlLib/SlicerConfiguration/Settings/PrinterSettings.cs similarity index 100% rename from SlicerConfiguration/Settings/PrinterSettings.cs rename to MatterControlLib/SlicerConfiguration/Settings/PrinterSettings.cs diff --git a/SlicerConfiguration/Settings/PrinterSettingsLayer.cs b/MatterControlLib/SlicerConfiguration/Settings/PrinterSettingsLayer.cs similarity index 100% rename from SlicerConfiguration/Settings/PrinterSettingsLayer.cs rename to MatterControlLib/SlicerConfiguration/Settings/PrinterSettingsLayer.cs diff --git a/SlicerConfiguration/Settings/ProfileManager.cs b/MatterControlLib/SlicerConfiguration/Settings/ProfileManager.cs similarity index 100% rename from SlicerConfiguration/Settings/ProfileManager.cs rename to MatterControlLib/SlicerConfiguration/Settings/ProfileManager.cs diff --git a/SlicerConfiguration/Settings/ProfileMigrations.cs b/MatterControlLib/SlicerConfiguration/Settings/ProfileMigrations.cs similarity index 100% rename from SlicerConfiguration/Settings/ProfileMigrations.cs rename to MatterControlLib/SlicerConfiguration/Settings/ProfileMigrations.cs diff --git a/SlicerConfiguration/Settings/SettingsDiagram.cd b/MatterControlLib/SlicerConfiguration/Settings/SettingsDiagram.cd similarity index 100% rename from SlicerConfiguration/Settings/SettingsDiagram.cd rename to MatterControlLib/SlicerConfiguration/Settings/SettingsDiagram.cd diff --git a/SlicerConfiguration/Settings/SettingsHelpers.cs b/MatterControlLib/SlicerConfiguration/Settings/SettingsHelpers.cs similarity index 100% rename from SlicerConfiguration/Settings/SettingsHelpers.cs rename to MatterControlLib/SlicerConfiguration/Settings/SettingsHelpers.cs diff --git a/SlicerConfiguration/SettingsContext.cs b/MatterControlLib/SlicerConfiguration/SettingsContext.cs similarity index 100% rename from SlicerConfiguration/SettingsContext.cs rename to MatterControlLib/SlicerConfiguration/SettingsContext.cs diff --git a/SlicerConfiguration/SettingsOrganizer.cs b/MatterControlLib/SlicerConfiguration/SettingsOrganizer.cs similarity index 100% rename from SlicerConfiguration/SettingsOrganizer.cs rename to MatterControlLib/SlicerConfiguration/SettingsOrganizer.cs diff --git a/SlicerConfiguration/SettingsRow.cs b/MatterControlLib/SlicerConfiguration/SettingsRow.cs similarity index 100% rename from SlicerConfiguration/SettingsRow.cs rename to MatterControlLib/SlicerConfiguration/SettingsRow.cs diff --git a/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs b/MatterControlLib/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs similarity index 100% rename from SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs rename to MatterControlLib/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs diff --git a/SlicerConfiguration/SliceSettingsRow.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsRow.cs similarity index 100% rename from SlicerConfiguration/SliceSettingsRow.cs rename to MatterControlLib/SlicerConfiguration/SliceSettingsRow.cs diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs similarity index 100% rename from SlicerConfiguration/SliceSettingsWidget.cs rename to MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs diff --git a/SlicerConfiguration/Slicer.cs b/MatterControlLib/SlicerConfiguration/Slicer.cs similarity index 100% rename from SlicerConfiguration/Slicer.cs rename to MatterControlLib/SlicerConfiguration/Slicer.cs diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/MatterControlLib/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs similarity index 100% rename from SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs rename to MatterControlLib/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs diff --git a/SlicerConfiguration/SlicerMapping/MappingClasses.cs b/MatterControlLib/SlicerConfiguration/SlicerMapping/MappingClasses.cs similarity index 100% rename from SlicerConfiguration/SlicerMapping/MappingClasses.cs rename to MatterControlLib/SlicerConfiguration/SlicerMapping/MappingClasses.cs diff --git a/SlicerConfiguration/Slicing/SliceLayers.cs b/MatterControlLib/SlicerConfiguration/Slicing/SliceLayers.cs similarity index 100% rename from SlicerConfiguration/Slicing/SliceLayers.cs rename to MatterControlLib/SlicerConfiguration/Slicing/SliceLayers.cs diff --git a/SlicerConfiguration/UIFields/BoundDoubleField.cs b/MatterControlLib/SlicerConfiguration/UIFields/BoundDoubleField.cs similarity index 100% rename from SlicerConfiguration/UIFields/BoundDoubleField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/BoundDoubleField.cs diff --git a/SlicerConfiguration/UIFields/CharField.cs b/MatterControlLib/SlicerConfiguration/UIFields/CharField.cs similarity index 100% rename from SlicerConfiguration/UIFields/CharField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/CharField.cs diff --git a/SlicerConfiguration/UIFields/CheckboxField.cs b/MatterControlLib/SlicerConfiguration/UIFields/CheckboxField.cs similarity index 100% rename from SlicerConfiguration/UIFields/CheckboxField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/CheckboxField.cs diff --git a/SlicerConfiguration/UIFields/ChildrenSelectorListField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ChildrenSelectorListField.cs similarity index 100% rename from SlicerConfiguration/UIFields/ChildrenSelectorListField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/ChildrenSelectorListField.cs diff --git a/SlicerConfiguration/UIFields/ComPortField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs similarity index 100% rename from SlicerConfiguration/UIFields/ComPortField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs diff --git a/SlicerConfiguration/UIFields/DirectionVectorField.cs b/MatterControlLib/SlicerConfiguration/UIFields/DirectionVectorField.cs similarity index 100% rename from SlicerConfiguration/UIFields/DirectionVectorField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/DirectionVectorField.cs diff --git a/SlicerConfiguration/UIFields/DoubleField.cs b/MatterControlLib/SlicerConfiguration/UIFields/DoubleField.cs similarity index 100% rename from SlicerConfiguration/UIFields/DoubleField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/DoubleField.cs diff --git a/SlicerConfiguration/UIFields/DoubleOrPercentField.cs b/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrPercentField.cs similarity index 100% rename from SlicerConfiguration/UIFields/DoubleOrPercentField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/DoubleOrPercentField.cs diff --git a/SlicerConfiguration/UIFields/DropMenuWrappedField.cs b/MatterControlLib/SlicerConfiguration/UIFields/DropMenuWrappedField.cs similarity index 100% rename from SlicerConfiguration/UIFields/DropMenuWrappedField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/DropMenuWrappedField.cs diff --git a/SlicerConfiguration/UIFields/EnumField.cs b/MatterControlLib/SlicerConfiguration/UIFields/EnumField.cs similarity index 100% rename from SlicerConfiguration/UIFields/EnumField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/EnumField.cs diff --git a/SlicerConfiguration/UIFields/ExtruderOffsetField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ExtruderOffsetField.cs similarity index 100% rename from SlicerConfiguration/UIFields/ExtruderOffsetField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/ExtruderOffsetField.cs diff --git a/SlicerConfiguration/UIFields/FieldChangedEventArgs.cs b/MatterControlLib/SlicerConfiguration/UIFields/FieldChangedEventArgs.cs similarity index 100% rename from SlicerConfiguration/UIFields/FieldChangedEventArgs.cs rename to MatterControlLib/SlicerConfiguration/UIFields/FieldChangedEventArgs.cs diff --git a/SlicerConfiguration/UIFields/IconEnumField.cs b/MatterControlLib/SlicerConfiguration/UIFields/IconEnumField.cs similarity index 100% rename from SlicerConfiguration/UIFields/IconEnumField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/IconEnumField.cs diff --git a/SlicerConfiguration/UIFields/IntField.cs b/MatterControlLib/SlicerConfiguration/UIFields/IntField.cs similarity index 100% rename from SlicerConfiguration/UIFields/IntField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/IntField.cs diff --git a/SlicerConfiguration/UIFields/IntOrMmField.cs b/MatterControlLib/SlicerConfiguration/UIFields/IntOrMmField.cs similarity index 100% rename from SlicerConfiguration/UIFields/IntOrMmField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/IntOrMmField.cs diff --git a/SlicerConfiguration/UIFields/IpAddessField.cs b/MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs similarity index 100% rename from SlicerConfiguration/UIFields/IpAddessField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs diff --git a/SlicerConfiguration/UIFields/ListField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ListField.cs similarity index 100% rename from SlicerConfiguration/UIFields/ListField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/ListField.cs diff --git a/SlicerConfiguration/UIFields/ListStringField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs similarity index 100% rename from SlicerConfiguration/UIFields/ListStringField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs diff --git a/SlicerConfiguration/UIFields/MarkdownEditField.cs b/MatterControlLib/SlicerConfiguration/UIFields/MarkdownEditField.cs similarity index 100% rename from SlicerConfiguration/UIFields/MarkdownEditField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/MarkdownEditField.cs diff --git a/SlicerConfiguration/UIFields/MultilineStringField.cs b/MatterControlLib/SlicerConfiguration/UIFields/MultilineStringField.cs similarity index 100% rename from SlicerConfiguration/UIFields/MultilineStringField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/MultilineStringField.cs diff --git a/SlicerConfiguration/UIFields/NumberField.cs b/MatterControlLib/SlicerConfiguration/UIFields/NumberField.cs similarity index 100% rename from SlicerConfiguration/UIFields/NumberField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/NumberField.cs diff --git a/SlicerConfiguration/UIFields/PositiveDoubleField.cs b/MatterControlLib/SlicerConfiguration/UIFields/PositiveDoubleField.cs similarity index 100% rename from SlicerConfiguration/UIFields/PositiveDoubleField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/PositiveDoubleField.cs diff --git a/SlicerConfiguration/UIFields/SurfacedEditorPage.cs b/MatterControlLib/SlicerConfiguration/UIFields/SurfacedEditorPage.cs similarity index 100% rename from SlicerConfiguration/UIFields/SurfacedEditorPage.cs rename to MatterControlLib/SlicerConfiguration/UIFields/SurfacedEditorPage.cs diff --git a/SlicerConfiguration/UIFields/SurfacedEditorsField.cs b/MatterControlLib/SlicerConfiguration/UIFields/SurfacedEditorsField.cs similarity index 100% rename from SlicerConfiguration/UIFields/SurfacedEditorsField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/SurfacedEditorsField.cs diff --git a/SlicerConfiguration/UIFields/TextField.cs b/MatterControlLib/SlicerConfiguration/UIFields/TextField.cs similarity index 100% rename from SlicerConfiguration/UIFields/TextField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/TextField.cs diff --git a/SlicerConfiguration/UIFields/UIField.cs b/MatterControlLib/SlicerConfiguration/UIFields/UIField.cs similarity index 100% rename from SlicerConfiguration/UIFields/UIField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/UIField.cs diff --git a/SlicerConfiguration/UIFields/ValueOrUnitsField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ValueOrUnitsField.cs similarity index 100% rename from SlicerConfiguration/UIFields/ValueOrUnitsField.cs rename to MatterControlLib/SlicerConfiguration/UIFields/ValueOrUnitsField.cs diff --git a/SlicerConfiguration/UIFields/Vector2Field.cs b/MatterControlLib/SlicerConfiguration/UIFields/Vector2Field.cs similarity index 100% rename from SlicerConfiguration/UIFields/Vector2Field.cs rename to MatterControlLib/SlicerConfiguration/UIFields/Vector2Field.cs diff --git a/SlicerConfiguration/UIFields/Vector3Field.cs b/MatterControlLib/SlicerConfiguration/UIFields/Vector3Field.cs similarity index 100% rename from SlicerConfiguration/UIFields/Vector3Field.cs rename to MatterControlLib/SlicerConfiguration/UIFields/Vector3Field.cs diff --git a/Utilities/AuthenticationData.cs b/MatterControlLib/Utilities/AuthenticationData.cs similarity index 100% rename from Utilities/AuthenticationData.cs rename to MatterControlLib/Utilities/AuthenticationData.cs diff --git a/Utilities/FieldValidation.cs b/MatterControlLib/Utilities/FieldValidation.cs similarity index 100% rename from Utilities/FieldValidation.cs rename to MatterControlLib/Utilities/FieldValidation.cs diff --git a/Utilities/IGCodePostProcessor.cs b/MatterControlLib/Utilities/IGCodePostProcessor.cs similarity index 100% rename from Utilities/IGCodePostProcessor.cs rename to MatterControlLib/Utilities/IGCodePostProcessor.cs diff --git a/Utilities/JsonPath.cs b/MatterControlLib/Utilities/JsonPath.cs similarity index 100% rename from Utilities/JsonPath.cs rename to MatterControlLib/Utilities/JsonPath.cs diff --git a/Utilities/LimitCallFrequency.cs b/MatterControlLib/Utilities/LimitCallFrequency.cs similarity index 100% rename from Utilities/LimitCallFrequency.cs rename to MatterControlLib/Utilities/LimitCallFrequency.cs diff --git a/Utilities/ManifestFileHandler.cs b/MatterControlLib/Utilities/ManifestFileHandler.cs similarity index 100% rename from Utilities/ManifestFileHandler.cs rename to MatterControlLib/Utilities/ManifestFileHandler.cs diff --git a/Utilities/MarkdigAgg/AggCodeBlockRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggCodeBlockRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/AggCodeBlockRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/AggCodeBlockRenderer.cs diff --git a/Utilities/MarkdigAgg/AggHeadingRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggHeadingRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/AggHeadingRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/AggHeadingRenderer.cs diff --git a/Utilities/MarkdigAgg/AggListRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/AggListRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs diff --git a/Utilities/MarkdigAgg/AggMarkdownDocument.cs b/MatterControlLib/Utilities/MarkdigAgg/AggMarkdownDocument.cs similarity index 100% rename from Utilities/MarkdigAgg/AggMarkdownDocument.cs rename to MatterControlLib/Utilities/MarkdigAgg/AggMarkdownDocument.cs diff --git a/Utilities/MarkdigAgg/AggObjectRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggObjectRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/AggObjectRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/AggObjectRenderer.cs diff --git a/Utilities/MarkdigAgg/AggParagraphRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggParagraphRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/AggParagraphRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/AggParagraphRenderer.cs diff --git a/Utilities/MarkdigAgg/AggQuoteBlockRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggQuoteBlockRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/AggQuoteBlockRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/AggQuoteBlockRenderer.cs diff --git a/Utilities/MarkdigAgg/AggRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/AggRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs diff --git a/Utilities/MarkdigAgg/AggThematicBreakRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggThematicBreakRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/AggThematicBreakRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/AggThematicBreakRenderer.cs diff --git a/Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/Inlines/AggAutolinkInlineRenderer.cs diff --git a/Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs diff --git a/Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/Inlines/AggDelimiterInlineRenderer.cs diff --git a/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs diff --git a/Utilities/MarkdigAgg/Inlines/AggLineBreakInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLineBreakInlineRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/Inlines/AggLineBreakInlineRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLineBreakInlineRenderer.cs diff --git a/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs diff --git a/Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs similarity index 100% rename from Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs rename to MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLiteralInlineRenderer.cs diff --git a/Utilities/MarkdigAgg/MarkdownExtensions.cs b/MatterControlLib/Utilities/MarkdigAgg/MarkdownExtensions.cs similarity index 100% rename from Utilities/MarkdigAgg/MarkdownExtensions.cs rename to MatterControlLib/Utilities/MarkdigAgg/MarkdownExtensions.cs diff --git a/Utilities/MarkdigAgg/MarkdownPage.cs b/MatterControlLib/Utilities/MarkdigAgg/MarkdownPage.cs similarity index 100% rename from Utilities/MarkdigAgg/MarkdownPage.cs rename to MatterControlLib/Utilities/MarkdigAgg/MarkdownPage.cs diff --git a/Utilities/MarkdigAgg/MarkdownWidget.cs b/MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs similarity index 100% rename from Utilities/MarkdigAgg/MarkdownWidget.cs rename to MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs diff --git a/Utilities/ProjectFileHandler.cs b/MatterControlLib/Utilities/ProjectFileHandler.cs similarity index 100% rename from Utilities/ProjectFileHandler.cs rename to MatterControlLib/Utilities/ProjectFileHandler.cs diff --git a/Utilities/SelectedListItems.cs b/MatterControlLib/Utilities/SelectedListItems.cs similarity index 100% rename from Utilities/SelectedListItems.cs rename to MatterControlLib/Utilities/SelectedListItems.cs diff --git a/Utilities/WebUtilities/JsonResponseDictionary.cs b/MatterControlLib/Utilities/WebUtilities/JsonResponseDictionary.cs similarity index 100% rename from Utilities/WebUtilities/JsonResponseDictionary.cs rename to MatterControlLib/Utilities/WebUtilities/JsonResponseDictionary.cs diff --git a/Utilities/WebUtilities/RequestManager.cs b/MatterControlLib/Utilities/WebUtilities/RequestManager.cs similarity index 100% rename from Utilities/WebUtilities/RequestManager.cs rename to MatterControlLib/Utilities/WebUtilities/RequestManager.cs diff --git a/VersionManagement/ClientTokenRequest.cs b/MatterControlLib/VersionManagement/ClientTokenRequest.cs similarity index 100% rename from VersionManagement/ClientTokenRequest.cs rename to MatterControlLib/VersionManagement/ClientTokenRequest.cs diff --git a/VersionManagement/ContactFormRequest.cs b/MatterControlLib/VersionManagement/ContactFormRequest.cs similarity index 100% rename from VersionManagement/ContactFormRequest.cs rename to MatterControlLib/VersionManagement/ContactFormRequest.cs diff --git a/VersionManagement/LatestVersionRequest.cs b/MatterControlLib/VersionManagement/LatestVersionRequest.cs similarity index 100% rename from VersionManagement/LatestVersionRequest.cs rename to MatterControlLib/VersionManagement/LatestVersionRequest.cs diff --git a/VersionManagement/VersionFileHandler.cs b/MatterControlLib/VersionManagement/VersionFileHandler.cs similarity index 100% rename from VersionManagement/VersionFileHandler.cs rename to MatterControlLib/VersionManagement/VersionFileHandler.cs diff --git a/VersionManagement/WebRequestHandler.cs b/MatterControlLib/VersionManagement/WebRequestHandler.cs similarity index 100% rename from VersionManagement/WebRequestHandler.cs rename to MatterControlLib/VersionManagement/WebRequestHandler.cs diff --git a/PartPreviewWindow/PrinterTab - Copy.cs b/PartPreviewWindow/PrinterTab - Copy.cs deleted file mode 100644 index 96e4d0152..000000000 --- a/PartPreviewWindow/PrinterTab - Copy.cs +++ /dev/null @@ -1,191 +0,0 @@ -/* -Copyright (c) 2017, Lars Brubaker, John Lewin -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -The views and conclusions contained in the software and documentation are those -of the authors and should not be interpreted as representing official policies, -either expressed or implied, of the FreeBSD Project. -*/ - -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using MatterHackers.Agg; -using MatterHackers.Agg.Image; -using MatterHackers.Agg.UI; -using MatterHackers.Agg.VertexSource; -using MatterHackers.VectorMath; - -namespace MatterHackers.MatterControl.PartPreviewWindow -{ - - public class PrinterTab : SimpleTabControl - { - public PrinterTab() - : base () - { - - } - } - - public interface ITab - { - GuiWidget Selector { get; } - GuiWidget Content { get; } - bool Selected { get; set; } - } - - public class SimpleTabControl : GuiWidget - { - protected GuiWidget TabBar; - protected GuiWidget Container; - - private List tabs = new List(); - private ITab activeTab; - - public SimpleTabControl() - { - this.TabBar = new FlowLayoutWidget(); - this.AddChild(this.TabBar); - - this.Container = new GuiWidget(); - this.AddChild(this.Container); - } - - public IEnumerable Tabs => tabs; - - public ITab ActiveTab - { - get => activeTab; - set - { - if (activeTab != value) - { - foreach (var tab in tabs) - { - tab.Selected = (tab == value); - } - } - - activeTab = value; - } - } - - public void AddTab(ITab tab) - { - tabs.Add(tab); - - this.TabBar.AddChild(tab.Selector); - this.Container.AddChild(tab.Content); - } - } - - - - - - public class PrinterTab2 : Tab - { - private class TabPill : FlowLayoutWidget - { - private TextWidget label; - - public TabPill(string tabTitle, RGBA_Bytes textColor, string imageUrl = null) - { - var imageWidget = new ImageWidget(new ImageBuffer(16, 16)) - { - Margin = new BorderDouble(right: 5), - VAnchor = VAnchor.Center - }; - this.AddChild(imageWidget); - - label = new TextWidget(tabTitle) - { - TextColor = textColor, - VAnchor = VAnchor.Center - }; - this.AddChild(label); - - if (imageUrl != null) - { - ApplicationController.Instance.DownloadToImageAsync(imageWidget.Image, imageUrl, false); - } - - this.DebugShowBounds = true; - } - - public RGBA_Bytes TextColor - { - get => label.TextColor; - set => label.TextColor = value; - } - - public override string Text - { - get => label.Text; - set => label.Text = value; - } - } - - public PrinterTab2(string tabTitle, string tabName, TabPage tabPage) - : this( - new TabPill(tabTitle, new RGBA_Bytes(ActiveTheme.Instance.PrimaryTextColor, 140), "https://www.google.com/s2/favicons?domain=www.printrbot.com"), - new TabPill(tabTitle, ActiveTheme.Instance.PrimaryTextColor, "https://www.google.com/s2/favicons?domain=www.printrbot.com"), - new TabPill(tabTitle, ActiveTheme.Instance.PrimaryTextColor, "https://www.google.com/s2/favicons?domain=www.printrbot.com"), - tabName, - tabPage) - { - } - - public PrinterTab(GuiWidget normalWidget, GuiWidget hoverWidget, GuiWidget pressedWidget, string tabName, TabPage tabPage) - : base(tabName, normalWidget, hoverWidget, pressedWidget, tabPage) - { - this.HAnchor = HAnchor.Fit; - this.VAnchor = VAnchor.Fit | VAnchor.Bottom; - } - - public int BorderWidth { get; set; } = 1; - public int borderRadius { get; set; } = 4; - - private RGBA_Bytes activeTabColor = ApplicationController.Instance.Theme.PrimaryTabFillColor; - private RGBA_Bytes inactiveTabColor = ApplicationController.Instance.Theme.SlightShade; - - public override void OnDraw(Graphics2D graphics2D) - { - RectangleDouble borderRectangle = LocalBounds; - borderRectangle.ExpandToInclude(new Vector2(0, -15)); - - if (BorderWidth > 0) - { - var r = new RoundedRect(borderRectangle, this.borderRadius); - r.normalize_radius(); - - graphics2D.Render( - r, - selectedWidget.Visible ? activeTabColor : inactiveTabColor); - } - - base.OnDraw(graphics2D); - } - } -} diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index ba392cf60..fec9a95a1 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -9,9 +8,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("MatterControl")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("MatterHackers, Inc.")] +[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("MatterControl")] -[assembly: AssemblyCopyright("2013")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,12 +19,8 @@ using System.Runtime.InteropServices; // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -[assembly: InternalsVisibleTo("MatterControl.Tests")] -[assembly: InternalsVisibleTo("MatterControl.AutomationTests")] -[assembly: InternalsVisibleTo("CloudServices.Tests")] - // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1558c103-dff3-49bd-854b-97d57339d662")] +[assembly: Guid("b2b001ee-a142-4e20-acf8-ae4a9cb984f8")] // Version information for an assembly consists of the following four values: // @@ -34,6 +29,8 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1001.1002.1003")] -[assembly: AssemblyFileVersion("1001.1002.1003")] -[assembly: NeutralResourcesLanguageAttribute("en")] \ No newline at end of file +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/RunUnitTests.txt b/RunUnitTests.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/SDL2.dll b/SDL2.dll new file mode 100644 index 000000000..6cf858caa Binary files /dev/null and b/SDL2.dll differ diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 173b07016..97d32fc17 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 173b07016a65229f5d357880af1614abd911d79f +Subproject commit 97d32fc172fd5ec45023c9b515673105950f76f0 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index af0ac2f83..eaf50da42 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit af0ac2f831771ef818689768646bdb69b2bc89c4 +Subproject commit eaf50da421aca920eeae96c1025bb4cd86cf4b53 diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj index 264dce3b7..03cdb4846 100644 --- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj +++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj @@ -70,10 +70,6 @@ - - {0b8d6f56-bd7f-4426-b858-d9292b084656} - MatterControl - {97d5ade3-c1b4-4b46-8a3e-718a4f7f079f} MatterControl.Printing @@ -82,6 +78,10 @@ {d6dc2669-7b1f-40fe-89bf-45d4c94473e3} MatterControl.Winforms + + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD} + MatterControlLib + {865172a0-a1a9-49c2-9386-f2fdb4e141b7} MatterControlPluginSystem diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj index 927f06b81..6fd743f42 100644 --- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj +++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj @@ -84,10 +84,6 @@ - - {0b8d6f56-bd7f-4426-b858-d9292b084656} - MatterControl - {97d5ade3-c1b4-4b46-8a3e-718a4f7f079f} MatterControl.Printing @@ -96,6 +92,10 @@ {d6dc2669-7b1f-40fe-89bf-45d4c94473e3} MatterControl.Winforms + + {93BEBFDF-B81A-4344-AB82-0DBF58B234CD} + MatterControlLib + {865172a0-a1a9-49c2-9386-f2fdb4e141b7} MatterControlPluginSystem