diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index e2fa3e6d45..0ea7d9ea2f 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1381,6 +1381,8 @@ + + diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index ac920b08bf..bd61765b68 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -188,13 +188,13 @@ this.SavestateTypeDefaultMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SavestateBinaryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SavestateTextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.coreSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gBInSGBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.nESInQuickNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.SaveConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LoadConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.coreSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gBInSGBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.nESInQuickNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ToolBoxMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); @@ -360,6 +360,7 @@ this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator(); this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CoreNameStatusBarButton = new System.Windows.Forms.ToolStripStatusLabel(); this.MainformMenu.SuspendLayout(); this.MainStatusBar.SuspendLayout(); this.MainFormContextMenu.SuspendLayout(); @@ -1748,6 +1749,31 @@ this.SavestateTextMenuItem.Text = "Text"; this.SavestateTextMenuItem.Click += new System.EventHandler(this.SavestateTextMenuItem_Click); // + // coreSelectionToolStripMenuItem + // + this.coreSelectionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.gBInSGBToolStripMenuItem, + this.nESInQuickNESToolStripMenuItem}); + this.coreSelectionToolStripMenuItem.Name = "coreSelectionToolStripMenuItem"; + this.coreSelectionToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.coreSelectionToolStripMenuItem.Text = "Core Selection"; + this.coreSelectionToolStripMenuItem.DropDownOpened += new System.EventHandler(this.coreSelectionToolStripMenuItem_DropDownOpened); + this.coreSelectionToolStripMenuItem.Click += new System.EventHandler(this.coreSelectionToolStripMenuItem_Click); + // + // gBInSGBToolStripMenuItem + // + this.gBInSGBToolStripMenuItem.Name = "gBInSGBToolStripMenuItem"; + this.gBInSGBToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.gBInSGBToolStripMenuItem.Text = "GB in SGB"; + this.gBInSGBToolStripMenuItem.Click += new System.EventHandler(this.gBInSGBToolStripMenuItem_Click); + // + // nESInQuickNESToolStripMenuItem + // + this.nESInQuickNESToolStripMenuItem.Name = "nESInQuickNESToolStripMenuItem"; + this.nESInQuickNESToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.nESInQuickNESToolStripMenuItem.Text = "NES in QuickNES"; + this.nESInQuickNESToolStripMenuItem.Click += new System.EventHandler(this.nESInQuickNESToolStripMenuItem_Click); + // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; @@ -1774,31 +1800,6 @@ this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Size = new System.Drawing.Size(156, 6); // - // coreSelectionToolStripMenuItem - // - this.coreSelectionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.gBInSGBToolStripMenuItem, - this.nESInQuickNESToolStripMenuItem}); - this.coreSelectionToolStripMenuItem.Name = "coreSelectionToolStripMenuItem"; - this.coreSelectionToolStripMenuItem.Size = new System.Drawing.Size(159, 22); - this.coreSelectionToolStripMenuItem.Text = "Core Selection"; - this.coreSelectionToolStripMenuItem.DropDownOpened += new System.EventHandler(this.coreSelectionToolStripMenuItem_DropDownOpened); - this.coreSelectionToolStripMenuItem.Click += new System.EventHandler(this.coreSelectionToolStripMenuItem_Click); - // - // gBInSGBToolStripMenuItem - // - this.gBInSGBToolStripMenuItem.Name = "gBInSGBToolStripMenuItem"; - this.gBInSGBToolStripMenuItem.Size = new System.Drawing.Size(163, 22); - this.gBInSGBToolStripMenuItem.Text = "GB in SGB"; - this.gBInSGBToolStripMenuItem.Click += new System.EventHandler(this.gBInSGBToolStripMenuItem_Click); - // - // nESInQuickNESToolStripMenuItem - // - this.nESInQuickNESToolStripMenuItem.Name = "nESInQuickNESToolStripMenuItem"; - this.nESInQuickNESToolStripMenuItem.Size = new System.Drawing.Size(163, 22); - this.nESInQuickNESToolStripMenuItem.Text = "NES in QuickNES"; - this.nESInQuickNESToolStripMenuItem.Click += new System.EventHandler(this.nESInQuickNESToolStripMenuItem_Click); - // // toolsToolStripMenuItem // this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2678,7 +2679,8 @@ this.Slot9StatusButton, this.Slot0StatusButton, this.CheatStatusButton, - this.KeyPriorityStatusLabel}); + this.KeyPriorityStatusLabel, + this.CoreNameStatusBarButton}); this.MainStatusBar.Location = new System.Drawing.Point(0, 386); this.MainStatusBar.Name = "MainStatusBar"; this.MainStatusBar.ShowItemToolTips = true; @@ -2839,8 +2841,9 @@ // this.KeyPriorityStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.KeyPriorityStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Both; + this.KeyPriorityStatusLabel.Margin = new System.Windows.Forms.Padding(5, 3, 5, 0); this.KeyPriorityStatusLabel.Name = "KeyPriorityStatusLabel"; - this.KeyPriorityStatusLabel.Size = new System.Drawing.Size(16, 17); + this.KeyPriorityStatusLabel.Size = new System.Drawing.Size(16, 19); this.KeyPriorityStatusLabel.Text = "KeyPriority"; this.KeyPriorityStatusLabel.Click += new System.EventHandler(this.KeyPriorityStatusLabel_Click); // @@ -3143,6 +3146,13 @@ this.ShowMenuContextMenuItem.Text = "Show Menu"; this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click); // + // CoreNameStatusBarButton + // + this.CoreNameStatusBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall; + this.CoreNameStatusBarButton.Name = "CoreNameStatusBarButton"; + this.CoreNameStatusBarButton.Size = new System.Drawing.Size(71, 17); + this.CoreNameStatusBarButton.Text = "Neshawk"; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); @@ -3514,6 +3524,7 @@ private System.Windows.Forms.ToolStripMenuItem extensionsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem Atari2600DebuggerMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator31; + private System.Windows.Forms.ToolStripStatusLabel CoreNameStatusBarButton; } } diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index d2525568f8..53c2119f53 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -12,6 +12,7 @@ using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Atari.Atari2600; using BizHawk.Emulation.Cores.Calculators; +using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Nintendo.GBA; @@ -2319,6 +2320,49 @@ namespace BizHawk.Client.EmuHawk return (ModifierKeys & Keys.Alt) != 0 || base.ProcessDialogChar(charCode); } + private void UpdateCoreStatusBarButton() + { + if (Global.Emulator is NullEmulator) + { + CoreNameStatusBarButton.Visible = false; + return; + } + + CoreNameStatusBarButton.Visible = true; + CoreAttributes attributes = Global.Emulator.Attributes(); + + CoreNameStatusBarButton.Text = + (!attributes.Released ? "(Experimental) " : string.Empty) + + attributes.CoreName; + + CoreNameStatusBarButton.ToolTipText = + (attributes.Ported ? "(ported) " : string.Empty) + + "written by: " + attributes.Author; + + if (!attributes.Ported) + { + CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall; + } + else + { + if (Global.Emulator is QuickNES) + { + CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.QuickNes; + } + + // TODO: other icons + // unknown + // yabause, + // bsnes, + // mupen64plus, + // atari 7800, + // ppsspp, + // gambattte, + // meteor, + // gpgx + } + } + #endregion #region Frame Loop @@ -2967,6 +3011,7 @@ namespace BizHawk.Client.EmuHawk HandlePlatformMenus(); _stateSlots.Clear(); UpdateStatusSlots(); + UpdateCoreStatusBarButton(); UpdateDumpIcon(); Global.Rewinder.CaptureRewindState(); @@ -3093,10 +3138,11 @@ namespace BizHawk.Client.EmuHawk RewireSound(); Global.Rewinder.ResetRewindBuffer(); - Text = "BizHawk" + (VersionInfo.INTERIM ? " (interim) " : String.Empty); + Text = "BizHawk" + (VersionInfo.INTERIM ? " (interim) " : string.Empty); HandlePlatformMenus(); _stateSlots.Clear(); UpdateDumpIcon(); + UpdateCoreStatusBarButton(); ToolHelpers.UpdateCheatRelatedTools(null, null); } } diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index b21fbded8d..31283f79d7 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -60,6 +60,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap A78Joystick { get { object obj = ResourceManager.GetObject("A78Joystick", resourceCulture); @@ -67,6 +70,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap addWatch { get { object obj = ResourceManager.GetObject("addWatch", resourceCulture); @@ -74,6 +80,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap alt_about_image { get { object obj = ResourceManager.GetObject("alt_about_image", resourceCulture); @@ -81,6 +90,9 @@ namespace BizHawk.Client.EmuHawk.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); @@ -88,6 +100,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap AudioHS { get { object obj = ResourceManager.GetObject("AudioHS", resourceCulture); @@ -95,6 +110,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap AutoSearch { get { object obj = ResourceManager.GetObject("AutoSearch", resourceCulture); @@ -102,6 +120,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap AVI { get { object obj = ResourceManager.GetObject("AVI", resourceCulture); @@ -109,6 +130,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Back { get { object obj = ResourceManager.GetObject("Back", resourceCulture); @@ -116,6 +140,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap BackMore { get { object obj = ResourceManager.GetObject("BackMore", resourceCulture); @@ -123,6 +150,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Blank { get { object obj = ResourceManager.GetObject("Blank", resourceCulture); @@ -130,6 +160,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap BlueDown { get { object obj = ResourceManager.GetObject("BlueDown", resourceCulture); @@ -137,6 +170,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap BlueUp { get { object obj = ResourceManager.GetObject("BlueUp", resourceCulture); @@ -144,6 +180,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Both { get { object obj = ResourceManager.GetObject("Both", resourceCulture); @@ -151,6 +190,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Bug { get { object obj = ResourceManager.GetObject("Bug", resourceCulture); @@ -158,6 +200,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap C64Joystick { get { object obj = ResourceManager.GetObject("C64Joystick", resourceCulture); @@ -165,6 +210,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap C64Keyboard { get { object obj = ResourceManager.GetObject("C64Keyboard", resourceCulture); @@ -172,6 +220,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap C64Symbol { get { object obj = ResourceManager.GetObject("C64Symbol", resourceCulture); @@ -179,6 +230,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap calculator { get { object obj = ResourceManager.GetObject("calculator", resourceCulture); @@ -186,6 +240,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap camera { get { object obj = ResourceManager.GetObject("camera", resourceCulture); @@ -193,6 +250,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap cheat { get { object obj = ResourceManager.GetObject("cheat", resourceCulture); @@ -200,6 +260,9 @@ namespace BizHawk.Client.EmuHawk.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); @@ -207,6 +270,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap checkbox { get { object obj = ResourceManager.GetObject("checkbox", resourceCulture); @@ -214,6 +280,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Close { get { object obj = ResourceManager.GetObject("Close", resourceCulture); @@ -221,6 +290,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap colecovisioncontroller { get { object obj = ResourceManager.GetObject("colecovisioncontroller", resourceCulture); @@ -228,6 +300,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap console16x16 { get { object obj = ResourceManager.GetObject("console16x16", resourceCulture); @@ -235,6 +310,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap console32x32 { get { object obj = ResourceManager.GetObject("console32x32", resourceCulture); @@ -242,6 +320,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap CopyFolderHS { get { object obj = ResourceManager.GetObject("CopyFolderHS", resourceCulture); @@ -249,6 +330,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap corphawk { get { object obj = ResourceManager.GetObject("corphawk", resourceCulture); @@ -256,6 +340,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap CorpHawkSmall { get { object obj = ResourceManager.GetObject("CorpHawkSmall", resourceCulture); @@ -263,6 +350,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap CutHS { get { object obj = ResourceManager.GetObject("CutHS", resourceCulture); @@ -270,6 +360,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Debugger { get { object obj = ResourceManager.GetObject("Debugger", resourceCulture); @@ -277,6 +370,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Delete { get { object obj = ResourceManager.GetObject("Delete", resourceCulture); @@ -284,6 +380,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Duplicate { get { object obj = ResourceManager.GetObject("Duplicate", resourceCulture); @@ -291,6 +390,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Erase { get { object obj = ResourceManager.GetObject("Erase", resourceCulture); @@ -298,6 +400,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap ExclamationRed { get { object obj = ResourceManager.GetObject("ExclamationRed", resourceCulture); @@ -305,6 +410,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap FastForward { get { object obj = ResourceManager.GetObject("FastForward", resourceCulture); @@ -312,6 +420,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap FindHS { get { object obj = ResourceManager.GetObject("FindHS", resourceCulture); @@ -319,6 +430,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Forward { get { object obj = ResourceManager.GetObject("Forward", resourceCulture); @@ -326,6 +440,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap ForwardMore { get { object obj = ResourceManager.GetObject("ForwardMore", resourceCulture); @@ -333,6 +450,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Freeze { get { object obj = ResourceManager.GetObject("Freeze", resourceCulture); @@ -340,6 +460,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Fullscreen { get { object obj = ResourceManager.GetObject("Fullscreen", resourceCulture); @@ -347,6 +470,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap GameController { get { object obj = ResourceManager.GetObject("GameController", resourceCulture); @@ -354,6 +480,9 @@ namespace BizHawk.Client.EmuHawk.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); @@ -361,6 +490,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap gba_icon { get { object obj = ResourceManager.GetObject("gba_icon", resourceCulture); @@ -368,6 +500,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap GBController { get { object obj = ResourceManager.GetObject("GBController", resourceCulture); @@ -375,6 +510,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap GENController { get { object obj = ResourceManager.GetObject("GENController", resourceCulture); @@ -382,6 +520,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap GenesisControllerIcon { get { object obj = ResourceManager.GetObject("GenesisControllerIcon", resourceCulture); @@ -389,6 +530,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap GreenCheck { get { object obj = ResourceManager.GetObject("GreenCheck", resourceCulture); @@ -396,6 +540,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Hack { get { object obj = ResourceManager.GetObject("Hack", resourceCulture); @@ -403,6 +550,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Help { get { object obj = ResourceManager.GetObject("Help", resourceCulture); @@ -410,6 +560,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap HomeBrew { get { object obj = ResourceManager.GetObject("HomeBrew", resourceCulture); @@ -417,6 +570,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap HotKeys { get { object obj = ResourceManager.GetObject("HotKeys", resourceCulture); @@ -424,6 +580,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Import { get { object obj = ResourceManager.GetObject("Import", resourceCulture); @@ -431,6 +590,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap InsertSeparator { get { object obj = ResourceManager.GetObject("InsertSeparator", resourceCulture); @@ -438,6 +600,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap IntVController { get { object obj = ResourceManager.GetObject("IntVController", resourceCulture); @@ -445,6 +610,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Lightning { get { object obj = ResourceManager.GetObject("Lightning", resourceCulture); @@ -452,6 +620,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap LightOff { get { object obj = ResourceManager.GetObject("LightOff", resourceCulture); @@ -459,6 +630,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap LightOn { get { object obj = ResourceManager.GetObject("LightOn", resourceCulture); @@ -466,6 +640,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap LoadConfig { get { object obj = ResourceManager.GetObject("LoadConfig", resourceCulture); @@ -473,6 +650,9 @@ namespace BizHawk.Client.EmuHawk.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); @@ -480,6 +660,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Lua { get { object obj = ResourceManager.GetObject("Lua", resourceCulture); @@ -487,6 +670,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap MessageConfig { get { object obj = ResourceManager.GetObject("MessageConfig", resourceCulture); @@ -494,6 +680,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap MoveDown { get { object obj = ResourceManager.GetObject("MoveDown", resourceCulture); @@ -501,6 +690,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap MoveLeft { get { object obj = ResourceManager.GetObject("MoveLeft", resourceCulture); @@ -508,6 +700,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap MoveRight { get { object obj = ResourceManager.GetObject("MoveRight", resourceCulture); @@ -515,6 +710,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap MoveUp { get { object obj = ResourceManager.GetObject("MoveUp", resourceCulture); @@ -522,6 +720,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap N64 { get { object obj = ResourceManager.GetObject("N64", resourceCulture); @@ -529,6 +730,9 @@ namespace BizHawk.Client.EmuHawk.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); @@ -536,6 +740,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap NESControllerIcon { get { object obj = ResourceManager.GetObject("NESControllerIcon", resourceCulture); @@ -543,6 +750,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap NewFile { get { object obj = ResourceManager.GetObject("NewFile", resourceCulture); @@ -550,12 +760,18 @@ namespace BizHawk.Client.EmuHawk.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); @@ -563,6 +779,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Paste { get { object obj = ResourceManager.GetObject("Paste", resourceCulture); @@ -570,6 +789,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Pause { get { object obj = ResourceManager.GetObject("Pause", resourceCulture); @@ -577,6 +799,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap pcb { get { object obj = ResourceManager.GetObject("pcb", resourceCulture); @@ -584,6 +809,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap pcejin1 { get { object obj = ResourceManager.GetObject("pcejin1", resourceCulture); @@ -591,6 +819,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap PCEngineController { get { object obj = ResourceManager.GetObject("PCEngineController", resourceCulture); @@ -598,6 +829,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap pencil { get { object obj = ResourceManager.GetObject("pencil", resourceCulture); @@ -605,6 +839,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Play { get { object obj = ResourceManager.GetObject("Play", resourceCulture); @@ -612,6 +849,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap poke { get { object obj = ResourceManager.GetObject("poke", resourceCulture); @@ -619,6 +859,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Previous { get { object obj = ResourceManager.GetObject("Previous", resourceCulture); @@ -626,6 +869,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap PrintPreviewHS { get { object obj = ResourceManager.GetObject("PrintPreviewHS", resourceCulture); @@ -633,6 +879,19 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap QuickNes { + get { + object obj = ResourceManager.GetObject("QuickNes", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap ReadOnly { get { object obj = ResourceManager.GetObject("ReadOnly", resourceCulture); @@ -640,6 +899,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap reboot { get { object obj = ResourceManager.GetObject("reboot", resourceCulture); @@ -647,6 +909,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Recent { get { object obj = ResourceManager.GetObject("Recent", resourceCulture); @@ -654,6 +919,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap RecordHS { get { object obj = ResourceManager.GetObject("RecordHS", resourceCulture); @@ -661,6 +929,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap redo { get { object obj = ResourceManager.GetObject("redo", resourceCulture); @@ -668,6 +939,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Refresh { get { object obj = ResourceManager.GetObject("Refresh", resourceCulture); @@ -675,6 +949,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Refresh1 { get { object obj = ResourceManager.GetObject("Refresh1", resourceCulture); @@ -682,6 +959,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap restart { get { object obj = ResourceManager.GetObject("restart", resourceCulture); @@ -689,6 +969,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap RetroQuestion { get { object obj = ResourceManager.GetObject("RetroQuestion", resourceCulture); @@ -696,6 +979,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap SaturnController { get { object obj = ResourceManager.GetObject("SaturnController", resourceCulture); @@ -703,6 +989,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Save { get { object obj = ResourceManager.GetObject("Save", resourceCulture); @@ -710,6 +999,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap SaveAs { get { object obj = ResourceManager.GetObject("SaveAs", resourceCulture); @@ -717,6 +1009,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap SaveConfig { get { object obj = ResourceManager.GetObject("SaveConfig", resourceCulture); @@ -724,6 +1019,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Scan { get { object obj = ResourceManager.GetObject("Scan", resourceCulture); @@ -731,6 +1029,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap search { get { object obj = ResourceManager.GetObject("search", resourceCulture); @@ -738,6 +1039,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap sms_icon { get { object obj = ResourceManager.GetObject("sms_icon", resourceCulture); @@ -755,6 +1059,9 @@ namespace BizHawk.Client.EmuHawk.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); @@ -762,6 +1069,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap SNESControllerIcon { get { object obj = ResourceManager.GetObject("SNESControllerIcon", resourceCulture); @@ -769,6 +1079,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Stop { get { object obj = ResourceManager.GetObject("Stop", resourceCulture); @@ -776,6 +1089,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap TAStudio { get { object obj = ResourceManager.GetObject("TAStudio", resourceCulture); @@ -783,6 +1099,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap textdoc { get { object obj = ResourceManager.GetObject("textdoc", resourceCulture); @@ -790,6 +1109,9 @@ namespace BizHawk.Client.EmuHawk.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); @@ -797,6 +1119,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap TI83Calculator { get { object obj = ResourceManager.GetObject("TI83Calculator", resourceCulture); @@ -804,6 +1129,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap ToolBox { get { object obj = ResourceManager.GetObject("ToolBox", resourceCulture); @@ -811,6 +1139,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Translation { get { object obj = ResourceManager.GetObject("Translation", resourceCulture); @@ -818,6 +1149,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap TruncateFromFile { get { object obj = ResourceManager.GetObject("TruncateFromFile", resourceCulture); @@ -825,6 +1159,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap TruncateFromRW { get { object obj = ResourceManager.GetObject("TruncateFromRW", resourceCulture); @@ -832,6 +1169,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap TurboFastForward { get { object obj = ResourceManager.GetObject("TurboFastForward", resourceCulture); @@ -839,6 +1179,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap tvIcon { get { object obj = ResourceManager.GetObject("tvIcon", resourceCulture); @@ -846,6 +1189,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap undo { get { object obj = ResourceManager.GetObject("undo", resourceCulture); @@ -853,6 +1199,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap Unfreeze { get { object obj = ResourceManager.GetObject("Unfreeze", resourceCulture); @@ -860,6 +1209,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap WarningHS { get { object obj = ResourceManager.GetObject("WarningHS", resourceCulture); @@ -867,6 +1219,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap watch { get { object obj = ResourceManager.GetObject("watch", resourceCulture); @@ -874,6 +1229,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap whiteTriDown { get { object obj = ResourceManager.GetObject("whiteTriDown", resourceCulture); @@ -881,6 +1239,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap whiteTriLeft { get { object obj = ResourceManager.GetObject("whiteTriLeft", resourceCulture); @@ -888,6 +1249,9 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap whiteTriRight { get { object obj = ResourceManager.GetObject("whiteTriRight", resourceCulture); @@ -895,6 +1259,9 @@ namespace BizHawk.Client.EmuHawk.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.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx index bb1cd5eae8..b17c067755 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -903,4 +903,7 @@ ..\images\sms-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\QuickNes.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.Client.EmuHawk/images/QuickNes.png b/BizHawk.Client.EmuHawk/images/QuickNes.png new file mode 100644 index 0000000000..5792558e8a Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/QuickNes.png differ diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj index 6df1946d29..9d8b33a4e7 100644 --- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj +++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj @@ -50,6 +50,7 @@ + diff --git a/BizHawk.Emulation.Common/CoreAttributes.cs b/BizHawk.Emulation.Common/CoreAttributes.cs index 9f38a89e02..6dcbb12a61 100644 --- a/BizHawk.Emulation.Common/CoreAttributes.cs +++ b/BizHawk.Emulation.Common/CoreAttributes.cs @@ -4,11 +4,17 @@ namespace BizHawk.Emulation.Common { public class CoreAttributes : Attribute { - public CoreAttributes(string name) + public CoreAttributes(string name, string author, bool isPorted = false, bool isReleased = false) { CoreName = name; + Author = author; + Ported = isPorted; + Released = isReleased; } public string CoreName { get; private set; } + public string Author { get; private set; } + public bool Ported { get; private set; } + public bool Released { get; private set; } } } diff --git a/BizHawk.Emulation.Common/Extensions.cs b/BizHawk.Emulation.Common/Extensions.cs new file mode 100644 index 0000000000..d1457fed2b --- /dev/null +++ b/BizHawk.Emulation.Common/Extensions.cs @@ -0,0 +1,12 @@ +using System; + +namespace BizHawk.Emulation.Common +{ + public static class Extensions + { + public static CoreAttributes Attributes(this IEmulator core) + { + return (CoreAttributes)Attribute.GetCustomAttribute(core.GetType(), typeof(CoreAttributes)); + } + } +} diff --git a/BizHawk.Emulation.Common/Interfaces/Base Implementations/NullEmulator.cs b/BizHawk.Emulation.Common/Interfaces/Base Implementations/NullEmulator.cs index 9fd4dc9628..144c40484a 100644 --- a/BizHawk.Emulation.Common/Interfaces/Base Implementations/NullEmulator.cs +++ b/BizHawk.Emulation.Common/Interfaces/Base Implementations/NullEmulator.cs @@ -5,7 +5,7 @@ using BizHawk.Common; namespace BizHawk.Emulation.Common { - [CoreAttributes("NullHawk")] + [CoreAttributes("NullHawk", "")] public class NullEmulator : IEmulator, IVideoProvider, ISyncSoundProvider, ISoundProvider { public string SystemId { get { return "NULL"; } } diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.cs b/BizHawk.Emulation.Cores/Calculator/TI83.cs index 2afc208063..edf687cd23 100644 --- a/BizHawk.Emulation.Cores/Calculator/TI83.cs +++ b/BizHawk.Emulation.Cores/Calculator/TI83.cs @@ -11,7 +11,12 @@ using BizHawk.Emulation.Cores.Components.Z80; namespace BizHawk.Emulation.Cores.Calculators { - [CoreAttributes("TI83Hawk")] + [CoreAttributes( + "TI83Hawk", + "zeromus", + isPorted: false, + isReleased: true + )] public class TI83 : IEmulator { //hardware diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs index bc2a8563da..2c770094a6 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs @@ -6,7 +6,12 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Computers.Commodore64 { - [CoreAttributes("C64Hawk")] + [CoreAttributes( + "C64Hawk", + "SaxxonPIke", + isPorted: false, + isReleased: false + )] sealed public partial class C64 : IEmulator { // internal variables diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs index 6d7633e689..2bafa69885 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs @@ -9,7 +9,12 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Atari.Atari2600 { - [CoreAttributes("Atari2600Hawk")] + [CoreAttributes( + "Atari2600Hawk", + "Micro500, adelikat", + isPorted: false, + isReleased: true + )] public partial class Atari2600 : IEmulator { private readonly GameInfo _game; diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs index 3d2b8fdd2b..1a0aeb2cc9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs @@ -8,7 +8,12 @@ using EMU7800.Core; namespace BizHawk.Emulation.Cores.Atari.Atari7800 { - [CoreAttributes("EMU7800")] + [CoreAttributes( + "EMU7800", + "Mike Murphy", + isPorted: true, + isReleased: true + )] public partial class Atari7800 : IEmulator { // TODO: diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs index b38f8ae078..93d3f08323 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs +++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs @@ -9,7 +9,12 @@ using BizHawk.Emulation.Cores.Components.Z80; namespace BizHawk.Emulation.Cores.ColecoVision { - [CoreAttributes("ColecoHawk")] + [CoreAttributes( + "ColecoHawk", + "Vecna", + isPorted: false, + isReleased: true + )] public sealed partial class ColecoVision : IEmulator { // ROM diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs index 656ebd0477..2a17c9bea8 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs +++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs @@ -7,7 +7,12 @@ using BizHawk.Emulation.Cores.Components.CP1610; namespace BizHawk.Emulation.Cores.Intellivision { - [CoreAttributes("IntelliHawk")] + [CoreAttributes( + "IntelliHawk", + "BrandonE", + isPorted: false, + isReleased: false + )] public sealed partial class Intellivision : IEmulator { byte[] Rom; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs index e33f6112b8..f315bf52f9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs @@ -8,7 +8,12 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Nintendo.GBA { - [CoreAttributes("Meteor")] + [CoreAttributes( + "Meteor", + "blastrock", + isPorted: true, + isReleased: true + )] public class GBA : IEmulator, IVideoProvider, ISyncSoundProvider { public Dictionary GetCpuFlagsAndRegisters() diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index bfb3877b44..4bc8b8c276 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -10,7 +10,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// /// a gameboy/gameboy color emulator wrapped around native C++ libgambatte /// - [CoreAttributes("Gambatte")] + [CoreAttributes( + "Gambatte", + "sinamas", + isPorted: true, + isReleased: false + )] public class Gameboy : IEmulator, IVideoProvider, ISyncSoundProvider { /// diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs index a10a9d5426..befcee1b09 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs @@ -9,7 +9,12 @@ using BizHawk.Emulation.Cores.Nintendo.SNES; namespace BizHawk.Emulation.Cores.Nintendo.Gameboy { - [CoreAttributes("DualGambatte")] + [CoreAttributes( + "DualGambatte", + "sinamas/natt", + isPorted: true, + isReleased: true + )] public class GambatteLink : IEmulator, IVideoProvider, ISyncSoundProvider { bool disposed = false; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index b67538b89a..d83d484ade 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -11,7 +11,12 @@ using BizHawk.Emulation.Cores.Nintendo.N64.NativeApi; namespace BizHawk.Emulation.Cores.Nintendo.N64 { - [CoreAttributes("Mupen64Plus")] + [CoreAttributes( + "Mupen64Plus", + "Richard Goedeken", + isPorted: true, + isReleased: true + )] public class N64 : IEmulator { public Dictionary GetCpuFlagsAndRegisters() diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs index 752226f363..935cc3bf76 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs @@ -9,7 +9,12 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Nintendo.NES { - [CoreAttributes("NesHawk")] + [CoreAttributes( + "NesHawk", + "zeromus, natt, adelikat", + isPorted: false, + isReleased: true + )] public partial class NES : IEmulator { static readonly bool USE_DATABASE = true; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index aefb4d60f5..dc0101cf30 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -10,7 +10,12 @@ using Newtonsoft.Json; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES { - [CoreAttributes("QuickNes")] + [CoreAttributes( + "QuickNes", + "kode54", + isPorted: true, + isReleased: true + )] public class QuickNES : IEmulator, IVideoProvider, ISyncSoundProvider { #region FPU precision diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs index 7085a71b56..230ee5a6ea 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -57,7 +57,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES } } - [CoreAttributes("BSNES")] + [CoreAttributes( + "BSNES", + "byuu", + isPorted: true, + isReleased: false + )] public unsafe class LibsnesCore : IEmulator, IVideoProvider { public bool IsSGB { get; private set; } diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index 5a9df5d3f4..0854c7ffa4 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs @@ -13,7 +13,12 @@ namespace BizHawk.Emulation.Cores.PCEngine { public enum NecSystemType { TurboGrafx, TurboCD, SuperGrafx } - [CoreAttributes("PCEHawk")] + [CoreAttributes( + "PCEHawk", + "Vecna", + isPorted: false, + isReleased: true + )] public sealed partial class PCEngine : IEmulator { // ROM diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs index 2debdf2f8e..e8f73e6f03 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs @@ -14,7 +14,12 @@ using Native68000; namespace BizHawk.Emulation.Cores.Sega.Genesis { - [CoreAttributes("GenesisHawk")] + [CoreAttributes( + "GenesisHawk", + "Vecna", + isPorted: false, + isReleased: false + )] public sealed partial class Genesis : IEmulator { private int _lagcount = 0; diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs index 230205e1e6..a92ef60d30 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs @@ -19,7 +19,12 @@ using BizHawk.Emulation.Cores.Components.Z80; namespace BizHawk.Emulation.Cores.Sega.MasterSystem { - [CoreAttributes("SMSHawk")] + [CoreAttributes( + "SMSHawk", + "Vecna", + isPorted: false, + isReleased: true + )] public sealed partial class SMS : IEmulator { // Constants diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs index d05fec42cd..ddc043bfc7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs @@ -11,7 +11,12 @@ using BizHawk.Emulation.DiscSystem; namespace BizHawk.Emulation.Cores.Sega.Saturn { - [CoreAttributes("Yabause")] + [CoreAttributes( + "Yabause", + "Guillaume", + isPorted: true, + isReleased: true + )] public class Yabause : IEmulator, IVideoProvider, ISyncSoundProvider { public static ControllerDefinition SaturnController = new ControllerDefinition diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs index 0858dccb99..17e4895f7a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs @@ -15,7 +15,12 @@ using System.ComponentModel; namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx { - [CoreAttributes("Genplus-gx")] + [CoreAttributes( + "Genplus-gx", + "ekeeke31", + isPorted: true, + isReleased: true + )] public class GPGX : IEmulator, ISyncSoundProvider, IVideoProvider { static GPGX AttachedCore = null; diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSP/PSP.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSP/PSP.cs index b827d4fbd0..67e6326c47 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sony/PSP/PSP.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSP/PSP.cs @@ -8,7 +8,12 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Sony.PSP { - [CoreAttributes("PPSSPP")] + [CoreAttributes( + "PPSSPP", + "hrydgard", + isPorted: true, + isReleased: false + )] public class PSP : IEmulator, IVideoProvider, ISyncSoundProvider { public static readonly ControllerDefinition PSPController = new ControllerDefinition diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs index 7d3ddef5ed..e75721def2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs @@ -9,7 +9,12 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Sony.PSX { - [CoreAttributes("MednafenPSX")] + [CoreAttributes( + "MednafenPSX", + "Ryphecha", + isPorted: true, + isReleased: false + )] public unsafe class Octoshock : IEmulator, IVideoProvider, ISoundProvider { public string SystemId { get { return "NULL"; } }