ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanups

This commit is contained in:
adelikat 2020-11-27 15:07:10 -06:00
parent e640b11e49
commit 0223c11504
3 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs
View File

@ -105,8 +105,8 @@ namespace BizHawk.Client.EmuHawk
public void DeduceFormat(string commandline)
{
string formatkey = "-f ";
Extension = commandline.Substring(commandline.IndexOf(formatkey) + formatkey.Length);
string formatKey = "-f ";
Extension = commandline.Substring(commandline.IndexOf(formatKey) + formatKey.Length);
// are there other formats that don't match their file extensions?
if (Extension == "matroska")

34
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs generated
View File

@ -101,10 +101,10 @@ namespace BizHawk.Client.EmuHawk
this.lvFirmwares.UseCompatibleStateImageBehavior = false;
this.lvFirmwares.View = System.Windows.Forms.View.Details;
this.lvFirmwares.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.lvFirmwares_ColumnClick);
this.lvFirmwares.DragDrop += new System.Windows.Forms.DragEventHandler(this.lvFirmwares_DragDrop);
this.lvFirmwares.DragEnter += new System.Windows.Forms.DragEventHandler(this.lvFirmwares_DragEnter);
this.lvFirmwares.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvFirmwares_KeyDown);
this.lvFirmwares.MouseClick += new System.Windows.Forms.MouseEventHandler(this.lvFirmwares_MouseClick);
this.lvFirmwares.DragDrop += new System.Windows.Forms.DragEventHandler(this.LvFirmwares_DragDrop);
this.lvFirmwares.DragEnter += new System.Windows.Forms.DragEventHandler(this.LvFirmwares_DragEnter);
this.lvFirmwares.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LvFirmwares_KeyDown);
this.lvFirmwares.MouseClick += new System.Windows.Forms.MouseEventHandler(this.LvFirmwares_MouseClick);
//
// columnHeader5
//
@ -152,27 +152,27 @@ namespace BizHawk.Client.EmuHawk
this.tsmiCopy});
this.lvFirmwaresContextMenuStrip.Name = "lvFirmwaresContextMenuStrip";
this.lvFirmwaresContextMenuStrip.Size = new System.Drawing.Size(182, 92);
this.lvFirmwaresContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.lvFirmwaresContextMenuStrip_Opening);
this.lvFirmwaresContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.LvFirmwaresContextMenuStrip_Opening);
//
// tsmiSetCustomization
//
this.tsmiSetCustomization.Text = "&Set Customization";
this.tsmiSetCustomization.Click += new System.EventHandler(this.tsmiSetCustomization_Click);
this.tsmiSetCustomization.Click += new System.EventHandler(this.TsmiSetCustomization_Click);
//
// tsmiClearCustomization
//
this.tsmiClearCustomization.Text = "C&lear Customization";
this.tsmiClearCustomization.Click += new System.EventHandler(this.tsmiClearCustomization_Click);
this.tsmiClearCustomization.Click += new System.EventHandler(this.TsmiClearCustomization_Click);
//
// tsmiInfo
//
this.tsmiInfo.Text = "&Info";
this.tsmiInfo.Click += new System.EventHandler(this.tsmiInfo_Click);
this.tsmiInfo.Click += new System.EventHandler(this.TsmiInfo_Click);
//
// tsmiCopy
//
this.tsmiCopy.Text = "&Copy";
this.tsmiCopy.Click += new System.EventHandler(this.tsmiCopy_Click);
this.tsmiCopy.Click += new System.EventHandler(this.TsmiCopy_Click);
//
// panel1
//
@ -210,7 +210,7 @@ namespace BizHawk.Client.EmuHawk
this.tbbGroup.Name = "tbbGroup";
this.tbbGroup.Size = new System.Drawing.Size(44, 22);
this.tbbGroup.Text = "Group";
this.tbbGroup.Click += new System.EventHandler(this.tbbGroup_Click);
this.tbbGroup.Click += new System.EventHandler(this.TbbGroup_Click);
//
// tbbScan
//
@ -219,7 +219,7 @@ namespace BizHawk.Client.EmuHawk
this.tbbScan.Name = "tbbScan";
this.tbbScan.Size = new System.Drawing.Size(36, 22);
this.tbbScan.Text = "Scan";
this.tbbScan.Click += new System.EventHandler(this.tbbScan_Click);
this.tbbScan.Click += new System.EventHandler(this.TbbScan_Click);
//
// tbbOrganize
//
@ -228,7 +228,7 @@ namespace BizHawk.Client.EmuHawk
this.tbbOrganize.Name = "tbbOrganize";
this.tbbOrganize.Size = new System.Drawing.Size(58, 22);
this.tbbOrganize.Text = "Organize";
this.tbbOrganize.Click += new System.EventHandler(this.tbbOrganize_Click);
this.tbbOrganize.Click += new System.EventHandler(this.TbbOrganize_Click);
//
// tbbImport
//
@ -237,7 +237,7 @@ namespace BizHawk.Client.EmuHawk
this.tbbImport.Name = "tbbImport";
this.tbbImport.Size = new System.Drawing.Size(47, 22);
this.tbbImport.Text = "Import";
this.tbbImport.Click += new System.EventHandler(this.tbbImport_Click);
this.tbbImport.Click += new System.EventHandler(this.TbbImport_Click);
//
// tbbClose
//
@ -248,7 +248,7 @@ namespace BizHawk.Client.EmuHawk
this.tbbClose.Name = "tbbClose";
this.tbbClose.Size = new System.Drawing.Size(40, 22);
this.tbbClose.Text = "Close";
this.tbbClose.Click += new System.EventHandler(this.tbbClose_Click);
this.tbbClose.Click += new System.EventHandler(this.TbbClose_Click);
this.toolStripSeparator1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator1.Visible = false;
//
@ -263,7 +263,7 @@ namespace BizHawk.Client.EmuHawk
this.tbbCloseReload.Text = "Close and reload ROM";
this.tbbCloseReload.ToolTipText = "Close and reload ROM";
this.tbbCloseReload.Visible = false;
this.tbbCloseReload.Click += new System.EventHandler(this.tbbCloseReload_Click);
this.tbbCloseReload.Click += new System.EventHandler(this.TbbCloseReload_Click);
//
// tbbOpenFolder
//
@ -272,7 +272,7 @@ namespace BizHawk.Client.EmuHawk
this.tbbOpenFolder.Name = "tbbOpenFolder";
this.tbbOpenFolder.Size = new System.Drawing.Size(128, 22);
this.tbbOpenFolder.Text = "Open Firmware Folder";
this.tbbOpenFolder.Click += new System.EventHandler(this.tbbOpenFolder_Click);
this.tbbOpenFolder.Click += new System.EventHandler(this.TbbOpenFolder_Click);
//
// tableLayoutPanel1
//
@ -313,7 +313,7 @@ namespace BizHawk.Client.EmuHawk
this.linkBasePath.TabIndex = 27;
this.linkBasePath.TabStop = true;
this.linkBasePath.Text = "linkLabel1";
this.linkBasePath.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkBasePath_LinkClicked);
this.linkBasePath.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkBasePath_LinkClicked);
//
// label1
//

