[ros-diffs] [cwittich] 41159: -allow to disconnect -properly update debugger menus
cwittich at svn.reactos.org
cwittich at svn.reactos.org
Wed May 27 23:25:43 CEST 2009
Author: cwittich
Date: Thu May 28 01:25:41 2009
New Revision: 41159
URL: http://svn.reactos.org/svn/reactos?rev=41159&view=rev
Log:
-allow to disconnect
-properly update debugger menus
Modified:
trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs
trunk/tools/reactosdbg/RosDBG/MainWindow.cs
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs?rev=41159&r1=41158&r2=41159&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Thu May 28 01:25:41 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 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 dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin();
+ WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin();
+ WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin();
+ WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = 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();
@@ -252,22 +252,25 @@
//
// continueToolStripMenuItem
//
+ this.continueToolStripMenuItem.Enabled = false;
this.continueToolStripMenuItem.Name = "continueToolStripMenuItem";
- this.continueToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+ this.continueToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.continueToolStripMenuItem.Text = "&Continue";
this.continueToolStripMenuItem.Click += new System.EventHandler(this.continueToolStripMenuItem_Click);
//
// nextToolStripMenuItem
//
+ this.nextToolStripMenuItem.Enabled = false;
this.nextToolStripMenuItem.Name = "nextToolStripMenuItem";
- this.nextToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+ this.nextToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.nextToolStripMenuItem.Text = "&Next";
this.nextToolStripMenuItem.Click += new System.EventHandler(this.nextToolStripMenuItem_Click);
//
// stepToolStripMenuItem
//
+ this.stepToolStripMenuItem.Enabled = false;
this.stepToolStripMenuItem.Name = "stepToolStripMenuItem";
- this.stepToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+ this.stepToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.stepToolStripMenuItem.Text = "&Step";
this.stepToolStripMenuItem.Click += new System.EventHandler(this.stepToolStripMenuItem_Click);
//
@@ -278,8 +281,9 @@
//
// breakToolStripMenuItem
//
+ this.breakToolStripMenuItem.Enabled = false;
this.breakToolStripMenuItem.Name = "breakToolStripMenuItem";
- this.breakToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+ this.breakToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.breakToolStripMenuItem.Text = "&Break";
this.breakToolStripMenuItem.Click += new System.EventHandler(this.breakToolStripMenuItem_Click);
//
@@ -469,50 +473,50 @@
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;
+ dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight;
+ dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight;
+ autoHideStripSkin2.DockStripGradient = dockPanelGradient4;
+ tabGradient8.EndColor = System.Drawing.SystemColors.Control;
+ tabGradient8.StartColor = System.Drawing.SystemColors.Control;
+ tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+ autoHideStripSkin2.TabGradient = tabGradient8;
+ dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2;
+ tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight;
+ tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight;
+ tabGradient9.TextColor = System.Drawing.SystemColors.ControlText;
+ dockPaneStripGradient2.ActiveTabGradient = tabGradient9;
+ dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control;
+ dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control;
+ dockPaneStripGradient2.DockStripGradient = dockPanelGradient5;
+ tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight;
+ tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight;
+ tabGradient10.TextColor = System.Drawing.SystemColors.ControlText;
+ dockPaneStripGradient2.InactiveTabGradient = tabGradient10;
+ dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2;
+ tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption;
+ tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+ tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
+ tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
+ dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11;
+ tabGradient12.EndColor = System.Drawing.SystemColors.Control;
+ tabGradient12.StartColor = System.Drawing.SystemColors.Control;
+ tabGradient12.TextColor = System.Drawing.SystemColors.ControlText;
+ dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12;
+ dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight;
+ dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight;
+ dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6;
+ tabGradient13.EndColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+ tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ tabGradient13.TextColor = System.Drawing.SystemColors.ControlText;
+ dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13;
+ tabGradient14.EndColor = System.Drawing.Color.Transparent;
+ tabGradient14.StartColor = System.Drawing.Color.Transparent;
+ tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+ dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14;
+ dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2;
+ dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2;
+ this.dockPanel.Skin = dockPanelSkin2;
this.dockPanel.TabIndex = 4;
//
// webbrowserToolStripMenuItem
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.cs?rev=41159&r1=41158&r2=41159&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Thu May 28 01:25:41 2009
@@ -108,7 +108,6 @@
mSymbolContext.ReactosOutputPath = Settings.OutputDirectory;
}
-
public void RegisterControl(Control ctrl)
{
IUseDebugConnection usedbg = ctrl as IUseDebugConnection;
@@ -177,10 +176,20 @@
void UpdateDebuggerMenu()
{
- breakToolStripMenuItem.Enabled = mRunning;
- nextToolStripMenuItem.Enabled = !mRunning;
- stepToolStripMenuItem.Enabled = !mRunning;
- continueToolStripMenuItem.Enabled = !mRunning;
+ if (mConnection.ConnectionMode == DebugConnection.Mode.ClosedMode)
+ {
+ breakToolStripMenuItem.Enabled = false;
+ nextToolStripMenuItem.Enabled = false;
+ stepToolStripMenuItem.Enabled = false;
+ continueToolStripMenuItem.Enabled = false;
+ }
+ else
+ {
+ breakToolStripMenuItem.Enabled = mRunning;
+ nextToolStripMenuItem.Enabled = !mRunning;
+ stepToolStripMenuItem.Enabled = !mRunning;
+ continueToolStripMenuItem.Enabled = !mRunning;
+ }
}
public void FocusAddress(ulong eipToFocus)
@@ -267,22 +276,32 @@
private void connectToolStripMenuItem_Click(object sender, EventArgs e)
{
- Connect newConnection = new Connect();
- if (newConnection.ShowDialog() == DialogResult.OK)
+ if (mConnection.ConnectionMode == DebugConnection.Mode.ClosedMode)
+ {
+ Connect newConnection = new Connect();
+ if (newConnection.ShowDialog() == DialogResult.OK)
+ {
+ mConnection.Close();
+ switch (newConnection.Type)
+ {
+ case Connect.ConnectionType.Serial:
+ mConnection.StartSerial(newConnection.ComPort, newConnection.Baudrate);
+ break;
+ case Connect.ConnectionType.Pipe:
+ mConnection.StartPipe(newConnection.PipeName, newConnection.PipeMode);
+ break;
+ case Connect.ConnectionType.Socket:
+ mConnection.StartTCP(newConnection.Host, newConnection.Port);
+ break;
+ }
+ }
+ connectToolStripMenuItem.Text = "&Disconect";
+ }
+ else
{
mConnection.Close();
- switch (newConnection.Type)
- {
- case Connect.ConnectionType.Serial:
- mConnection.StartSerial(newConnection.ComPort, newConnection.Baudrate);
- break;
- case Connect.ConnectionType.Pipe:
- mConnection.StartPipe(newConnection.PipeName, newConnection.PipeMode);
- break;
- case Connect.ConnectionType.Socket:
- mConnection.StartTCP(newConnection.Host, newConnection.Port);
- break;
- }
+ UpdateDebuggerMenu();
+ connectToolStripMenuItem.Text = "&Connect";
}
}
More information about the Ros-diffs
mailing list