From 3721293e9da61b91f560d8cf95abedf28eca6f5c Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Wed, 27 May 2009 22:42:30 +0000 Subject: [PATCH] -fix statusbar -make edit menu functional svn path=/trunk/tools/reactosdbg/; revision=1013 --- .../Dockable Objects/RawTraffic.Designer.cs | 57 +++++ RosDBG/Dockable Objects/RawTraffic.cs | 10 + RosDBG/Dockable Objects/RawTraffic.resx | 3 + .../Dockable Objects/SourceView.Designer.cs | 69 +++++- RosDBG/Dockable Objects/SourceView.cs | 12 +- RosDBG/Dockable Objects/SourceView.resx | 27 +-- RosDBG/MainWindow.Designer.cs | 201 +++++++++--------- RosDBG/MainWindow.cs | 17 +- RosDBG/MainWindow.resx | 15 -- RosDBG/Properties/Resources.Designer.cs | 31 +-- RosDBG/Properties/Resources.resx | 13 +- RosDBG/RosDBG.csproj | 1 + 12 files changed, 301 insertions(+), 155 deletions(-) diff --git a/RosDBG/Dockable Objects/RawTraffic.Designer.cs b/RosDBG/Dockable Objects/RawTraffic.Designer.cs index acf8b0d..760c91c 100644 --- a/RosDBG/Dockable Objects/RawTraffic.Designer.cs +++ b/RosDBG/Dockable Objects/RawTraffic.Designer.cs @@ -31,6 +31,12 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RawTraffic)); this.RawTrafficText = new System.Windows.Forms.TextBox(); this.InputLabel = new System.Windows.Forms.Label(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // // RawTrafficText @@ -55,12 +61,56 @@ this.InputLabel.Size = new System.Drawing.Size(0, 13); this.InputLabel.TabIndex = 1; // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.editToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(397, 24); + this.menuStrip1.TabIndex = 4; + this.menuStrip1.Text = "menuStrip1"; + this.menuStrip1.Visible = false; + // + // editToolStripMenuItem + // + this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.copyToolStripMenuItem, + this.toolStripMenuItem1, + this.selectAllToolStripMenuItem}); + this.editToolStripMenuItem.MergeAction = System.Windows.Forms.MergeAction.Insert; + this.editToolStripMenuItem.MergeIndex = 1; + this.editToolStripMenuItem.Name = "editToolStripMenuItem"; + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editToolStripMenuItem.Text = "&Edit"; + // + // copyToolStripMenuItem + // + this.copyToolStripMenuItem.Image = global::RosDBG.Properties.Resources.copyToolStripMenuItem_Image; + this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; + this.copyToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.copyToolStripMenuItem.Text = "&Copy"; + this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + // + // selectAllToolStripMenuItem + // + this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.selectAllToolStripMenuItem.Text = "&Select all"; + this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); + // // RawTraffic // this.AllowEndUserDocking = false; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(397, 253); + this.Controls.Add(this.menuStrip1); this.Controls.Add(this.InputLabel); this.Controls.Add(this.RawTrafficText); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -68,6 +118,8 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "RawTraffic"; this.Text = "Console"; + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -77,5 +129,10 @@ private System.Windows.Forms.TextBox RawTrafficText; private System.Windows.Forms.Label InputLabel; + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem; } } diff --git a/RosDBG/Dockable Objects/RawTraffic.cs b/RosDBG/Dockable Objects/RawTraffic.cs index 773ceea..8268a5f 100644 --- a/RosDBG/Dockable Objects/RawTraffic.cs +++ b/RosDBG/Dockable Objects/RawTraffic.cs @@ -98,5 +98,15 @@ namespace RosDBG CanCopyChangedEvent(this, new CanCopyChangedEventArgs(RawTrafficText.SelectionLength != 0)); */ } + private void copyToolStripMenuItem_Click(object sender, EventArgs e) + { + Clipboard.SetText(RawTrafficText.SelectedText); + } + + private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) + { + RawTrafficText.SelectAll(); + } + } } diff --git a/RosDBG/Dockable Objects/RawTraffic.resx b/RosDBG/Dockable Objects/RawTraffic.resx index a15ec78..65358d6 100644 --- a/RosDBG/Dockable Objects/RawTraffic.resx +++ b/RosDBG/Dockable Objects/RawTraffic.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + diff --git a/RosDBG/Dockable Objects/SourceView.Designer.cs b/RosDBG/Dockable Objects/SourceView.Designer.cs index 2168c26..13f717a 100644 --- a/RosDBG/Dockable Objects/SourceView.Designer.cs +++ b/RosDBG/Dockable Objects/SourceView.Designer.cs @@ -34,10 +34,16 @@ this.btnCopy = new System.Windows.Forms.ToolStripButton(); this.btnBreakpoint = new System.Windows.Forms.ToolStripButton(); this.SourceCode = new System.Windows.Forms.RichTextBox(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.toolStrip1.SuspendLayout(); + this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 @@ -55,7 +61,7 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.SourceCode); - this.splitContainer1.Size = new System.Drawing.Size(497, 308); + this.splitContainer1.Size = new System.Drawing.Size(481, 272); this.splitContainer1.SplitterDistance = 25; this.splitContainer1.TabIndex = 2; // @@ -66,7 +72,7 @@ this.btnBreakpoint}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(497, 25); + this.toolStrip1.Size = new System.Drawing.Size(481, 25); this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; // @@ -97,35 +103,88 @@ this.SourceCode.Location = new System.Drawing.Point(0, 0); this.SourceCode.Name = "SourceCode"; this.SourceCode.ReadOnly = true; - this.SourceCode.Size = new System.Drawing.Size(497, 279); + this.SourceCode.Size = new System.Drawing.Size(481, 243); this.SourceCode.TabIndex = 3; this.SourceCode.Text = ""; this.SourceCode.SelectionChanged += new System.EventHandler(this.SourceCode_SelectionChanged); // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.editToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(481, 24); + this.menuStrip1.TabIndex = 3; + this.menuStrip1.Text = "menuStrip1"; + this.menuStrip1.Visible = false; + // + // editToolStripMenuItem + // + this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.copyToolStripMenuItem, + this.toolStripMenuItem1, + this.selectAllToolStripMenuItem}); + this.editToolStripMenuItem.MergeAction = System.Windows.Forms.MergeAction.Insert; + this.editToolStripMenuItem.MergeIndex = 1; + this.editToolStripMenuItem.Name = "editToolStripMenuItem"; + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editToolStripMenuItem.Text = "&Edit"; + // + // copyToolStripMenuItem + // + this.copyToolStripMenuItem.Image = global::RosDBG.Properties.Resources.copyToolStripMenuItem_Image; + this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; + this.copyToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.copyToolStripMenuItem.Text = "&Copy"; + this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + // + // selectAllToolStripMenuItem + // + this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.selectAllToolStripMenuItem.Text = "&Select all"; + this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); + // // SourceView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(481, 272); this.Controls.Add(this.splitContainer1); + this.Controls.Add(this.menuStrip1); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "SourceView"; - this.Size = new System.Drawing.Size(497, 308); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel1.PerformLayout(); this.splitContainer1.Panel2.ResumeLayout(false); this.splitContainer1.ResumeLayout(false); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.RichTextBox SourceCode; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton btnCopy; private System.Windows.Forms.ToolStripButton btnBreakpoint; - private System.Windows.Forms.RichTextBox SourceCode; + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem; } } diff --git a/RosDBG/Dockable Objects/SourceView.cs b/RosDBG/Dockable Objects/SourceView.cs index dc44c7b..4a54268 100644 --- a/RosDBG/Dockable Objects/SourceView.cs +++ b/RosDBG/Dockable Objects/SourceView.cs @@ -90,7 +90,7 @@ namespace RosDBG /* void CopyEvent(object sender, CopyEventArgs args) { if (args.Obj == this) - Clipboard.SetText(SourceCode.SelectedText); + } */ private void SourceCode_SelectionChanged(object sender, EventArgs e) @@ -106,6 +106,16 @@ namespace RosDBG //CopyEvent(this, new CopyEventArgs(this)); } + private void copyToolStripMenuItem_Click(object sender, EventArgs e) + { + Clipboard.SetText(SourceCode.SelectedText); + } + + private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) + { + SourceCode.SelectAll(); + } + } } diff --git a/RosDBG/Dockable Objects/SourceView.resx b/RosDBG/Dockable Objects/SourceView.resx index 77962b1..8d145b7 100644 --- a/RosDBG/Dockable Objects/SourceView.resx +++ b/RosDBG/Dockable Objects/SourceView.resx @@ -139,18 +139,21 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlRJREFUOE+10l9I - U1EcB3Bfe/MhiHrqoYeKIorEiiVZtooKR4EFG8mKZImunN1sunm33a5X16ZbzXbbdLoxaYtqCkYYaOwh - yFUrFW3T/mk1/FPNP+XI8n67d0EgmdpDB87Dj3N+n9/hd34pKf9rhR62bah30jKvsxJqVcHaB4FA6pJr - mWhij7+Bged6BTf1Ws812qg3/kYGLT6nekmIm6W56UEKQnWMWuBmKSQG6WQcDrXvWBSpt5FfuJEaPoH5 - BdQaIMQetgKsWQO3ozp7QaTOWs4nVMNj1wMjFrisWnA81FCrx9e3FOxmdfuCgMVQmKzouqIGN2wBazyP - WR60VxGYGaoERcijc4AGm07rsukh7HvN7ssMkcsnVsNRU4SZd0ZcoxWYeV8FU+lpTA9egkp+uO834Deb - l3lYGuMvKf6Qwk2XDhqFBD9iRtz3ncNkVIvgrUJMvSLhu5qHyUgZzkjF3XNe4HUwBpV0F8b6dJgY0MCu - kyAxxCA+YMB4vwbxiBqfIwTGo2rEwvk4JRE9/qMHTY4qIol0F2P0mRLxFzpM9hswESHxsbcMw10lGA6f - RbTtGGQH04PzNtFp1d4QkA+dCsRCSozySZ96SzHWcxFDj/Lw/PY+dDgzuOP7t3bMCwQCNakXcsWUgHS1 - HsXTOxKup/UI1918CE/8u9HpFaGyQPRNdWKv/a/f2GQil/NNJAXEb8ri2thMLujKwF3bttkS+ebvB3au - B3Eya9WCc0Dmi9eUK3OKZdnbW9I3rkykrVuBzLTVfVLxlrqinMxNi47yv1z4CauDcDT2mV8JAAAAAElF - TkSuQmCC + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlNJREFUOE+10l9I + U1EcB3Bfe/OhCHrqoYeKJCijPyxpZauocBRYsNH6QzIkV27darp5t3tbm7bNLWdbm25uTNqk2IQkFCx8 + CJrFzIW2aVFayZzVdJXSyvvtXoNAsmkPHTgPP875fX6H3/nl5f2v1fuoc0OzSyf2uwxQys+tfRgK5S+5 + llFH7Al69HA3Ukx6iGRaGujXwRY92gMu5ZKQZpuWmR6hwVVHygKvg8bMiG4ujvZ271gUuWUjvzDj9WyC + /hfQSIGLfY5rcJhU8DrNJTmRJmsNm2CGz64Fxi1wW9VgWMjTqMXXNzTsJmV3TsBCVcxVdN9Qgkla4Ki7 + iFkWtNcSyI4aQBGnEvMAj02jdtu04Pb9sPe6npCwiWY46yuRfVuHmzopsu9qYaw6i+mRq5CfPDz4Gwia + TMt8Dh0mX9LsIY02twYqqRA/xurQFbiATEKNnjsV+PyKRKChDJl4NaQiQWzeC/xOPSUX7cLEoAZTwyrY + NULMjOqRHqYwOaRCOq7EpziByYQSY9FynBHynvzRg1ZnLTGHxBRI9cmQfqFBZojCVJzEh4FqJPsvIxk9 + j0TnMYgPbu1ZsIkuq/o2h7yPSDHWK0OKTfo4UIWJ51cw+rgMz+7uQ5e9iDm+v/DBgkAoVJ9/SSKgOaT/ + 3lFE2oRMX/gIEwsfwtPgbkT8PBjKed/kJ/ba//qNrUZyOdtEkkNaDcVMh43P9LiL0GHbNquQFHw/sHM9 + iNPFq3LOAVkuWFMjK1WIS7a3by5YMbNl3UrwC1cPigSbmipL+RsXHeV/ufAT9/1vzTktLEcAAAAASUVO + RK5CYII= + + 122, 17 + \ No newline at end of file diff --git a/RosDBG/MainWindow.Designer.cs b/RosDBG/MainWindow.Designer.cs index 8f1f5fe..056d188 100644 --- a/RosDBG/MainWindow.Designer.cs +++ b/RosDBG/MainWindow.Designer.cs @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin4 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin4 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient10 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient22 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin4 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient23 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient11 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient24 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient25 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient26 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient12 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient27 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient28 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -56,10 +56,6 @@ this.printSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.connectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); @@ -92,6 +88,9 @@ this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); + this.registerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.localsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backtraceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip.SuspendLayout(); this.toolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); @@ -101,7 +100,6 @@ // this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileMenu, - this.editMenu, this.debugToolStripMenuItem, this.viewMenu, this.toolsMenu, @@ -192,38 +190,6 @@ this.exitToolStripMenuItem.Text = "&Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.ExitToolsStripMenuItem_Click); // - // editMenu - // - this.editMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.copyToolStripMenuItem, - this.toolStripSeparator7, - this.selectAllToolStripMenuItem}); - this.editMenu.Name = "editMenu"; - this.editMenu.Size = new System.Drawing.Size(39, 20); - this.editMenu.Text = "&Edit"; - // - // copyToolStripMenuItem - // - this.copyToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("copyToolStripMenuItem.Image"))); - this.copyToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; - this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.copyToolStripMenuItem.Text = "&Copy"; - this.copyToolStripMenuItem.Click += new System.EventHandler(this.CopyToolStripMenuItem_Click); - // - // toolStripSeparator7 - // - this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(161, 6); - // - // selectAllToolStripMenuItem - // - this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; - this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.selectAllToolStripMenuItem.Text = "Select &all"; - // // debugToolStripMenuItem // this.debugToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -292,6 +258,9 @@ this.viewMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.consoleToolStripMenuItem, this.memoryToolStripMenuItem, + this.registerToolStripMenuItem, + this.localsToolStripMenuItem, + this.backtraceToolStripMenuItem, this.webbrowserToolStripMenuItem, this.toolStripMenuItem2, this.toolBarToolStripMenuItem, @@ -303,28 +272,28 @@ // consoleToolStripMenuItem // this.consoleToolStripMenuItem.Name = "consoleToolStripMenuItem"; - this.consoleToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.consoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.consoleToolStripMenuItem.Text = "&Console"; this.consoleToolStripMenuItem.Click += new System.EventHandler(this.consoleToolStripMenuItem_Click); // // memoryToolStripMenuItem // this.memoryToolStripMenuItem.Name = "memoryToolStripMenuItem"; - this.memoryToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.memoryToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.memoryToolStripMenuItem.Text = "&Memory"; this.memoryToolStripMenuItem.Click += new System.EventHandler(this.memoryToolStripMenuItem_Click); // // webbrowserToolStripMenuItem // this.webbrowserToolStripMenuItem.Name = "webbrowserToolStripMenuItem"; - this.webbrowserToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.webbrowserToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.webbrowserToolStripMenuItem.Text = "&Webbrowser"; this.webbrowserToolStripMenuItem.Click += new System.EventHandler(this.webbrowserToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); // // toolBarToolStripMenuItem // @@ -332,7 +301,7 @@ this.toolBarToolStripMenuItem.CheckOnClick = true; this.toolBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.toolBarToolStripMenuItem.Name = "toolBarToolStripMenuItem"; - this.toolBarToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.toolBarToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.toolBarToolStripMenuItem.Text = "&Toolbar"; this.toolBarToolStripMenuItem.Click += new System.EventHandler(this.ToolBarToolStripMenuItem_Click); // @@ -342,7 +311,7 @@ this.statusBarToolStripMenuItem.CheckOnClick = true; this.statusBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.statusBarToolStripMenuItem.Name = "statusBarToolStripMenuItem"; - this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.statusBarToolStripMenuItem.Text = "Status&bar"; this.statusBarToolStripMenuItem.Click += new System.EventHandler(this.StatusBarToolStripMenuItem_Click); // @@ -480,52 +449,73 @@ this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Name = "dockPanel"; this.dockPanel.Size = new System.Drawing.Size(632, 379); - dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin1.DockStripGradient = dockPanelGradient1; - tabGradient1.EndColor = System.Drawing.SystemColors.Control; - tabGradient1.StartColor = System.Drawing.SystemColors.Control; - tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin1.TabGradient = tabGradient1; - dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; - tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.ActiveTabGradient = tabGradient2; - dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; - tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.InactiveTabGradient = tabGradient3; - dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; - tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; - tabGradient5.EndColor = System.Drawing.SystemColors.Control; - tabGradient5.StartColor = System.Drawing.SystemColors.Control; - tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; - dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; - tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient6.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; - tabGradient7.EndColor = System.Drawing.Color.Transparent; - tabGradient7.StartColor = System.Drawing.Color.Transparent; - tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; - dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; - dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; - this.dockPanel.Skin = dockPanelSkin1; + dockPanelGradient10.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient10.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin4.DockStripGradient = dockPanelGradient10; + tabGradient22.EndColor = System.Drawing.SystemColors.Control; + tabGradient22.StartColor = System.Drawing.SystemColors.Control; + tabGradient22.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin4.TabGradient = tabGradient22; + dockPanelSkin4.AutoHideStripSkin = autoHideStripSkin4; + tabGradient23.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient23.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient23.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient4.ActiveTabGradient = tabGradient23; + dockPanelGradient11.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient11.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient4.DockStripGradient = dockPanelGradient11; + tabGradient24.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient24.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient24.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient4.InactiveTabGradient = tabGradient24; + dockPaneStripSkin4.DocumentGradient = dockPaneStripGradient4; + tabGradient25.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient25.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient25.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient25.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient4.ActiveCaptionGradient = tabGradient25; + tabGradient26.EndColor = System.Drawing.SystemColors.Control; + tabGradient26.StartColor = System.Drawing.SystemColors.Control; + tabGradient26.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient4.ActiveTabGradient = tabGradient26; + dockPanelGradient12.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient12.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient4.DockStripGradient = dockPanelGradient12; + tabGradient27.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient27.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient27.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient27.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient4.InactiveCaptionGradient = tabGradient27; + tabGradient28.EndColor = System.Drawing.Color.Transparent; + tabGradient28.StartColor = System.Drawing.Color.Transparent; + tabGradient28.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient4.InactiveTabGradient = tabGradient28; + dockPaneStripSkin4.ToolWindowGradient = dockPaneStripToolWindowGradient4; + dockPanelSkin4.DockPaneStripSkin = dockPaneStripSkin4; + this.dockPanel.Skin = dockPanelSkin4; this.dockPanel.TabIndex = 4; // + // registerToolStripMenuItem + // + this.registerToolStripMenuItem.Name = "registerToolStripMenuItem"; + this.registerToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.registerToolStripMenuItem.Text = "&Register"; + this.registerToolStripMenuItem.Click += new System.EventHandler(this.registerToolStripMenuItem_Click); + // + // localsToolStripMenuItem + // + this.localsToolStripMenuItem.Name = "localsToolStripMenuItem"; + this.localsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.localsToolStripMenuItem.Text = "&Locals"; + this.localsToolStripMenuItem.Click += new System.EventHandler(this.localsToolStripMenuItem_Click); + // + // backtraceToolStripMenuItem + // + this.backtraceToolStripMenuItem.Name = "backtraceToolStripMenuItem"; + this.backtraceToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.backtraceToolStripMenuItem.Text = "&Backtrace"; + this.backtraceToolStripMenuItem.Click += new System.EventHandler(this.backtraceToolStripMenuItem_Click); + // // MainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -595,12 +585,11 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem connectToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; - private System.Windows.Forms.ToolStripMenuItem editMenu; - private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; - private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem memoryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem webbrowserToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem registerToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem localsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem backtraceToolStripMenuItem; } } diff --git a/RosDBG/MainWindow.cs b/RosDBG/MainWindow.cs index a55ae4d..ff570e2 100644 --- a/RosDBG/MainWindow.cs +++ b/RosDBG/MainWindow.cs @@ -62,7 +62,7 @@ namespace RosDBG void ComposeTitleString() { FocusAddress(mCurrentEip); - statusStrip.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + " - Source Location: " + mCurrentFile + ":" + mCurrentLine; + toolStripStatusLabel.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + " - Source Location: " + mCurrentFile + ":" + mCurrentLine; } void DebugModuleChangedEvent(object sender, DebugModuleChangedEventArgs args) @@ -316,6 +316,21 @@ namespace RosDBG web.Show(dockPanel); } + private void registerToolStripMenuItem_Click(object sender, EventArgs e) + { + m_RegView.Show(dockPanel, DockState.DockRight); + } + + private void localsToolStripMenuItem_Click(object sender, EventArgs e) + { + m_Locals.Show(dockPanel, DockState.DockRight); + } + + private void backtraceToolStripMenuItem_Click(object sender, EventArgs e) + { + m_BackTrace.Show(dockPanel, DockState.DockBottom); + } + } } diff --git a/RosDBG/MainWindow.resx b/RosDBG/MainWindow.resx index 29ad7af..7596251 100644 --- a/RosDBG/MainWindow.resx +++ b/RosDBG/MainWindow.resx @@ -168,21 +168,6 @@ YHpuCczccsWuf0QTmPOtYWw2TJotfw1O1CpwoEK4aaDUUND00vAG4wjH0vD/TGNxOYWJhV8Ynoyi37FC yFkd4YlJcy5BvaQVsls6jE76yN3+j/IM2GNIVI9RUadEmeAauMwzLapqwmFeIw6duoT95ULsK6vHXm5t jpyj78RP/gPgHTGb+rLlcwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAd1JREFUOE+lk99L - U2EYgP1TShlSXdt9RGpSYFB4UVCQRVe70KuuIsMgqxkLnG0Tc5ayzc70RKSLlJlraTJzrl+TlkFtMJVz - dDmnZ/a480mzLdgEX3juvvd5f3zfV1a235DHv6AjjYUFzuEgvfI77tpk9uTWkwvDMRTgastTjtY1lpZ4 - RsN5+ZmtP3T0vcLrD3O+qb20xDkyIwTeCEgfIBRVeeh4iTSh4h5XcPkUHo8omAeXBRfvx/K76pUDuQ42 - NjOoq2liiaQQFEZr/yJVV/yC3H7sbp841+3fxDSsclP6RXNPlL7XS/8JmqwJ5EmVIw1DAiGxZOfV515L - aSwqKRZiK3yKLmF/EReCNikjCM2vcMkU53DDcw6dHaCy/smOQJ93Pa3lKhvtEa5ZPvLAtZDXgfpbY/7n - Ov65VazSNIbTXbsCNZnm8/cEM19jBEI/GHv/jZbuneu90Z/EaIlz4V6EM7dmBVZpCkNd566g6uRlCmk2 - zwqBlh0voWjMRdcYDap43izzaCBARY25+BtpbJ0Ugn8r/+2g0/2W8hOm4oJz132kNrawDwaxeaaxPpsS - lfVki3OCg8fvFBfUGL3ZbbsElfUODKdsVNR2UF7dnk1u48Cx26Wf+Z4+034PbQPvwt9VHJdeuQAAAABJ - RU5ErkJggg== diff --git a/RosDBG/Properties/Resources.Designer.cs b/RosDBG/Properties/Resources.Designer.cs index 1148a07..7def005 100644 --- a/RosDBG/Properties/Resources.Designer.cs +++ b/RosDBG/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:2.0.50727.1433 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:2.0.50727.4016 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace RosDBG.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ namespace RosDBG.Properties { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ namespace RosDBG.Properties { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -59,5 +59,12 @@ namespace RosDBG.Properties { resourceCulture = value; } } + + internal static System.Drawing.Bitmap copyToolStripMenuItem_Image { + get { + object obj = ResourceManager.GetObject("copyToolStripMenuItem.Image", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RosDBG/Properties/Resources.resx b/RosDBG/Properties/Resources.resx index ffecec8..abe1f42 100644 --- a/RosDBG/Properties/Resources.resx +++ b/RosDBG/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -114,4 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\copyToolStripMenuItem.Image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RosDBG/RosDBG.csproj b/RosDBG/RosDBG.csproj index e79a5b9..ed02348 100644 --- a/RosDBG/RosDBG.csproj +++ b/RosDBG/RosDBG.csproj @@ -268,6 +268,7 @@ +