diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 7bbc76663e..90cf4cab75 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -836,6 +836,8 @@
+
+
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index 0ccfe50454..f5026dba05 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.269
+// Runtime Version:4.0.30319.17626
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -60,6 +60,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap atari_controller {
get {
object obj = ResourceManager.GetObject("atari_controller", resourceCulture);
@@ -67,6 +70,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap AudioHS {
get {
object obj = ResourceManager.GetObject("AudioHS", resourceCulture);
@@ -74,6 +80,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap AutoSearch {
get {
object obj = ResourceManager.GetObject("AutoSearch", resourceCulture);
@@ -81,6 +90,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap AVI {
get {
object obj = ResourceManager.GetObject("AVI", resourceCulture);
@@ -88,6 +100,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Back {
get {
object obj = ResourceManager.GetObject("Back", resourceCulture);
@@ -95,6 +110,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap BackMore {
get {
object obj = ResourceManager.GetObject("BackMore", resourceCulture);
@@ -102,6 +120,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Blank {
get {
object obj = ResourceManager.GetObject("Blank", resourceCulture);
@@ -109,6 +130,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap BlueDown {
get {
object obj = ResourceManager.GetObject("BlueDown", resourceCulture);
@@ -116,6 +140,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap BlueUp {
get {
object obj = ResourceManager.GetObject("BlueUp", resourceCulture);
@@ -123,6 +150,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Bug {
get {
object obj = ResourceManager.GetObject("Bug", resourceCulture);
@@ -130,6 +160,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap calculator {
get {
object obj = ResourceManager.GetObject("calculator", resourceCulture);
@@ -137,6 +170,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap camera {
get {
object obj = ResourceManager.GetObject("camera", resourceCulture);
@@ -144,6 +180,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap cheat {
get {
object obj = ResourceManager.GetObject("cheat", resourceCulture);
@@ -151,6 +190,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ ///
internal static System.Drawing.Icon Cheats {
get {
object obj = ResourceManager.GetObject("Cheats", resourceCulture);
@@ -158,6 +200,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Close {
get {
object obj = ResourceManager.GetObject("Close", resourceCulture);
@@ -165,6 +210,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap console16x16 {
get {
object obj = ResourceManager.GetObject("console16x16", resourceCulture);
@@ -172,6 +220,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap console32x32 {
get {
object obj = ResourceManager.GetObject("console32x32", resourceCulture);
@@ -179,6 +230,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap CopyFolderHS {
get {
object obj = ResourceManager.GetObject("CopyFolderHS", resourceCulture);
@@ -186,6 +240,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap corphawk {
get {
object obj = ResourceManager.GetObject("corphawk", resourceCulture);
@@ -193,6 +250,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap CorpHawkSmall {
get {
object obj = ResourceManager.GetObject("CorpHawkSmall", resourceCulture);
@@ -200,6 +260,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap CutHS {
get {
object obj = ResourceManager.GetObject("CutHS", resourceCulture);
@@ -207,6 +270,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Debugger {
get {
object obj = ResourceManager.GetObject("Debugger", resourceCulture);
@@ -214,6 +280,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Delete {
get {
object obj = ResourceManager.GetObject("Delete", resourceCulture);
@@ -221,6 +290,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Duplicate {
get {
object obj = ResourceManager.GetObject("Duplicate", resourceCulture);
@@ -228,6 +300,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap ExclamationRed {
get {
object obj = ResourceManager.GetObject("ExclamationRed", resourceCulture);
@@ -235,6 +310,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap FastForward {
get {
object obj = ResourceManager.GetObject("FastForward", resourceCulture);
@@ -242,6 +320,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap FindHS {
get {
object obj = ResourceManager.GetObject("FindHS", resourceCulture);
@@ -249,6 +330,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Forward {
get {
object obj = ResourceManager.GetObject("Forward", resourceCulture);
@@ -256,6 +340,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap ForwardMore {
get {
object obj = ResourceManager.GetObject("ForwardMore", resourceCulture);
@@ -263,6 +350,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Freeze {
get {
object obj = ResourceManager.GetObject("Freeze", resourceCulture);
@@ -270,6 +360,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Fullscreen {
get {
object obj = ResourceManager.GetObject("Fullscreen", resourceCulture);
@@ -277,6 +370,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap GameController {
get {
object obj = ResourceManager.GetObject("GameController", resourceCulture);
@@ -284,6 +380,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap GBController {
get {
object obj = ResourceManager.GetObject("GBController", resourceCulture);
@@ -291,6 +390,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap GENController {
get {
object obj = ResourceManager.GetObject("GENController", resourceCulture);
@@ -298,6 +400,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap GreenCheck {
get {
object obj = ResourceManager.GetObject("GreenCheck", resourceCulture);
@@ -305,6 +410,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Hack {
get {
object obj = ResourceManager.GetObject("Hack", resourceCulture);
@@ -312,6 +420,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Help {
get {
object obj = ResourceManager.GetObject("Help", resourceCulture);
@@ -319,6 +430,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap HomeBrew {
get {
object obj = ResourceManager.GetObject("HomeBrew", resourceCulture);
@@ -326,6 +440,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap HotKeys {
get {
object obj = ResourceManager.GetObject("HotKeys", resourceCulture);
@@ -333,6 +450,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Import {
get {
object obj = ResourceManager.GetObject("Import", resourceCulture);
@@ -340,6 +460,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap InsertSeparator {
get {
object obj = ResourceManager.GetObject("InsertSeparator", resourceCulture);
@@ -347,6 +470,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Lightning {
get {
object obj = ResourceManager.GetObject("Lightning", resourceCulture);
@@ -354,6 +480,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap LoadConfig {
get {
object obj = ResourceManager.GetObject("LoadConfig", resourceCulture);
@@ -361,6 +490,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ ///
internal static System.Drawing.Icon logo {
get {
object obj = ResourceManager.GetObject("logo", resourceCulture);
@@ -368,6 +500,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Lua {
get {
object obj = ResourceManager.GetObject("Lua", resourceCulture);
@@ -375,6 +510,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap MessageConfig {
get {
object obj = ResourceManager.GetObject("MessageConfig", resourceCulture);
@@ -382,6 +520,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap MoveDown {
get {
object obj = ResourceManager.GetObject("MoveDown", resourceCulture);
@@ -389,6 +530,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap MoveLeft {
get {
object obj = ResourceManager.GetObject("MoveLeft", resourceCulture);
@@ -396,6 +540,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap MoveRight {
get {
object obj = ResourceManager.GetObject("MoveRight", resourceCulture);
@@ -403,6 +550,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap MoveUp {
get {
object obj = ResourceManager.GetObject("MoveUp", resourceCulture);
@@ -410,6 +560,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap NESController {
get {
object obj = ResourceManager.GetObject("NESController", resourceCulture);
@@ -417,6 +570,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap NESControllerIcon {
get {
object obj = ResourceManager.GetObject("NESControllerIcon", resourceCulture);
@@ -424,6 +580,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap NewFile {
get {
object obj = ResourceManager.GetObject("NewFile", resourceCulture);
@@ -431,12 +590,18 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+ ///
internal static System.IO.UnmanagedMemoryStream nothawk {
get {
return ResourceManager.GetStream("nothawk", resourceCulture);
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap OpenFile {
get {
object obj = ResourceManager.GetObject("OpenFile", resourceCulture);
@@ -444,6 +609,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Paste {
get {
object obj = ResourceManager.GetObject("Paste", resourceCulture);
@@ -451,6 +619,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Pause {
get {
object obj = ResourceManager.GetObject("Pause", resourceCulture);
@@ -458,6 +629,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap PCEngineController {
get {
object obj = ResourceManager.GetObject("PCEngineController", resourceCulture);
@@ -465,6 +639,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Play {
get {
object obj = ResourceManager.GetObject("Play", resourceCulture);
@@ -472,6 +649,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap poke {
get {
object obj = ResourceManager.GetObject("poke", resourceCulture);
@@ -479,6 +659,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Previous {
get {
object obj = ResourceManager.GetObject("Previous", resourceCulture);
@@ -486,6 +669,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap PrintPreviewHS {
get {
object obj = ResourceManager.GetObject("PrintPreviewHS", resourceCulture);
@@ -493,6 +679,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap ReadOnly {
get {
object obj = ResourceManager.GetObject("ReadOnly", resourceCulture);
@@ -500,6 +689,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Recent {
get {
object obj = ResourceManager.GetObject("Recent", resourceCulture);
@@ -507,6 +699,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap RecordHS {
get {
object obj = ResourceManager.GetObject("RecordHS", resourceCulture);
@@ -514,6 +709,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap redo {
get {
object obj = ResourceManager.GetObject("redo", resourceCulture);
@@ -521,6 +719,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Refresh {
get {
object obj = ResourceManager.GetObject("Refresh", resourceCulture);
@@ -528,6 +729,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Refresh1 {
get {
object obj = ResourceManager.GetObject("Refresh1", resourceCulture);
@@ -535,6 +739,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap restart {
get {
object obj = ResourceManager.GetObject("restart", resourceCulture);
@@ -542,6 +749,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap RetroQuestion {
get {
object obj = ResourceManager.GetObject("RetroQuestion", resourceCulture);
@@ -549,6 +759,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Save {
get {
object obj = ResourceManager.GetObject("Save", resourceCulture);
@@ -556,6 +769,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap SaveAs {
get {
object obj = ResourceManager.GetObject("SaveAs", resourceCulture);
@@ -563,6 +779,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap SaveConfig {
get {
object obj = ResourceManager.GetObject("SaveConfig", resourceCulture);
@@ -570,6 +789,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Scan {
get {
object obj = ResourceManager.GetObject("Scan", resourceCulture);
@@ -577,6 +799,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap search {
get {
object obj = ResourceManager.GetObject("search", resourceCulture);
@@ -584,6 +809,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap SMSController {
get {
object obj = ResourceManager.GetObject("SMSController", resourceCulture);
@@ -591,6 +819,19 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap SNESController {
+ get {
+ object obj = ResourceManager.GetObject("SNESController", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Stop {
get {
object obj = ResourceManager.GetObject("Stop", resourceCulture);
@@ -598,6 +839,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap TAStudio {
get {
object obj = ResourceManager.GetObject("TAStudio", resourceCulture);
@@ -605,6 +849,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap textdoc {
get {
object obj = ResourceManager.GetObject("textdoc", resourceCulture);
@@ -612,6 +859,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap TI83Calculator {
get {
object obj = ResourceManager.GetObject("TI83Calculator", resourceCulture);
@@ -619,6 +869,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap TI83CalculatorCrop {
get {
object obj = ResourceManager.GetObject("TI83CalculatorCrop", resourceCulture);
@@ -626,6 +879,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap ToolBox {
get {
object obj = ResourceManager.GetObject("ToolBox", resourceCulture);
@@ -633,6 +889,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Translation {
get {
object obj = ResourceManager.GetObject("Translation", resourceCulture);
@@ -640,6 +899,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap TruncateFromFile {
get {
object obj = ResourceManager.GetObject("TruncateFromFile", resourceCulture);
@@ -647,6 +909,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap TruncateFromRW {
get {
object obj = ResourceManager.GetObject("TruncateFromRW", resourceCulture);
@@ -654,6 +919,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap TurboFastForward {
get {
object obj = ResourceManager.GetObject("TurboFastForward", resourceCulture);
@@ -661,6 +929,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap undo {
get {
object obj = ResourceManager.GetObject("undo", resourceCulture);
@@ -668,6 +939,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Unfreeze {
get {
object obj = ResourceManager.GetObject("Unfreeze", resourceCulture);
@@ -675,6 +949,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap WarningHS {
get {
object obj = ResourceManager.GetObject("WarningHS", resourceCulture);
@@ -682,6 +959,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap whiteTriDown {
get {
object obj = ResourceManager.GetObject("whiteTriDown", resourceCulture);
@@ -689,6 +969,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap whiteTriLeft {
get {
object obj = ResourceManager.GetObject("whiteTriLeft", resourceCulture);
@@ -696,6 +979,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap whiteTriRight {
get {
object obj = ResourceManager.GetObject("whiteTriRight", resourceCulture);
@@ -703,6 +989,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap whiteTriUp {
get {
object obj = ResourceManager.GetObject("whiteTriUp", resourceCulture);
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx
index c0474edc94..23fc96476c 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -822,4 +822,7 @@
..\images\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\config\ControllerImages\SNESController.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/BizHawk.MultiClient/config/ControllerImages/SNESController.jpg b/BizHawk.MultiClient/config/ControllerImages/SNESController.jpg
new file mode 100644
index 0000000000..cb6f93f4d7
Binary files /dev/null and b/BizHawk.MultiClient/config/ControllerImages/SNESController.jpg differ
diff --git a/BizHawk.MultiClient/config/InputConfig.Designer.cs b/BizHawk.MultiClient/config/InputConfig.Designer.cs
index 2036046890..90c5f9a6ca 100644
--- a/BizHawk.MultiClient/config/InputConfig.Designer.cs
+++ b/BizHawk.MultiClient/config/InputConfig.Designer.cs
@@ -49,7 +49,7 @@
// OK
//
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.OK.Location = new System.Drawing.Point(259, 329);
+ this.OK.Location = new System.Drawing.Point(334, 365);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 0;
@@ -61,7 +61,7 @@
//
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.Cancel.Location = new System.Drawing.Point(342, 329);
+ this.Cancel.Location = new System.Drawing.Point(415, 365);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 1;
@@ -76,7 +76,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.ButtonsGroupBox.Location = new System.Drawing.Point(12, 84);
this.ButtonsGroupBox.Name = "ButtonsGroupBox";
- this.ButtonsGroupBox.Size = new System.Drawing.Size(241, 268);
+ this.ButtonsGroupBox.Size = new System.Drawing.Size(238, 304);
this.ButtonsGroupBox.TabIndex = 2;
this.ButtonsGroupBox.TabStop = false;
this.ButtonsGroupBox.Text = "Buttons";
@@ -86,9 +86,9 @@
this.ControllerImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.ControllerImage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.ControllerImage.Location = new System.Drawing.Point(259, 84);
+ this.ControllerImage.Location = new System.Drawing.Point(256, 84);
this.ControllerImage.Name = "ControllerImage";
- this.ControllerImage.Size = new System.Drawing.Size(169, 214);
+ this.ControllerImage.Size = new System.Drawing.Size(234, 250);
this.ControllerImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.ControllerImage.TabIndex = 3;
this.ControllerImage.TabStop = false;
@@ -101,7 +101,7 @@
this.ControllerSelectGroupBox.Controls.Add(this.ControllComboBox);
this.ControllerSelectGroupBox.Location = new System.Drawing.Point(13, 28);
this.ControllerSelectGroupBox.Name = "ControllerSelectGroupBox";
- this.ControllerSelectGroupBox.Size = new System.Drawing.Size(240, 50);
+ this.ControllerSelectGroupBox.Size = new System.Drawing.Size(237, 50);
this.ControllerSelectGroupBox.TabIndex = 4;
this.ControllerSelectGroupBox.TabStop = false;
this.ControllerSelectGroupBox.Text = "Controller";
@@ -133,7 +133,7 @@
//
this.SystemGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SystemGroupBox.Controls.Add(this.SystemComboBox);
- this.SystemGroupBox.Location = new System.Drawing.Point(259, 28);
+ this.SystemGroupBox.Location = new System.Drawing.Point(256, 28);
this.SystemGroupBox.Name = "SystemGroupBox";
this.SystemGroupBox.Size = new System.Drawing.Size(158, 50);
this.SystemGroupBox.TabIndex = 6;
@@ -146,7 +146,7 @@
this.SystemComboBox.FormattingEnabled = true;
this.SystemComboBox.Items.AddRange(new object[] {
"NES",
- "SNES",
+ "SNES",
"Gameboy",
"SMS / GG / SG-1000",
"Sega Genesis",
@@ -162,7 +162,7 @@
//
this.AllowLR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.AllowLR.AutoSize = true;
- this.AllowLR.Location = new System.Drawing.Point(259, 304);
+ this.AllowLR.Location = new System.Drawing.Point(383, 342);
this.AllowLR.Name = "AllowLR";
this.AllowLR.Size = new System.Drawing.Size(107, 17);
this.AllowLR.TabIndex = 7;
@@ -184,7 +184,7 @@
//
this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label38.AutoSize = true;
- this.label38.Location = new System.Drawing.Point(9, 356);
+ this.label38.Location = new System.Drawing.Point(9, 392);
this.label38.Name = "label38";
this.label38.Size = new System.Drawing.Size(153, 13);
this.label38.TabIndex = 9;
@@ -196,7 +196,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
- this.ClientSize = new System.Drawing.Size(440, 378);
+ this.ClientSize = new System.Drawing.Size(502, 414);
this.Controls.Add(this.label38);
this.Controls.Add(this.AutoTab);
this.Controls.Add(this.AllowLR);
diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs
index 03fec17af2..ca8a0c0af7 100644
--- a/BizHawk.MultiClient/config/InputConfig.cs
+++ b/BizHawk.MultiClient/config/InputConfig.cs
@@ -136,7 +136,7 @@ namespace BizHawk.MultiClient
controller = Global.Config.TI83Controller;
break;
case "SNES":
- ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.NESController;
+ ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.SNESController;
controller = Global.Config.SNESController;
break;
default: