Mainform Status Label - add a Cheats status button. Displays if there are active cheats, clicking it opens the cheat window

This commit is contained in:
andres.delikat 2011-08-07 02:12:41 +00:00
parent 7a6bc33ebc
commit fd36356536
3 changed files with 62 additions and 11 deletions

View File

@ -209,6 +209,7 @@
this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton(); this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton();
this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton(); this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton();
this.FreezeStatus = new System.Windows.Forms.ToolStripMenuItem();
this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.StatusSlot1 = new System.Windows.Forms.ToolStripStatusLabel(); this.StatusSlot1 = new System.Windows.Forms.ToolStripStatusLabel();
@ -221,6 +222,7 @@
this.StatusSlot8 = new System.Windows.Forms.ToolStripStatusLabel(); this.StatusSlot8 = new System.Windows.Forms.ToolStripStatusLabel();
this.StatusSlot9 = new System.Windows.Forms.ToolStripStatusLabel(); this.StatusSlot9 = new System.Windows.Forms.ToolStripStatusLabel();
this.StatusSlot10 = new System.Windows.Forms.ToolStripStatusLabel(); this.StatusSlot10 = new System.Windows.Forms.ToolStripStatusLabel();
this.CheatStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.openRomToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.openRomToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.loadLastROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadLastROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -1447,20 +1449,20 @@
// //
this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox;
this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem";
this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.toolBoxToolStripMenuItem.Text = "&Tool Box"; this.toolBoxToolStripMenuItem.Text = "&Tool Box";
this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click);
// //
// toolStripSeparator12 // toolStripSeparator12
// //
this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(149, 6); this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6);
// //
// rAMWatchToolStripMenuItem // rAMWatchToolStripMenuItem
// //
this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem";
this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Text = "RAM &Watch";
this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click);
// //
@ -1468,7 +1470,7 @@
// //
this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search;
this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem";
this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Text = "RAM &Search";
this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click);
// //
@ -1476,7 +1478,7 @@
// //
this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem";
this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Text = "RAM &Poke";
this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click);
// //
@ -1484,7 +1486,7 @@
// //
this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem";
this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Text = "&Hex Editor";
this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click);
// //
@ -1492,20 +1494,20 @@
// //
this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem";
this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.tAStudioToolStripMenuItem.Text = "&TAStudio"; this.tAStudioToolStripMenuItem.Text = "&TAStudio";
this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click);
// //
// toolStripSeparator11 // toolStripSeparator11
// //
this.toolStripSeparator11.Name = "toolStripSeparator11"; this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6); this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6);
// //
// luaConsoleToolStripMenuItem // luaConsoleToolStripMenuItem
// //
this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua;
this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem";
this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Text = "Lua Console";
this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click);
// //
@ -1513,7 +1515,7 @@
// //
this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem";
this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Text = "Cheats";
this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click);
// //
@ -1650,6 +1652,7 @@
this.EmuStatus, this.EmuStatus,
this.PlayRecordStatus, this.PlayRecordStatus,
this.PauseStrip, this.PauseStrip,
this.FreezeStatus,
this.AVIStatusLabel, this.AVIStatusLabel,
this.toolStripStatusLabel1, this.toolStripStatusLabel1,
this.StatusSlot1, this.StatusSlot1,
@ -1661,7 +1664,8 @@
this.StatusSlot7, this.StatusSlot7,
this.StatusSlot8, this.StatusSlot8,
this.StatusSlot9, this.StatusSlot9,
this.StatusSlot10}); this.StatusSlot10,
this.CheatStatus});
this.StatusSlot0.Location = new System.Drawing.Point(0, 386); this.StatusSlot0.Location = new System.Drawing.Point(0, 386);
this.StatusSlot0.Name = "StatusSlot0"; this.StatusSlot0.Name = "StatusSlot0";
this.StatusSlot0.ShowItemToolTips = true; this.StatusSlot0.ShowItemToolTips = true;
@ -1709,6 +1713,14 @@
this.PauseStrip.ToolTipText = "Emulator is paused"; this.PauseStrip.ToolTipText = "Emulator is paused";
this.PauseStrip.Click += new System.EventHandler(this.PauseStrip_Click); this.PauseStrip.Click += new System.EventHandler(this.PauseStrip_Click);
// //
// FreezeStatus
//
this.FreezeStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.FreezeStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
this.FreezeStatus.Name = "FreezeStatus";
this.FreezeStatus.Size = new System.Drawing.Size(28, 22);
this.FreezeStatus.Click += new System.EventHandler(this.FreezeStatus_Click);
//
// AVIStatusLabel // AVIStatusLabel
// //
this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@ -1794,6 +1806,11 @@
this.StatusSlot10.Text = "0"; this.StatusSlot10.Text = "0";
this.StatusSlot10.Click += new System.EventHandler(this.StatusSlot10_Click); this.StatusSlot10.Click += new System.EventHandler(this.StatusSlot10_Click);
// //
// CheatStatus
//
this.CheatStatus.Name = "CheatStatus";
this.CheatStatus.Size = new System.Drawing.Size(0, 17);
//
// contextMenuStrip1 // contextMenuStrip1
// //
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -2182,6 +2199,8 @@
private System.Windows.Forms.ToolStripStatusLabel AVIStatusLabel; private System.Windows.Forms.ToolStripStatusLabel AVIStatusLabel;
private System.Windows.Forms.ToolStripMenuItem restartMovieToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem restartMovieToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem backupSavestatesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem backupSavestatesToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel CheatStatus;
private System.Windows.Forms.ToolStripMenuItem FreezeStatus;
} }
} }

View File

@ -2233,5 +2233,24 @@ namespace BizHawk.MultiClient
StateSlots.ToggleRedo(SaveSlot); StateSlots.ToggleRedo(SaveSlot);
} }
private void FreezeStatus_Click(object sender, EventArgs e)
{
LoadCheatsWindow();
}
public void UpdateCheatStatus()
{
if (Global.CheatList.HasActiveCheat())
{
CheatStatus.ToolTipText = "Cheats are currently active";
CheatStatus.Image = BizHawk.MultiClient.Properties.Resources.Freeze;
}
else
{
CheatStatus.ToolTipText = "";
CheatStatus.Image = BizHawk.MultiClient.Properties.Resources.Blank;
}
}
} }
} }

View File

@ -233,6 +233,7 @@ namespace BizHawk.MultiClient
else else
{ {
LoadCheatFile(CheatFile, false); LoadCheatFile(CheatFile, false);
Global.MainForm.UpdateCheatStatus();
return true; return true;
} }
} }
@ -241,17 +242,20 @@ namespace BizHawk.MultiClient
{ {
cheatList.Clear(); cheatList.Clear();
MemoryPulse.Clear(); MemoryPulse.Clear();
Global.MainForm.UpdateCheatStatus();
} }
public void Remove(Cheat c) public void Remove(Cheat c)
{ {
MemoryPulse.Remove(c.domain, c.address); MemoryPulse.Remove(c.domain, c.address);
cheatList.Remove(c); cheatList.Remove(c);
Global.MainForm.UpdateCheatStatus();
} }
public void Add(Cheat c) public void Add(Cheat c)
{ {
cheatList.Add(c); cheatList.Add(c);
Global.MainForm.UpdateCheatStatus();
} }
public Cheat Cheat(int index) public Cheat Cheat(int index)
@ -262,6 +266,15 @@ namespace BizHawk.MultiClient
public void Insert(int index, Cheat item) public void Insert(int index, Cheat item)
{ {
cheatList.Insert(index, item); cheatList.Insert(index, item);
Global.MainForm.UpdateCheatStatus();
}
public bool HasActiveCheat()
{
for (int x = 0; x < cheatList.Count; x++)
if (cheatList[x].IsEnabled())
return true;
return false;
} }
} }
} }