[cwittich] 41168: -lots of UI improvements -implementing SaveAs for Console and WebBrowser window
Author: cwittich Date: Thu May 28 13:16:07 2009 New Revision: 41168
URL: http://svn.reactos.org/svn/reactos?rev=41168&view=rev Log: -lots of UI improvements -implementing SaveAs for Console and WebBrowser window
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/Locals.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/MemoryWindow.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/Modules.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.resx trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -16,7 +16,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class BackTrace : DockContent, IUseDebugConnection, IUseSymbols, IUseShell + public partial class BackTrace : ToolWindow, IUseDebugConnection, IUseSymbols, IUseShell { DebugConnection mConnection; SymbolContext mSymbols;
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/Locals.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/Locals.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/Locals.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -16,7 +16,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class Locals : DockContent, IUseDebugConnection, IUseSymbols, IUseShell + public partial class Locals : ToolWindow, IUseDebugConnection, IUseSymbols, IUseShell { class DisplayValue {
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/MemoryWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/MemoryWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/MemoryWindow.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -14,7 +14,7 @@ namespace RosDBG { [DebugControl] - public partial class MemoryWindow : DockContent, IUseDebugConnection + public partial class MemoryWindow : ToolWindow, IUseDebugConnection { ulong mAddress; DebugConnection mConnection;
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/Modules.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/Modules.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/Modules.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -12,7 +12,7 @@ namespace RosDBG { [DebugControl,BuildAtStartup] - public partial class Modules : DockContent, IUseDebugConnection + public partial class Modules : ToolWindow, IUseDebugConnection { public SortedList<uint, string> mModules = new SortedList<uint, string>();
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -87,7 +87,7 @@ this.HideOnClose = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "ProcThread"; - this.Text = "Processes & Threads"; + this.Text = "Processes / Threads"; this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); this.splitContainer1.ResumeLayout(false);
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -13,7 +13,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class ProcThread : DockContent, IUseDebugConnection, IUseSymbols + public partial class ProcThread : ToolWindow, IUseDebugConnection, IUseSymbols { DebugConnection mConnection; SymbolContext mSymcon;
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -83,6 +83,7 @@ this.editToolStripMenuItem.Name = "editToolStripMenuItem"; this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.editToolStripMenuItem.Text = "&Edit"; + this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); // // copyToolStripMenuItem //
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -3,6 +3,7 @@ using System.ComponentModel; using System.Drawing; using System.Data; +using System.IO; using System.Linq; using System.Text; using System.Windows.Forms; @@ -12,7 +13,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class RawTraffic : DockContent, IUseDebugConnection + public partial class RawTraffic : ToolWindow, IUseDebugConnection { DebugConnection mConnection; List<string> textToAdd = new List<string>(); @@ -110,5 +111,34 @@ RawTrafficText.SelectAll(); }
+ private void editToolStripMenuItem_Click(object sender, EventArgs e) + { + selectAllToolStripMenuItem.Enabled = (RawTrafficText.Text.Length != 0); + } + + public override bool IsCmdEnabled(Commands Cmd) + { + switch (Cmd) + { + case Commands.SaveAs: + return true; + } + return false; + } + + public override void SaveAs(string FileName) + { + SaveFileDialog saveFileDialog = new SaveFileDialog(); + saveFileDialog.FileName = "debuglog-" + DateTime.Now.Date.ToShortDateString() + ".txt"; + saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal); + saveFileDialog.Filter = "Textfiles (*.txt)|*.txt|All Files (*.*)|*.*"; + if (saveFileDialog.ShowDialog(this) == DialogResult.OK) + { + StreamWriter sw = new StreamWriter(saveFileDialog.FileName); + sw.Write(RawTrafficText.Text); + sw.Close(); + } + } + } }
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -42,10 +42,16 @@ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.BugzillaInput = new System.Windows.Forms.ToolStripTextBox(); this.BrowserView = new System.Windows.Forms.WebBrowser(); + 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 @@ -184,12 +190,58 @@ this.BrowserView.TabIndex = 0; this.BrowserView.Navigating += new System.Windows.Forms.WebBrowserNavigatingEventHandler(this.BrowserView_Navigating); // + // 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(427, 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"; + this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); + // + // copyToolStripMenuItem + // + this.copyToolStripMenuItem.Enabled = false; + 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); + // // ReactOSWeb // this.AllowEndUserDocking = false; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(427, 281); + this.Controls.Add(this.menuStrip1); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -201,7 +253,10 @@ this.splitContainer1.ResumeLayout(false); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout();
}
@@ -220,5 +275,10 @@ private System.Windows.Forms.ToolStripTextBox BugzillaInput; private System.Windows.Forms.ToolStripButton navReload; private System.Windows.Forms.ToolStripButton navHome; + 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; } }
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -6,12 +6,13 @@ using System.Linq; using System.Text; using System.Windows.Forms; +using mshtml; using WeifenLuo.WinFormsUI.Docking;
namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class ReactOSWeb : DockContent + public partial class ReactOSWeb : ToolWindow { public ReactOSWeb() { @@ -82,6 +83,60 @@ if (e.KeyCode == Keys.Return) BrowserView.Navigate("http://www.reactos.org/bugzilla/show_bug.cgi?id=" + ((ToolStripTextBox)sender).Text); } - + + private bool pIsCmdEnabled(string Cmd) + { + IHTMLDocument2 doc2 = BrowserView.Document.DomDocument as IHTMLDocument2; + if (doc2 != null) + return doc2.queryCommandEnabled(Cmd); + return false; + } + + public override bool IsCmdEnabled(Commands Cmd) + { + switch (Cmd) + { + case Commands.Copy: + return pIsCmdEnabled("copy"); + case Commands.Save: + case Commands.SaveAs: + return true; + } + return false; + } + + private void copyToolStripMenuItem_Click(object sender, EventArgs e) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("copy", true, null); + } + + private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("selectall", true, null); + } + + private void editToolStripMenuItem_Click(object sender, EventArgs e) + { + copyToolStripMenuItem.Enabled = IsCmdEnabled(Commands.Copy); + } + + public override void Save(string FileName) + { + SaveAs(FileName); + } + + public override void SaveAs(string FileName) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("saveas", true, FileName); + } + + public override string GetDocumentName() + { + return BrowserView.Url.GetComponents(UriComponents.Host, UriFormat.UriEscaped).ToString() + ".html"; + } + } }
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.resx [iso-8859-1] Thu May 28 13:16:07 2009 @@ -201,6 +201,9 @@ DRuN9dviyqNcAAAAAElFTkSuQmCC </value> </data> + <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>141, 23</value> + </metadata> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -12,7 +12,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class RegisterView : DockContent, IUseDebugConnection + public partial class RegisterView : ToolWindow, IUseDebugConnection { bool mGridEnabled; Registers mRegisters;
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -50,7 +50,7 @@ // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer1.Location = new System.Drawing.Point(0, 24); + this.splitContainer1.Location = new System.Drawing.Point(0, 0); this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -61,7 +61,7 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.SourceCode); - this.splitContainer1.Size = new System.Drawing.Size(481, 248); + this.splitContainer1.Size = new System.Drawing.Size(481, 272); this.splitContainer1.SplitterDistance = 25; this.splitContainer1.TabIndex = 2; // @@ -103,7 +103,7 @@ this.SourceCode.Location = new System.Drawing.Point(0, 0); this.SourceCode.Name = "SourceCode"; this.SourceCode.ReadOnly = true; - this.SourceCode.Size = new System.Drawing.Size(481, 219); + 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); @@ -136,19 +136,19 @@ this.copyToolStripMenuItem.Enabled = false; this.copyToolStripMenuItem.Image = global::RosDBG.Properties.Resources.copyToolStripMenuItem_Image; this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(120, 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); + this.toolStripMenuItem1.Size = new System.Drawing.Size(117, 6); // // selectAllToolStripMenuItem // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.selectAllToolStripMenuItem.Text = "&Select all"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); //
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -12,7 +12,7 @@ namespace RosDBG {
- public partial class SourceView : DockContent + public partial class SourceView : ToolWindow { string mSourceFile; //public event CanCopyChangedEventHandler CanCopyChangedEvent; @@ -104,6 +104,9 @@
private void btnCopy_Click(object sender, EventArgs e) { + if (SourceCode.SelectionLength != 0) + Clipboard.SetText(SourceCode.SelectedText); + //CopyEvent(this, new CopyEventArgs(this)); }
@@ -118,6 +121,29 @@ SourceCode.SelectAll(); }
+ /* + public override void Save(string FileName) + { + SaveAs(FileName); + } + + public override void SaveAs(string FileName) + { + SaveFileDialog saveFileDialog = new SaveFileDialog(); + saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal); + saveFileDialog.Filter = "Textfiles (*.txt)|*.txt|All Files (*.*)|*.*"; + if (saveFileDialog.ShowDialog(this) == DialogResult.OK) + { + string File = saveFileDialog.FileName; + } + } + */ + + public override string GetDocumentName() + { + return SourceFile; + } + }
}
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx [iso-8859-1] Thu May 28 13:16:07 2009 @@ -139,18 +139,18 @@ <data name="btnBreakpoint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - 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= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlJJREFUOE+10l9I + U1EcB3Bfe/NBCHrqoYcKIxCjPyxpZauocBRYoLT+kIyRlrNbTTfvttu623JztunGNjc3JrkopmCEgcYe + ArVYuXBtWtRWjTnLzVWOVt5vdwaBZGoPHTgPP875fX6H3/kVFPyvNfp4oLjTpqr22NSQiC9sfOTzFa66 + VouK2Od10ug0KZiZCMl0Gak33i4afT02yaoQu1HOzEUp5KsjaYDLQiEbVS3EgdHBXSsiFhP5hZlqZRPo + X0C7EvnYbbkBi04Kl1VfsSxib2tmE/RwmxXAlAGONhkYFnK2K/D1LQWzTjK4LGBQ1i5UdNySgEkYYNFe + xjwLmjUEcjE1lMSZyCLAaZLLHCYF8vtBr+smTQjYRD2srfXIvdOiQyVE7r0GLY3nMRe9DvHpo6HfgFen + W+O2qJB+RbGHFO445JAK+fgR1+JhzyVkIjL479bi82sSPcYaZMJNEFbxgote4LHSSnHVHkyH5JidlMIs + 5yMbo5GaVCI9IUUqLMFMmEA6IkE8IMI5PufJHz3otmqIBSTYgOSzOqReypGZUGI2TOLjeBMSY1eRCFxE + ZOAEqg9v9y/ZRFub7HYe+TAiRHy0Dkk26dN4I6ZfXENsuAbP7x3AQEcZc/Jg6dCSgM/XWnhFwKPyyFj/ + cQx7+UzAd4wJ9h7BU+9ejHg4UIs438Sn9pv/+o3dLWQR20Qyj3jocqbfyGX8jjLcN+2YFwuKvx/avRnE + 2fJ1y84BKeJtaK6rbKiu2NlXsqUou23TWnBL14eqeCX2+kru1hVH+V8u/ATQB2+2DQmylgAAAABJRU5E + rkJggg== </value> </data> <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); - 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(); + 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(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -67,6 +67,9 @@ this.viewMenu = new System.Windows.Forms.ToolStripMenuItem(); this.consoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.memoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.registerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.localsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backtraceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.webbrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.toolBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -88,9 +91,8 @@ 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.modulesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.procThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip.SuspendLayout(); this.toolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); @@ -106,7 +108,7 @@ this.helpMenu}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(632, 24); + this.menuStrip.Size = new System.Drawing.Size(784, 24); this.menuStrip.TabIndex = 0; this.menuStrip.Text = "MenuStrip"; // @@ -133,14 +135,14 @@ this.openToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.openToolStripMenuItem.Text = "&Open"; this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); // // saveToolStripMenuItem // @@ -148,20 +150,21 @@ this.saveToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveToolStripMenuItem.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveAsToolStripMenuItem.Text = "Save &as"; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsToolStripMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); // // printToolStripMenuItem // @@ -169,24 +172,25 @@ this.printToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.printToolStripMenuItem.Name = "printToolStripMenuItem"; this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.printToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.printToolStripMenuItem.Text = "&Print"; // // printSetupToolStripMenuItem // + this.printSetupToolStripMenuItem.Enabled = false; this.printSetupToolStripMenuItem.Name = "printSetupToolStripMenuItem"; - this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.printSetupToolStripMenuItem.Text = "Print setup"; // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(149, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.exitToolStripMenuItem.Text = "&Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.ExitToolsStripMenuItem_Click); // @@ -259,6 +263,8 @@ this.consoleToolStripMenuItem, this.memoryToolStripMenuItem, this.registerToolStripMenuItem, + this.modulesToolStripMenuItem, + this.procThreadToolStripMenuItem, this.localsToolStripMenuItem, this.backtraceToolStripMenuItem, this.webbrowserToolStripMenuItem, @@ -272,28 +278,49 @@ // consoleToolStripMenuItem // this.consoleToolStripMenuItem.Name = "consoleToolStripMenuItem"; - this.consoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.consoleToolStripMenuItem.Size = new System.Drawing.Size(178, 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(152, 22); + this.memoryToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.memoryToolStripMenuItem.Text = "&Memory"; this.memoryToolStripMenuItem.Click += new System.EventHandler(this.memoryToolStripMenuItem_Click); // + // registerToolStripMenuItem + // + this.registerToolStripMenuItem.Name = "registerToolStripMenuItem"; + this.registerToolStripMenuItem.Size = new System.Drawing.Size(178, 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(178, 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(178, 22); + this.backtraceToolStripMenuItem.Text = "&Backtrace"; + this.backtraceToolStripMenuItem.Click += new System.EventHandler(this.backtraceToolStripMenuItem_Click); + // // webbrowserToolStripMenuItem // this.webbrowserToolStripMenuItem.Name = "webbrowserToolStripMenuItem"; - this.webbrowserToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.webbrowserToolStripMenuItem.Size = new System.Drawing.Size(178, 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(149, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(175, 6); // // toolBarToolStripMenuItem // @@ -301,7 +328,7 @@ this.toolBarToolStripMenuItem.CheckOnClick = true; this.toolBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.toolBarToolStripMenuItem.Name = "toolBarToolStripMenuItem"; - this.toolBarToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.toolBarToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.toolBarToolStripMenuItem.Text = "&Toolbar"; this.toolBarToolStripMenuItem.Click += new System.EventHandler(this.ToolBarToolStripMenuItem_Click); // @@ -311,7 +338,7 @@ this.statusBarToolStripMenuItem.CheckOnClick = true; this.statusBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.statusBarToolStripMenuItem.Name = "statusBarToolStripMenuItem"; - this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.statusBarToolStripMenuItem.Text = "Status&bar"; this.statusBarToolStripMenuItem.Click += new System.EventHandler(this.StatusBarToolStripMenuItem_Click); // @@ -326,8 +353,8 @@ // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(116, 22); - this.optionsToolStripMenuItem.Text = "&Options"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.optionsToolStripMenuItem.Text = "&Settings"; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // // helpMenu @@ -370,7 +397,7 @@ this.helpToolStripButton}); this.toolStrip.Location = new System.Drawing.Point(0, 24); this.toolStrip.Name = "toolStrip"; - this.toolStrip.Size = new System.Drawing.Size(632, 25); + this.toolStrip.Size = new System.Drawing.Size(784, 25); this.toolStrip.TabIndex = 1; this.toolStrip.Text = "ToolStrip"; // @@ -426,9 +453,9 @@ // this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel}); - this.statusStrip.Location = new System.Drawing.Point(0, 431); + this.statusStrip.Location = new System.Drawing.Point(0, 542); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(632, 22); + this.statusStrip.Size = new System.Drawing.Size(784, 22); this.statusStrip.TabIndex = 2; this.statusStrip.Text = "StatusStrip"; // @@ -448,79 +475,73 @@ this.dockPanel.DockBackColor = System.Drawing.SystemColors.AppWorkspace; this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Name = "dockPanel"; - this.dockPanel.Size = new System.Drawing.Size(632, 379); - 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.Size = new System.Drawing.Size(784, 490); + 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; 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); + this.dockPanel.ActiveContentChanged += new System.EventHandler(this.dockPanel_ActiveContentChanged); + // + // modulesToolStripMenuItem + // + this.modulesToolStripMenuItem.Name = "modulesToolStripMenuItem"; + this.modulesToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.modulesToolStripMenuItem.Text = "M&odules"; + this.modulesToolStripMenuItem.Click += new System.EventHandler(this.modulesToolStripMenuItem_Click); + // + // procThreadToolStripMenuItem + // + this.procThreadToolStripMenuItem.Name = "procThreadToolStripMenuItem"; + this.procThreadToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.procThreadToolStripMenuItem.Text = "&Processes / Threads"; + this.procThreadToolStripMenuItem.Click += new System.EventHandler(this.procThreadToolStripMenuItem_Click); // // MainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(632, 453); + this.ClientSize = new System.Drawing.Size(784, 564); this.Controls.Add(this.statusStrip); this.Controls.Add(this.dockPanel); this.Controls.Add(this.toolStrip); @@ -590,6 +611,8 @@ private System.Windows.Forms.ToolStripMenuItem registerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem localsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem backtraceToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem modulesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem procThreadToolStripMenuItem; } }
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -25,6 +25,8 @@ private RawTraffic m_RawTraffic = new RawTraffic(); private Locals m_Locals = new Locals(); private MemoryWindow m_MemoryWindow = new MemoryWindow(); + private ProcThread m_ProcThread = new ProcThread(); + private Modules m_Modules = new Modules();
private bool mRunning; private DebugConnection.Mode mConnectionMode; @@ -49,12 +51,15 @@ RegisterControl(m_RawTraffic); RegisterControl(m_Locals); RegisterControl(m_MemoryWindow); + RegisterControl(m_ProcThread); + RegisterControl(m_Modules);
m_Locals.Show(dockPanel, DockState.DockRight); m_RegView.Show(dockPanel, DockState.DockRight); m_BackTrace.Show(dockPanel, DockState.DockBottom); m_RawTraffic.Show(dockPanel); - m_MemoryWindow.Show(dockPanel); + m_Modules.Show(dockPanel); + m_ProcThread.Show(dockPanel); ReactOSWeb web = new ReactOSWeb(); web.Show(dockPanel); } @@ -62,7 +67,7 @@ void ComposeTitleString() { FocusAddress(mCurrentEip); - toolStripStatusLabel.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + " - Source Location: " + mCurrentFile + ":" + mCurrentLine; + toolStripStatusLabel.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + (mCurrentFile.CompareTo("unknown") != 0 ? " - Source Location: " + mCurrentFile + ":" + mCurrentLine : ""); }
void DebugModuleChangedEvent(object sender, DebugModuleChangedEventArgs args) @@ -131,32 +136,9 @@ } }
- private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) - { - SaveFileDialog saveFileDialog = new SaveFileDialog(); - saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal); - saveFileDialog.Filter = "Textdateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*"; - if (saveFileDialog.ShowDialog(this) == DialogResult.OK) - { - string FileName = saveFileDialog.FileName; - } - } - private void ExitToolsStripMenuItem_Click(object sender, EventArgs e) { this.Close(); - } - - private void CutToolStripMenuItem_Click(object sender, EventArgs e) - { - } - - private void CopyToolStripMenuItem_Click(object sender, EventArgs e) - { - } - - private void PasteToolStripMenuItem_Click(object sender, EventArgs e) - { }
private void ToolBarToolStripMenuItem_Click(object sender, EventArgs e) @@ -326,11 +308,44 @@ m_Locals.Show(dockPanel, DockState.DockRight); }
+ private void procThreadToolStripMenuItem_Click(object sender, EventArgs e) + { + m_ProcThread.Show(dockPanel); + } + + private void modulesToolStripMenuItem_Click(object sender, EventArgs e) + { + m_Modules.Show(dockPanel); + } + private void backtraceToolStripMenuItem_Click(object sender, EventArgs e) { m_BackTrace.Show(dockPanel, DockState.DockBottom); }
+ private void saveToolStripMenuItem_Click(object sender, EventArgs e) + { + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).Save( + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).GetDocumentName()); + } + + private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) + { + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).SaveAs( + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).GetDocumentName()); + } + + private void dockPanel_ActiveContentChanged(object sender, EventArgs e) + { + ToolWindow Wnd = (ToolWindow)dockPanel.ActiveDocument.DockHandler.Form; + + saveToolStripButton.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Save); + saveToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Save); + saveAsToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.SaveAs); + printToolStripButton.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); + printToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); + } + }
}
Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.cspr... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Thu May 28 13:16:07 2009 @@ -47,6 +47,10 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> + <Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..............\Program Files (x86)\Microsoft.NET\Primary Interop Assemblies\Microsoft.mshtml.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> @@ -81,6 +85,12 @@ </Compile> <Compile Include="DebugInfoFile.cs" /> <Compile Include="DirectoryChooser.cs"> + </Compile> + <Compile Include="Dockable Objects\ToolWindow.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="Dockable Objects\ToolWindow.Designer.cs"> + <DependentUpon>ToolWindow.cs</DependentUpon> </Compile> <Compile Include="HighLevelInteraction.cs" /> <Compile Include="HostWindow.cs">
-
cwittich＠svn.reactos.org