[ros-diffs] [gedmurphy] 41270: split and set the status info instead of dumping everything into a string
gedmurphy at svn.reactos.org
gedmurphy at svn.reactos.org
Wed Jun 3 14:28:37 CEST 2009
Author: gedmurphy
Date: Wed Jun 3 16:28:36 2009
New Revision: 41270
URL: http://svn.reactos.org/svn/reactos?rev=41270&view=rev
Log:
split and set the status info instead of dumping everything into a string
Modified:
trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs
trunk/tools/reactosdbg/RosDBG/MainWindow.cs
trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs?rev=41270&r1=41269&r2=41270&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Wed Jun 3 16:28:36 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 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();
+ 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();
@@ -95,9 +95,16 @@
this.continueToolStripButton = new System.Windows.Forms.ToolStripButton();
this.breakToolStripButton = new System.Windows.Forms.ToolStripButton();
this.statusStrip = new System.Windows.Forms.StatusStrip();
- this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel();
+ this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusConnectionMode = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusConnected = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusSourceLocation = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusSourceLocationFile = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusSourceLocationLine = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusSourceLocationColon = new System.Windows.Forms.ToolStripStatusLabel();
this.menuStrip.SuspendLayout();
this.toolStrip.SuspendLayout();
this.statusStrip.SuspendLayout();
@@ -381,19 +388,19 @@
// externalToolsToolStripMenuItem
//
this.externalToolsToolStripMenuItem.Name = "externalToolsToolStripMenuItem";
- this.externalToolsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.externalToolsToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
this.externalToolsToolStripMenuItem.Text = "Exte&rnal Tools";
this.externalToolsToolStripMenuItem.Click += new System.EventHandler(this.externalToolsToolStripMenuItem_Click);
//
// toolStripMenuItem5
//
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
- this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 6);
+ this.toolStripMenuItem5.Size = new System.Drawing.Size(144, 6);
//
// optionsToolStripMenuItem
//
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
- this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.optionsToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
this.optionsToolStripMenuItem.Text = "&Settings";
this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click);
//
@@ -525,18 +532,19 @@
// statusStrip
//
this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripStatusLabel});
- this.statusStrip.Location = new System.Drawing.Point(0, 542);
+ this.toolStripStatusLabel1,
+ this.toolStripStatusConnectionMode,
+ this.toolStripStatusLabel3,
+ this.toolStripStatusConnected,
+ this.toolStripStatusSourceLocation,
+ this.toolStripStatusSourceLocationFile,
+ this.toolStripStatusSourceLocationColon,
+ this.toolStripStatusSourceLocationLine});
+ this.statusStrip.Location = new System.Drawing.Point(0, 540);
this.statusStrip.Name = "statusStrip";
- this.statusStrip.Size = new System.Drawing.Size(784, 22);
+ this.statusStrip.Size = new System.Drawing.Size(784, 24);
this.statusStrip.TabIndex = 2;
this.statusStrip.Text = "StatusStrip";
- //
- // toolStripStatusLabel
- //
- this.toolStripStatusLabel.Name = "toolStripStatusLabel";
- this.toolStripStatusLabel.Size = new System.Drawing.Size(39, 17);
- this.toolStripStatusLabel.Text = "Status";
//
// dockPanel
//
@@ -549,52 +557,115 @@
this.dockPanel.Location = new System.Drawing.Point(0, 49);
this.dockPanel.Name = "dockPanel";
this.dockPanel.Size = new System.Drawing.Size(784, 490);
- 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;
+ 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;
this.dockPanel.ActiveDocumentChanged += new System.EventHandler(this.dockPanel_ActiveDocumentChanged);
+ //
+ // toolStripStatusLabel1
+ //
+ this.toolStripStatusLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
+ this.toolStripStatusLabel1.Size = new System.Drawing.Size(106, 19);
+ this.toolStripStatusLabel1.Text = "Connection Mode:";
+ this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // toolStripStatusConnectionMode
+ //
+ this.toolStripStatusConnectionMode.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
+ this.toolStripStatusConnectionMode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripStatusConnectionMode.Name = "toolStripStatusConnectionMode";
+ this.toolStripStatusConnectionMode.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0);
+ this.toolStripStatusConnectionMode.Size = new System.Drawing.Size(72, 19);
+ this.toolStripStatusConnectionMode.Text = "Unknown";
+ this.toolStripStatusConnectionMode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // toolStripStatusLabel3
+ //
+ this.toolStripStatusLabel3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripStatusLabel3.Name = "toolStripStatusLabel3";
+ this.toolStripStatusLabel3.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
+ this.toolStripStatusLabel3.Size = new System.Drawing.Size(78, 19);
+ this.toolStripStatusLabel3.Text = "Connected:";
+ this.toolStripStatusLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // toolStripStatusConnected
+ //
+ this.toolStripStatusConnected.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
+ this.toolStripStatusConnected.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripStatusConnected.ForeColor = System.Drawing.Color.Crimson;
+ this.toolStripStatusConnected.Name = "toolStripStatusConnected";
+ this.toolStripStatusConnected.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0);
+ this.toolStripStatusConnected.Size = new System.Drawing.Size(45, 19);
+ this.toolStripStatusConnected.Text = "false";
+ this.toolStripStatusConnected.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // toolStripStatusSourceLocation
+ //
+ this.toolStripStatusSourceLocation.Name = "toolStripStatusSourceLocation";
+ this.toolStripStatusSourceLocation.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
+ this.toolStripStatusSourceLocation.Size = new System.Drawing.Size(105, 19);
+ this.toolStripStatusSourceLocation.Text = "Source Location:";
+ //
+ // toolStripStatusSourceLocationFile
+ //
+ this.toolStripStatusSourceLocationFile.Name = "toolStripStatusSourceLocationFile";
+ this.toolStripStatusSourceLocationFile.Size = new System.Drawing.Size(25, 19);
+ this.toolStripStatusSourceLocationFile.Text = "File";
+ //
+ // toolStripStatusSourceLocationLine
+ //
+ this.toolStripStatusSourceLocationLine.Name = "toolStripStatusSourceLocationLine";
+ this.toolStripStatusSourceLocationLine.Size = new System.Drawing.Size(29, 19);
+ this.toolStripStatusSourceLocationLine.Text = "Line";
+ //
+ // toolStripStatusSourceLocationColon
+ //
+ this.toolStripStatusSourceLocationColon.Name = "toolStripStatusSourceLocationColon";
+ this.toolStripStatusSourceLocationColon.Size = new System.Drawing.Size(10, 19);
+ this.toolStripStatusSourceLocationColon.Text = ":";
//
// MainWindow
//
@@ -635,7 +706,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripMenuItem printSetupToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
- private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel;
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem fileMenu;
private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem;
@@ -678,6 +748,14 @@
private System.Windows.Forms.ToolStripMenuItem externalToolsToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5;
private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusConnectionMode;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusConnected;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocation;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocationFile;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocationLine;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocationColon;
}
}
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.cs?rev=41270&r1=41269&r2=41270&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Wed Jun 3 16:28:36 2009
@@ -73,7 +73,35 @@
void ComposeTitleString()
{
FocusAddress(mCurrentEip);
- toolStripStatusLabel.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + (mCurrentFile.CompareTo("unknown") != 0 ? " - Source Location: " + mCurrentFile + ":" + mCurrentLine : "");
+
+ string mode;
+ switch (mConnectionMode)
+ {
+ case DebugConnection.Mode.ClosedMode: mode = "Closed"; break;
+ case DebugConnection.Mode.PipeMode: mode = "Pipe"; break;
+ case DebugConnection.Mode.SerialMode: mode = "Serial"; break;
+ case DebugConnection.Mode.SocketMode: mode = "Socket"; break;
+ default: mode = "Unknown"; break;
+ }
+
+ toolStripStatusConnectionMode.Text = mode;
+ toolStripStatusConnected.ForeColor = mRunning ? Color.Green : Color.Crimson;
+ toolStripStatusConnected.Text = mRunning.ToString();
+
+ if (mCurrentFile.CompareTo("unknown") != 0)
+ {
+ toolStripStatusSourceLocation.Text = "Source Location:";
+ toolStripStatusSourceLocationFile.Text = mCurrentFile;
+ toolStripStatusSourceLocationLine.Text = mCurrentLine.ToString();
+ toolStripStatusSourceLocationColon.Visible = true;
+ }
+ else
+ {
+ toolStripStatusSourceLocation.Text = string.Empty;
+ toolStripStatusSourceLocationFile.Text = string.Empty;
+ toolStripStatusSourceLocationLine.Text = string.Empty;
+ toolStripStatusSourceLocationColon.Visible = false;
+ }
}
void DebugModuleChangedEvent(object sender, DebugModuleChangedEventArgs args)
Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs?rev=41270&r1=41269&r2=41270&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Jun 3 16:28:36 2009
@@ -39,5 +39,5 @@
// will be increased as well. MSI installers must not be generated with the same Build Number
// otherwise they won't upgrade the old installation!
-[assembly: AssemblyVersion("1.0.2.54")]
-[assembly: AssemblyFileVersion("1.0.2.54")]
+[assembly: AssemblyVersion("1.0.2.55")]
+[assembly: AssemblyFileVersion("1.0.2.55")]
More information about the Ros-diffs
mailing list