universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use nameof() instead of hardcoding widget name - that way if we ever need to change it we can just do a simple refactor

Browse Source
This commit is contained in:
Michael Becker 2020-05-10 21:24:26 -04:00
parent 7025bb400f
commit 8f2fd6837f
No known key found for this signature in database
GPG Key ID: 506F54899E2BFED7
6 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
View File

@ -92,7 +92,7 @@ namespace UniversalEditor.UserInterface.Dialogs
private Accessor mvarAccessor = null;
public Accessor Accessor { get { return mvarAccessor; } set { mvarAccessor = value; mvarInitialAccesor = value; } }
[EventHandler("cmdObjectModel", "Click")]
[EventHandler(nameof(cmdObjectModel), "Click")]
private void cmdObjectModel_Click(object sender, EventArgs e)
{
GenericBrowserPopup<ObjectModel, ObjectModelReference> popup = new GenericBrowserPopup<ObjectModel, ObjectModelReference>();
@ -222,7 +222,7 @@ namespace UniversalEditor.UserInterface.Dialogs
RefreshButtons();
}
[EventHandler("cmdDataFormat", "Click")]
[EventHandler(nameof(cmdDataFormat), "Click")]
private void cmdDataFormat_Click(object sender, EventArgs e)
{
GenericBrowserPopup<DataFormat, DataFormatReference> popup = new GenericBrowserPopup<DataFormat, DataFormatReference>();
@ -296,7 +296,7 @@ namespace UniversalEditor.UserInterface.Dialogs
popup.ShowDialog();
}
[EventHandler("cmdAccessor", "Click")]
[EventHandler(nameof(cmdAccessor), "Click")]
private void cmdAccessor_Click(object sender, EventArgs e)
{
GenericBrowserPopup<Accessor, AccessorReference> dlg = new GenericBrowserPopup<Accessor, AccessorReference>();

7
Libraries/UniversalEditor.UserInterface/Dialogs/ManageBookmarksDialog.cs
View File

@ -35,6 +35,7 @@ namespace UniversalEditor.UserInterface.Dialogs
{
private ListView tv;
private DefaultTreeModel tm;
private Button cmdOK;
private System.Collections.Specialized.StringCollection _FileNames = new System.Collections.Specialized.StringCollection();
@ -60,7 +61,7 @@ namespace UniversalEditor.UserInterface.Dialogs
DefaultButton = Buttons[0];
}
[EventHandler("cmdOK", "Click")]
[EventHandler(nameof(cmdOK), "Click")]
private void cmdOK_Click(object sender, EventArgs e)
{
Engine.CurrentEngine.BookmarksManager.FileNames.Clear();
@ -71,7 +72,7 @@ namespace UniversalEditor.UserInterface.Dialogs
Close();
}
[EventHandler("tv", "KeyDown")]
[EventHandler(nameof(tv), "KeyDown")]
private void tv_KeyDown(object sender, KeyEventArgs e)
{
switch (e.Key)
@ -101,7 +102,7 @@ namespace UniversalEditor.UserInterface.Dialogs
}
}
[EventHandler("tv", "RowActivated")]
[EventHandler(nameof(tv), "RowActivated")]
private void tv_RowActivated(object sender, ListViewRowActivatedEventArgs e)
{
int index = e.Row.GetExtraData<int>("index");

12
Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
View File

@ -39,6 +39,8 @@ namespace UniversalEditor.UserInterface.Dialogs
[ContainerLayout("~/Dialogs/NewDialog.glade", "GtkDialog")]
public class NewDialog : Dialog
{
private Button cmdOK;
private TextBox txtFileName;
private TextBox txtFilePath;
@ -227,7 +229,7 @@ namespace UniversalEditor.UserInterface.Dialogs
InitializeObjectModelTreeViewRow(tm, row, omr, index + 1);
}
[EventHandler("cmdOK", "Click")]
[EventHandler(nameof(cmdOK), "Click")]
private void cmdOK_Click(object sender, EventArgs e)
{
SolutionTitle = txtSolutionName.Text;
@ -360,7 +362,7 @@ namespace UniversalEditor.UserInterface.Dialogs
return null;
}
[EventHandler("txtSearch", "Changed")]
[EventHandler(nameof(txtSearch), "Changed")]
private void txtSearch_Changed(object sender, EventArgs e)
{
InitializeTreeView();
@ -485,7 +487,7 @@ namespace UniversalEditor.UserInterface.Dialogs
}
}
[EventHandler("tvObjectModel", "SelectionChanged")]
[EventHandler(nameof(tvObjectModel), "SelectionChanged")]
private void tvObjectModel_SelectionChanged(object sender, EventArgs e)
{
if (tvObjectModel.SelectedRows.Count < 1) return;
@ -508,7 +510,7 @@ namespace UniversalEditor.UserInterface.Dialogs
}
}
[EventHandler("tvTemplate", "SelectionChanged")]
[EventHandler(nameof(tvTemplate), "SelectionChanged")]
private void tvTemplate_SelectionChanged(object sender, EventArgs e)
{
Buttons[0].Enabled = (tvTemplate.SelectedRows.Count > 0);
@ -540,7 +542,7 @@ namespace UniversalEditor.UserInterface.Dialogs
}
}
}
[EventHandler("tvTemplate", "RowActivated")]
[EventHandler(nameof(tvTemplate), "RowActivated")]
private void tvTemplate_RowActivated(object sender, ListViewRowActivatedEventArgs e)
{
cmdOK_Click(sender, e);

30
Libraries/UniversalEditor.UserInterface/Editors/Binary/BinaryEditor.cs
View File

@ -502,34 +502,34 @@ namespace UniversalEditor.Editors.Binary
}
}
[EventHandler("cboEndianness", "Changed")]
[EventHandler(nameof(cboEndianness), "Changed")]
private void cboEndianness_Changed(object sender, EventArgs e)
{
Endianness = cboEndianness.SelectedItem.GetExtraData<IO.Endianness>("value", IO.Endianness.LittleEndian);
}
[EventHandler("txtStart", "Changed")]
[EventHandler(nameof(txtStart), "Changed")]
private void txtStart_Changed(object sender, EventArgs e)
{
hexedit.SelectionStart = new HexEditorPosition((int)txtStart.Value, 0);
}
[EventHandler("txtEnd", "Changed")]
[EventHandler(nameof(txtEnd), "Changed")]
private void txtEnd_Changed(object sender, EventArgs e)
{
hexedit.SelectionLength = new HexEditorPosition((int)txtEnd.Value - hexedit.SelectionStart, 0);
}
[EventHandler("txtLength", "Changed")]
[EventHandler(nameof(txtLength), "Changed")]
private void txtLength_Changed(object sender, EventArgs e)
{
hexedit.SelectionLength = new HexEditorPosition((int)txtLength.Value, 0);
}
[EventHandler("hexedit", "Changing")]
[EventHandler(nameof(hexedit), "Changing")]
private void hexedit_Changing(object sender, System.ComponentModel.CancelEventArgs e)
{
BeginEdit();
}
[EventHandler("hexedit", "Changed")]
[EventHandler(nameof(hexedit), "Changed")]
private void hexedit_Changed(object sender, EventArgs e)
{
EndEdit();
@ -544,7 +544,7 @@ namespace UniversalEditor.Editors.Binary
}
[EventHandler("lvFieldDefinitions", "RowActivated")]
[EventHandler(nameof(lvFieldDefinitions), "RowActivated")]
private void lvFieldDefinitions_RowActivated(object sender, ListViewRowActivatedEventArgs e)
{
tsbFieldDefinitionEdit_Click(sender, e);
@ -579,7 +579,7 @@ namespace UniversalEditor.Editors.Binary
return String.Empty;
}
[EventHandler("tsbFieldDefinitionAdd", "Click")]
// [EventHandler(nameof(tsbFieldDefinitionAdd), "Click")]
private void tsbFieldDefinitionAdd_Click(object sender, EventArgs e)
{
FieldDefinitionPropertiesDialog2 dlg = new FieldDefinitionPropertiesDialog2();
@ -598,7 +598,7 @@ namespace UniversalEditor.Editors.Binary
hexedit.HighlightAreas.Add(new HexEditorHighlightArea(dlg.FieldDefinition.Name, dlg.FieldDefinition.Name, dlg.FieldDefinition.Offset, dlg.FieldDefinition.DataTypeSize, dlg.FieldDefinition.Color));
}
}
[EventHandler("tsbFieldDefinitionEdit", "Click")]
// [EventHandler(nameof(tsbFieldDefinitionEdit), "Click")]
private void tsbFieldDefinitionEdit_Click(object sender, EventArgs e)
{
if (lvFieldDefinitions.SelectedRows.Count != 1)
@ -627,11 +627,11 @@ namespace UniversalEditor.Editors.Binary
}
}
}
[EventHandler("tsbFieldDefinitionRemove", "Click")]
// [EventHandler(nameof(tsbFieldDefinitionRemove), "Click")]
private void tsbFieldDefinitionRemove_Click(object sender, EventArgs e)
{
}
[EventHandler("tsbFieldDefinitionLoad", "Click")]
// [EventHandler(nameof(tsbFieldDefinitionLoad), "Click")]
private void tsbFieldDefinitionLoad_Click(object sender, EventArgs e)
{
FileDialog dlg = new FileDialog();
@ -649,7 +649,7 @@ namespace UniversalEditor.Editors.Binary
}
}
void Txt_KeyDown(object sender, MBS.Framework.UserInterface.Input.Keyboard.KeyEventArgs e)
private void Txt_KeyDown(object sender, MBS.Framework.UserInterface.Input.Keyboard.KeyEventArgs e)
{
if (e.Key == MBS.Framework.UserInterface.Input.Keyboard.KeyboardKey.Enter)
{
@ -717,7 +717,7 @@ namespace UniversalEditor.Editors.Binary
}
void Txt_LostFocus(object sender, EventArgs e)
private void Txt_LostFocus(object sender, EventArgs e)
{
HexEditorHighlightArea area = hexedit.HighlightAreas["conversion"];
if (area != null)
@ -725,7 +725,7 @@ namespace UniversalEditor.Editors.Binary
}
void Txt_GotFocus(object sender, EventArgs e)
private void Txt_GotFocus(object sender, EventArgs e)
{
TextBox ctl = sender as TextBox;
CONVERSION_DATA converter = ctl.GetExtraData<CONVERSION_DATA>("converter");
@ -740,7 +740,7 @@ namespace UniversalEditor.Editors.Binary
hexedit.HighlightAreas["conversion"] = area;
}
[EventHandler("hexedit", "SelectionChanged")]
[EventHandler(nameof(hexedit), "SelectionChanged")]
private void Hexedit_SelectionChanged(object sender, EventArgs e)
{
// this actually worked on the very first try. holy crap.

7
Libraries/UniversalEditor.UserInterface/Editors/Binary/FieldDefinitionPropertiesDialog.cs
View File

@ -38,6 +38,7 @@ namespace UniversalEditor.Editors.Binary
private Label lblLength;
private NumericTextBox txtLength;
private Button cmdColor;
// private Button cmdOK;
public FieldDefinition FieldDefinition { get; set; } = new FieldDefinition();
@ -66,7 +67,7 @@ namespace UniversalEditor.Editors.Binary
}
}
[EventHandler("cboDataType", "Changed")]
[EventHandler(nameof(cboDataType), "Changed")]
private void cboDataType_Changed(object sender, EventArgs e)
{
if (cboDataType.SelectedItem == null) return;
@ -86,7 +87,7 @@ namespace UniversalEditor.Editors.Binary
}
}
[EventHandler("cmdColor", "Click")]
[EventHandler(nameof(cmdColor), "Click")]
private void cmdColor_Click(object sender, EventArgs e)
{
ColorDialog dlg = new ColorDialog();
@ -97,7 +98,7 @@ namespace UniversalEditor.Editors.Binary
}
}
[EventHandler("cmdOK", "Click")]
// [EventHandler(nameof(cmdOK), "Click")]
private void cmdOK_Click(object sender, EventArgs e)
{
FieldDefinition.Name = txtName.Text;

8
Libraries/UniversalEditor.UserInterface/Editors/RIFF/Dialogs/RIFFChunkPropertiesDialog.cs
View File

@ -39,6 +39,8 @@ namespace UniversalEditor.Editors.RIFF.Dialogs
private ComboBox cboTypeID;
private HexEditorControl hexData;
private Disclosure dscData;
private Button cmdImportData;
private Button cmdExportData;
public RIFFChunk Chunk { get; set; } = null;
@ -87,7 +89,7 @@ namespace UniversalEditor.Editors.RIFF.Dialogs
this.Close();
}
[EventHandler("cboChunkType", "Changed")]
[EventHandler(nameof(cboChunkType), "Changed")]
private void cboChunkType_Changed(object sender, EventArgs e)
{
if (cboChunkType.SelectedItem == (cboChunkType.Model as DefaultTreeModel).Rows[0])
@ -106,7 +108,7 @@ namespace UniversalEditor.Editors.RIFF.Dialogs
}
}
[EventHandler("cmdImportData", "Click")]
[EventHandler(nameof(cmdImportData), "Click")]
private void cmdImportData_Click(object sender, EventArgs e)
{
FileDialog dlg = new FileDialog();
@ -117,7 +119,7 @@ namespace UniversalEditor.Editors.RIFF.Dialogs
}
}
[EventHandler("cmdExportData", "Click")]
[EventHandler(nameof(cmdExportData), "Click")]
private void cmdExportData_Click(object sender, EventArgs e)
{
FileDialog dlg = new FileDialog();