From 889d997a32de5279f1a873f8deaf9a30befd42f6 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Thu, 30 Jun 2011 01:27:46 +0000 Subject: [PATCH] More images for menu items --- .../BizHawk.MultiClient.csproj | 2 + BizHawk.MultiClient/MainForm.Designer.cs | 64 ++++++++++-------- .../Properties/Resources.Designer.cs | 14 ++++ BizHawk.MultiClient/Properties/Resources.resx | 6 ++ BizHawk.MultiClient/images/Fullscreen.png | Bin 0 -> 3610 bytes BizHawk.MultiClient/images/camera.png | Bin 0 -> 1058 bytes 6 files changed, 56 insertions(+), 30 deletions(-) create mode 100644 BizHawk.MultiClient/images/Fullscreen.png create mode 100644 BizHawk.MultiClient/images/camera.png diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 1d1ca7962f..25a1fea53b 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -573,6 +573,8 @@ + + diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index ed9e7878b8..926032cfff 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -194,11 +194,11 @@ this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); this.autoloadVirtualKeyboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.disableSaveslotKeysOnLoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.debuggerToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.debuggerToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.DumpError = new System.Windows.Forms.ToolStripDropDownButton(); this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel(); @@ -241,7 +241,7 @@ this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(470, 40); + this.menuStrip1.Size = new System.Drawing.Size(470, 21); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate); @@ -271,7 +271,7 @@ // this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); // @@ -283,7 +283,7 @@ this.clearToolStripMenuItem, this.autoloadMostRecentToolStripMenuItem}); this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; - this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.recentROMToolStripMenuItem.Text = "Recent ROM"; this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); // @@ -316,14 +316,14 @@ // this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; - this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.closeROMToolStripMenuItem.Text = "&Close ROM"; this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(142, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); // // saveStateToolStripMenuItem // @@ -341,7 +341,7 @@ this.toolStripSeparator6, this.saveNamedStateToolStripMenuItem}); this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; - this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveStateToolStripMenuItem.Text = "Save State"; this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); // @@ -443,7 +443,7 @@ this.toolStripSeparator7, this.loadNamedStateToolStripMenuItem}); this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; - this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.loadStateToolStripMenuItem.Text = "Load State"; this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); // @@ -548,7 +548,7 @@ this.saveToCurrentSlotToolStripMenuItem, this.loadCurrentSlotToolStripMenuItem}); this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; - this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveSlotToolStripMenuItem.Text = "SaveSlot"; this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); // @@ -658,7 +658,7 @@ // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(142, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); // // movieToolStripMenuItem // @@ -674,7 +674,7 @@ this.bindSavestatesToMoviesToolStripMenuItem, this.automaticallyBackupMoviesToolStripMenuItem}); this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; - this.movieToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.movieToolStripMenuItem.Text = "Movie"; this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); // @@ -780,11 +780,12 @@ this.screenshotF12ToolStripMenuItem, this.screenshotAsToolStripMenuItem}); this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; - this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.screenshotToolStripMenuItem.Text = "Screenshot"; // // screenshotF12ToolStripMenuItem // + this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; @@ -800,13 +801,13 @@ // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(142, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -826,6 +827,7 @@ // // pauseToolStripMenuItem // + this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; this.pauseToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.pauseToolStripMenuItem.Text = "&Pause"; @@ -961,6 +963,7 @@ // // switchToFullscreenToolStripMenuItem // + this.switchToFullscreenToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen; this.switchToFullscreenToolStripMenuItem.Name = "switchToFullscreenToolStripMenuItem"; this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(198, 22); this.switchToFullscreenToolStripMenuItem.Text = "Switch to Fullscreen"; @@ -1533,6 +1536,21 @@ this.disableSaveslotKeysOnLoToolStripMenuItem.Text = "Disable Saveslot Keys on Load"; this.disableSaveslotKeysOnLoToolStripMenuItem.Click += new System.EventHandler(this.disableSaveslotKeysOnLoToolStripMenuItem_Click); // + // gBToolStripMenuItem + // + this.gBToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.debuggerToolStripMenuItem1}); + this.gBToolStripMenuItem.Name = "gBToolStripMenuItem"; + this.gBToolStripMenuItem.Size = new System.Drawing.Size(32, 17); + this.gBToolStripMenuItem.Text = "GB"; + // + // debuggerToolStripMenuItem1 + // + this.debuggerToolStripMenuItem1.Name = "debuggerToolStripMenuItem1"; + this.debuggerToolStripMenuItem1.Size = new System.Drawing.Size(132, 22); + this.debuggerToolStripMenuItem1.Text = "Debugger"; + this.debuggerToolStripMenuItem1.Click += new System.EventHandler(this.debuggerToolStripMenuItem1_Click); + // // helpToolStripMenuItem // this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1557,21 +1575,6 @@ this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // - // gBToolStripMenuItem - // - this.gBToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.debuggerToolStripMenuItem1}); - this.gBToolStripMenuItem.Name = "gBToolStripMenuItem"; - this.gBToolStripMenuItem.Size = new System.Drawing.Size(32, 17); - this.gBToolStripMenuItem.Text = "GB"; - // - // debuggerToolStripMenuItem1 - // - this.debuggerToolStripMenuItem1.Name = "debuggerToolStripMenuItem1"; - this.debuggerToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); - this.debuggerToolStripMenuItem1.Text = "Debugger"; - this.debuggerToolStripMenuItem1.Click += new System.EventHandler(this.debuggerToolStripMenuItem1_Click); - // // statusStrip1 // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1735,6 +1738,7 @@ // // screenshotToolStripMenuItem1 // + this.screenshotToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.camera; this.screenshotToolStripMenuItem1.Name = "screenshotToolStripMenuItem1"; this.screenshotToolStripMenuItem1.Size = new System.Drawing.Size(178, 22); this.screenshotToolStripMenuItem1.Text = "Screenshot"; diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index 4e11057144..4aa675f2f2 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -102,6 +102,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap camera { + get { + object obj = ResourceManager.GetObject("camera", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap cheat { get { object obj = ResourceManager.GetObject("cheat", resourceCulture); @@ -186,6 +193,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Fullscreen { + get { + object obj = ResourceManager.GetObject("Fullscreen", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap GameController { get { object obj = ResourceManager.GetObject("GameController", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index 6f16654a8f..c36a507a31 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -732,4 +732,10 @@ ..\images\MoveUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Fullscreen.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/Fullscreen.png b/BizHawk.MultiClient/images/Fullscreen.png new file mode 100644 index 0000000000000000000000000000000000000000..7bbfc7e15168174984c47b42d98a3776ebc709ed GIT binary patch literal 3610 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 literal 0 HcmV?d00001 diff --git a/BizHawk.MultiClient/images/camera.png b/BizHawk.MultiClient/images/camera.png new file mode 100644 index 0000000000000000000000000000000000000000..a5f0cf0d24bce0101a4378655a7cd80c9513a01d GIT binary patch literal 1058 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(^vlDyqr z82*Fcg1yTp14TFsJR*yMvQ&rUPlPc?>bf)*fbHVEXOp;uvCadg)|; z|J!8@ZSnsP^Y#5L{x@UBBL;8l2?Fe!GusV+uy{Ofu<-xQWL@CA`&)1cPh-HvE!?Ya z>0VuBeg zYj!^?uk##=bJwn2`(I>3aB%R4+WNwjlqcPB>yLLWvN-XyXnn@4 zx{AWWk2en;I>i6@@#BN<-o4wezam6SLxgMov!b21zgEd^%ROws;}Y0m(6f%c`C#&8 zlkMF{AC=#}ef#<%jYHr6?q_9Kv3Kv@^UIenx3By6M>1~TA7=BsJ4}kU5^ao1!Z-Tv zn)!ZS8LLn^88+ZD((H6HEX6s95!ePTRk;Eg!S|1&la|}N4v$3&zL#$ zVCeSFq^&#;J^4K+IfRS6e7$q0%IZvc!Q++MV%@bK-jj~}+-Lt}mtM?u*QG^Ww)BdJ2vQKUoMSZe=}#%<(CR8 zUwQPNe`vm$El|QuX=1~wRRJ80I$aW1O*on!$jQo<&Rn{5siWQe|AC>Q)fE*#Z2P1q z?ViizW)A13Ag&>&CBnV1=_W{G~RkU4$&^nUT~ zqw6E5)lT(Wen0H0pwnd&jV`DC_uUs?Y*6vcFq>`Q``PZWf$FnTfxCI)KWpTg6tfUVY={&6~#_K76RYdGqG|>(;Mt{)%h7N)gOLFPgHt1`(u*HgbznMk^HVa@Dv@;>Trf4bW@^G=xM7RY zCZL{6P@RtKtlaafK3)gvR07!&C7u-NCMzgOsoGrm6lyk5ROD_I!y=dfN` T$FtHGsG7mk)z4*}Q$iB}mY~@J literal 0 HcmV?d00001