Remove event keyword from private fields

This commit is contained in:
John Lewin 2016-12-29 06:55:12 -08:00
parent 09178e11d5
commit 535a161115
66 changed files with 72 additions and 72 deletions

View file

@ -333,7 +333,7 @@ namespace MatterHackers.MatterControl.ContactForm
MinimumSize = new Vector2(500, 550);
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private void AddHandlers()
{

View file

@ -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();

View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl
this.Create();
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public void Create()
{

View file

@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.ActionBar
AddHandlers();
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public override void OnClosed(EventArgs e)
{

View file

@ -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

View file

@ -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()

View file

@ -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)

View file

@ -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)
{

View file

@ -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();

View file

@ -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;

View file

@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl
{
public class CompactSlidePanel : SlidePanel
{
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private TabControl mainControlsTabControl;
public TabPage QueueTabPage;

View file

@ -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)
{

View file

@ -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

View file

@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl
LinkButtonFactory linkButtonFactory = new LinkButtonFactory();
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
GuiWidget popUpAboutPage;

View file

@ -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";

View file

@ -247,7 +247,7 @@ namespace MatterHackers.MatterControl
}
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public override void OnClosed(EventArgs e)
{

View file

@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl
private GuiWidget leftBorderLine;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public static RootedObjectEventHandler PreChangePanels = new RootedObjectEventHandler();

View file

@ -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;

View file

@ -183,7 +183,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
}
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private void AddHandlers()
{

View file

@ -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)
{

View file

@ -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)
{

View file

@ -247,7 +247,7 @@ namespace MatterHackers.MatterControl
this.linkButtonFactory.fontSize = 11;
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private void AddHandlers()
{

View file

@ -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())

View file

@ -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)
{

View file

@ -386,7 +386,7 @@ namespace MatterHackers.MatterControl
base.OnClosed(e);
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private void ReloadAfterPrinterProfileChanged(object sender, EventArgs e)
{

View file

@ -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; }

View file

@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.CustomWidgets.LibrarySelector
public event Action<object, EventArgs> SelectedIndexChanged;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public LibraryProvider CurrentLibraryProvider
{

View file

@ -157,7 +157,7 @@ namespace MatterHackers.MatterControl
public event EventHandler<StringEventArgs> DoneRendering;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public enum ImageSizes { Size50x50, Size115x115 };

View file

@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.CreatorPlugins
AddHandlers();
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
protected void AddHandlers()
{

View file

@ -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;

View file

@ -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;

View file

@ -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)

View file

@ -153,7 +153,7 @@ namespace MatterHackers.MatterControl.PrintHistory
});
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public override void OnClosed(EventArgs e)
{

View file

@ -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()
{

View file

@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
public event HoverValueChangedEventHandler HoverValueChanged;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public LibraryProvider CurrentLibraryProvider
{

View file

@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
private GuiWidget thumbnailWidget;
protected GuiWidget middleColumn;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
/// <summary>
/// Indicates that this item is a logical element meant to support the view or if it's a standard provider item

View file

@ -502,7 +502,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
}
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public override void OnClosed(EventArgs e)
{

View file

@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
public ILibraryCreator SharedLibraryCreator { get; private set; }
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private List<ImageBuffer> folderImagesForChildren = new List<ImageBuffer>();

View file

@ -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()
{

View file

@ -399,7 +399,7 @@ namespace MatterHackers.MatterControl
}
}
private event EventHandler unregisterEvent;
private EventHandler unregisterEvent;
public static MatterControlApplication Instance
{

View file

@ -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;

View file

@ -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;

View file

@ -38,7 +38,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class PartPreviewMainWindow : SystemWindow
{
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private PartPreviewContent partPreviewWidget;

View file

@ -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)
{

View file

@ -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()
{

View file

@ -37,7 +37,7 @@ namespace MatterHackers.MatterControl.PrinterControls
{
public class FanControls : ControlWidgetBase
{
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private EditableNumberDisplay fanSpeedDisplay;

View file

@ -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"];

View file

@ -38,7 +38,7 @@ namespace MatterHackers.MatterControl.PrinterControls
{
public class PowerControls : ControlWidgetBase
{
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private CheckBox atxPowertoggleSwitch;

View file

@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl
}
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public void AddPlugins()
{
AddPluginControls.CallEvents(this, null);

View file

@ -26,7 +26,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private TextWidget printerComPortHelpMessage;
private TextWidget printerComPortError;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
protected List<SerialPortIndexRadioButton> SerialPortButtonsList = new List<SerialPortIndexRadioButton>();
public SetupStepComPortManual()

View file

@ -18,7 +18,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private Button connectButton;
private TextWidget printerErrorMessage;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public SetupStepComPortTwo()
{

View file

@ -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()
{

View file

@ -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()
{

View file

@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl
private string[] StartLineStringFilters = null;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private List<string> allSourceLines;
private List<string> visibleLines;

View file

@ -61,7 +61,7 @@ namespace MatterHackers.MatterControl
private MoveButtonFactory moveButtonFactory = new MoveButtonFactory();
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public JogControls(XYZColors colors)
{

View file

@ -287,7 +287,7 @@ namespace MatterHackers.MatterControl.PrintQueue
private bool gotBeginFileList = false;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public void LoadFilesFromSD()
{

View file

@ -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()

View file

@ -274,7 +274,7 @@ namespace MatterHackers.MatterControl.PrintQueue
public delegate void SendButtonAction(object state, List<PrintItemWrapper> sendItems);
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public void CreateCopyInQueue()
{

View file

@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl.PrintQueue
ConstructPrintQueueItem();
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public bool IsHoverItem
{

View file

@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl
{
public class AndroidConnectDevicePage : WizardPage
{
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private TextWidget generalError;

View file

@ -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;

View file

@ -24,7 +24,7 @@ namespace MatterHackers.MatterControl
{
private Button nextButton;
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
private CriteriaRow connectToPrinterRow;

View file

@ -14,7 +14,7 @@ namespace MatterHackers.MatterControl
{
public class WizardWindow : SystemWindow
{
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public static Func<bool> ShouldShowAuthPanel { get; set; }
public static Action ShowAuthDialog;
public static Action ChangeToAccountCreate;

View file

@ -399,7 +399,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return dropDownList;
}
private event EventHandler unregisterEvents;
private EventHandler unregisterEvents;
public override void OnClosed(EventArgs e)
{

View file

@ -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;
/// <summary>
/// Gets or sets the delegate to be invoked when the settings values need to be refreshed. The implementation should

@ -1 +1 @@
Subproject commit 0184b613a0c9b3306393090353dee8101199e5ce
Subproject commit d2768d80ebff5c9d788fed5764e6057eb5fdfde8