diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index c16ecc65df..f21f410059 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -983,6 +983,7 @@
+
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index 69e3249d63..9dea0d1ce0 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.296
+// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -60,6 +60,19 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap A78Joystick {
+ get {
+ object obj = ResourceManager.GetObject("A78Joystick", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// 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 +80,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 +90,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 +100,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 +110,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 +120,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 +130,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 +140,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 +150,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 +160,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Both {
get {
object obj = ResourceManager.GetObject("Both", resourceCulture);
@@ -130,6 +170,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);
@@ -137,6 +180,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap C64Joystick {
get {
object obj = ResourceManager.GetObject("C64Joystick", resourceCulture);
@@ -144,6 +190,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap C64Keyboard {
get {
object obj = ResourceManager.GetObject("C64Keyboard", resourceCulture);
@@ -151,6 +200,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap C64Symbol {
get {
object obj = ResourceManager.GetObject("C64Symbol", resourceCulture);
@@ -158,6 +210,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);
@@ -165,6 +220,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);
@@ -172,6 +230,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);
@@ -179,6 +240,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);
@@ -186,6 +250,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);
@@ -193,6 +260,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap colecovisioncontroller {
get {
object obj = ResourceManager.GetObject("colecovisioncontroller", resourceCulture);
@@ -200,6 +270,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);
@@ -207,6 +280,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);
@@ -214,6 +290,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);
@@ -221,6 +300,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);
@@ -228,6 +310,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);
@@ -235,6 +320,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);
@@ -242,6 +330,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);
@@ -249,6 +340,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);
@@ -256,6 +350,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);
@@ -263,6 +360,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);
@@ -270,6 +370,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);
@@ -277,6 +380,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);
@@ -284,6 +390,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);
@@ -291,6 +400,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);
@@ -298,6 +410,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);
@@ -305,6 +420,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);
@@ -312,6 +430,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);
@@ -319,6 +440,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap GBA_Controller {
get {
object obj = ResourceManager.GetObject("GBA_Controller", resourceCulture);
@@ -326,6 +450,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);
@@ -333,6 +460,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);
@@ -340,6 +470,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap GenesisControllerIcon {
get {
object obj = ResourceManager.GetObject("GenesisControllerIcon", resourceCulture);
@@ -347,6 +480,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);
@@ -354,6 +490,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);
@@ -361,6 +500,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);
@@ -368,6 +510,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);
@@ -375,6 +520,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);
@@ -382,6 +530,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);
@@ -389,6 +540,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);
@@ -396,6 +550,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);
@@ -403,6 +560,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap LightOff {
get {
object obj = ResourceManager.GetObject("LightOff", resourceCulture);
@@ -410,6 +570,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap LightOn {
get {
object obj = ResourceManager.GetObject("LightOn", resourceCulture);
@@ -417,6 +580,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);
@@ -424,6 +590,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);
@@ -431,6 +600,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);
@@ -438,6 +610,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);
@@ -445,6 +620,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);
@@ -452,6 +630,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);
@@ -459,6 +640,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);
@@ -466,6 +650,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);
@@ -473,6 +660,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap NES_Controller {
get {
object obj = ResourceManager.GetObject("NES_Controller", resourceCulture);
@@ -480,6 +670,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);
@@ -487,6 +680,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);
@@ -494,12 +690,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);
@@ -507,6 +709,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);
@@ -514,6 +719,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);
@@ -521,6 +729,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);
@@ -528,6 +739,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap pencil {
get {
object obj = ResourceManager.GetObject("pencil", resourceCulture);
@@ -535,6 +749,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);
@@ -542,6 +759,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);
@@ -549,6 +769,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);
@@ -556,6 +779,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);
@@ -563,6 +789,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);
@@ -570,6 +799,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap reboot {
get {
object obj = ResourceManager.GetObject("reboot", resourceCulture);
@@ -577,6 +809,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);
@@ -584,6 +819,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);
@@ -591,6 +829,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);
@@ -598,6 +839,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);
@@ -605,6 +849,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);
@@ -612,6 +859,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);
@@ -619,6 +869,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);
@@ -626,6 +879,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);
@@ -633,6 +889,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);
@@ -640,6 +899,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);
@@ -647,6 +909,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);
@@ -654,6 +919,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);
@@ -661,6 +929,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);
@@ -668,6 +939,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap SNES_Controller {
get {
object obj = ResourceManager.GetObject("SNES_Controller", resourceCulture);
@@ -675,6 +949,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap SNESControllerIcon {
get {
object obj = ResourceManager.GetObject("SNESControllerIcon", resourceCulture);
@@ -682,6 +959,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap Stop {
get {
object obj = ResourceManager.GetObject("Stop", resourceCulture);
@@ -689,6 +969,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);
@@ -696,6 +979,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);
@@ -703,6 +989,9 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
internal static System.Drawing.Bitmap TI83_Controller {
get {
object obj = ResourceManager.GetObject("TI83_Controller", resourceCulture);
@@ -710,6 +999,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);
@@ -717,6 +1009,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);
@@ -724,6 +1019,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);
@@ -731,6 +1029,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);
@@ -738,6 +1039,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);
@@ -745,6 +1049,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);
@@ -752,6 +1059,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);
@@ -759,6 +1069,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);
@@ -766,6 +1079,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);
@@ -773,6 +1089,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);
@@ -780,6 +1099,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);
@@ -787,6 +1109,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);
@@ -794,6 +1119,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 26c1d8d5c0..e8ec21198b 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -150,7 +150,7 @@
AAEAAAD/////AQAAAAAAAAAEAQAAABZTeXN0ZW0uSU8uTWVtb3J5U3RyZWFtCgAAAAdfYnVmZmVyB19v
cmlnaW4JX3Bvc2l0aW9uB19sZW5ndGgJX2NhcGFjaXR5C19leHBhbmRhYmxlCV93cml0YWJsZQpfZXhw
b3NhYmxlB19pc09wZW4dTWFyc2hhbEJ5UmVmT2JqZWN0K19faWRlbnRpdHkHAAAAAAAAAAACAggICAgB
- AQEBCQIAAAAAAAAAAAAAAHhiAAB4YgAAAAEAAQoPAgAAAHhiAAACUklGRnBiAABXQVZFZm10IBAAAAAB
+ AQEBCQIAAAAAAAAAeGIAAHhiAAB4YgAAAAEAAQoPAgAAAHhiAAACUklGRnBiAABXQVZFZm10IBAAAAAB
AAEAIlYAACJWAAABAAgAZGF0YYBhAAB/f39/gICAgH9/f39/gICAgH9/f4CAgIB/f39/gICAf39/gIB/
f39/f39/f3+AgH9/f3+AgIB/f39/gICAf39/gICAgIB/f39/f3+AgICAf39/gICAgH9/f4CAgIB/f39/
gICAgH9/gICAgH9/f3+AgIB/f39/f4CAgIB/f3+AgIB/f39/gICAf3+AgIB/f39/gICAf39/gICAf39/
@@ -861,4 +861,7 @@
..\images\Both.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\config\ControllerImages\A78Joystick.png;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/ControllerConfig.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs
index c81291342f..2803ae9315 100644
--- a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs
@@ -146,6 +146,19 @@
this.Atari2600Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.tabPage58 = new System.Windows.Forms.TabPage();
this.Atari2600Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
+ this.tabPageAtari7800 = new System.Windows.Forms.TabPage();
+ this.pictureBox16 = new System.Windows.Forms.PictureBox();
+ this.tabControl11 = new System.Windows.Forms.TabControl();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.Atari7800Controller1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
+ this.tabPage4 = new System.Windows.Forms.TabPage();
+ this.Atari7800Controller2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
+ this.tabPage5 = new System.Windows.Forms.TabPage();
+ this.Atari7800ConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel();
+ this.tabPage6 = new System.Windows.Forms.TabPage();
+ this.Atari7800Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
+ this.tabPage7 = new System.Windows.Forms.TabPage();
+ this.Atari7800Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.tabPageC64 = new System.Windows.Forms.TabPage();
this.tabControl8 = new System.Windows.Forms.TabControl();
this.tabPage49 = new System.Windows.Forms.TabPage();
@@ -182,19 +195,6 @@
this.label38 = new System.Windows.Forms.Label();
this.AllowLR = new System.Windows.Forms.CheckBox();
this.AutoTab = new System.Windows.Forms.CheckBox();
- this.tabPageAtari7800 = new System.Windows.Forms.TabPage();
- this.pictureBox16 = new System.Windows.Forms.PictureBox();
- this.tabControl11 = new System.Windows.Forms.TabControl();
- this.tabPage3 = new System.Windows.Forms.TabPage();
- this.Atari7800Controller1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
- this.tabPage4 = new System.Windows.Forms.TabPage();
- this.Atari7800Controller2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
- this.tabPage5 = new System.Windows.Forms.TabPage();
- this.Atari7800ConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel();
- this.tabPage6 = new System.Windows.Forms.TabPage();
- this.Atari7800Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
- this.tabPage7 = new System.Windows.Forms.TabPage();
- this.Atari7800Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.PlatformTabControl.SuspendLayout();
this.tabPageNES.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).BeginInit();
@@ -265,6 +265,14 @@
this.tabPage48.SuspendLayout();
this.tabPage35.SuspendLayout();
this.tabPage58.SuspendLayout();
+ this.tabPageAtari7800.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox16)).BeginInit();
+ this.tabControl11.SuspendLayout();
+ this.tabPage3.SuspendLayout();
+ this.tabPage4.SuspendLayout();
+ this.tabPage5.SuspendLayout();
+ this.tabPage6.SuspendLayout();
+ this.tabPage7.SuspendLayout();
this.tabPageC64.SuspendLayout();
this.tabControl8.SuspendLayout();
this.tabPage49.SuspendLayout();
@@ -286,14 +294,6 @@
this.tabPage63.SuspendLayout();
this.tabPageTI83.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
- this.tabPageAtari7800.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox16)).BeginInit();
- this.tabControl11.SuspendLayout();
- this.tabPage3.SuspendLayout();
- this.tabPage4.SuspendLayout();
- this.tabPage5.SuspendLayout();
- this.tabPage6.SuspendLayout();
- this.tabPage7.SuspendLayout();
this.SuspendLayout();
//
// PlatformTabControl
@@ -1442,6 +1442,133 @@
this.Atari2600Autofire2Panel.Size = new System.Drawing.Size(368, 332);
this.Atari2600Autofire2Panel.TabIndex = 3;
//
+ // tabPageAtari7800
+ //
+ this.tabPageAtari7800.Controls.Add(this.pictureBox16);
+ this.tabPageAtari7800.Controls.Add(this.tabControl11);
+ this.tabPageAtari7800.Location = new System.Drawing.Point(4, 22);
+ this.tabPageAtari7800.Name = "tabPageAtari7800";
+ this.tabPageAtari7800.Size = new System.Drawing.Size(787, 425);
+ this.tabPageAtari7800.TabIndex = 11;
+ this.tabPageAtari7800.Text = "Atari 7800";
+ this.tabPageAtari7800.UseVisualStyleBackColor = true;
+ //
+ // pictureBox16
+ //
+ this.pictureBox16.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.pictureBox16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.pictureBox16.Image = global::BizHawk.MultiClient.Properties.Resources.A78Joystick;
+ this.pictureBox16.Location = new System.Drawing.Point(426, 37);
+ this.pictureBox16.Name = "pictureBox16";
+ this.pictureBox16.Size = new System.Drawing.Size(241, 210);
+ this.pictureBox16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.pictureBox16.TabIndex = 6;
+ this.pictureBox16.TabStop = false;
+ //
+ // tabControl11
+ //
+ this.tabControl11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)));
+ this.tabControl11.Controls.Add(this.tabPage3);
+ this.tabControl11.Controls.Add(this.tabPage4);
+ this.tabControl11.Controls.Add(this.tabPage5);
+ this.tabControl11.Controls.Add(this.tabPage6);
+ this.tabControl11.Controls.Add(this.tabPage7);
+ this.tabControl11.Location = new System.Drawing.Point(17, 15);
+ this.tabControl11.Name = "tabControl11";
+ this.tabControl11.SelectedIndex = 0;
+ this.tabControl11.Size = new System.Drawing.Size(389, 401);
+ this.tabControl11.TabIndex = 5;
+ //
+ // tabPage3
+ //
+ this.tabPage3.Controls.Add(this.Atari7800Controller1Panel);
+ this.tabPage3.Location = new System.Drawing.Point(4, 22);
+ this.tabPage3.Name = "tabPage3";
+ this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage3.Size = new System.Drawing.Size(381, 375);
+ this.tabPage3.TabIndex = 0;
+ this.tabPage3.Text = "Joystick 1";
+ this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // Atari7800Controller1Panel
+ //
+ this.Atari7800Controller1Panel.Location = new System.Drawing.Point(10, 10);
+ this.Atari7800Controller1Panel.Name = "Atari7800Controller1Panel";
+ this.Atari7800Controller1Panel.Size = new System.Drawing.Size(365, 332);
+ this.Atari7800Controller1Panel.TabIndex = 1;
+ //
+ // tabPage4
+ //
+ this.tabPage4.Controls.Add(this.Atari7800Controller2Panel);
+ this.tabPage4.Location = new System.Drawing.Point(4, 22);
+ this.tabPage4.Name = "tabPage4";
+ this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage4.Size = new System.Drawing.Size(381, 375);
+ this.tabPage4.TabIndex = 1;
+ this.tabPage4.Text = "Joystick 2";
+ this.tabPage4.UseVisualStyleBackColor = true;
+ //
+ // Atari7800Controller2Panel
+ //
+ this.Atari7800Controller2Panel.Location = new System.Drawing.Point(10, 10);
+ this.Atari7800Controller2Panel.Name = "Atari7800Controller2Panel";
+ this.Atari7800Controller2Panel.Size = new System.Drawing.Size(365, 332);
+ this.Atari7800Controller2Panel.TabIndex = 2;
+ //
+ // tabPage5
+ //
+ this.tabPage5.Controls.Add(this.Atari7800ConsoleButtons);
+ this.tabPage5.Location = new System.Drawing.Point(4, 22);
+ this.tabPage5.Name = "tabPage5";
+ this.tabPage5.Size = new System.Drawing.Size(381, 375);
+ this.tabPage5.TabIndex = 2;
+ this.tabPage5.Text = "Console";
+ this.tabPage5.UseVisualStyleBackColor = true;
+ //
+ // Atari7800ConsoleButtons
+ //
+ this.Atari7800ConsoleButtons.Location = new System.Drawing.Point(10, 10);
+ this.Atari7800ConsoleButtons.Name = "Atari7800ConsoleButtons";
+ this.Atari7800ConsoleButtons.Size = new System.Drawing.Size(359, 125);
+ this.Atari7800ConsoleButtons.TabIndex = 1;
+ //
+ // tabPage6
+ //
+ this.tabPage6.Controls.Add(this.Atari7800Autofire1Panel);
+ this.tabPage6.Location = new System.Drawing.Point(4, 22);
+ this.tabPage6.Name = "tabPage6";
+ this.tabPage6.Size = new System.Drawing.Size(381, 375);
+ this.tabPage6.TabIndex = 3;
+ this.tabPage6.Text = "Autofire 1";
+ this.tabPage6.UseVisualStyleBackColor = true;
+ //
+ // Atari7800Autofire1Panel
+ //
+ this.Atari7800Autofire1Panel.Location = new System.Drawing.Point(10, 10);
+ this.Atari7800Autofire1Panel.Name = "Atari7800Autofire1Panel";
+ this.Atari7800Autofire1Panel.Size = new System.Drawing.Size(368, 332);
+ this.Atari7800Autofire1Panel.TabIndex = 3;
+ //
+ // tabPage7
+ //
+ this.tabPage7.Controls.Add(this.Atari7800Autofire2Panel);
+ this.tabPage7.Location = new System.Drawing.Point(4, 22);
+ this.tabPage7.Name = "tabPage7";
+ this.tabPage7.Size = new System.Drawing.Size(381, 375);
+ this.tabPage7.TabIndex = 4;
+ this.tabPage7.Text = "Autofire 2";
+ this.tabPage7.UseVisualStyleBackColor = true;
+ //
+ // Atari7800Autofire2Panel
+ //
+ this.Atari7800Autofire2Panel.Location = new System.Drawing.Point(10, 10);
+ this.Atari7800Autofire2Panel.Name = "Atari7800Autofire2Panel";
+ this.Atari7800Autofire2Panel.Size = new System.Drawing.Size(368, 332);
+ this.Atari7800Autofire2Panel.TabIndex = 3;
+ //
// tabPageC64
//
this.tabPageC64.Controls.Add(this.tabControl8);
@@ -1818,133 +1945,6 @@
this.AutoTab.UseVisualStyleBackColor = true;
this.AutoTab.CheckedChanged += new System.EventHandler(this.AutoTab_CheckedChanged);
//
- // tabPageAtari7800
- //
- this.tabPageAtari7800.Controls.Add(this.pictureBox16);
- this.tabPageAtari7800.Controls.Add(this.tabControl11);
- this.tabPageAtari7800.Location = new System.Drawing.Point(4, 22);
- this.tabPageAtari7800.Name = "tabPageAtari7800";
- this.tabPageAtari7800.Size = new System.Drawing.Size(787, 425);
- this.tabPageAtari7800.TabIndex = 11;
- this.tabPageAtari7800.Text = "Atari 7800";
- this.tabPageAtari7800.UseVisualStyleBackColor = true;
- //
- // pictureBox16
- //
- this.pictureBox16.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.pictureBox16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.pictureBox16.Image = global::BizHawk.MultiClient.Properties.Resources.atari_controller;
- this.pictureBox16.Location = new System.Drawing.Point(426, 37);
- this.pictureBox16.Name = "pictureBox16";
- this.pictureBox16.Size = new System.Drawing.Size(177, 199);
- this.pictureBox16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
- this.pictureBox16.TabIndex = 6;
- this.pictureBox16.TabStop = false;
- //
- // tabControl11
- //
- this.tabControl11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)));
- this.tabControl11.Controls.Add(this.tabPage3);
- this.tabControl11.Controls.Add(this.tabPage4);
- this.tabControl11.Controls.Add(this.tabPage5);
- this.tabControl11.Controls.Add(this.tabPage6);
- this.tabControl11.Controls.Add(this.tabPage7);
- this.tabControl11.Location = new System.Drawing.Point(17, 15);
- this.tabControl11.Name = "tabControl11";
- this.tabControl11.SelectedIndex = 0;
- this.tabControl11.Size = new System.Drawing.Size(389, 401);
- this.tabControl11.TabIndex = 5;
- //
- // tabPage3
- //
- this.tabPage3.Controls.Add(this.Atari7800Controller1Panel);
- this.tabPage3.Location = new System.Drawing.Point(4, 22);
- this.tabPage3.Name = "tabPage3";
- this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(381, 375);
- this.tabPage3.TabIndex = 0;
- this.tabPage3.Text = "Joystick 1";
- this.tabPage3.UseVisualStyleBackColor = true;
- //
- // Atari7800Controller1Panel
- //
- this.Atari7800Controller1Panel.Location = new System.Drawing.Point(10, 10);
- this.Atari7800Controller1Panel.Name = "Atari7800Controller1Panel";
- this.Atari7800Controller1Panel.Size = new System.Drawing.Size(365, 332);
- this.Atari7800Controller1Panel.TabIndex = 1;
- //
- // tabPage4
- //
- this.tabPage4.Controls.Add(this.Atari7800Controller2Panel);
- this.tabPage4.Location = new System.Drawing.Point(4, 22);
- this.tabPage4.Name = "tabPage4";
- this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage4.Size = new System.Drawing.Size(381, 375);
- this.tabPage4.TabIndex = 1;
- this.tabPage4.Text = "Joystick 2";
- this.tabPage4.UseVisualStyleBackColor = true;
- //
- // Atari7800Controller2Panel
- //
- this.Atari7800Controller2Panel.Location = new System.Drawing.Point(10, 10);
- this.Atari7800Controller2Panel.Name = "Atari7800Controller2Panel";
- this.Atari7800Controller2Panel.Size = new System.Drawing.Size(365, 332);
- this.Atari7800Controller2Panel.TabIndex = 2;
- //
- // tabPage5
- //
- this.tabPage5.Controls.Add(this.Atari7800ConsoleButtons);
- this.tabPage5.Location = new System.Drawing.Point(4, 22);
- this.tabPage5.Name = "tabPage5";
- this.tabPage5.Size = new System.Drawing.Size(381, 375);
- this.tabPage5.TabIndex = 2;
- this.tabPage5.Text = "Console";
- this.tabPage5.UseVisualStyleBackColor = true;
- //
- // Atari7800ConsoleButtons
- //
- this.Atari7800ConsoleButtons.Location = new System.Drawing.Point(10, 10);
- this.Atari7800ConsoleButtons.Name = "Atari7800ConsoleButtons";
- this.Atari7800ConsoleButtons.Size = new System.Drawing.Size(359, 125);
- this.Atari7800ConsoleButtons.TabIndex = 1;
- //
- // tabPage6
- //
- this.tabPage6.Controls.Add(this.Atari7800Autofire1Panel);
- this.tabPage6.Location = new System.Drawing.Point(4, 22);
- this.tabPage6.Name = "tabPage6";
- this.tabPage6.Size = new System.Drawing.Size(381, 375);
- this.tabPage6.TabIndex = 3;
- this.tabPage6.Text = "Autofire 1";
- this.tabPage6.UseVisualStyleBackColor = true;
- //
- // Atari7800Autofire1Panel
- //
- this.Atari7800Autofire1Panel.Location = new System.Drawing.Point(10, 10);
- this.Atari7800Autofire1Panel.Name = "Atari7800Autofire1Panel";
- this.Atari7800Autofire1Panel.Size = new System.Drawing.Size(368, 332);
- this.Atari7800Autofire1Panel.TabIndex = 3;
- //
- // tabPage7
- //
- this.tabPage7.Controls.Add(this.Atari7800Autofire2Panel);
- this.tabPage7.Location = new System.Drawing.Point(4, 22);
- this.tabPage7.Name = "tabPage7";
- this.tabPage7.Size = new System.Drawing.Size(381, 375);
- this.tabPage7.TabIndex = 4;
- this.tabPage7.Text = "Autofire 2";
- this.tabPage7.UseVisualStyleBackColor = true;
- //
- // Atari7800Autofire2Panel
- //
- this.Atari7800Autofire2Panel.Location = new System.Drawing.Point(10, 10);
- this.Atari7800Autofire2Panel.Name = "Atari7800Autofire2Panel";
- this.Atari7800Autofire2Panel.Size = new System.Drawing.Size(368, 332);
- this.Atari7800Autofire2Panel.TabIndex = 3;
- //
// ControllerConfig
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2031,6 +2031,14 @@
this.tabPage48.ResumeLayout(false);
this.tabPage35.ResumeLayout(false);
this.tabPage58.ResumeLayout(false);
+ this.tabPageAtari7800.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox16)).EndInit();
+ this.tabControl11.ResumeLayout(false);
+ this.tabPage3.ResumeLayout(false);
+ this.tabPage4.ResumeLayout(false);
+ this.tabPage5.ResumeLayout(false);
+ this.tabPage6.ResumeLayout(false);
+ this.tabPage7.ResumeLayout(false);
this.tabPageC64.ResumeLayout(false);
this.tabControl8.ResumeLayout(false);
this.tabPage49.ResumeLayout(false);
@@ -2052,14 +2060,6 @@
this.tabPage63.ResumeLayout(false);
this.tabPageTI83.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
- this.tabPageAtari7800.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox16)).EndInit();
- this.tabControl11.ResumeLayout(false);
- this.tabPage3.ResumeLayout(false);
- this.tabPage4.ResumeLayout(false);
- this.tabPage5.ResumeLayout(false);
- this.tabPage6.ResumeLayout(false);
- this.tabPage7.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/BizHawk.MultiClient/config/ControllerImages/A78Joystick.png b/BizHawk.MultiClient/config/ControllerImages/A78Joystick.png
new file mode 100644
index 0000000000..1c1dad9150
Binary files /dev/null and b/BizHawk.MultiClient/config/ControllerImages/A78Joystick.png differ