diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 2781d0d258..911a17e1e8 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -599,6 +599,10 @@ + + + + diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index bac17583be..3ddfda859b 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -930,14 +930,36 @@ namespace BizHawk.MultiClient { if (Global.Game != null) { - if (Global.Game.Status == RomStatus.BadDump) - { - DumpError.Image = BizHawk.MultiClient.Properties.Resources.WarningHS; - DumpError.ToolTipText = "Warning: Bad ROM Dump"; - } else { - DumpError.Image = BizHawk.MultiClient.Properties.Resources.GreenCheck; - DumpError.ToolTipText = "Verified good dump"; - } + if (Global.Game.Status == RomStatus.BadDump) + { + DumpError.Image = BizHawk.MultiClient.Properties.Resources.ExclamationRed; + DumpError.ToolTipText = "Warning: Bad ROM Dump"; + } + else if (Global.Game.Status == RomStatus.Overdump) + { + DumpError.Image = BizHawk.MultiClient.Properties.Resources.ExclamationRed; + DumpError.ToolTipText = "Warning: Overdump"; + } + else if (Global.Game.Status == RomStatus.NotInDatabase) + { + DumpError.Image = BizHawk.MultiClient.Properties.Resources.RetroQuestion; + DumpError.ToolTipText = "Warning: Unknown ROM"; + } + else if (Global.Game.Status == RomStatus.TranslatedRom) + { + DumpError.Image = BizHawk.MultiClient.Properties.Resources.Translation; + DumpError.ToolTipText = "Translated ROM"; + } + else if (Global.Game.Status == RomStatus.Homebrew) + { + DumpError.Image = BizHawk.MultiClient.Properties.Resources.HomeBrew; + DumpError.ToolTipText = "Homebrew ROM"; + } + else + { + DumpError.Image = BizHawk.MultiClient.Properties.Resources.GreenCheck; + DumpError.ToolTipText = "Verified good dump"; + } } else { diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs index 71c0d36550..99286e0aa0 100644 --- a/BizHawk.MultiClient/PlayMovie.cs +++ b/BizHawk.MultiClient/PlayMovie.cs @@ -13,10 +13,8 @@ namespace BizHawk.MultiClient public partial class PlayMovie : Form { //TODO: after browse & update, focus on the movie just added, and show stats - //This is a modal dialog, implement it as modeless // Option to include subdirectories // Option to include savestate files (that have an input log) - //Clicking column headers should sort info //AddMovieToList should check for duplicates and not add them List MovieList = new List(); @@ -87,6 +85,9 @@ namespace BizHawk.MultiClient { AddMovieToList(ofd.FileName); } + MovieView.SelectedIndices.Clear(); + MovieView.setSelection(MovieList.Count - 1); + MovieView.SelectItem(MovieView.Items.Count - 1, true); } } @@ -101,8 +102,7 @@ namespace BizHawk.MultiClient PreLoadMovieFile(file); MovieView.ItemCount = MovieList.Count; UpdateList(); - MovieView.SelectedIndices.Clear(); - MovieView.setSelection(MovieList.Count - 1); + sortReverse = false; sortedCol = ""; } diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index 888c5fa23f..9a8532c36e 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -172,6 +172,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap ExclamationRed { + get { + object obj = ResourceManager.GetObject("ExclamationRed", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap FastForward { get { object obj = ResourceManager.GetObject("FastForward", resourceCulture); @@ -235,6 +242,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap HomeBrew { + get { + object obj = ResourceManager.GetObject("HomeBrew", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap HotKeys { get { object obj = ResourceManager.GetObject("HotKeys", resourceCulture); @@ -409,6 +423,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap RetroQuestion { + get { + object obj = ResourceManager.GetObject("RetroQuestion", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Save { get { object obj = ResourceManager.GetObject("Save", resourceCulture); @@ -486,6 +507,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Translation { + get { + object obj = ResourceManager.GetObject("Translation", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap TruncateFromFile { get { object obj = ResourceManager.GetObject("TruncateFromFile", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index 1618793b2f..15d2904471 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -744,10 +744,22 @@ ..\images\Blank.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\ExclamationRed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\GreenCheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\HomeBrew.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\RecordHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\RetroQuestion.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Translation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.MultiClient/images/ExclamationRed.png b/BizHawk.MultiClient/images/ExclamationRed.png new file mode 100644 index 0000000000..1397827e46 Binary files /dev/null and b/BizHawk.MultiClient/images/ExclamationRed.png differ diff --git a/BizHawk.MultiClient/images/HomeBrew.png b/BizHawk.MultiClient/images/HomeBrew.png new file mode 100644 index 0000000000..11c0727134 Binary files /dev/null and b/BizHawk.MultiClient/images/HomeBrew.png differ diff --git a/BizHawk.MultiClient/images/RetroQuestion.png b/BizHawk.MultiClient/images/RetroQuestion.png new file mode 100644 index 0000000000..8eb1682b39 Binary files /dev/null and b/BizHawk.MultiClient/images/RetroQuestion.png differ diff --git a/BizHawk.MultiClient/images/Translation.png b/BizHawk.MultiClient/images/Translation.png new file mode 100644 index 0000000000..2ddedbb605 Binary files /dev/null and b/BizHawk.MultiClient/images/Translation.png differ