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

Status bar icons - actually hide conditional status bar icons when not relevant

This commit is contained in:
adelikat 2012-09-29 22:37:34 +00:00
parent 0b03e6edc8
commit 486d621657
7 changed files with 283 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

492
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

7
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -1588,7 +1588,10 @@ namespace BizHawk.MultiClient
private void FreezeStatus_Click(object sender, EventArgs e)
{
LoadCheatsWindow();
if (CheatStatus.Visible)
{
LoadCheatsWindow();
}
}
public void UpdateCheatStatus()
@ -1597,11 +1600,13 @@ namespace BizHawk.MultiClient
{
CheatStatus.ToolTipText = "Cheats are currently active";
CheatStatus.Image = BizHawk.MultiClient.Properties.Resources.Freeze;
CheatStatus.Visible = true;
}
else
{
CheatStatus.ToolTipText = "";
CheatStatus.Image = BizHawk.MultiClient.Properties.Resources.Blank;
CheatStatus.Visible = false;
}
}

3
BizHawk.MultiClient/MainForm.Movie.cs
View File

@ -56,18 +56,21 @@ namespace BizHawk.MultiClient
Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
PlayRecordStatus.Image = BizHawk.MultiClient.Properties.Resources.Play;
PlayRecordStatus.ToolTipText = "Movie is in playback mode";
PlayRecordStatus.Visible = true;
}
else if (Global.MovieSession.Movie.IsRecording)
{
Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
PlayRecordStatus.Image = BizHawk.MultiClient.Properties.Resources.RecordHS;
PlayRecordStatus.ToolTipText = "Movie is in record mode";
PlayRecordStatus.Visible = true;
}
else if (!Global.MovieSession.Movie.IsActive)
{
Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name;
PlayRecordStatus.Image = BizHawk.MultiClient.Properties.Resources.Blank;
PlayRecordStatus.ToolTipText = "No movie is active";
PlayRecordStatus.Visible = false;
}
}

40
BizHawk.MultiClient/MainForm.cs
View File

@ -51,7 +51,7 @@ namespace BizHawk.MultiClient
bool exit;
bool runloop_frameProgress;
DateTime FrameAdvanceTimestamp = DateTime.MinValue;
public bool EmulatorPaused;
public bool EmulatorPaused { get; private set; }
public EventWaitHandle MainWait;
int runloop_fps;
int runloop_last_fps;
@ -509,27 +509,35 @@ namespace BizHawk.MultiClient
public void PauseEmulator()
{
EmulatorPaused = true;
PauseStrip.Image = BizHawk.MultiClient.Properties.Resources.Pause;
}
public void UnpauseEmulator()
{
EmulatorPaused = false;
PauseStrip.Image = BizHawk.MultiClient.Properties.Resources.Blank;
}
private void SetPauseStatusbarIcon()
{
if (EmulatorPaused)
{
PauseStrip.Image = BizHawk.MultiClient.Properties.Resources.Pause;
PauseStrip.Visible = true;
PauseStrip.ToolTipText = "Emulator Paused";
}
else
{
PauseStrip.Image = BizHawk.MultiClient.Properties.Resources.Blank;
PauseStrip.Visible = false;
PauseStrip.ToolTipText = "";
}
}
public void TogglePause()
{
EmulatorPaused ^= true;
if (EmulatorPaused)
{
PauseStrip.Image = BizHawk.MultiClient.Properties.Resources.Pause;
}
else
{
PauseStrip.Image = BizHawk.MultiClient.Properties.Resources.Blank;
}
SetPauseStatusbarIcon();
}
private void LoadRomFromRecent(string rom)
@ -3184,6 +3192,7 @@ namespace BizHawk.MultiClient
Global.OSD.AddMessage("A/V capture started");
AVIStatusLabel.Image = BizHawk.MultiClient.Properties.Resources.AVI;
AVIStatusLabel.ToolTipText = "A/V capture in progress";
AVIStatusLabel.Visible = true;
}
catch
{
@ -3210,6 +3219,7 @@ namespace BizHawk.MultiClient
Global.OSD.AddMessage("AVI capture stopped");
AVIStatusLabel.Image = BizHawk.MultiClient.Properties.Resources.Blank;
AVIStatusLabel.ToolTipText = "";
AVIStatusLabel.Visible = false;
DumpProxy = null; // return to normal sound output
SoundRemainder = 0;
}
@ -3508,6 +3518,12 @@ namespace BizHawk.MultiClient
private void MainForm_Load(object sender, EventArgs e)
{
Text = "BizHawk" + (INTERIM ? " (interim) " : "");
//Hide Status bar icons
PlayRecordStatus.Visible = false;
AVIStatusLabel.Visible = false;
SetPauseStatusbarIcon();
UpdateCheatStatus();
}
private void IncreaseWindowSize()

3
BizHawk.MultiClient/tools/Cheat.cs
View File

@ -69,12 +69,15 @@ namespace BizHawk.MultiClient
{
MemoryPulse.Add(domain, address, value, compare);
}
Global.MainForm.UpdateCheatStatus();
}
public void Disable()
{
enabled = false;
DisposeOfCheat();
Global.MainForm.UpdateCheatStatus();
}
public void DisposeOfCheat()

1
BizHawk.MultiClient/tools/CheatList.cs
View File

@ -116,6 +116,7 @@ namespace BizHawk.MultiClient
{
Changes = false;
Global.Config.RecentCheats.Add(file.FullName);
Global.MainForm.UpdateCheatStatus();
return true;
}
else

2
BizHawk.MultiClient/tools/Cheats.cs
View File

@ -593,7 +593,7 @@ namespace BizHawk.MultiClient
UpdateNumberOfCheats();
MessageLabel.Text = Path.GetFileName(Global.CheatList.currentCheatFile);
DisplayCheatsList();
return true; //TODO
return true;
}