status strip - pause icon implemented, movie icon put in but hidden and unimplmeented. Dump Error warning icon put in and disabled, needs to be implemented
This commit is contained in:
parent
50727e79ed
commit
f5014946db
|
@ -537,6 +537,7 @@
|
||||||
<None Include="images\ForwardMore.png" />
|
<None Include="images\ForwardMore.png" />
|
||||||
<None Include="images\BlueDown.png" />
|
<None Include="images\BlueDown.png" />
|
||||||
<None Include="images\BlueUp.png" />
|
<None Include="images\BlueUp.png" />
|
||||||
|
<None Include="images\WarningHS.png" />
|
||||||
<Content Include="output\gamedb.txt" />
|
<Content Include="output\gamedb.txt" />
|
||||||
<Content Include="output\gamedb_neshomebrew.txt" />
|
<Content Include="output\gamedb_neshomebrew.txt" />
|
||||||
<None Include="images\Refresh.bmp" />
|
<None Include="images\Refresh.bmp" />
|
||||||
|
|
|
@ -199,6 +199,9 @@
|
||||||
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
|
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
|
||||||
this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel();
|
this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel();
|
||||||
|
this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton();
|
||||||
|
this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton();
|
||||||
|
this.DumpError = new System.Windows.Forms.ToolStripDropDownButton();
|
||||||
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();
|
||||||
|
@ -1532,7 +1535,10 @@
|
||||||
// statusStrip1
|
// statusStrip1
|
||||||
//
|
//
|
||||||
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
this.EmuStatus});
|
this.DumpError,
|
||||||
|
this.EmuStatus,
|
||||||
|
this.PlayRecordStatus,
|
||||||
|
this.PauseStrip});
|
||||||
this.statusStrip1.Location = new System.Drawing.Point(0, 386);
|
this.statusStrip1.Location = new System.Drawing.Point(0, 386);
|
||||||
this.statusStrip1.Name = "statusStrip1";
|
this.statusStrip1.Name = "statusStrip1";
|
||||||
this.statusStrip1.Size = new System.Drawing.Size(470, 22);
|
this.statusStrip1.Size = new System.Drawing.Size(470, 22);
|
||||||
|
@ -1545,6 +1551,38 @@
|
||||||
this.EmuStatus.Name = "EmuStatus";
|
this.EmuStatus.Name = "EmuStatus";
|
||||||
this.EmuStatus.Size = new System.Drawing.Size(0, 17);
|
this.EmuStatus.Size = new System.Drawing.Size(0, 17);
|
||||||
//
|
//
|
||||||
|
// PlayRecordStatus
|
||||||
|
//
|
||||||
|
this.PlayRecordStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None;
|
||||||
|
this.PlayRecordStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Play;
|
||||||
|
this.PlayRecordStatus.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||||
|
this.PlayRecordStatus.Name = "PlayRecordStatus";
|
||||||
|
this.PlayRecordStatus.ShowDropDownArrow = false;
|
||||||
|
this.PlayRecordStatus.Size = new System.Drawing.Size(4, 20);
|
||||||
|
this.PlayRecordStatus.Text = "Movie is in play mode";
|
||||||
|
//
|
||||||
|
// PauseStrip
|
||||||
|
//
|
||||||
|
this.PauseStrip.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||||
|
this.PauseStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None;
|
||||||
|
this.PauseStrip.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
|
||||||
|
this.PauseStrip.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||||
|
this.PauseStrip.Name = "PauseStrip";
|
||||||
|
this.PauseStrip.ShowDropDownArrow = false;
|
||||||
|
this.PauseStrip.Size = new System.Drawing.Size(4, 20);
|
||||||
|
this.PauseStrip.Text = "toolStripDropDownButton1";
|
||||||
|
this.PauseStrip.ToolTipText = "Emulator is paused";
|
||||||
|
//
|
||||||
|
// DumpError
|
||||||
|
//
|
||||||
|
this.DumpError.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None;
|
||||||
|
this.DumpError.Image = global::BizHawk.MultiClient.Properties.Resources.WarningHS;
|
||||||
|
this.DumpError.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||||
|
this.DumpError.Name = "DumpError";
|
||||||
|
this.DumpError.ShowDropDownArrow = false;
|
||||||
|
this.DumpError.Size = new System.Drawing.Size(4, 20);
|
||||||
|
this.DumpError.Text = "Bad ROM Dump in use";
|
||||||
|
//
|
||||||
// contextMenuStrip1
|
// contextMenuStrip1
|
||||||
//
|
//
|
||||||
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
|
@ -1563,7 +1601,7 @@
|
||||||
this.screenshotToolStripMenuItem1,
|
this.screenshotToolStripMenuItem1,
|
||||||
this.closeROMToolStripMenuItem1});
|
this.closeROMToolStripMenuItem1});
|
||||||
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
||||||
this.contextMenuStrip1.Size = new System.Drawing.Size(179, 286);
|
this.contextMenuStrip1.Size = new System.Drawing.Size(179, 264);
|
||||||
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
|
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
|
||||||
this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing);
|
this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing);
|
||||||
//
|
//
|
||||||
|
@ -1874,6 +1912,9 @@
|
||||||
private System.Windows.Forms.ToolStripMenuItem makeMovieBackupToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem makeMovieBackupToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem automaticallyBackupMoviesToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem automaticallyBackupMoviesToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem stopMovieToolStripMenuItem1;
|
private System.Windows.Forms.ToolStripMenuItem stopMovieToolStripMenuItem1;
|
||||||
|
private System.Windows.Forms.ToolStripDropDownButton PauseStrip;
|
||||||
|
private System.Windows.Forms.ToolStripDropDownButton PlayRecordStatus;
|
||||||
|
private System.Windows.Forms.ToolStripDropDownButton DumpError;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -322,16 +322,23 @@ namespace BizHawk.MultiClient
|
||||||
private void PauseEmulator()
|
private void PauseEmulator()
|
||||||
{
|
{
|
||||||
EmulatorPaused = true;
|
EmulatorPaused = true;
|
||||||
|
PauseStrip.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UnpauseEmulator()
|
private void UnpauseEmulator()
|
||||||
{
|
{
|
||||||
EmulatorPaused = false;
|
EmulatorPaused = false;
|
||||||
|
PauseStrip.DisplayStyle = ToolStripItemDisplayStyle.None;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void TogglePause()
|
public void TogglePause()
|
||||||
{
|
{
|
||||||
EmulatorPaused ^= true;
|
EmulatorPaused ^= true;
|
||||||
|
if (EmulatorPaused)
|
||||||
|
PauseStrip.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
||||||
|
else
|
||||||
|
PauseStrip.DisplayStyle = ToolStripItemDisplayStyle.None;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadRomFromRecent(string rom)
|
private void LoadRomFromRecent(string rom)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// This code was generated by a tool.
|
||||||
// Runtime Version:2.0.50727.3620
|
// Runtime Version:2.0.50727.3623
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
// the code is regenerated.
|
// the code is regenerated.
|
||||||
|
@ -332,6 +332,13 @@ namespace BizHawk.MultiClient.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal static System.Drawing.Bitmap WarningHS {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("WarningHS", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
internal static System.Drawing.Bitmap whiteTriDown {
|
internal static System.Drawing.Bitmap whiteTriDown {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("whiteTriDown", resourceCulture);
|
object obj = ResourceManager.GetObject("whiteTriDown", resourceCulture);
|
||||||
|
|
|
@ -672,4 +672,7 @@
|
||||||
<data name="BlueUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="BlueUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\images\BlueUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\images\BlueUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="WarningHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\images\WarningHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
Binary file not shown.
After Width: | Height: | Size: 746 B |
|
@ -24,7 +24,7 @@ namespace BizHawk.MultiClient
|
||||||
public int rerecordCount;
|
public int rerecordCount;
|
||||||
|
|
||||||
//TODO:
|
//TODO:
|
||||||
//Author field, needs to be passed in by a record or play dialog
|
//Author field, needs to be passed in play dialog
|
||||||
|
|
||||||
public Movie(string filename, MOVIEMODE m)
|
public Movie(string filename, MOVIEMODE m)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue