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

Add files via upload

This commit is contained in:
alyosha-tas 2017-06-11 18:17:34 -04:00 committed by GitHub
parent 3c46604f28
commit 16163d959e
3 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -290,8 +290,10 @@
this.AutoloadKeypadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.paletteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AtariSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AtariSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GBSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AtariSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.A7800SubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.A7800ControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GBSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.GBcoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.LoadGBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator();
@ -456,7 +458,8 @@
this.SMSSubMenu,
this.TI83SubMenu,
this.AtariSubMenu,
this.GBSubMenu,
this.A7800SubMenu,
this.GBSubMenu,
this.GBASubMenu,
this.PSXSubMenu,
this.SNESSubMenu,
@ -2655,10 +2658,26 @@
this.AtariSettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.AtariSettingsToolStripMenuItem.Text = "Settings...";
this.AtariSettingsToolStripMenuItem.Click += new System.EventHandler(this.AtariSettingsToolStripMenuItem_Click);
//
// GBSubMenu
//
this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
//
// A7800SubMenu
//
this.A7800SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.A7800ControllerSettingsMenuItem});
this.A7800SubMenu.Name = "A7800SubMenu";
this.A7800SubMenu.Size = new System.Drawing.Size(56, 19);
this.A7800SubMenu.Text = "&A7800";
this.A7800SubMenu.DropDownOpened += new System.EventHandler(this.A7800SubMenu_DropDownOpened);
//
// A7800SettingsToolStripMenuItem
//
this.A7800ControllerSettingsMenuItem.Name = "A7800ControllerSettingsMenuItem";
this.A7800ControllerSettingsMenuItem.Size = new System.Drawing.Size(125, 22);
this.A7800ControllerSettingsMenuItem.Text = "Settings...";
this.A7800ControllerSettingsMenuItem.Click += new System.EventHandler(this.A7800SettingsToolStripMenuItem_Click);
//
// GBSubMenu
//
this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.GBcoreSettingsToolStripMenuItem,
this.LoadGBInSGBMenuItem,
this.toolStripSeparator28,
@ -4097,6 +4116,7 @@
private System.Windows.Forms.ToolStripMenuItem PCEBGViewerMenuItem;
private System.Windows.Forms.ToolStripMenuItem ScreenshotContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem AtariSubMenu;
private System.Windows.Forms.ToolStripMenuItem A7800SubMenu;
private System.Windows.Forms.ToolStripMenuItem NESSoundChannelsMenuItem;
private System.Windows.Forms.ToolStripMenuItem SNESSubMenu;
private System.Windows.Forms.ToolStripMenuItem SnesGfxDebuggerMenuItem;
@ -4167,6 +4187,7 @@
private System.Windows.Forms.ToolStripMenuItem GenesisSubMenu;
private System.Windows.Forms.ToolStripMenuItem GenesisSettingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem AtariSettingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem A7800ControllerSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem MovieSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem CoresSubMenu;
private System.Windows.Forms.ToolStripMenuItem GBInSGBMenuItem;

28
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1211,8 +1211,6 @@ namespace BizHawk.Client.EmuHawk
private void CoresSubMenu_DropDownOpened(object sender, EventArgs e)
{
Atari7800WithEmu7800MenuItem.Visible = VersionInfo.DeveloperBuild; // Don't expose Atari7800Hawk in releases yet
GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB;
NesInQuickNESMenuItem.Checked = Global.Config.NES_InQuickNES;
gBAWithMGBAToolStripMenuItem.Checked = Global.Config.GBA_UsemGBA;
@ -1326,7 +1324,7 @@ namespace BizHawk.Client.EmuHawk
{
Global.Config = ConfigService.Load<Config>(PathManager.DefaultIniPath);
Global.Config.ResolveDefaults();
InitControls(); // rebind hotkeys
InitControls(); //rebind hotkeys
GlobalWin.OSD.AddMessage("Config file loaded: " + PathManager.DefaultIniPath);
}
@ -1345,7 +1343,7 @@ namespace BizHawk.Client.EmuHawk
{
Global.Config = ConfigService.Load<Config>(ofd.FileName);
Global.Config.ResolveDefaults();
InitControls(); // rebind hotkeys
InitControls(); //rebind hotkeys
GlobalWin.OSD.AddMessage("Config file loaded: " + ofd.FileName);
}
}
@ -1612,7 +1610,7 @@ namespace BizHawk.Client.EmuHawk
{
if (Emulator is NES && ((NES)Emulator).IsVS)
{
new NesVsSettings().ShowHawkDialog();
new NESVSSettings().ShowHawkDialog();
}
}
@ -1981,6 +1979,20 @@ namespace BizHawk.Client.EmuHawk
#endregion
#region Atari7800
private void A7800SubMenu_DropDownOpened(object sender, EventArgs e)
{
A7800ControllerSettingsMenuItem.Enabled = !Global.MovieSession.Movie.IsActive;
}
private void A7800SettingsToolStripMenuItem_Click(object sender, EventArgs e)
{
new A7800ControllerSettings().ShowDialog();
}
#endregion
#region GB
private void GBSubMenu_DropDownOpened(object sender, EventArgs e)
@ -1990,7 +2002,7 @@ namespace BizHawk.Client.EmuHawk
private void GBCoreSettingsMenuItem_Click(object sender, EventArgs e)
{
GBPrefs.DoGBPrefsDialog(this);
config.GB.GBPrefs.DoGBPrefsDialog(this);
}
private void LoadGbInSgbMenuItem_Click(object sender, EventArgs e)
@ -2296,7 +2308,7 @@ namespace BizHawk.Client.EmuHawk
private void DgbSettingsMenuItem_Click(object sender, EventArgs e)
{
DGBPrefs.DoDGBPrefsDialog(this);
config.GB.DGBPrefs.DoDGBPrefsDialog(this);
}
#endregion
@ -2604,7 +2616,7 @@ namespace BizHawk.Client.EmuHawk
private void DisplayConfigMenuItem_Click(object sender, EventArgs e)
{
var window = new DisplayConfigLite();
var window = new config.DisplayConfigLite();
var result = window.ShowDialog();
if (result == DialogResult.OK)
{

9
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -1785,6 +1785,7 @@ namespace BizHawk.Client.EmuHawk
GBSubMenu.Visible = false;
GBASubMenu.Visible = false;
AtariSubMenu.Visible = false;
A7800SubMenu.Visible = false;
SNESSubMenu.Visible = false;
PSXSubMenu.Visible = false;
ColecoSubMenu.Visible = false;
@ -1835,6 +1836,9 @@ namespace BizHawk.Client.EmuHawk
case "A26":
AtariSubMenu.Visible = true;
break;
case "A7800":
A7800SubMenu.Visible = true;
break;
case "PSX":
PSXSubMenu.Visible = true;
break;
@ -2140,7 +2144,7 @@ namespace BizHawk.Client.EmuHawk
"PlayStation", "*.cue;*.ccd;*.m3u",
"PSX Executables (experimental)", "*.exe",
"PSF Playstation Sound File", "*.psf;*.minipsf",
"Commodore 64", "*.prg; *.d64, *.g64; *.crt; *.tap;%ARCH%",
"Commodore 64 (experimental)", "*.prg; *.d64, *.g64; *.crt; *.tap;%ARCH%",
"SID Commodore 64 Music File", "*.sid;%ARCH%",
"Nintendo 64", "*.z64;*.v64;*.n64",
"WonderSwan", "*.ws;*.wsc;%ARCH%",
@ -2149,7 +2153,7 @@ namespace BizHawk.Client.EmuHawk
}
return FormatFilter(
"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.int;*.rom;*.m3u;*.cue;*.ccd;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;*.psf;*.prg;*.d64;*.g64;*.minipsf;*.nsf;%ARCH%",
"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.int;*.rom;*.m3u;*.cue;*.ccd;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;*.psf;*.minipsf;*.nsf;%ARCH%",
"Disc Images", "*.cue;*.ccd;*.m3u",
"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
@ -2171,7 +2175,6 @@ namespace BizHawk.Client.EmuHawk
"Genesis", "*.gen;*.md;*.smd;*.bin;*.cue;*.ccd;%ARCH%",
"WonderSwan", "*.ws;*.wsc;%ARCH%",
"Apple II", "*.dsk;*.do;*.po;%ARCH%",
"Commodore 64", "*.prg; *.d64, *.g64; *.crt; *.tap;%ARCH%",
"All Files", "*.*");
}
}