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

some more topmosts and sound mutes

This commit is contained in:
feos 2017-03-14 22:13:51 +03:00
parent 19cf3b8551
commit 868c02175c
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
View File

@ -165,7 +165,7 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
form.StartPosition = FormStartPosition.Manual; form.StartPosition = FormStartPosition.Manual;
form.Location = position; form.Location = position;
} }
var result = (owner == null ? form.ShowDialog() : form.ShowDialog(owner)); var result = (owner == null ? form.ShowDialog(new Form() { TopMost = true }) : form.ShowDialog(owner));
GlobalWin.Sound.StartSound(); GlobalWin.Sound.StartSound();
return result; return result;
} }

1
BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs generated
View File

@ -95,6 +95,7 @@
this.ShowIcon = false; this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Input Prompt"; this.Text = "Input Prompt";
this.TopMost = true;
this.Load += new System.EventHandler(this.InputPrompt_Load); this.Load += new System.EventHandler(this.InputPrompt_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

3
BizHawk.Client.EmuHawk/tools/InputPrompt.cs
View File

@ -15,6 +15,7 @@ namespace BizHawk.Client.EmuHawk
{ {
public InputPrompt() public InputPrompt()
{ {
GlobalWin.Sound.StopSound();
InitializeComponent(); InitializeComponent();
StartLocation = new Point(-1, -1); StartLocation = new Point(-1, -1);
} }
@ -60,12 +61,14 @@ namespace BizHawk.Client.EmuHawk
{ {
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
Close(); Close();
GlobalWin.Sound.StartSound();
} }
private void Cancel_Click(object sender, EventArgs e) private void Cancel_Click(object sender, EventArgs e)
{ {
DialogResult = DialogResult.Cancel; DialogResult = DialogResult.Cancel;
Close(); Close();
GlobalWin.Sound.StartSound();
} }
private void PromptBox_KeyPress(object sender, KeyPressEventArgs e) private void PromptBox_KeyPress(object sender, KeyPressEventArgs e)

6
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -108,6 +108,7 @@ namespace BizHawk.Client.EmuHawk
else else
{ {
_autosaveTimer.Stop(); _autosaveTimer.Stop();
GlobalWin.Sound.StopSound();
MessageStatusLabel.Text = "Saving..."; MessageStatusLabel.Text = "Saving...";
this.Cursor = Cursors.WaitCursor; this.Cursor = Cursors.WaitCursor;
Update(); Update();
@ -117,6 +118,7 @@ namespace BizHawk.Client.EmuHawk
MessageStatusLabel.Text = CurrentTasMovie.Name + " saved."; MessageStatusLabel.Text = CurrentTasMovie.Name + " saved.";
Settings.RecentTas.Add(CurrentTasMovie.Filename); Settings.RecentTas.Add(CurrentTasMovie.Filename);
this.Cursor = Cursors.Default; this.Cursor = Cursors.Default;
GlobalWin.Sound.StartSound();
} }
} }
@ -131,6 +133,7 @@ namespace BizHawk.Client.EmuHawk
private void SaveAsTas(object sender, EventArgs e) private void SaveAsTas(object sender, EventArgs e)
{ {
_autosaveTimer.Stop(); _autosaveTimer.Stop();
GlobalWin.Sound.StopSound();
ClearLeftMouseStates(); ClearLeftMouseStates();
var filename = CurrentTasMovie.Filename; var filename = CurrentTasMovie.Filename;
if (string.IsNullOrWhiteSpace(filename) || filename == DefaultTasProjName()) if (string.IsNullOrWhiteSpace(filename) || filename == DefaultTasProjName())
@ -159,6 +162,7 @@ namespace BizHawk.Client.EmuHawk
// keep insisting // keep insisting
if (Settings.AutosaveInterval > 0) if (Settings.AutosaveInterval > 0)
_autosaveTimer.Start(); _autosaveTimer.Start();
GlobalWin.Sound.StartSound();
} }
// call this one from the menu only // call this one from the menu only
@ -179,6 +183,7 @@ namespace BizHawk.Client.EmuHawk
else else
{ {
_autosaveTimer.Stop(); _autosaveTimer.Stop();
GlobalWin.Sound.StopSound();
MessageStatusLabel.Text = "Saving..."; MessageStatusLabel.Text = "Saving...";
this.Cursor = Cursors.WaitCursor; this.Cursor = Cursors.WaitCursor;
Update(); Update();
@ -188,6 +193,7 @@ namespace BizHawk.Client.EmuHawk
MessageStatusLabel.Text = "Backup .tasproj saved to \"Movie backups\" path."; MessageStatusLabel.Text = "Backup .tasproj saved to \"Movie backups\" path.";
Settings.RecentTas.Add(CurrentTasMovie.Filename); Settings.RecentTas.Add(CurrentTasMovie.Filename);
this.Cursor = Cursors.Default; this.Cursor = Cursors.Default;
GlobalWin.Sound.StartSound();
} }
} }