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

AVI - status bar icon when avi is capturing

This commit is contained in:
andres.delikat 2011-07-12 00:37:24 +00:00
parent 652e56083f
commit 1b4258947b
6 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -613,6 +613,7 @@
<None Include="images\Translation.png" /> <None Include="images\Translation.png" />
<None Include="images\HomeBrew.png" /> <None Include="images\HomeBrew.png" />
<None Include="images\Hack.png" /> <None Include="images\Hack.png" />
<None Include="images\AVI.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" />

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

@ -220,6 +220,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.AVIStatusLabel = 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();
@ -289,7 +290,7 @@
// //
this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.openROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Text = "Open ROM";
this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
// //
@ -302,7 +303,7 @@
this.autoloadMostRecentToolStripMenuItem}); this.autoloadMostRecentToolStripMenuItem});
this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.recentROMToolStripMenuItem.Text = "Recent ROM"; this.recentROMToolStripMenuItem.Text = "Recent ROM";
this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
// //
@ -335,14 +336,14 @@
// //
this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.closeROMToolStripMenuItem.Text = "&Close ROM"; this.closeROMToolStripMenuItem.Text = "&Close ROM";
this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click);
// //
// toolStripMenuItem1 // toolStripMenuItem1
// //
this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); this.toolStripMenuItem1.Size = new System.Drawing.Size(142, 6);
// //
// saveStateToolStripMenuItem // saveStateToolStripMenuItem
// //
@ -360,7 +361,7 @@
this.toolStripSeparator6, this.toolStripSeparator6,
this.saveNamedStateToolStripMenuItem}); this.saveNamedStateToolStripMenuItem});
this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.saveStateToolStripMenuItem.Text = "Save State"; this.saveStateToolStripMenuItem.Text = "Save State";
this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened);
// //
@ -462,7 +463,7 @@
this.toolStripSeparator7, this.toolStripSeparator7,
this.loadNamedStateToolStripMenuItem}); this.loadNamedStateToolStripMenuItem});
this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.loadStateToolStripMenuItem.Text = "Load State"; this.loadStateToolStripMenuItem.Text = "Load State";
this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened);
// //
@ -567,7 +568,7 @@
this.saveToCurrentSlotToolStripMenuItem, this.saveToCurrentSlotToolStripMenuItem,
this.loadCurrentSlotToolStripMenuItem}); this.loadCurrentSlotToolStripMenuItem});
this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.saveSlotToolStripMenuItem.Text = "SaveSlot"; this.saveSlotToolStripMenuItem.Text = "SaveSlot";
this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened);
// //
@ -677,7 +678,7 @@
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); this.toolStripMenuItem2.Size = new System.Drawing.Size(142, 6);
// //
// movieToolStripMenuItem // movieToolStripMenuItem
// //
@ -693,7 +694,7 @@
this.bindSavestatesToMoviesToolStripMenuItem, this.bindSavestatesToMoviesToolStripMenuItem,
this.automaticallyBackupMoviesToolStripMenuItem}); this.automaticallyBackupMoviesToolStripMenuItem});
this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; this.movieToolStripMenuItem.Name = "movieToolStripMenuItem";
this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.movieToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.movieToolStripMenuItem.Text = "Movie"; this.movieToolStripMenuItem.Text = "Movie";
this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened);
// //
@ -803,15 +804,15 @@
this.recordAVIToolStripMenuItem, this.recordAVIToolStripMenuItem,
this.stopAVIToolStripMenuItem}); this.stopAVIToolStripMenuItem});
this.aVIWAVToolStripMenuItem.Name = "aVIWAVToolStripMenuItem"; this.aVIWAVToolStripMenuItem.Name = "aVIWAVToolStripMenuItem";
this.aVIWAVToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.aVIWAVToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.aVIWAVToolStripMenuItem.Text = "AVI/WAV"; this.aVIWAVToolStripMenuItem.Text = "AVI/WAV";
this.aVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); this.aVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened);
// //
// recordAVIToolStripMenuItem // recordAVIToolStripMenuItem
// //
this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI;
this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem"; this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem";
this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.recordAVIToolStripMenuItem.Text = "Record AVI"; this.recordAVIToolStripMenuItem.Text = "Record AVI";
this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click); this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click);
// //
@ -819,7 +820,7 @@
// //
this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem"; this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem";
this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.stopAVIToolStripMenuItem.Text = "Stop AVI"; this.stopAVIToolStripMenuItem.Text = "Stop AVI";
this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click); this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click);
// //
@ -829,7 +830,7 @@
this.screenshotF12ToolStripMenuItem, this.screenshotF12ToolStripMenuItem,
this.screenshotAsToolStripMenuItem}); this.screenshotAsToolStripMenuItem});
this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem";
this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.screenshotToolStripMenuItem.Text = "Screenshot"; this.screenshotToolStripMenuItem.Text = "Screenshot";
// //
// screenshotF12ToolStripMenuItem // screenshotF12ToolStripMenuItem
@ -850,13 +851,13 @@
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(142, 6);
// //
// exitToolStripMenuItem // exitToolStripMenuItem
// //
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.exitToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
// //
@ -1647,6 +1648,7 @@
this.EmuStatus, this.EmuStatus,
this.PlayRecordStatus, this.PlayRecordStatus,
this.PauseStrip, this.PauseStrip,
this.AVIStatusLabel,
this.toolStripStatusLabel1, this.toolStripStatusLabel1,
this.StatusSlot1, this.StatusSlot1,
this.StatusSlot2, this.StatusSlot2,
@ -1782,6 +1784,14 @@
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);
// //
// AVIStatusLabel
//
this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
this.AVIStatusLabel.Name = "AVIStatusLabel";
this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17);
this.AVIStatusLabel.Text = "AVI Capture";
//
// contextMenuStrip1 // contextMenuStrip1
// //
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -2158,6 +2168,7 @@
private System.Windows.Forms.ToolStripMenuItem aVIWAVToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem aVIWAVToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem recordAVIToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem recordAVIToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem stopAVIToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem stopAVIToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel AVIStatusLabel;
} }
} }

