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

remove trailing comma in various places in Emuhawk probject

This commit is contained in:
adelikat 2020-03-21 16:04:08 -05:00
parent c1e2f6afe5
commit 6a25679ae3
21 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs
View File

@ -70,7 +70,7 @@ namespace BizHawk.Client.EmuHawk
new FormatPreset("FLV", "AVC video and AAC audio in a Flash Video container.", new FormatPreset("FLV", "AVC video and AAC audio in a Flash Video container.",
"-c:a aac -c:v libx264 -f flv", false, "flv"), "-c:a aac -c:v libx264 -f flv", false, "flv"),
new FormatPreset("[Custom]", "Write your own ffmpeg command. For advanced users only.", new FormatPreset("[Custom]", "Write your own ffmpeg command. For advanced users only.",
"-c:a foo -c:v bar -f baz", true, "foobar"), "-c:a foo -c:v bar -f baz", true, "foobar")
}; };
} }

2
BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs
View File

@ -192,7 +192,7 @@ namespace BizHawk.Client.EmuHawk
0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9,
0x130476DC, 0x17C56B6B, 0x1A864DB2, 0x1E475005, 0x130476DC, 0x17C56B6B, 0x1A864DB2, 0x1E475005,
0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6, 0x2B4BCB61, 0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6, 0x2B4BCB61,
0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD, 0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD
}; };
/// <summary> /// <summary>

2
BizHawk.Client.EmuHawk/Communication.cs
View File

@ -128,7 +128,7 @@ namespace BizHawk.Client.EmuHawk
{ {
var values = new Dictionary<string, string> var values = new Dictionary<string, string>
{ {
["payload"] = payload, ["payload"] = payload
}; };
FormUrlEncodedContent content = new FormUrlEncodedContent(values); FormUrlEncodedContent content = new FormUrlEncodedContent(values);
return Post(PostUrl, content).Result; return Post(PostUrl, content).Result;

2
BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs
View File

@ -524,7 +524,7 @@ namespace BizHawk.Client.EmuHawk
Cell relativeCell = new Cell Cell relativeCell = new Cell
{ {
RowIndex = cell.RowIndex - visibleRows.Start, RowIndex = cell.RowIndex - visibleRows.Start,
Column = cell.Column, Column = cell.Column
}; };
relativeCell.RowIndex -= CountLagFramesAbsolute(relativeCell.RowIndex.Value); relativeCell.RowIndex -= CountLagFramesAbsolute(relativeCell.RowIndex.Value);

2
BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
View File

@ -946,7 +946,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Name = "RotateMenuItem", Name = "RotateMenuItem",
Text = "Rotate", Text = "Rotate",
ShortcutKeyDisplayString = RotateHotkeyStr, ShortcutKeyDisplayString = RotateHotkeyStr
}; };
rotate.Click += (o, ev) => { HorizontalOrientation ^= true; }; rotate.Click += (o, ev) => { HorizontalOrientation ^= true; };

4
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
View File

@ -431,7 +431,7 @@ namespace BizHawk.Client.EmuHawk
VideoProvider = videoProvider, VideoProvider = videoProvider,
Simulate = displayNothing, Simulate = displayNothing,
ChainOutsize = GraphicsControl.Size, ChainOutsize = GraphicsControl.Size,
IncludeOSD = true, IncludeOSD = true
}; };
UpdateSourceInternal(job); UpdateSourceInternal(job);
} }
@ -651,7 +651,7 @@ namespace BizHawk.Client.EmuHawk
{ {
VideoProvider = fvp, VideoProvider = fvp,
Simulate = true, Simulate = true,
ChainOutsize = chainOutsize, ChainOutsize = chainOutsize
}; };
var filterProgram = UpdateSourceInternal(job); var filterProgram = UpdateSourceInternal(job);

2
BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_SlimDX9.cs
View File

@ -434,7 +434,7 @@ namespace BizHawk.Client.EmuHawk
VertexDeclaration = new VertexDeclaration(Dev, ves), VertexDeclaration = new VertexDeclaration(Dev, ves),
VertexShader = vertexShader.Opaque as ShaderWrapper, VertexShader = vertexShader.Opaque as ShaderWrapper,
FragmentShader = fragmentShader.Opaque as ShaderWrapper, FragmentShader = fragmentShader.Opaque as ShaderWrapper,
VertexStride = stride, VertexStride = stride
}; };
//scan uniforms from constant tables //scan uniforms from constant tables

2
BizHawk.Client.EmuHawk/Input/Input.cs
View File

@ -111,7 +111,7 @@ namespace BizHawk.Client.EmuHawk
// //
// Summary: // Summary:
// The ALT modifier key. // The ALT modifier key.
Alt = 262144, Alt = 262144
} }
public static Input Instance { get; private set; } public static Input Instance { get; private set; }

2
BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
View File

@ -131,7 +131,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Location = new Point(x + _inputSize + _labelPadding, y + UIHelper.ScaleY(3)), Location = new Point(x + _inputSize + _labelPadding, y + UIHelper.ScaleY(3)),
Size = new Size(UIHelper.ScaleX(100), UIHelper.ScaleY(15)), Size = new Size(UIHelper.ScaleX(100), UIHelper.ScaleY(15)),
Text = _buttons[i].Replace('_', ' ').Trim(), Text = _buttons[i].Replace('_', ' ').Trim()
}; };
////Tooltip.SetToolTip(label, null); //??? not supported yet ////Tooltip.SetToolTip(label, null); //??? not supported yet

2
BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -59,7 +59,7 @@ namespace BizHawk.Client.EmuHawk
["AmstradCPC"] = "Amstrad CPC", ["AmstradCPC"] = "Amstrad CPC",
["ChannelF"] = "Channel F", ["ChannelF"] = "Channel F",
["Vectrex"] = "Vectrex", ["Vectrex"] = "Vectrex",
["MSX"] = "MSX", ["MSX"] = "MSX"
}; };
public string TargetSystem { get; set; } public string TargetSystem { get; set; }

8
BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -38,7 +38,7 @@ namespace BizHawk.Client.EmuHawk
"%exe%", "%exe%",
"%rom%", "%rom%",
".\\", ".\\",
"..\\", "..\\"
}; };
public PathConfig(MainForm mainForm, Config config) public PathConfig(MainForm mainForm, Config config)
@ -134,7 +134,7 @@ namespace BizHawk.Client.EmuHawk
MinimumSize = new Size(UIHelper.ScaleX(26), UIHelper.ScaleY(23)), MinimumSize = new Size(UIHelper.ScaleX(26), UIHelper.ScaleY(23)),
AutoCompleteMode = AutoCompleteMode.SuggestAppend, AutoCompleteMode = AutoCompleteMode.SuggestAppend,
AutoCompleteCustomSource = AutoCompleteOptions, AutoCompleteCustomSource = AutoCompleteOptions,
AutoCompleteSource = AutoCompleteSource.CustomSource, AutoCompleteSource = AutoCompleteSource.CustomSource
}; };
var btn = new Button var btn = new Button
@ -144,7 +144,7 @@ namespace BizHawk.Client.EmuHawk
Location = new Point(widgetOffset, y + buttonOffsetY), Location = new Point(widgetOffset, y + buttonOffsetY),
Size = new Size(buttonWidth, buttonHeight), Size = new Size(buttonWidth, buttonHeight),
Name = path.Type, Name = path.Type,
Anchor = AnchorStyles.Top | AnchorStyles.Right, Anchor = AnchorStyles.Top | AnchorStyles.Right
}; };
var tempBox = box; var tempBox = box;
@ -191,7 +191,7 @@ namespace BizHawk.Client.EmuHawk
Location = new Point(widgetOffset + buttonWidth + padding + infoPadding, y + UIHelper.ScaleY(4)), Location = new Point(widgetOffset + buttonWidth + padding + infoPadding, y + UIHelper.ScaleY(4)),
Size = new Size(UIHelper.ScaleX(100), UIHelper.ScaleY(15)), Size = new Size(UIHelper.ScaleX(100), UIHelper.ScaleY(15)),
Name = path.Type, Name = path.Type,
Anchor = AnchorStyles.Top | AnchorStyles.Right, Anchor = AnchorStyles.Top | AnchorStyles.Right
}; };
t.Controls.Add(label); t.Controls.Add(label);

4
BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs
View File

@ -121,7 +121,7 @@ namespace BizHawk.Client.EmuHawk
System.Drawing.Color.FromArgb(0x00, 0xFF, 0x00), System.Drawing.Color.FromArgb(0x00, 0xFF, 0x00),
System.Drawing.Color.FromArgb(0x00, 0xFF, 0xFF), System.Drawing.Color.FromArgb(0x00, 0xFF, 0xFF),
System.Drawing.Color.FromArgb(0xFF, 0xFF, 0x00), System.Drawing.Color.FromArgb(0xFF, 0xFF, 0x00),
System.Drawing.Color.FromArgb(0xFF, 0xFF, 0xFF), System.Drawing.Color.FromArgb(0xFF, 0xFF, 0xFF)
}; };
cd.CustomColors = new[] cd.CustomColors = new[]
@ -141,7 +141,7 @@ namespace BizHawk.Client.EmuHawk
System.Drawing.ColorTranslator.ToOle(colors[12]), System.Drawing.ColorTranslator.ToOle(colors[12]),
System.Drawing.ColorTranslator.ToOle(colors[13]), System.Drawing.ColorTranslator.ToOle(colors[13]),
System.Drawing.ColorTranslator.ToOle(colors[14]), System.Drawing.ColorTranslator.ToOle(colors[14]),
System.Drawing.ColorTranslator.ToOle(colors[15]), System.Drawing.ColorTranslator.ToOle(colors[15])
}; };
cd.Color = c; cd.Color = c;

2
BizHawk.Client.EmuHawk/tools/BatchRunner.cs
View File

@ -48,7 +48,7 @@ namespace BizHawk.Client.EmuHawk
ErrorOnLoad, // error method thrown on load ErrorOnLoad, // error method thrown on load
FalseOnLoad, // RomLoader returned false with no other information FalseOnLoad, // RomLoader returned false with no other information
ExceptOnAdv, // exception thrown on frame advance ExceptOnAdv, // exception thrown on frame advance
Success, // load fully complete Success // load fully complete
} }
public EStatus Status { get; set; } // what happened public EStatus Status { get; set; } // what happened

2
BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -1312,7 +1312,7 @@ namespace BizHawk.Client.EmuHawk
new FilesystemFilter("Binary", new[] { "bin" }), new FilesystemFilter("Binary", new[] { "bin" }),
new FilesystemFilter("Save Files", new[] { "sav" }) new FilesystemFilter("Save Files", new[] { "sav" })
).ToString(), ).ToString(),
RestoreDirectory = true, RestoreDirectory = true
}; };
var result = sfd.ShowHawkDialog(); var result = sfd.ShowHawkDialog();

4
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs
View File

@ -41,13 +41,13 @@ namespace BizHawk.Client.EmuHawk
{ {
InputChange, InputChange,
InsertFrames, InsertFrames,
DeleteFrames, DeleteFrames
} }
private enum InputChangeTypes private enum InputChangeTypes
{ {
Bool, Bool,
Float, Float
} }
public class TastudioBranchInfo public class TastudioBranchInfo

2
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -260,7 +260,7 @@ namespace BizHawk.Client.EmuHawk
Filter = Path.GetFileName(path), Filter = Path.GetFileName(path),
NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite
| NotifyFilters.FileName | NotifyFilters.DirectoryName, | NotifyFilters.FileName | NotifyFilters.DirectoryName,
EnableRaisingEvents = true, EnableRaisingEvents = true
}; };
// TODO, Deleted and Renamed events // TODO, Deleted and Renamed events

2
BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs
View File

@ -179,7 +179,7 @@ namespace BizHawk.Client.EmuHawk
private static readonly byte[] EmptyWav = { private static readonly byte[] EmptyWav = {
0x52, 0x49, 0x46, 0x46, 0x24, 0x04, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6D, 0x74, 0x20, 0x52, 0x49, 0x46, 0x46, 0x24, 0x04, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6D, 0x74, 0x20,
0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0xE0, 0x2E, 0x00, 0x00, 0xC0, 0x5D, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0xE0, 0x2E, 0x00, 0x00, 0xC0, 0x5D, 0x00, 0x00,
0x02, 0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61, 0x00, 0x04, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61, 0x00, 0x04, 0x00, 0x00
}; };

2
BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs
View File

@ -490,7 +490,7 @@ namespace BizHawk.Client.EmuHawk
enum eDisplayType enum eDisplayType
{ {
BG1 = 1, BG2 = 2, BG3 = 3, BG4 = 4, OBJTiles0, OBJTiles1, Tiles2bpp, Tiles4bpp, Tiles8bpp, TilesMode7, TilesMode7Ext, TilesMode7DC, Sprites, OBJ, BG1 = 1, BG2 = 2, BG3 = 3, BG4 = 4, OBJTiles0, OBJTiles1, Tiles2bpp, Tiles4bpp, Tiles8bpp, TilesMode7, TilesMode7Ext, TilesMode7DC, Sprites, OBJ,
BG1Screen = 101, BG2Screen = 102, BG3Screen = 103, BG4Screen = 104, BG1Screen = 101, BG2Screen = 102, BG3Screen = 103, BG4Screen = 104
} }
static bool IsDisplayTypeBG(eDisplayType type) { return type == eDisplayType.BG1 || type == eDisplayType.BG2 || type == eDisplayType.BG3 || type == eDisplayType.BG4; } static bool IsDisplayTypeBG(eDisplayType type) { return type == eDisplayType.BG1 || type == eDisplayType.BG2 || type == eDisplayType.BG3 || type == eDisplayType.BG4; }
static bool IsDisplayTypeOBJ(eDisplayType type) { return type == eDisplayType.OBJTiles0 || type == eDisplayType.OBJTiles1; } static bool IsDisplayTypeOBJ(eDisplayType type) { return type == eDisplayType.OBJTiles0 || type == eDisplayType.OBJTiles1; }

2
BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
View File

@ -71,7 +71,7 @@ namespace BizHawk.Client.EmuHawk
Name = UserTextColumnName, Name = UserTextColumnName,
Text = "UserText", Text = "UserText",
UnscaledWidth = 90 UnscaledWidth = 90
}, }
}); });
} }

2
BizHawk.Client.EmuHawk/tools/ToolFormBase.cs
View File

@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk
: $"{Global.Game.FilesystemSafeName()}.{fileExt}", : $"{Global.Game.FilesystemSafeName()}.{fileExt}",
InitialDirectory = path, InitialDirectory = path,
Filter = new FilesystemFilterSet(new FilesystemFilter(fileType, new[] { fileExt })).ToString(), Filter = new FilesystemFilterSet(new FilesystemFilter(fileType, new[] { fileExt })).ToString(),
RestoreDirectory = true, RestoreDirectory = true
}; };
var result = sfd.ShowHawkDialog(); var result = sfd.ShowHawkDialog();

4
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -946,7 +946,7 @@ namespace BizHawk.Client.EmuHawk
new RollColumn { Text = "Value", Name = WatchList.Value, Visible = true, UnscaledWidth = 59, Type = ColumnType.Text }, new RollColumn { Text = "Value", Name = WatchList.Value, Visible = true, UnscaledWidth = 59, Type = ColumnType.Text },
new RollColumn { Text = "Prev", Name = WatchList.Prev, Visible = true, UnscaledWidth = 59, Type = ColumnType.Text }, new RollColumn { Text = "Prev", Name = WatchList.Prev, Visible = true, UnscaledWidth = 59, Type = ColumnType.Text },
new RollColumn { Text = "Changes", Name = WatchList.ChangesCol, Visible = true, UnscaledWidth = 60, Type = ColumnType.Text }, new RollColumn { Text = "Changes", Name = WatchList.ChangesCol, Visible = true, UnscaledWidth = 60, Type = ColumnType.Text },
new RollColumn { Text = "Diff", Name = WatchList.Diff, Visible = false, UnscaledWidth = 59, Type = ColumnType.Text }, new RollColumn { Text = "Diff", Name = WatchList.Diff, Visible = false, UnscaledWidth = 59, Type = ColumnType.Text }
}; };
PreviewMode = true; PreviewMode = true;
@ -1086,7 +1086,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Name = $"{type}ToolStripMenuItem", Name = $"{type}ToolStripMenuItem",
Text = Watch.DisplayTypeToString(type), Text = Watch.DisplayTypeToString(type),
Checked = _settings.Type == type, Checked = _settings.Type == type
}; };
var type1 = type; var type1 = type;
item.Click += (o, ev) => DoDisplayTypeClick(type1); item.Click += (o, ev) => DoDisplayTypeClick(type1);