From 8812f4b0fb354b260c036a9f29100674269ad730 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 16 Sep 2012 16:10:26 +0000 Subject: [PATCH] Add icon for reboot, change Reset menu item to say Soft Reset (makes it more accurate and consistent with the hotkey name) --- .../BizHawk.MultiClient.csproj | 1 + BizHawk.MultiClient/MainForm.Designer.cs | 19 +++++++++--------- .../Properties/Resources.Designer.cs | 7 +++++++ BizHawk.MultiClient/Properties/Resources.resx | 3 +++ BizHawk.MultiClient/images/reboot.png | Bin 0 -> 3474 bytes 5 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 BizHawk.MultiClient/images/reboot.png diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 266ac62ff7..47e6017cb0 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -860,6 +860,7 @@ + diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index fb965ab6e2..4fbce4e03e 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -103,8 +103,8 @@ this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.rebootCoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.windowFilterMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -989,23 +989,24 @@ this.pauseToolStripMenuItem.Text = "&Pause"; this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); // + // rebootCoreToolStripMenuItem + // + this.rebootCoreToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; + this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem"; + this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rebootCoreToolStripMenuItem.Text = "&Reboot Core"; + this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); + // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); // - // rebootCoreToolStripMenuItem - // - this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem"; - this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.rebootCoreToolStripMenuItem.Text = "Reboot Core"; - this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); - // // resetToolStripMenuItem // this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.resetToolStripMenuItem.Text = "&Reset"; + this.resetToolStripMenuItem.Text = "&Soft Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // // viewToolStripMenuItem diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index 1a4dd77f91..8bd61b0e87 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -500,6 +500,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap reboot { + get { + object obj = ResourceManager.GetObject("reboot", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Recent { get { object obj = ResourceManager.GetObject("Recent", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index 8d00393179..b33f1be9c4 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -825,4 +825,7 @@ ..\config\ControllerImages\TI83_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\reboot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.MultiClient/images/reboot.png b/BizHawk.MultiClient/images/reboot.png new file mode 100644 index 0000000000000000000000000000000000000000..59a39eea9d3bdaa24806d97db4bed54c6ac3b54c GIT binary patch literal 3474 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