4
BizHawk.MultiClient/MainForm.cs
View File

@ -2595,6 +2595,8 @@ namespace BizHawk.MultiClient
//commit the avi writing last, in case there were any errors earlier //commit the avi writing last, in case there were any errors earlier
CurrAviWriter = aw; CurrAviWriter = aw;
Global.RenderPanel.AddMessage("AVI capture started"); Global.RenderPanel.AddMessage("AVI capture started");
AVIStatusLabel.Image = BizHawk.MultiClient.Properties.Resources.AVI;
AVIStatusLabel.ToolTipText = "AVI capture in progress";
} }
catch catch
{ {
@ -2610,6 +2612,8 @@ namespace BizHawk.MultiClient
CurrAviWriter.CloseFile(); CurrAviWriter.CloseFile();
CurrAviWriter = null; CurrAviWriter = null;
Global.RenderPanel.AddMessage("AVI capture stopped"); Global.RenderPanel.AddMessage("AVI capture stopped");
AVIStatusLabel.Image = BizHawk.MultiClient.Properties.Resources.Blank;
AVIStatusLabel.ToolTipText = "";
} }
} }
} }

7
BizHawk.MultiClient/Properties/Resources.Designer.cs generated
View File

@ -67,6 +67,13 @@ namespace BizHawk.MultiClient.Properties {
} }
} }
internal static System.Drawing.Bitmap AVI {
get {
object obj = ResourceManager.GetObject("AVI", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap Back { internal static System.Drawing.Bitmap Back {
get { get {
object obj = ResourceManager.GetObject("Back", resourceCulture); object obj = ResourceManager.GetObject("Back", resourceCulture);

3
BizHawk.MultiClient/Properties/Resources.resx
View File

@ -765,4 +765,7 @@
<data name="Hack" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Hack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\Hack.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\images\Hack.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="AVI" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\AVI.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

BIN
BizHawk.MultiClient/images/AVI.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB