From ba2a354a56ba9e950b8315e46903ac9bd21333f9 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 27 Jul 2018 18:05:21 -0700 Subject: [PATCH] Consolidate TextCreator into MatterControl --- .../Braille/BrailleCardObject3D.cs | 0 .../Braille/BrailleGrade2.cs | 0 .../Braille/BrailleGrade2Mapping.cs | 0 .../Braille/BrailleObject3D.cs | 0 MatterControl.csproj | 4 + MatterControl.sln | 40 +----- SlicerConfiguration/SliceSettingsWidget.cs | 2 +- .../MatterControl.AutomationTests.csproj | 4 - .../MatterControl.Tests.csproj | 4 - TextCreator/TextCreator.csproj | 136 ------------------ TextCreator/app.config | 19 --- TextCreator/packages.config | 4 - 12 files changed, 9 insertions(+), 204 deletions(-) rename {TextCreator => DesignTools}/Braille/BrailleCardObject3D.cs (100%) rename {TextCreator => DesignTools}/Braille/BrailleGrade2.cs (100%) rename {TextCreator => DesignTools}/Braille/BrailleGrade2Mapping.cs (100%) rename {TextCreator => DesignTools}/Braille/BrailleObject3D.cs (100%) delete mode 100644 TextCreator/TextCreator.csproj delete mode 100644 TextCreator/app.config delete mode 100644 TextCreator/packages.config diff --git a/TextCreator/Braille/BrailleCardObject3D.cs b/DesignTools/Braille/BrailleCardObject3D.cs similarity index 100% rename from TextCreator/Braille/BrailleCardObject3D.cs rename to DesignTools/Braille/BrailleCardObject3D.cs diff --git a/TextCreator/Braille/BrailleGrade2.cs b/DesignTools/Braille/BrailleGrade2.cs similarity index 100% rename from TextCreator/Braille/BrailleGrade2.cs rename to DesignTools/Braille/BrailleGrade2.cs diff --git a/TextCreator/Braille/BrailleGrade2Mapping.cs b/DesignTools/Braille/BrailleGrade2Mapping.cs similarity index 100% rename from TextCreator/Braille/BrailleGrade2Mapping.cs rename to DesignTools/Braille/BrailleGrade2Mapping.cs diff --git a/TextCreator/Braille/BrailleObject3D.cs b/DesignTools/Braille/BrailleObject3D.cs similarity index 100% rename from TextCreator/Braille/BrailleObject3D.cs rename to DesignTools/Braille/BrailleObject3D.cs diff --git a/MatterControl.csproj b/MatterControl.csproj index 2103c484c..284bd872e 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -92,6 +92,10 @@ + + + + diff --git a/MatterControl.sln b/MatterControl.sln index 02a78ffde..e1041790f 100644 --- a/MatterControl.sln +++ b/MatterControl.sln @@ -10,7 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterCont {F1653F20-D47D-4F29-8C55-3C835542AF5F} = {F1653F20-D47D-4F29-8C55-3C835542AF5F} {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95} = {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95} {3DF4CB3D-9A03-4256-9A81-70523AAD828B} = {3DF4CB3D-9A03-4256-9A81-70523AAD828B} - {C958F745-156E-4BDC-A24A-3721C7BE7B8A} = {C958F745-156E-4BDC-A24A-3721C7BE7B8A} {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} @@ -45,8 +44,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolygonMesh", "Submodules\a EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agg", "Submodules\agg-sharp\agg\Agg.csproj", "{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGlGui", "Submodules\agg-sharp\OpenGlGui\OpenGlGui.csproj", "{C958F745-156E-4BDC-A24A-3721C7BE7B8A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Community.CsharpSqlite", "Community.CsharpSqlite\Community.CsharpSqlite.csproj", "{F1653F20-D47D-4F29-8C55-3C835542AF5F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RayTracer", "Submodules\agg-sharp\RayTracer\RayTracer.csproj", "{1E01ABE0-B494-4FE4-B0D6-540133286887}" @@ -71,10 +68,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InfInstaller", "PrinterDriv EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{FBE6DF29-85A9-4A8B-B739-35BE4CA0A9B7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{32E5B656-D6DF-415E-9E7E-D03F1D8C3A8A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextCreator", "TextCreator\TextCreator.csproj", "{F49EC1DD-D645-4709-8667-B57318AF67B0}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataConverters3D", "Submodules\agg-sharp\DataConverters3D\DataConverters3D.csproj", "{04667764-DC7B-4B95-AEF6-B4E6C87A54E9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.Tests", "Tests\MatterControl.Tests\MatterControl.Tests.csproj", "{E1455E5C-127C-4282-8CC5-452C300E91D0}" @@ -93,8 +86,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{FED00F38 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net3dBool", "Submodules\agg-sharp\PolygonMesh\Net3dBool\Net3dBool.csproj", "{7EE4636D-8A92-4015-9562-7FCD6ADD0645}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrinterEmulator", "PrinterEmulator\PrinterEmulator.csproj", "{BB58CA42-991B-41B7-BDE7-DCD2911DF8B9}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MatterSlice", "MatterSlice", "{57647FCB-8F00-4C05-972C-3CF6ACD12A63}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pathfinding", "Submodules\MatterSlice\Pathfinding\Pathfinding.csproj", "{8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}" @@ -110,6 +101,10 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.Printing", "MatterControl.Printing\MatterControl.Printing.csproj", "{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}" EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4 + Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms @@ -189,14 +184,6 @@ Global {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|Any CPU.Build.0 = Release|Any CPU {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|Any CPU.Build.0 = Release|Any CPU - {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|Any CPU.Build.0 = Debug|Any CPU {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -277,14 +264,6 @@ Global {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Release|Any CPU.Build.0 = Release|Any CPU {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F49EC1DD-D645-4709-8667-B57318AF67B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F49EC1DD-D645-4709-8667-B57318AF67B0}.Release|Any CPU.Build.0 = Release|Any CPU - {F49EC1DD-D645-4709-8667-B57318AF67B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F49EC1DD-D645-4709-8667-B57318AF67B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU {04667764-DC7B-4B95-AEF6-B4E6C87A54E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {04667764-DC7B-4B95-AEF6-B4E6C87A54E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {04667764-DC7B-4B95-AEF6-B4E6C87A54E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -349,14 +328,6 @@ Global {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Release|Any CPU.Build.0 = Release|Any CPU {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {BB58CA42-991B-41B7-BDE7-DCD2911DF8B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB58CA42-991B-41B7-BDE7-DCD2911DF8B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB58CA42-991B-41B7-BDE7-DCD2911DF8B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BB58CA42-991B-41B7-BDE7-DCD2911DF8B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {BB58CA42-991B-41B7-BDE7-DCD2911DF8B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB58CA42-991B-41B7-BDE7-DCD2911DF8B9}.Release|Any CPU.Build.0 = Release|Any CPU - {BB58CA42-991B-41B7-BDE7-DCD2911DF8B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {BB58CA42-991B-41B7-BDE7-DCD2911DF8B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU {8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}.Debug|Any CPU.Build.0 = Debug|Any CPU {8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -418,7 +389,6 @@ Global {7E61A5BD-E78F-4B80-88C9-3821B4FA062E} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {86F6AAF2-9B50-40B8-A427-1897D76471C5} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {C958F745-156E-4BDC-A24A-3721C7BE7B8A} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {F1653F20-D47D-4F29-8C55-3C835542AF5F} = {FED00F38-E911-45E1-A788-26980E84C3D6} {1E01ABE0-B494-4FE4-B0D6-540133286887} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {CA96058C-1A37-465D-A357-D6D695B13D25} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} @@ -428,7 +398,6 @@ Global {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63} {3DF4CB3D-9A03-4256-9A81-70523AAD828B} = {FED00F38-E911-45E1-A788-26980E84C3D6} {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9} = {FED00F38-E911-45E1-A788-26980E84C3D6} - {F49EC1DD-D645-4709-8667-B57318AF67B0} = {32E5B656-D6DF-415E-9E7E-D03F1D8C3A8A} {04667764-DC7B-4B95-AEF6-B4E6C87A54E9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {E1455E5C-127C-4282-8CC5-452C300E91D0} = {FBE6DF29-85A9-4A8B-B739-35BE4CA0A9B7} {195CBE56-E654-437B-AB05-3BE1B9452497} = {FBE6DF29-85A9-4A8B-B739-35BE4CA0A9B7} @@ -437,7 +406,6 @@ Global {94838988-523C-4B11-AD82-8B9B76F23A31} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {418E7058-92EE-4329-86BA-AC26B65AFB25} = {FBE6DF29-85A9-4A8B-B739-35BE4CA0A9B7} {7EE4636D-8A92-4015-9562-7FCD6ADD0645} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {BB58CA42-991B-41B7-BDE7-DCD2911DF8B9} = {FED00F38-E911-45E1-A788-26980E84C3D6} {8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63} {23EC3364-7C93-4169-9AB2-7181C66004C0} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63} {2C564BE1-352D-4DDB-8226-F0981F983C60} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63} diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index d4f626137..24a4162b0 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -854,7 +854,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration uiField.SetValue(sliceSettingValue, userInitiated: false); - // make sure the undo data goes back to the intial value after a change + // make sure the undo data goes back to the initial value after a change if(uiField.Content is MHTextEditWidget textWidget) { textWidget.ActualTextEditWidget.InternalTextEditWidget.ClearUndoHistory(); diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj index e398fef5d..cb2e0d5b1 100644 --- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj +++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj @@ -122,10 +122,6 @@ {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} VectorMath - - {f49ec1dd-d645-4709-8667-b57318af67b0} - TextCreator - diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj index 9007a6edd..d5a18f9a6 100644 --- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj +++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj @@ -138,10 +138,6 @@ {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} VectorMath - - {F49EC1DD-D645-4709-8667-B57318AF67B0} - TextCreator - diff --git a/TextCreator/TextCreator.csproj b/TextCreator/TextCreator.csproj deleted file mode 100644 index aae872a92..000000000 --- a/TextCreator/TextCreator.csproj +++ /dev/null @@ -1,136 +0,0 @@ - - - - Release - AnyCPU - 8.0.50727 - 2.0 - {F49EC1DD-D645-4709-8667-B57318AF67B0} - Library - Properties - MatterHackers.Plugins.TextCreator - TextCreator - - - - - 2.0 - v4.7.1 - - - - True - full - False - ..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - AnyCPU - false - - - pdbonly - True - ..\bin\Release\ - TRACE - prompt - 4 - True - AnyCPU - false - - - false - - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - False - ..\Submodules\agg-sharp\PlatformWin32\OpenTK.dll - - - - - - - - - - - - {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} - Agg - - - {9B062971-A88E-4A3D-B3C9-12B78D15FA66} - clipper_library - - - {94838988-523C-4B11-AD82-8B9B76F23A31} - DataConverters2D - - - {04667764-DC7B-4B95-AEF6-B4E6C87A54E9} - DataConverters3D - - - {74F6BB6C-9D02-4512-A59A-21940E35C532} - Gui - - - {036BCCBA-52D8-457C-84AE-8821F209FE4A} - ImageProcessing - - - {ca96058c-1a37-465d-a357-d6d695b13d25} - Localizations - - - {DF6845CD-64C6-4263-8357-DA8066855739} - MarchingSquares - - - {86F6AAF2-9B50-40B8-A427-1897D76471C5} - PolygonMesh - - - {1E01ABE0-B494-4FE4-B0D6-540133286887} - RayTracer - - - {545B6912-77FF-4B34-BA76-6C3D6A32BE6A} - RenderOpenGl - - - {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} - VectorMath - - - {0B8D6F56-BD7F-4426-B858-D9292B084656} - MatterControl - - - {865172A0-A1A9-49C2-9386-F2FDB4E141B7} - MatterControlPluginSystem - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TextCreator/app.config b/TextCreator/app.config deleted file mode 100644 index edc605d58..000000000 --- a/TextCreator/app.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/TextCreator/packages.config b/TextCreator/packages.config deleted file mode 100644 index 7ee8c1052..000000000 --- a/TextCreator/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file