39
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -207,14 +207,13 @@ namespace BizHawk.Client.EmuHawk
toolStrip1.Items.Add(host);
}
private void tbbClose_Click(object sender, EventArgs e)
private void TbbClose_Click(object sender, EventArgs e)
{
this.Close();
DialogResult = DialogResult.Cancel;
}
private void tbbCloseReload_Click(object sender, EventArgs e)
private void TbbCloseReload_Click(object sender, EventArgs e)
{
this.Close();
DialogResult = DialogResult.Retry;
@ -227,7 +226,7 @@ namespace BizHawk.Client.EmuHawk
_boldFixedFont.Dispose();
}
private void tbbGroup_Click(object sender, EventArgs e)
private void TbbGroup_Click(object sender, EventArgs e)
{
// toggle the grouping state
lvFirmwares.ShowGroups = !lvFirmwares.ShowGroups;
@ -246,7 +245,7 @@ namespace BizHawk.Client.EmuHawk
lvFirmwares.Sort();
}
private void tbbScan_Click(object sender, EventArgs e)
private void TbbScan_Click(object sender, EventArgs e)
{
// user-initiated scan
DoScan();
@ -308,12 +307,12 @@ namespace BizHawk.Client.EmuHawk
// bolden the item if necessary
if (bolden)
{
foreach (ListViewItem.ListViewSubItem lvsi in lvi.SubItems) lvsi.Font = _boldFont;
foreach (ListViewItem.ListViewSubItem subItem in lvi.SubItems) subItem.Font = _boldFont;
lvi.SubItems[6].Font = _boldFixedFont;
}
else
{
foreach (ListViewItem.ListViewSubItem lvsi in lvi.SubItems) lvsi.Font = lvFirmwares.Font;
foreach (ListViewItem.ListViewSubItem subItem in lvi.SubItems) subItem.Font = lvFirmwares.Font;
lvi.SubItems[6].Font = _fixedFont;
}
@ -345,7 +344,7 @@ namespace BizHawk.Client.EmuHawk
lvFirmwares.EndUpdate();
}
private void tbbOrganize_Click(object sender, EventArgs e)
private void TbbOrganize_Click(object sender, EventArgs e)
{
if (MessageBox.Show(this, "This is going to move/rename every automatically-selected firmware file under your configured firmwares directory to match our recommended organizational scheme (which is not super great right now). Proceed?", "Firmwares Organization Confirm", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
{
@ -379,7 +378,7 @@ namespace BizHawk.Client.EmuHawk
DoScan();
}
private void tbbOpenFolder_Click(object sender, EventArgs e)
private void TbbOpenFolder_Click(object sender, EventArgs e)
{
var frmWares = _config.PathEntries.FirmwareAbsolutePath();
if (!Directory.Exists(frmWares))
@ -390,7 +389,7 @@ namespace BizHawk.Client.EmuHawk
System.Diagnostics.Process.Start(frmWares);
}
private void lvFirmwares_KeyDown(object sender, KeyEventArgs e)
private void LvFirmwares_KeyDown(object sender, KeyEventArgs e)
{
if (e.IsCtrl(Keys.C))
{
@ -404,13 +403,13 @@ namespace BizHawk.Client.EmuHawk
if (str.Length > 0) Clipboard.SetDataObject(str);
}
private void lvFirmwares_MouseClick(object sender, MouseEventArgs e)
private void LvFirmwares_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Right && lvFirmwares.GetItemAt(e.X, e.Y) != null)
lvFirmwaresContextMenuStrip.Show(lvFirmwares, e.Location);
}
private void tsmiSetCustomization_Click(object sender, EventArgs e)
private void TsmiSetCustomization_Click(object sender, EventArgs e)
{
using var ofd = new OpenFileDialog
{
@ -493,7 +492,7 @@ namespace BizHawk.Client.EmuHawk
}
}
private void tsmiClearCustomization_Click(object sender, EventArgs e)
private void TsmiClearCustomization_Click(object sender, EventArgs e)
{
// for each selected item, clear the user choice
foreach (ListViewItem lvi in lvFirmwares.SelectedItems)
@ -505,7 +504,7 @@ namespace BizHawk.Client.EmuHawk
DoScan();
}
private void tsmiInfo_Click(object sender, EventArgs e)
private void TsmiInfo_Click(object sender, EventArgs e)
{
var lvi = lvFirmwares.SelectedItems[0];
var fr = (FirmwareDatabase.FirmwareRecord)lvi.Tag;
@ -573,19 +572,19 @@ namespace BizHawk.Client.EmuHawk
fciDialog.ShowDialog(this);
}
private void lvFirmwaresContextMenuStrip_Opening(object sender, CancelEventArgs e)
private void LvFirmwaresContextMenuStrip_Opening(object sender, CancelEventArgs e)
{
// hide menu items that aren't appropriate for multi-select
tsmiSetCustomization.Visible = lvFirmwares.SelectedItems.Count == 1;
tsmiInfo.Visible = lvFirmwares.SelectedItems.Count == 1;
}
private void tsmiCopy_Click(object sender, EventArgs e)
private void TsmiCopy_Click(object sender, EventArgs e)
{
PerformListCopy();
}
private void linkBasePath_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
private void LinkBasePath_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (Owner is PathConfig)
{
@ -608,7 +607,7 @@ namespace BizHawk.Client.EmuHawk
}
}
private void tbbImport_Click(object sender, EventArgs e)
private void TbbImport_Click(object sender, EventArgs e)
{
using var ofd = new OpenFileDialog { Multiselect = true };
if (ofd.ShowDialog() != DialogResult.OK)
@ -732,12 +731,12 @@ namespace BizHawk.Client.EmuHawk
return base.ProcessCmdKey(ref msg, keyData);
}
private void lvFirmwares_DragEnter(object sender, DragEventArgs e)
private void LvFirmwares_DragEnter(object sender, DragEventArgs e)
{
e.Set(DragDropEffects.Copy);
}
private void lvFirmwares_DragDrop(object sender, DragEventArgs e)
private void LvFirmwares_DragDrop(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.FileDrop))
{