diff --git a/AboutPage/ContactForm.cs b/AboutPage/ContactForm.cs index 6144dd363..d11ee32d0 100644 --- a/AboutPage/ContactForm.cs +++ b/AboutPage/ContactForm.cs @@ -333,7 +333,7 @@ namespace MatterHackers.MatterControl.ContactForm MinimumSize = new Vector2(500, 550); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private void AddHandlers() { diff --git a/AboutPage/UpdateControlView.cs b/AboutPage/UpdateControlView.cs index b0f36ed9c..7a766806a 100644 --- a/AboutPage/UpdateControlView.cs +++ b/AboutPage/UpdateControlView.cs @@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl private Button installUpdateLink; private TextWidget updateStatusText; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private RGBA_Bytes offWhite = new RGBA_Bytes(245, 245, 245); private TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory(); diff --git a/ActionBar/ActionBarPlus.cs b/ActionBar/ActionBarPlus.cs index ab8afced3..98b7f4130 100644 --- a/ActionBar/ActionBarPlus.cs +++ b/ActionBar/ActionBarPlus.cs @@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl this.Create(); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public void Create() { diff --git a/ActionBar/PrintActionRow.cs b/ActionBar/PrintActionRow.cs index 235decd0a..4680c5430 100644 --- a/ActionBar/PrintActionRow.cs +++ b/ActionBar/PrintActionRow.cs @@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.ActionBar AddHandlers(); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { diff --git a/ActionBar/PrintStatusRow.cs b/ActionBar/PrintStatusRow.cs index 1b9f115a0..069162e62 100644 --- a/ActionBar/PrintStatusRow.cs +++ b/ActionBar/PrintStatusRow.cs @@ -113,7 +113,7 @@ namespace MatterHackers.MatterControl.ActionBar DoAddIconToPrintStatusRow(); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private string ActivePrintStatusText { @@ -501,7 +501,7 @@ namespace MatterHackers.MatterControl.ActionBar public delegate void AddIconToPrintStatusRowDelegate(GuiWidget iconContainer); - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private string ActivePrintStatusText { set diff --git a/ActionBar/PrinterConnectAndSelectControl.cs b/ActionBar/PrinterConnectAndSelectControl.cs index 736a9dd50..deb56ff2f 100644 --- a/ActionBar/PrinterConnectAndSelectControl.cs +++ b/ActionBar/PrinterConnectAndSelectControl.cs @@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.ActionBar private PrinterSelector printerSelector; GuiWidget printerSelectorAndEditOverlay; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; static EventHandler staticUnregisterEvents; public PrinterConnectAndSelectControl() diff --git a/ActionBar/TemperatureWidgetBase.cs b/ActionBar/TemperatureWidgetBase.cs index 4578e5343..747e2ab61 100644 --- a/ActionBar/TemperatureWidgetBase.cs +++ b/ActionBar/TemperatureWidgetBase.cs @@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl.ActionBar } } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public TemperatureWidgetBase(string textValue) : base(52 * GuiWidget.DeviceScale, 52 * GuiWidget.DeviceScale) diff --git a/ActionBar/TemperatureWidgetBed.cs b/ActionBar/TemperatureWidgetBed.cs index 7e84ea1f6..87659a8be 100644 --- a/ActionBar/TemperatureWidgetBed.cs +++ b/ActionBar/TemperatureWidgetBed.cs @@ -47,7 +47,7 @@ namespace MatterHackers.MatterControl.ActionBar PrinterConnectionAndCommunication.Instance.BedTemperatureRead.RegisterEvent(onTemperatureRead, ref unregisterEvents); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { diff --git a/ActionBar/TemperatureWidgetExtruder.cs b/ActionBar/TemperatureWidgetExtruder.cs index 8870ee413..3c09713fa 100644 --- a/ActionBar/TemperatureWidgetExtruder.cs +++ b/ActionBar/TemperatureWidgetExtruder.cs @@ -37,7 +37,7 @@ namespace MatterHackers.MatterControl.ActionBar internal class TemperatureWidgetExtruder : TemperatureWidgetBase { private int extruderNumber = 1; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private string sliceSettingsNote = "Note: Slice Settings are applied before the print actually starts. Changes while printing will not effect the active print.".Localize(); private string waitingForExtruderToHeatMessage = "The extruder is currently heating and its target temperature cannot be changed until it reaches {0}°C.\n\nYou can set the starting extruder temperature in 'Slice Settings' -> 'Filament'.\n\n{1}".Localize(); diff --git a/ApplicationView/AdvancedControlsPanel.cs b/ApplicationView/AdvancedControlsPanel.cs index 90c333d7f..369f0e5a1 100644 --- a/ApplicationView/AdvancedControlsPanel.cs +++ b/ApplicationView/AdvancedControlsPanel.cs @@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl { private static readonly string ThirdPanelTabView_AdvancedControls_CurrentTab = "ThirdPanelTabView_AdvancedControls_CurrentTab"; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private Button backButton; private GuiWidget sliceSettingsWidget; diff --git a/ApplicationView/CompactSlidePanel.cs b/ApplicationView/CompactSlidePanel.cs index 8f58167b5..4b0131f23 100644 --- a/ApplicationView/CompactSlidePanel.cs +++ b/ApplicationView/CompactSlidePanel.cs @@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl { public class CompactSlidePanel : SlidePanel { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private TabControl mainControlsTabControl; public TabPage QueueTabPage; diff --git a/ApplicationView/FirstPanelTabView.cs b/ApplicationView/FirstPanelTabView.cs index a67587b07..af2be3768 100644 --- a/ApplicationView/FirstPanelTabView.cs +++ b/ApplicationView/FirstPanelTabView.cs @@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl private RGBA_Bytes unselectedTextColor = ActiveTheme.Instance.TabLabelUnselected; private QueueDataView queueDataView; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public FirstPanelTabView(QueueDataView queueDataView) { diff --git a/ApplicationView/MainApplicationWidget.cs b/ApplicationView/MainApplicationWidget.cs index 81d295096..e633be747 100644 --- a/ApplicationView/MainApplicationWidget.cs +++ b/ApplicationView/MainApplicationWidget.cs @@ -218,7 +218,7 @@ namespace MatterHackers.MatterControl public event EventHandler ApplicationClosed; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; static int applicationInstanceCount = 0; public static int ApplicationInstanceCount diff --git a/ApplicationView/MenuRow/ApplicationMenuRow.cs b/ApplicationView/MenuRow/ApplicationMenuRow.cs index 9eb6ce9fc..91061f38a 100644 --- a/ApplicationView/MenuRow/ApplicationMenuRow.cs +++ b/ApplicationView/MenuRow/ApplicationMenuRow.cs @@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl LinkButtonFactory linkButtonFactory = new LinkButtonFactory(); - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; GuiWidget popUpAboutPage; diff --git a/ApplicationView/MenuRow/MenuOptionAction.cs b/ApplicationView/MenuRow/MenuOptionAction.cs index edd3f5ca7..421375553 100644 --- a/ApplicationView/MenuRow/MenuOptionAction.cs +++ b/ApplicationView/MenuRow/MenuOptionAction.cs @@ -15,7 +15,7 @@ namespace MatterHackers.MatterControl { public class MenuOptionAction : MenuBase { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public MenuOptionAction() : base("Actions".Localize()) { Name = "Actions Menu"; diff --git a/ApplicationView/TouchscreenTabView.cs b/ApplicationView/TouchscreenTabView.cs index da38e7f75..91f8c26c8 100644 --- a/ApplicationView/TouchscreenTabView.cs +++ b/ApplicationView/TouchscreenTabView.cs @@ -247,7 +247,7 @@ namespace MatterHackers.MatterControl } } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { diff --git a/ApplicationView/WidescreenPanel.cs b/ApplicationView/WidescreenPanel.cs index 0635d15ee..505a4e540 100644 --- a/ApplicationView/WidescreenPanel.cs +++ b/ApplicationView/WidescreenPanel.cs @@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl private GuiWidget leftBorderLine; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public static RootedObjectEventHandler PreChangePanels = new RootedObjectEventHandler(); diff --git a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs index 5e4ad9439..f81eee16b 100644 --- a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs +++ b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs @@ -18,7 +18,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage public class CalibrationSettingsWidget : SettingsViewBase { private DisableableWidget printLevelingContainer; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private EditLevelingSettingsWindow editLevelingSettingsWindow; private TextWidget printLevelingStatusLabel; Button runPrintLevelingButton; diff --git a/ConfigurationPage/CloudSettings/CloudSettingsView.cs b/ConfigurationPage/CloudSettings/CloudSettingsView.cs index 15921111c..05b3cb913 100644 --- a/ConfigurationPage/CloudSettings/CloudSettingsView.cs +++ b/ConfigurationPage/CloudSettings/CloudSettingsView.cs @@ -183,7 +183,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage } } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private void AddHandlers() { diff --git a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs index 83994e630..506ea3765 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs @@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling Vector3 lastDestinationWithLevelingApplied = new Vector3(); - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public RadialLevlingFunctions(int numberOfRadialSamples, PrintLevelingData levelingData, Vector2 bedCenter) { diff --git a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs index 90c2badb1..8556a4187 100644 --- a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs +++ b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs @@ -121,7 +121,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling this.container = container; } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { @@ -221,7 +221,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling AddTextField(setZHeightCoarseInstruction2, 10); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { diff --git a/ConfigurationPage/PrinterConfigurationPage.cs b/ConfigurationPage/PrinterConfigurationPage.cs index 7534c7c46..b534166b8 100644 --- a/ConfigurationPage/PrinterConfigurationPage.cs +++ b/ConfigurationPage/PrinterConfigurationPage.cs @@ -247,7 +247,7 @@ namespace MatterHackers.MatterControl this.linkButtonFactory.fontSize = 11; } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private void AddHandlers() { diff --git a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs index ace9cf560..02a2a5455 100644 --- a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs +++ b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs @@ -22,7 +22,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage private DisableableWidget eePromControlsContainer; private DisableableWidget terminalCommunicationsContainer; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public HardwareSettingsWidget() : base("Hardware".Localize()) diff --git a/ConfigurationPage/RunningMacroPage.cs b/ConfigurationPage/RunningMacroPage.cs index d32ab8c76..c2c3d9cc6 100644 --- a/ConfigurationPage/RunningMacroPage.cs +++ b/ConfigurationPage/RunningMacroPage.cs @@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl.PrinterControls } } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public static void Show(string message, bool showOkButton = false, bool showMaterialSelector = false, double expectedSeconds = 0, double expectedTemperature = 0) { diff --git a/CustomWidgets/ExportPrintItemWindow.cs b/CustomWidgets/ExportPrintItemWindow.cs index 18e6bd658..fe3b84c64 100644 --- a/CustomWidgets/ExportPrintItemWindow.cs +++ b/CustomWidgets/ExportPrintItemWindow.cs @@ -386,7 +386,7 @@ namespace MatterHackers.MatterControl base.OnClosed(e); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private void ReloadAfterPrinterProfileChanged(object sender, EventArgs e) { diff --git a/CustomWidgets/LibrarySelector/LibrarySelectorRowItem.cs b/CustomWidgets/LibrarySelector/LibrarySelectorRowItem.cs index 39157ceaf..ca71b594e 100644 --- a/CustomWidgets/LibrarySelector/LibrarySelectorRowItem.cs +++ b/CustomWidgets/LibrarySelector/LibrarySelectorRowItem.cs @@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.CustomWidgets.LibrarySelector private LinkButtonFactory linkButtonFactory = new LinkButtonFactory(); private GuiWidget thumbnailWidget; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public LibrarySelectorWidget libraryDataView { get; private set; } diff --git a/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs b/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs index cf838c41e..9fbceac2a 100644 --- a/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs +++ b/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs @@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.CustomWidgets.LibrarySelector public event Action SelectedIndexChanged; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public LibraryProvider CurrentLibraryProvider { diff --git a/CustomWidgets/PartThumbnailWidget.cs b/CustomWidgets/PartThumbnailWidget.cs index 866ca3025..ad8bdd9ab 100644 --- a/CustomWidgets/PartThumbnailWidget.cs +++ b/CustomWidgets/PartThumbnailWidget.cs @@ -157,7 +157,7 @@ namespace MatterHackers.MatterControl public event EventHandler DoneRendering; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public enum ImageSizes { Size50x50, Size115x115 }; diff --git a/CustomWidgets/PluginChooserWindow.cs b/CustomWidgets/PluginChooserWindow.cs index cccb9d54e..23a10d6d6 100644 --- a/CustomWidgets/PluginChooserWindow.cs +++ b/CustomWidgets/PluginChooserWindow.cs @@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.CreatorPlugins AddHandlers(); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; protected void AddHandlers() { diff --git a/CustomWidgets/PrintProgressBarWidget.cs b/CustomWidgets/PrintProgressBarWidget.cs index 0a629b67f..89b57a148 100644 --- a/CustomWidgets/PrintProgressBarWidget.cs +++ b/CustomWidgets/PrintProgressBarWidget.cs @@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl private RGBA_Bytes completeColor = new RGBA_Bytes(255, 255, 255); private TextWidget printTimeRemaining; private TextWidget printTimeElapsed; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private bool widgetIsExtended; private Agg.Image.ImageBuffer upImageBuffer; private Agg.Image.ImageBuffer downImageBuffer; diff --git a/EeProm/EePromMarlinWindow.cs b/EeProm/EePromMarlinWindow.cs index fe1be04c6..5196a6f56 100644 --- a/EeProm/EePromMarlinWindow.cs +++ b/EeProm/EePromMarlinWindow.cs @@ -73,7 +73,7 @@ namespace MatterHackers.MatterControl.EeProm private MHNumberEdit maxXYJerk; private MHNumberEdit maxZJerk; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory(); private double maxWidthOfLeftStuff = 0; diff --git a/EeProm/EePromRepetierWindow.cs b/EeProm/EePromRepetierWindow.cs index 017fc5826..f0c4da8f9 100644 --- a/EeProm/EePromRepetierWindow.cs +++ b/EeProm/EePromRepetierWindow.cs @@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl.EeProm private EePromRepetierStorage currentEePromSettings; private FlowLayoutWidget settingsColmun; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public EePromRepetierWindow() : base(650 * GuiWidget.DeviceScale, 480 * GuiWidget.DeviceScale) diff --git a/History/PrintHistoryDataView.cs b/History/PrintHistoryDataView.cs index 34e96c4f7..df7664a80 100644 --- a/History/PrintHistoryDataView.cs +++ b/History/PrintHistoryDataView.cs @@ -153,7 +153,7 @@ namespace MatterHackers.MatterControl.PrintHistory }); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { diff --git a/History/PrintHistoryListItem.cs b/History/PrintHistoryListItem.cs index 224b0043d..1c2499f85 100644 --- a/History/PrintHistoryListItem.cs +++ b/History/PrintHistoryListItem.cs @@ -312,7 +312,7 @@ namespace MatterHackers.MatterControl.PrintHistory this.Margin = new BorderDouble(6, 0, 6, 6); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private void AddHandlers() { diff --git a/Library/LibraryDataView.cs b/Library/LibraryDataView.cs index 5f8e047ed..19db32c72 100644 --- a/Library/LibraryDataView.cs +++ b/Library/LibraryDataView.cs @@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.PrintLibrary public event HoverValueChangedEventHandler HoverValueChanged; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public LibraryProvider CurrentLibraryProvider { diff --git a/Library/LibraryRowItem.cs b/Library/LibraryRowItem.cs index 462557227..89ce01384 100644 --- a/Library/LibraryRowItem.cs +++ b/Library/LibraryRowItem.cs @@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl.PrintLibrary private GuiWidget thumbnailWidget; protected GuiWidget middleColumn; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; /// /// Indicates that this item is a logical element meant to support the view or if it's a standard provider item diff --git a/Library/PrintLibraryWidget.cs b/Library/PrintLibraryWidget.cs index b348dd57a..1150c58e8 100644 --- a/Library/PrintLibraryWidget.cs +++ b/Library/PrintLibraryWidget.cs @@ -502,7 +502,7 @@ namespace MatterHackers.MatterControl.PrintLibrary } } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { diff --git a/Library/Provider/LibraryProviderSelector.cs b/Library/Provider/LibraryProviderSelector.cs index 6444de43a..b0db0dcef 100644 --- a/Library/Provider/LibraryProviderSelector.cs +++ b/Library/Provider/LibraryProviderSelector.cs @@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider public ILibraryCreator SharedLibraryCreator { get; private set; } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private List folderImagesForChildren = new List(); diff --git a/Library/Provider/LibraryProviderSqlite.cs b/Library/Provider/LibraryProviderSqlite.cs index e0c947022..a69d70c5d 100644 --- a/Library/Provider/LibraryProviderSqlite.cs +++ b/Library/Provider/LibraryProviderSqlite.cs @@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider ItemAdded.RegisterEvent(DatabaseFileChange, ref unregisterEvents); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void Dispose() { diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index 182b27d30..7e4fc4a2a 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -399,7 +399,7 @@ namespace MatterHackers.MatterControl } } - private event EventHandler unregisterEvent; + private EventHandler unregisterEvent; public static MatterControlApplication Instance { diff --git a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs index 61f446c7f..504c8109e 100644 --- a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs +++ b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs @@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow protected bool allowAutoRotate = false; public MeshViewerWidget meshViewerWidget; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; protected ViewControls3D viewControls3D; diff --git a/PartPreviewWindow/PartPreviewContent.cs b/PartPreviewWindow/PartPreviewContent.cs index 4cfd4d749..38155b6b9 100644 --- a/PartPreviewWindow/PartPreviewContent.cs +++ b/PartPreviewWindow/PartPreviewContent.cs @@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { public class PartPreviewContent : GuiWidget { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private View3DWidget partPreviewView; private ViewGcodeBasic viewGcodeBasic; diff --git a/PartPreviewWindow/PartPreviewMainWindow.cs b/PartPreviewWindow/PartPreviewMainWindow.cs index 0a2760407..89d293165 100644 --- a/PartPreviewWindow/PartPreviewMainWindow.cs +++ b/PartPreviewWindow/PartPreviewMainWindow.cs @@ -38,7 +38,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { public class PartPreviewMainWindow : SystemWindow { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private PartPreviewContent partPreviewWidget; diff --git a/PartPreviewWindow/ViewControls3D.cs b/PartPreviewWindow/ViewControls3D.cs index b75a56cbd..f32811788 100644 --- a/PartPreviewWindow/ViewControls3D.cs +++ b/PartPreviewWindow/ViewControls3D.cs @@ -201,7 +201,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow ActiveTheme.ThemeChanged.RegisterEvent(ThemeChanged, ref unregisterEvents); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { diff --git a/PrinterControls/ControlWidgets/AdjustmentControls.cs b/PrinterControls/ControlWidgets/AdjustmentControls.cs index 4c6362784..33e409f15 100644 --- a/PrinterControls/ControlWidgets/AdjustmentControls.cs +++ b/PrinterControls/ControlWidgets/AdjustmentControls.cs @@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.PrinterControls private readonly double minFeedRateRatio = .5; private readonly double maxFeedRateRatio = 2; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public AdjustmentControls() { diff --git a/PrinterControls/ControlWidgets/FanControls.cs b/PrinterControls/ControlWidgets/FanControls.cs index 9cc1f1ef2..66dbde191 100644 --- a/PrinterControls/ControlWidgets/FanControls.cs +++ b/PrinterControls/ControlWidgets/FanControls.cs @@ -37,7 +37,7 @@ namespace MatterHackers.MatterControl.PrinterControls { public class FanControls : ControlWidgetBase { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private EditableNumberDisplay fanSpeedDisplay; diff --git a/PrinterControls/ControlWidgets/MovementControls.cs b/PrinterControls/ControlWidgets/MovementControls.cs index 8e4731276..798e162d5 100644 --- a/PrinterControls/ControlWidgets/MovementControls.cs +++ b/PrinterControls/ControlWidgets/MovementControls.cs @@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.PrinterControls private LimitCallingFrequency reportDestinationChanged = null; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public static double XSpeed => ActiveSliceSettings.Instance.Helpers.GetMovementSpeeds()["x"]; diff --git a/PrinterControls/ControlWidgets/PowerControls.cs b/PrinterControls/ControlWidgets/PowerControls.cs index d64ab851d..577ab005d 100644 --- a/PrinterControls/ControlWidgets/PowerControls.cs +++ b/PrinterControls/ControlWidgets/PowerControls.cs @@ -38,7 +38,7 @@ namespace MatterHackers.MatterControl.PrinterControls { public class PowerControls : ControlWidgetBase { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private CheckBox atxPowertoggleSwitch; diff --git a/PrinterControls/ManualPrinterControls.cs b/PrinterControls/ManualPrinterControls.cs index a43850922..88f072f24 100644 --- a/PrinterControls/ManualPrinterControls.cs +++ b/PrinterControls/ManualPrinterControls.cs @@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl } } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public void AddPlugins() { AddPluginControls.CallEvents(this, null); diff --git a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs index 0f01fce0f..f8b3beb02 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs @@ -26,7 +26,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections private TextWidget printerComPortHelpMessage; private TextWidget printerComPortError; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; protected List SerialPortButtonsList = new List(); public SetupStepComPortManual() diff --git a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs index 9a218ae02..3426cfc27 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs @@ -18,7 +18,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections private Button connectButton; private TextWidget printerErrorMessage; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public SetupStepComPortTwo() { diff --git a/PrinterControls/TemperatureIndicator.cs b/PrinterControls/TemperatureIndicator.cs index f03ade9b8..bcdee766d 100644 --- a/PrinterControls/TemperatureIndicator.cs +++ b/PrinterControls/TemperatureIndicator.cs @@ -443,7 +443,7 @@ namespace MatterHackers.MatterControl get { return "Override the current extruder temperature. While printing, the extruder temperature is normally determined by the 'Slice Settings'."; } } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private void AddHandlers() { @@ -544,7 +544,7 @@ namespace MatterHackers.MatterControl get { return "Override the current bed temperature. While printing, the bed temperature is normally determined by the 'Slice Settings'."; } } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private void AddHandlers() { diff --git a/PrinterControls/TerminalWindow/PrinterOutputCache.cs b/PrinterControls/TerminalWindow/PrinterOutputCache.cs index f650f85ec..710bcdd18 100644 --- a/PrinterControls/TerminalWindow/PrinterOutputCache.cs +++ b/PrinterControls/TerminalWindow/PrinterOutputCache.cs @@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl public RootedObjectEventHandler HasChanged = new RootedObjectEventHandler(); private int maxLinesToBuffer = int.MaxValue - 1; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private PrinterOutputCache() { diff --git a/PrinterControls/TerminalWindow/TextScrollWidget.cs b/PrinterControls/TerminalWindow/TextScrollWidget.cs index c75255c39..3034eddf0 100644 --- a/PrinterControls/TerminalWindow/TextScrollWidget.cs +++ b/PrinterControls/TerminalWindow/TextScrollWidget.cs @@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl private string[] StartLineStringFilters = null; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private List allSourceLines; private List visibleLines; diff --git a/PrinterControls/XYZJogControls.cs b/PrinterControls/XYZJogControls.cs index 5b2df306f..02386facf 100644 --- a/PrinterControls/XYZJogControls.cs +++ b/PrinterControls/XYZJogControls.cs @@ -61,7 +61,7 @@ namespace MatterHackers.MatterControl private MoveButtonFactory moveButtonFactory = new MoveButtonFactory(); - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public JogControls(XYZColors colors) { diff --git a/Queue/QueueData.cs b/Queue/QueueData.cs index 66fc9e522..5379793e6 100644 --- a/Queue/QueueData.cs +++ b/Queue/QueueData.cs @@ -287,7 +287,7 @@ namespace MatterHackers.MatterControl.PrintQueue private bool gotBeginFileList = false; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public void LoadFilesFromSD() { diff --git a/Queue/QueueDataView.cs b/Queue/QueueDataView.cs index 201aa84bc..7bbe5f2a3 100644 --- a/Queue/QueueDataView.cs +++ b/Queue/QueueDataView.cs @@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl.PrintQueue { public class QueueDataView : ScrollableWidget { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; // make this private so it can only be built from the Instance private void SetDisplayAttributes() diff --git a/Queue/QueueDataWidget.cs b/Queue/QueueDataWidget.cs index 1d6990e8d..5b84a9639 100644 --- a/Queue/QueueDataWidget.cs +++ b/Queue/QueueDataWidget.cs @@ -274,7 +274,7 @@ namespace MatterHackers.MatterControl.PrintQueue public delegate void SendButtonAction(object state, List sendItems); - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public void CreateCopyInQueue() { diff --git a/Queue/QueueRowItem.cs b/Queue/QueueRowItem.cs index 249ef010e..1546ea997 100644 --- a/Queue/QueueRowItem.cs +++ b/Queue/QueueRowItem.cs @@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl.PrintQueue ConstructPrintQueueItem(); } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public bool IsHoverItem { diff --git a/SetupWizard/AndroidConnectDevicePage.cs b/SetupWizard/AndroidConnectDevicePage.cs index 7ce918959..4a9a88da0 100644 --- a/SetupWizard/AndroidConnectDevicePage.cs +++ b/SetupWizard/AndroidConnectDevicePage.cs @@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl { public class AndroidConnectDevicePage : WizardPage { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private TextWidget generalError; diff --git a/SetupWizard/AndroidSetupOptionsPage.cs b/SetupWizard/AndroidSetupOptionsPage.cs index e690b5c93..b236659b4 100644 --- a/SetupWizard/AndroidSetupOptionsPage.cs +++ b/SetupWizard/AndroidSetupOptionsPage.cs @@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl { public class SetupOptionsPage : WizardPage { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public SetupOptionsPage() : base("Done") @@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl private Button disconnectButton; private TextWidget connectionStatus; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public SetupPrinterView(TextImageButtonFactory textImageButtonFactory) : base("Printer Profile") @@ -139,7 +139,7 @@ namespace MatterHackers.MatterControl public class SetupAccountView : SetupViewBase { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private Button signInButton; private Button signOutButton; private TextWidget statusMessage; diff --git a/SetupWizard/SetupWizardTroubleshooting.cs b/SetupWizard/SetupWizardTroubleshooting.cs index 111b33a5e..83f1e5beb 100644 --- a/SetupWizard/SetupWizardTroubleshooting.cs +++ b/SetupWizard/SetupWizardTroubleshooting.cs @@ -24,7 +24,7 @@ namespace MatterHackers.MatterControl { private Button nextButton; - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; private CriteriaRow connectToPrinterRow; diff --git a/SetupWizard/WizardWindow.cs b/SetupWizard/WizardWindow.cs index 6103aa8a6..8d155f227 100644 --- a/SetupWizard/WizardWindow.cs +++ b/SetupWizard/WizardWindow.cs @@ -14,7 +14,7 @@ namespace MatterHackers.MatterControl { public class WizardWindow : SystemWindow { - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public static Func ShouldShowAuthPanel { get; set; } public static Action ShowAuthDialog; public static Action ChangeToAccountCreate; diff --git a/SlicerConfiguration/SettingsControlSelectors.cs b/SlicerConfiguration/SettingsControlSelectors.cs index 6b2ac22ef..7183ea770 100644 --- a/SlicerConfiguration/SettingsControlSelectors.cs +++ b/SlicerConfiguration/SettingsControlSelectors.cs @@ -399,7 +399,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration return dropDownList; } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index 9d64f2404..92457a1db 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -282,7 +282,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; public override void OnClosed(EventArgs e) { @@ -611,7 +611,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { public string SettingsKey { get; set; } public string SettingsValue { get; set; } - private event EventHandler unregisterEvents; + private EventHandler unregisterEvents; /// /// Gets or sets the delegate to be invoked when the settings values need to be refreshed. The implementation should diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 0184b613a..d2768d80e 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 0184b613a0c9b3306393090353dee8101199e5ce +Subproject commit d2768d80ebff5c9d788fed5764e6057eb5fdfde8