From c3806b61bf94a2cf35ffb0a1649e82ac9671a4b5 Mon Sep 17 00:00:00 2001 From: Sour Date: Sun, 16 Dec 2018 10:44:34 -0500 Subject: [PATCH] Debugger: Added icons to script window context menu --- GUI.NET/Debugger/frmScript.Designer.cs | 46 ++++++++++++----------- GUI.NET/GUI.NET.csproj | 1 + GUI.NET/Properties/Resources.Designer.cs | 10 +++++ GUI.NET/Properties/Resources.resx | 3 ++ GUI.NET/Resources/Cut.png | Bin 0 -> 807 bytes 5 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 GUI.NET/Resources/Cut.png diff --git a/GUI.NET/Debugger/frmScript.Designer.cs b/GUI.NET/Debugger/frmScript.Designer.cs index b8da980b..24e47ccb 100644 --- a/GUI.NET/Debugger/frmScript.Designer.cs +++ b/GUI.NET/Debugger/frmScript.Designer.cs @@ -55,6 +55,8 @@ this.scriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mnuRun = new System.Windows.Forms.ToolStripMenuItem(); this.mnuStop = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuSetScriptTimeout = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.mnuSaveBeforeRun = new System.Windows.Forms.ToolStripMenuItem(); this.mnuAutoReload = new System.Windows.Forms.ToolStripMenuItem(); @@ -78,8 +80,6 @@ this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.lblScriptActive = new System.Windows.Forms.ToolStripStatusLabel(); - this.mnuSetScriptTimeout = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator(); this.mnuMain.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txtScriptContent)).BeginInit(); this.contextMenu.SuspendLayout(); @@ -286,6 +286,19 @@ this.mnuStop.Text = "Stop"; this.mnuStop.Click += new System.EventHandler(this.mnuStop_Click); // + // toolStripMenuItem7 + // + this.toolStripMenuItem7.Name = "toolStripMenuItem7"; + this.toolStripMenuItem7.Size = new System.Drawing.Size(255, 6); + // + // mnuSetScriptTimeout + // + this.mnuSetScriptTimeout.Image = global::Mesen.GUI.Properties.Resources.Speed; + this.mnuSetScriptTimeout.Name = "mnuSetScriptTimeout"; + this.mnuSetScriptTimeout.Size = new System.Drawing.Size(258, 22); + this.mnuSetScriptTimeout.Text = "Set Script Timeout..."; + this.mnuSetScriptTimeout.Click += new System.EventHandler(this.mnuSetScriptTimeout_Click); + // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; @@ -413,38 +426,42 @@ this.toolStripMenuItem5, this.mnuSelectAll}); this.contextMenu.Name = "contextMenu"; - this.contextMenu.Size = new System.Drawing.Size(123, 98); + this.contextMenu.Size = new System.Drawing.Size(153, 120); // // mnuCopy // + this.mnuCopy.Image = global::Mesen.GUI.Properties.Resources.Copy; this.mnuCopy.Name = "mnuCopy"; - this.mnuCopy.Size = new System.Drawing.Size(122, 22); + this.mnuCopy.Size = new System.Drawing.Size(152, 22); this.mnuCopy.Text = "Copy"; this.mnuCopy.Click += new System.EventHandler(this.mnuCopy_Click); // // mnuCut // + this.mnuCut.Image = global::Mesen.GUI.Properties.Resources.Cut; this.mnuCut.Name = "mnuCut"; - this.mnuCut.Size = new System.Drawing.Size(122, 22); + this.mnuCut.Size = new System.Drawing.Size(152, 22); this.mnuCut.Text = "Cut"; this.mnuCut.Click += new System.EventHandler(this.mnuCut_Click); // // mnuPaste // + this.mnuPaste.Image = global::Mesen.GUI.Properties.Resources.Paste; this.mnuPaste.Name = "mnuPaste"; - this.mnuPaste.Size = new System.Drawing.Size(122, 22); + this.mnuPaste.Size = new System.Drawing.Size(152, 22); this.mnuPaste.Text = "Paste"; this.mnuPaste.Click += new System.EventHandler(this.mnuPaste_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(119, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 6); // // mnuSelectAll // + this.mnuSelectAll.Image = global::Mesen.GUI.Properties.Resources.SelectAll; this.mnuSelectAll.Name = "mnuSelectAll"; - this.mnuSelectAll.Size = new System.Drawing.Size(122, 22); + this.mnuSelectAll.Size = new System.Drawing.Size(152, 22); this.mnuSelectAll.Text = "Select All"; this.mnuSelectAll.Click += new System.EventHandler(this.mnuSelectAll_Click); // @@ -515,19 +532,6 @@ this.lblScriptActive.Text = "Script is running"; this.lblScriptActive.Visible = false; // - // mnuSetScriptTimeout - // - this.mnuSetScriptTimeout.Image = global::Mesen.GUI.Properties.Resources.Speed; - this.mnuSetScriptTimeout.Name = "mnuSetScriptTimeout"; - this.mnuSetScriptTimeout.Size = new System.Drawing.Size(258, 22); - this.mnuSetScriptTimeout.Text = "Set Script Timeout..."; - this.mnuSetScriptTimeout.Click += new System.EventHandler(this.mnuSetScriptTimeout_Click); - // - // toolStripMenuItem7 - // - this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(255, 6); - // // frmScript // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/GUI.NET/GUI.NET.csproj b/GUI.NET/GUI.NET.csproj index fef09691..88de552c 100644 --- a/GUI.NET/GUI.NET.csproj +++ b/GUI.NET/GUI.NET.csproj @@ -1230,6 +1230,7 @@ + diff --git a/GUI.NET/Properties/Resources.Designer.cs b/GUI.NET/Properties/Resources.Designer.cs index 9c49ce03..bd4db6ae 100644 --- a/GUI.NET/Properties/Resources.Designer.cs +++ b/GUI.NET/Properties/Resources.Designer.cs @@ -250,6 +250,16 @@ namespace Mesen.GUI.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Cut { + get { + object obj = ResourceManager.GetObject("Cut", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/GUI.NET/Properties/Resources.resx b/GUI.NET/Properties/Resources.resx index a8daef58..376e14bd 100644 --- a/GUI.NET/Properties/Resources.resx +++ b/GUI.NET/Properties/Resources.resx @@ -424,4 +424,7 @@ ..\Resources\HistoryViewer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Cut.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/GUI.NET/Resources/Cut.png b/GUI.NET/Resources/Cut.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9eb9a7ad3e9500991938d0da531c06f90fea85 GIT binary patch literal 807 zcmV+?1K9kDP) z1Hh-$q?nqWnZ{11 z1JXGjGT#nH5JGSEt3`W-F{81UPnb`417>0bwH3tCzhB0pcmY+{X4F+L%h_RSnk|a_^$fF6B>ZO8Zd4#b& zIcbiYQS<4l$&8G?%anG5EK?xFunXWgL9J9WU-R-}CY`QnUJ$&B%*-pvkEGQ$e0RAv z4j($yFl({I2&EV>4gdf!007lmt}-!W5XkX| l!x~>C;!~(p=dGgX{tck>ItSb|!8`x}002ovPDHLkV1ju0W~TrE literal 0 HcmV?d00001