diff --git a/.gitignore b/.gitignore index 516dc9143..4a0850308 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,5 @@ _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML MatterControl.userprefs +Launcher/app.config +PrinterDriverInstaller/app.config diff --git a/App.config b/App.config index ebd31843c..287959adb 100644 --- a/App.config +++ b/App.config @@ -1,9 +1,9 @@ - + - + - \ No newline at end of file + diff --git a/Community.CsharpSqlite/Community.CsharpSqlite.csproj b/Community.CsharpSqlite/Community.CsharpSqlite.csproj index 6e5052ed7..656579c7b 100644 --- a/Community.CsharpSqlite/Community.CsharpSqlite.csproj +++ b/Community.CsharpSqlite/Community.CsharpSqlite.csproj @@ -31,6 +31,8 @@ false true 1.1.4 + v4.5 + True @@ -42,6 +44,7 @@ 4 AllRules.ruleset x86 + false True @@ -51,6 +54,7 @@ 4 AllRules.ruleset x86 + false True @@ -62,6 +66,7 @@ AllRules.ruleset 4 False + false bin\x86\Release\ @@ -71,6 +76,7 @@ prompt AllRules.ruleset 4 + false bin\Release64\ @@ -86,6 +92,7 @@ false ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules 4 + false bin\x86\Release64\ @@ -103,6 +110,7 @@ false false 4 + false true @@ -117,6 +125,7 @@ false 4 false + false true @@ -131,6 +140,7 @@ false 4 false + false true @@ -144,6 +154,7 @@ false 4 false + false bin\x64\Release\ @@ -155,6 +166,7 @@ false false 4 + false bin\x64\Release64\ @@ -171,6 +183,7 @@ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules false 4 + false true @@ -184,6 +197,7 @@ false 4 false + false diff --git a/Community.CsharpSqlite/app.config b/Community.CsharpSqlite/app.config index 0df7832f9..a80813afe 100644 --- a/Community.CsharpSqlite/app.config +++ b/Community.CsharpSqlite/app.config @@ -1,3 +1,3 @@ - + diff --git a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs index 1f698adcb..f58f2eac9 100644 --- a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs +++ b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs @@ -20,7 +20,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage { Button languageRestartButton; Button configureUpdateFeedButton; - Button configureLanguageButton; Button displayControlRestartButton; public ApplicationSettingsWidget() diff --git a/ConfigurationPage/PrinterConfigurationPage.cs b/ConfigurationPage/PrinterConfigurationPage.cs index a2746f9c7..5675dbef8 100644 --- a/ConfigurationPage/PrinterConfigurationPage.cs +++ b/ConfigurationPage/PrinterConfigurationPage.cs @@ -64,7 +64,6 @@ namespace MatterHackers.MatterControl Button disablePrintLevelingButton; DisableableWidget eePromControlsContainer; - DisableableWidget terminalCommunicationsContainer; DisableableWidget printLevelingContainer; @@ -135,8 +134,6 @@ namespace MatterHackers.MatterControl controlsTopToBottomLayout.AddChild(container); } - Button restartButton; - private void RestartApplication() { UiThread.RunOnIdle((state) => @@ -159,7 +156,6 @@ namespace MatterHackers.MatterControl if (languageCode != UserSettings.Instance.get("Language")) { UserSettings.Instance.set("Language", languageCode); - restartButton.Visible = true; } } @@ -459,7 +455,6 @@ namespace MatterHackers.MatterControl { // no printer selected eePromControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); - terminalCommunicationsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); //cloudMonitorContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); } @@ -475,20 +470,17 @@ namespace MatterHackers.MatterControl case PrinterConnectionAndCommunication.CommunicationStates.FailedToConnect: eePromControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); - terminalCommunicationsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); break; case PrinterConnectionAndCommunication.CommunicationStates.FinishedPrint: case PrinterConnectionAndCommunication.CommunicationStates.Connected: eePromControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); - terminalCommunicationsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); break; case PrinterConnectionAndCommunication.CommunicationStates.PrintingFromSd: eePromControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); - terminalCommunicationsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); break; case PrinterConnectionAndCommunication.CommunicationStates.PreparingToPrint: @@ -503,7 +495,6 @@ namespace MatterHackers.MatterControl case PrinterConnectionAndCommunication.DetailedPrintingState.Printing: eePromControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); - terminalCommunicationsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); break; default: @@ -514,7 +505,6 @@ namespace MatterHackers.MatterControl case PrinterConnectionAndCommunication.CommunicationStates.Paused: eePromControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); - terminalCommunicationsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); break; default: diff --git a/CustomWidgets/AltGroupBox.cs b/CustomWidgets/AltGroupBox.cs index f9e2fe8e1..34758e427 100644 --- a/CustomWidgets/AltGroupBox.cs +++ b/CustomWidgets/AltGroupBox.cs @@ -13,7 +13,6 @@ namespace MatterHackers.MatterControl public class AltGroupBox : FlowLayoutWidget { GuiWidget groupBoxLabel; - double lineInset = 8.5; RGBA_Bytes borderColor = RGBA_Bytes.Black; GuiWidget clientArea; diff --git a/CustomWidgets/PartThumbnailWidget.cs b/CustomWidgets/PartThumbnailWidget.cs index 2c612f32b..7c9b1b2d6 100644 --- a/CustomWidgets/PartThumbnailWidget.cs +++ b/CustomWidgets/PartThumbnailWidget.cs @@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl ImageBuffer thumbnailImage = new Agg.Image.ImageBuffer(); // all the color stuff - public double BorderWidth = 0; //Don't delete this - required for OnDraw + new public double BorderWidth = 0; //Don't delete this - required for OnDraw protected double borderRadius = 0; protected RGBA_Bytes HoverBorderColor = new RGBA_Bytes(); diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj index b20a2a243..70d1eb78f 100644 --- a/Launcher/Launcher.csproj +++ b/Launcher/Launcher.csproj @@ -17,6 +17,8 @@ 2.0 0.8.2 + v4.5 + True @@ -28,6 +30,7 @@ 4 True x86 + false pdbonly @@ -37,6 +40,7 @@ 4 True x86 + false bin\Release64\ @@ -55,6 +59,7 @@ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules false false + false true @@ -67,6 +72,7 @@ false false false + false true @@ -78,6 +84,7 @@ prompt false false + false bin\x64\Release\ @@ -89,6 +96,7 @@ prompt false false + false bin\x64\Release64\ @@ -106,6 +114,7 @@ false ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules false + false true @@ -117,11 +126,13 @@ prompt false false + false + diff --git a/MatterControl.csproj b/MatterControl.csproj index 0120a1213..feb051f1c 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -38,6 +38,8 @@ true 8.0.30703 2.0 + v4.5 + True @@ -49,6 +51,7 @@ 4 x86 SHOW_MEMORY + false none @@ -59,6 +62,7 @@ 4 x86 true + false application.ico @@ -78,6 +82,7 @@ false ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules 4 + false diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index 1d12fd2bb..abc23bef8 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -387,7 +387,6 @@ namespace MatterHackers.MatterControl } } - bool cancelClose; void onConfirmExit(bool messageBoxResponse) { bool CancelClose; diff --git a/PartPreviewWindow/View3D/View3DAlign.cs b/PartPreviewWindow/View3D/View3DAlign.cs index d661b9601..23b001ecc 100644 --- a/PartPreviewWindow/View3D/View3DAlign.cs +++ b/PartPreviewWindow/View3D/View3DAlign.cs @@ -35,7 +35,6 @@ using MatterHackers.Localizations; using MatterHackers.MeshVisualizer; using MatterHackers.VectorMath; using MatterHackers.PolygonMesh; -using MatterHackers.MeshVisualizer; namespace MatterHackers.MatterControl.PartPreviewWindow { diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index b71569756..859e0541b 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -1831,7 +1831,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - int nextColor = 0; RGBA_Bytes[] SelectionColors = new RGBA_Bytes[] { new RGBA_Bytes(131, 4, 66), new RGBA_Bytes(227, 31, 61), new RGBA_Bytes(255, 148, 1), new RGBA_Bytes(247, 224, 23), new RGBA_Bytes(143, 212, 1) }; private void AddHandlers() diff --git a/PluginSystem/MatterControlPluginSystem.csproj b/PluginSystem/MatterControlPluginSystem.csproj index a4eb9d3d2..4ec25232b 100644 --- a/PluginSystem/MatterControlPluginSystem.csproj +++ b/PluginSystem/MatterControlPluginSystem.csproj @@ -16,6 +16,8 @@ 2.0 1.1.4 + v4.5 + True @@ -27,6 +29,7 @@ 4 True x86 + false pdbonly @@ -37,6 +40,7 @@ 4 True x86 + false bin\Release64\ @@ -56,6 +60,7 @@ false false 4 + false true @@ -69,6 +74,7 @@ false 4 false + false true @@ -82,6 +88,7 @@ false 4 false + false bin\x64\Release\ @@ -94,6 +101,7 @@ false false 4 + false bin\x64\Release64\ @@ -111,6 +119,7 @@ false ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules 4 + false true @@ -125,6 +134,7 @@ false 4 false + false diff --git a/PrintHistory/PrintHistoryWidget.cs b/PrintHistory/PrintHistoryWidget.cs index 3dc79c553..880db8610 100644 --- a/PrintHistory/PrintHistoryWidget.cs +++ b/PrintHistory/PrintHistoryWidget.cs @@ -51,7 +51,6 @@ namespace MatterHackers.MatterControl.PrintHistory public class PrintHistoryWidget : GuiWidget { TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory(); - Button deleteFromLibraryButton; CheckBox showOnlyCompletedCheckbox; CheckBox showTimestampCheckbox; PrintHistoryDataView historyView; diff --git a/PrintLibrary/LibraryDataView.cs b/PrintLibrary/LibraryDataView.cs index 424320d7d..ab89b4fcb 100644 --- a/PrintLibrary/LibraryDataView.cs +++ b/PrintLibrary/LibraryDataView.cs @@ -123,7 +123,6 @@ namespace MatterHackers.MatterControl.PrintLibrary public SelectedListItems SelectedItems = new SelectedListItems(); int selectedIndex = -1; int hoverIndex = -1; - int dragIndex = -1; int Count { diff --git a/PrintQueue/QueueDataWidget.cs b/PrintQueue/QueueDataWidget.cs index 768e2b5e6..6a53e99c4 100644 --- a/PrintQueue/QueueDataWidget.cs +++ b/PrintQueue/QueueDataWidget.cs @@ -56,7 +56,6 @@ namespace MatterHackers.MatterControl.PrintQueue Button removeItemButton; Button enterEditModeButton; Button leaveEditModeButton; - QueueRowItem queueRowItem; Button addToQueueButton; Button createButton; diff --git a/PrinterControls/PrinterConnections/ChooseConnectionWidget.cs b/PrinterControls/PrinterConnections/ChooseConnectionWidget.cs index b056c22c9..3c4939d21 100644 --- a/PrinterControls/PrinterConnections/ChooseConnectionWidget.cs +++ b/PrinterControls/PrinterConnections/ChooseConnectionWidget.cs @@ -44,8 +44,6 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory(); TextImageButtonFactory editButtonFactory = new TextImageButtonFactory(); Button closeButton; - Button enterEditModeButton; - Button leaveEditModeButton; bool editMode; diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj index 64a0b0ccc..4d82e6582 100644 --- a/PrinterDriverInstaller/InfInstaller.csproj +++ b/PrinterDriverInstaller/InfInstaller.csproj @@ -17,6 +17,8 @@ 2.0 1.1.4 + v4.5 + True @@ -28,6 +30,7 @@ 4 True x86 + false pdbonly @@ -37,6 +40,7 @@ 4 True x86 + false bin\Release64\ @@ -55,6 +59,7 @@ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules false 4 + false true @@ -68,6 +73,7 @@ false 4 false + false true @@ -81,6 +87,7 @@ false 4 false + false bin\x64\Release\ @@ -93,6 +100,7 @@ false false 4 + false bin\x64\Release64\ @@ -110,6 +118,7 @@ false ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules 4 + false true @@ -123,6 +132,7 @@ false 4 false + false @@ -160,5 +170,8 @@ + + + \ No newline at end of file diff --git a/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs b/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs index 9ce8db97a..67305e4a7 100644 --- a/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs +++ b/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs @@ -429,7 +429,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration this.windowController.ActivePresetLayer.settingsDictionary[addRowSettingData.SlicerConfigName] = sliceSetting; OnSettingsChanged(); - HasUncommittedChanges = true; } addRowSettingData = null; PopulateAddSettingRow(-1, -1, "-1"); @@ -475,7 +474,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration }); } - bool HasUncommittedChanges; public RootedObjectEventHandler CommitStatusChanged = new RootedObjectEventHandler(); public RootedObjectEventHandler SettingsChanged = new RootedObjectEventHandler(); @@ -487,7 +485,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration this.windowController.ActivePresetLayer.settingsDictionary[keyName].Value = keyValue; OnSettingsChanged(); - HasUncommittedChanges = true; } else { @@ -499,7 +496,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration this.windowController.ActivePresetLayer.settingsDictionary[keyName] = sliceSetting; OnSettingsChanged(); - HasUncommittedChanges = true; } } @@ -927,7 +923,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration LoadSettingsRows(); } } - catch (Exception e) + catch (Exception) { // Error loading configuration } diff --git a/SlicerConfiguration/SlicePresetsWindow/SlicePresetListWidget.cs b/SlicerConfiguration/SlicePresetsWindow/SlicePresetListWidget.cs index bf93ae81e..cad7be9e9 100644 --- a/SlicerConfiguration/SlicePresetsWindow/SlicePresetListWidget.cs +++ b/SlicerConfiguration/SlicePresetsWindow/SlicePresetListWidget.cs @@ -207,7 +207,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration windowController.ChangeToSlicePresetList(); } } - catch (Exception e) + catch (Exception) { // Error loading configuration } diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index c00cfdf1f..528cd9f3a 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -200,7 +200,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } return "Minimal"; - return "Beginner"; + //return "Beginner"; } }