[gschneider] 36736: RosDbg Part 2/3: - Visual improvements for rawtraffic/modules - Shortcuts for menu, menu separators and item reordering - Visual and functional additions to PipeTargetSelect dialog - Misc cleanup
Author: gschneider Date: Sun Oct 12 16:43:31 2008 New Revision: 36736
URL: http://svn.reactos.org/svn/reactos?rev=36736&view=rev Log: RosDbg Part 2/3: - Visual improvements for rawtraffic/modules - Shortcuts for menu, menu separators and item reordering - Visual and functional additions to PipeTargetSelect dialog - Misc cleanup
Modified: trunk/tools/reactosdbg/RosDBG/BackTrace.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Modules.Designer.cs trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs trunk/tools/reactosdbg/RosDBG/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Settings.cs
Modified: trunk/tools/reactosdbg/RosDBG/BackTrace.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/BackTrace.c... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/BackTrace.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/BackTrace.cs [iso-8859-1] Sun Oct 12 16:43:31 2008 @@ -136,7 +136,7 @@
private void StackFrames_SelectedIndexChanged(object sender, EventArgs e) { - if (StackFrames.SelectedItem != null) //crashed with argumentnullexception + if (StackFrames.SelectedItem != null) { string[] parsedEntry = ((string)StackFrames.SelectedItem).Split(new char[] { ' ' }); mSelectedAddr = ulong.Parse(parsedEntry[0], NumberStyles.HexNumber);
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] Sun Oct 12 16:43:31 2008 @@ -37,7 +37,7 @@ this.connectSerialToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.connectPipeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.connectTCPIPToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.symbolDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -46,10 +46,12 @@ this.pasteToInteractionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.memoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bugcheckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.continueToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bugcheckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.stepToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.nextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.breakToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.stepToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.breakHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.breakpointClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.followListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -119,69 +121,75 @@ this.connectSerialToolStripMenuItem, this.connectPipeToolStripMenuItem, this.connectTCPIPToolStripMenuItem, - this.toolStripMenuItem1, + this.toolStripSeparator3, this.symbolDirectoryToolStripMenuItem, this.toolStripSeparator1, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); - this.fileToolStripMenuItem.Text = "File"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Text = "&File"; // // openSourceFileToolStripMenuItem // this.openSourceFileToolStripMenuItem.Name = "openSourceFileToolStripMenuItem"; - this.openSourceFileToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.openSourceFileToolStripMenuItem.Text = "Open Source File ..."; + this.openSourceFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.openSourceFileToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.openSourceFileToolStripMenuItem.Text = "&Open Source File ..."; this.openSourceFileToolStripMenuItem.Click += new System.EventHandler(this.openSourceFileToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(172, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(210, 6); // // connectSerialToolStripMenuItem // this.connectSerialToolStripMenuItem.Name = "connectSerialToolStripMenuItem"; - this.connectSerialToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.connectSerialToolStripMenuItem.Text = "Connect Serial ..."; + this.connectSerialToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L))); + this.connectSerialToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.connectSerialToolStripMenuItem.Text = "Connect Seria&l ..."; this.connectSerialToolStripMenuItem.Click += new System.EventHandler(this.connectSerialToolStripMenuItem_Click); // // connectPipeToolStripMenuItem // this.connectPipeToolStripMenuItem.Name = "connectPipeToolStripMenuItem"; - this.connectPipeToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.connectPipeToolStripMenuItem.Text = "Connect Pipe ..."; + this.connectPipeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); + this.connectPipeToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.connectPipeToolStripMenuItem.Text = "Connect &Pipe ..."; this.connectPipeToolStripMenuItem.Click += new System.EventHandler(this.connectPipeToolStripMenuItem_Click); // // connectTCPIPToolStripMenuItem // this.connectTCPIPToolStripMenuItem.Name = "connectTCPIPToolStripMenuItem"; - this.connectTCPIPToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.connectTCPIPToolStripMenuItem.Text = "Connect TCP/IP ..."; + this.connectTCPIPToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); + this.connectTCPIPToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.connectTCPIPToolStripMenuItem.Text = "Connect &TCP/IP ..."; this.connectTCPIPToolStripMenuItem.Click += new System.EventHandler(this.connectTCPIPToolStripMenuItem_Click); // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(172, 6); + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(210, 6); // // symbolDirectoryToolStripMenuItem // this.symbolDirectoryToolStripMenuItem.Name = "symbolDirectoryToolStripMenuItem"; - this.symbolDirectoryToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.symbolDirectoryToolStripMenuItem.Text = "Settings ..."; + this.symbolDirectoryToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.symbolDirectoryToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.symbolDirectoryToolStripMenuItem.Text = "&Settings ..."; this.symbolDirectoryToolStripMenuItem.Click += new System.EventHandler(this.symbolDirectoryToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(172, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(210, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.exitToolStripMenuItem.Text = "Exit"; + this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.X))); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // // editToolStripMenuItem @@ -191,93 +199,111 @@ this.pasteToInteractionToolStripMenuItem, this.memoryToolStripMenuItem}); this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); - this.editToolStripMenuItem.Text = "Edit"; + this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.editToolStripMenuItem.Text = "&Edit"; // // copyToolStripMenuItem // - this.copyToolStripMenuItem.Enabled = false; this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(187, 22); - this.copyToolStripMenuItem.Text = "Copy"; + this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.copyToolStripMenuItem.Text = "&Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // // pasteToInteractionToolStripMenuItem // this.pasteToInteractionToolStripMenuItem.Enabled = false; this.pasteToInteractionToolStripMenuItem.Name = "pasteToInteractionToolStripMenuItem"; - this.pasteToInteractionToolStripMenuItem.Size = new System.Drawing.Size(187, 22); - this.pasteToInteractionToolStripMenuItem.Text = "Paste to Interaction"; + this.pasteToInteractionToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.pasteToInteractionToolStripMenuItem.Text = "&Paste to Interaction"; // // memoryToolStripMenuItem // this.memoryToolStripMenuItem.Enabled = false; this.memoryToolStripMenuItem.Name = "memoryToolStripMenuItem"; - this.memoryToolStripMenuItem.Size = new System.Drawing.Size(187, 22); - this.memoryToolStripMenuItem.Text = "Memory at Clipboard"; + this.memoryToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.memoryToolStripMenuItem.Text = "&Memory at Clipboard"; // // debugToolStripMenuItem // this.debugToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bugcheckToolStripMenuItem, this.continueToolStripMenuItem, - this.bugcheckToolStripMenuItem, + this.stepToolStripMenuItem, + this.nextToolStripMenuItem, + this.toolStripSeparator4, this.breakToolStripMenuItem, - this.stepToolStripMenuItem, this.breakHereToolStripMenuItem, this.breakpointClipboardToolStripMenuItem, this.followListToolStripMenuItem}); this.debugToolStripMenuItem.Name = "debugToolStripMenuItem"; - this.debugToolStripMenuItem.Size = new System.Drawing.Size(54, 20); - this.debugToolStripMenuItem.Text = "Debug"; - // - // continueToolStripMenuItem - // - this.continueToolStripMenuItem.Name = "continueToolStripMenuItem"; - this.continueToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.continueToolStripMenuItem.Text = "Continue"; - this.continueToolStripMenuItem.Click += new System.EventHandler(this.continueToolStripMenuItem_Click); + this.debugToolStripMenuItem.Size = new System.Drawing.Size(50, 20); + this.debugToolStripMenuItem.Text = "&Debug"; // // bugcheckToolStripMenuItem // this.bugcheckToolStripMenuItem.Enabled = false; this.bugcheckToolStripMenuItem.Name = "bugcheckToolStripMenuItem"; - this.bugcheckToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.bugcheckToolStripMenuItem.Text = "Bugcheck"; + this.bugcheckToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.bugcheckToolStripMenuItem.Text = "&Bugcheck"; + // + // continueToolStripMenuItem + // + this.continueToolStripMenuItem.Name = "continueToolStripMenuItem"; + this.continueToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; + this.continueToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.continueToolStripMenuItem.Text = "&Continue"; + this.continueToolStripMenuItem.Click += new System.EventHandler(this.continueToolStripMenuItem_Click); + // + // stepToolStripMenuItem + // + this.stepToolStripMenuItem.Name = "stepToolStripMenuItem"; + this.stepToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F11; + this.stepToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.stepToolStripMenuItem.Text = "&Step"; + this.stepToolStripMenuItem.Click += new System.EventHandler(this.stepToolStripMenuItem_Click); + // + // nextToolStripMenuItem + // + this.nextToolStripMenuItem.Name = "nextToolStripMenuItem"; + this.nextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10; + this.nextToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.nextToolStripMenuItem.Text = "&Next"; + this.nextToolStripMenuItem.Click += new System.EventHandler(this.nextToolStripMenuItem_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(170, 6); // // breakToolStripMenuItem // this.breakToolStripMenuItem.Name = "breakToolStripMenuItem"; - this.breakToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.breakToolStripMenuItem.Text = "Break"; + this.breakToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.breakToolStripMenuItem.Text = "B&reak"; this.breakToolStripMenuItem.Click += new System.EventHandler(this.breakToolStripMenuItem_Click); - // - // stepToolStripMenuItem - // - this.stepToolStripMenuItem.Name = "stepToolStripMenuItem"; - this.stepToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.stepToolStripMenuItem.Text = "Step"; - this.stepToolStripMenuItem.Click += new System.EventHandler(this.stepToolStripMenuItem_Click); // // breakHereToolStripMenuItem // this.breakHereToolStripMenuItem.Enabled = false; this.breakHereToolStripMenuItem.Name = "breakHereToolStripMenuItem"; - this.breakHereToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.breakHereToolStripMenuItem.Text = "Breakpoint Here"; + this.breakHereToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F9; + this.breakHereToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.breakHereToolStripMenuItem.Text = "Breakpoint &Here"; // // breakpointClipboardToolStripMenuItem // this.breakpointClipboardToolStripMenuItem.Enabled = false; this.breakpointClipboardToolStripMenuItem.Name = "breakpointClipboardToolStripMenuItem"; - this.breakpointClipboardToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.breakpointClipboardToolStripMenuItem.Text = "Breakpoint Clipboard"; + this.breakpointClipboardToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.breakpointClipboardToolStripMenuItem.Text = "Breakpoint Cli&pboard"; // // followListToolStripMenuItem // this.followListToolStripMenuItem.Enabled = false; this.followListToolStripMenuItem.Name = "followListToolStripMenuItem"; - this.followListToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.followListToolStripMenuItem.Text = "Follow List"; + this.followListToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.followListToolStripMenuItem.Text = "&Follow List"; // // windowToolStripMenuItem // @@ -286,27 +312,27 @@ this.detachCurrentTabToolStripMenuItem, this.closeCurrentTabToolStripMenuItem}); this.windowToolStripMenuItem.Name = "windowToolStripMenuItem"; - this.windowToolStripMenuItem.Size = new System.Drawing.Size(63, 20); - this.windowToolStripMenuItem.Text = "Window"; + this.windowToolStripMenuItem.Size = new System.Drawing.Size(57, 20); + this.windowToolStripMenuItem.Text = "&Window"; // // NewWindowItem // this.NewWindowItem.Name = "NewWindowItem"; - this.NewWindowItem.Size = new System.Drawing.Size(177, 22); - this.NewWindowItem.Text = "New"; + this.NewWindowItem.Size = new System.Drawing.Size(169, 22); + this.NewWindowItem.Text = "&New"; // // detachCurrentTabToolStripMenuItem // this.detachCurrentTabToolStripMenuItem.Name = "detachCurrentTabToolStripMenuItem"; - this.detachCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.detachCurrentTabToolStripMenuItem.Text = "Detach Current Tab"; + this.detachCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.detachCurrentTabToolStripMenuItem.Text = "&Detach Current Tab"; this.detachCurrentTabToolStripMenuItem.Click += new System.EventHandler(this.detachCurrentTabToolStripMenuItem_Click); // // closeCurrentTabToolStripMenuItem // this.closeCurrentTabToolStripMenuItem.Name = "closeCurrentTabToolStripMenuItem"; - this.closeCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.closeCurrentTabToolStripMenuItem.Text = "Close Current Tab"; + this.closeCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.closeCurrentTabToolStripMenuItem.Text = "&Close Current Tab"; this.closeCurrentTabToolStripMenuItem.Click += new System.EventHandler(this.closeCurrentTabToolStripMenuItem_Click); // // toolStripMenuItem2 @@ -321,14 +347,15 @@ // helpToolStripMenuItem // this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(107, 22); + this.helpToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; + this.helpToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.helpToolStripMenuItem.Text = "&Help"; this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click); // // infoToolStripMenuItem // this.infoToolStripMenuItem.Name = "infoToolStripMenuItem"; - this.infoToolStripMenuItem.Size = new System.Drawing.Size(107, 22); + this.infoToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.infoToolStripMenuItem.Text = "&About"; // // splitContainer2 @@ -381,12 +408,12 @@ this.contextMenuTabStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.closeToolStripMenuItem}); this.contextMenuTabStrip.Name = "contextMenuTabStrip"; - this.contextMenuTabStrip.Size = new System.Drawing.Size(104, 26); + this.contextMenuTabStrip.Size = new System.Drawing.Size(101, 26); // // closeToolStripMenuItem // this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; - this.closeToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.closeToolStripMenuItem.Size = new System.Drawing.Size(100, 22); this.closeToolStripMenuItem.Text = "&Close"; this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click); // @@ -436,7 +463,6 @@ private System.Windows.Forms.ToolStripMenuItem connectPipeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem connectTCPIPToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem stepToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem breakHereToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem breakpointClipboardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem followListToolStripMenuItem; @@ -449,12 +475,15 @@ private System.Windows.Forms.ToolStripStatusLabel RunStatus; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ContextMenuStrip contextMenuTabStrip; private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem infoToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem stepToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem nextToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
} }
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] Sun Oct 12 16:43:31 2008 @@ -8,6 +8,7 @@ using System.Text; using System.Windows.Forms; using System.Reflection; +using AbstractPipe; using DebugProtocol; using KDBGProtocol; using DbgHelpAPI; @@ -244,7 +245,7 @@ if (targetSelect.ShowDialog() == DialogResult.OK) { mConnection.Close(); - mConnection.Start(targetSelect.Host, targetSelect.Port); + mConnection.StartTCP(targetSelect.Host, targetSelect.Port); } }
@@ -256,6 +257,11 @@ private void stepToolStripMenuItem_Click(object sender, EventArgs e) { mConnection.Step(); + } + + private void nextToolStripMenuItem_Click(object sender, EventArgs e) + { + mConnection.Next(); }
private void continueToolStripMenuItem_Click(object sender, EventArgs e) @@ -276,7 +282,7 @@ if (targetSelect.ShowDialog() == DialogResult.OK) { mConnection.Close(); - mConnection.Start(targetSelect.Baudrate, targetSelect.Port); + mConnection.StartSerial(targetSelect.Port, targetSelect.Baudrate); } }
@@ -340,7 +346,7 @@ if (targetSelect.ShowDialog() == DialogResult.OK) { mConnection.Close(); - mConnection.Start(targetSelect.PipeName); + mConnection.StartPipe(targetSelect.PipeName, targetSelect.PipeMode); } }
Modified: trunk/tools/reactosdbg/RosDBG/Modules.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Modules.Des... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Modules.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Modules.Designer.cs [iso-8859-1] Sun Oct 12 16:43:31 2008 @@ -39,6 +39,9 @@ this.MListAddress, this.MListShortName}); this.ModulesList.Dock = System.Windows.Forms.DockStyle.Fill; + this.ModulesList.FullRowSelect = true; + this.ModulesList.GridLines = true; + this.ModulesList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.ModulesList.Location = new System.Drawing.Point(0, 0); this.ModulesList.Name = "ModulesList"; this.ModulesList.Size = new System.Drawing.Size(244, 218); @@ -51,6 +54,7 @@ // MListAddress // this.MListAddress.Text = "Address"; + this.MListAddress.Width = 80; // // MListShortName //
Modified: trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/PipeTargetS... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs [iso-8859-1] Sun Oct 12 16:43:31 2008 @@ -33,17 +33,18 @@ this.PipeNameTextBox = new System.Windows.Forms.TextBox(); this.DefaultRadioBtn = new System.Windows.Forms.RadioButton(); this.CustomRadioBtn = new System.Windows.Forms.RadioButton(); - this.DefaultNameLabel = new System.Windows.Forms.Label(); + this.cType = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // bOK // this.bOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.bOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.bOK.Location = new System.Drawing.Point(69, 86); + this.bOK.Location = new System.Drawing.Point(69, 121); this.bOK.Name = "bOK"; this.bOK.Size = new System.Drawing.Size(75, 23); - this.bOK.TabIndex = 5; + this.bOK.TabIndex = 6; this.bOK.Text = "OK"; this.bOK.UseVisualStyleBackColor = true; this.bOK.Click += new System.EventHandler(this.bOK_Click); @@ -52,10 +53,10 @@ // this.bCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.bCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.bCancel.Location = new System.Drawing.Point(150, 86); + this.bCancel.Location = new System.Drawing.Point(150, 121); this.bCancel.Name = "bCancel"; this.bCancel.Size = new System.Drawing.Size(75, 23); - this.bCancel.TabIndex = 6; + this.bCancel.TabIndex = 7; this.bCancel.Text = "Cancel"; this.bCancel.UseVisualStyleBackColor = true; this.bCancel.Click += new System.EventHandler(this.bCancel_Click); @@ -63,19 +64,19 @@ // PipeNameTextBox // this.PipeNameTextBox.Enabled = false; - this.PipeNameTextBox.Location = new System.Drawing.Point(15, 60); + this.PipeNameTextBox.Location = new System.Drawing.Point(12, 86); this.PipeNameTextBox.Name = "PipeNameTextBox"; this.PipeNameTextBox.Size = new System.Drawing.Size(213, 20); - this.PipeNameTextBox.TabIndex = 8; + this.PipeNameTextBox.TabIndex = 5; // // DefaultRadioBtn // this.DefaultRadioBtn.AutoSize = true; this.DefaultRadioBtn.Checked = true; - this.DefaultRadioBtn.Location = new System.Drawing.Point(15, 12); + this.DefaultRadioBtn.Location = new System.Drawing.Point(12, 38); this.DefaultRadioBtn.Name = "DefaultRadioBtn"; this.DefaultRadioBtn.Size = new System.Drawing.Size(81, 17); - this.DefaultRadioBtn.TabIndex = 9; + this.DefaultRadioBtn.TabIndex = 3; this.DefaultRadioBtn.TabStop = true; this.DefaultRadioBtn.Text = "Use Default"; this.DefaultRadioBtn.UseVisualStyleBackColor = true; @@ -83,21 +84,33 @@ // CustomRadioBtn // this.CustomRadioBtn.AutoSize = true; - this.CustomRadioBtn.Location = new System.Drawing.Point(15, 37); + this.CustomRadioBtn.Location = new System.Drawing.Point(12, 61); this.CustomRadioBtn.Name = "CustomRadioBtn"; this.CustomRadioBtn.Size = new System.Drawing.Size(91, 17); - this.CustomRadioBtn.TabIndex = 10; + this.CustomRadioBtn.TabIndex = 4; this.CustomRadioBtn.Text = "Custom Name"; this.CustomRadioBtn.UseVisualStyleBackColor = true; this.CustomRadioBtn.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); // - // DefaultNameLabel + // cType // - this.DefaultNameLabel.AutoSize = true; - this.DefaultNameLabel.Location = new System.Drawing.Point(118, 14); - this.DefaultNameLabel.Name = "DefaultNameLabel"; - this.DefaultNameLabel.Size = new System.Drawing.Size(0, 13); - this.DefaultNameLabel.TabIndex = 11; + this.cType.FormattingEnabled = true; + this.cType.Items.AddRange(new object[] { + "Client", + "Server"}); + this.cType.Location = new System.Drawing.Point(69, 6); + this.cType.Name = "cType"; + this.cType.Size = new System.Drawing.Size(156, 21); + this.cType.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(31, 13); + this.label1.TabIndex = 1; + this.label1.Text = "Type"; // // PipeTargetSelect // @@ -105,8 +118,9 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.bCancel; - this.ClientSize = new System.Drawing.Size(237, 121); - this.Controls.Add(this.DefaultNameLabel); + this.ClientSize = new System.Drawing.Size(237, 156); + this.Controls.Add(this.label1); + this.Controls.Add(this.cType); this.Controls.Add(this.CustomRadioBtn); this.Controls.Add(this.DefaultRadioBtn); this.Controls.Add(this.PipeNameTextBox); @@ -129,6 +143,7 @@ private System.Windows.Forms.TextBox PipeNameTextBox; private System.Windows.Forms.RadioButton DefaultRadioBtn; private System.Windows.Forms.RadioButton CustomRadioBtn; - private System.Windows.Forms.Label DefaultNameLabel; + private System.Windows.Forms.ComboBox cType; + private System.Windows.Forms.Label label1; } }
Modified: trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/PipeTargetS... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs [iso-8859-1] Sun Oct 12 16:43:31 2008 @@ -1,4 +1,5 @@ -using System; +using AbstractPipe; +using System; using System.Windows.Forms;
namespace RosDBG @@ -7,10 +8,16 @@ { private string defaultPipeName = Settings.Pipe; private string pipeName; + public ConnectionMode pipeMode;
public string PipeName { get { return pipeName; } + } + + public ConnectionMode PipeMode + { + get { return (ConnectionMode)pipeMode; } }
public bool UseDefault @@ -34,6 +41,19 @@ pipeName = PipeNameTextBox.Text; }
+ if (cType.SelectedItem.ToString().CompareTo("Client") == 0) + { + pipeMode = ConnectionMode.MODE_CLIENT; + } + else if (cType.SelectedItem.ToString().CompareTo("Server") == 0) + { + pipeMode = ConnectionMode.MODE_SERVER; + } + else if (cType.SelectedItem.ToString().CompareTo("Automatic") == 0) + { + pipeMode = ConnectionMode.MODE_AUTO; + } + DialogResult = DialogResult.OK; Close(); } @@ -53,7 +73,8 @@
private void PipeTargetSelect_Load(object sender, EventArgs e) { - DefaultNameLabel.Text = "[" + defaultPipeName + "]"; + DefaultRadioBtn.Text += " [" + defaultPipeName + "]"; + cType.SelectedIndex = 0; } } }
Modified: trunk/tools/reactosdbg/RosDBG/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RawTraffic.... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] Sun Oct 12 16:43:31 2008 @@ -37,6 +37,7 @@ foreach (string s in textToAdd) toAdd.Append(s); textToAdd.Clear(); + //TODO: skip backspace signs } RawTrafficText.AppendText(toAdd.ToString()); } @@ -52,7 +53,7 @@
void CopyEvent(object sender, CopyEventArgs args) { - if (args.Obj == this) + if (args.Obj == this && RawTrafficText.SelectedText != null) Clipboard.SetText(RawTrafficText.SelectedText); }
Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.cs... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Sun Oct 12 16:43:31 2008 @@ -56,7 +56,7 @@ }
[CategoryAttribute("Connection"), DescriptionAttribute("Connection settings")] - [UserScopedSetting, DefaultSettingValue(@"\.\Pipe\RosDbg")] + [UserScopedSetting, DefaultSettingValue(@"RosDbg")] public string Pipe { get { return this["Pipe"].ToString(); }
-
gschneider＠svn.reactos.org