Author: gschneider Date: Wed Jul 29 00:54:03 2009 New Revision: 42281
URL: http://svn.reactos.org/svn/reactos?rev=42281&view=rev Log: RosDbg: - Don't try to send data to an unconnected debugger ('cos it crashes) - Opening a connection may fail, don't change connection tool strip text in that case - Add some basic credits, joined two labels
Modified: trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs trunk/tools/reactosdbg/RosDBG/AboutDlg.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs
Modified: trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/AboutDlg.De... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs [iso-8859-1] Wed Jul 29 00:54:03 2009 @@ -30,8 +30,8 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutDlg)); this.btnOK = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.versionLabel = new System.Windows.Forms.Label(); + this.rosDbgLabel = new System.Windows.Forms.Label(); + this.creditsLabel = new System.Windows.Forms.Label(); this.SuspendLayout(); // // btnOK @@ -45,23 +45,25 @@ this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // - // label1 + // rosDbgLabel // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(37, 30); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(164, 13); - this.label1.TabIndex = 1; - this.label1.Text = "ReactOS Remote Debugger"; + this.rosDbgLabel.AutoSize = true; + this.rosDbgLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rosDbgLabel.Location = new System.Drawing.Point(37, 30); + this.rosDbgLabel.Name = "rosDbgLabel"; + this.rosDbgLabel.Size = new System.Drawing.Size(164, 13); + this.rosDbgLabel.TabIndex = 1; + this.rosDbgLabel.Text = "ReactOS Remote Debugger"; // - // versionLabel + // creditsLabel // - this.versionLabel.AutoSize = true; - this.versionLabel.Location = new System.Drawing.Point(37, 56); - this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(0, 13); - this.versionLabel.TabIndex = 2; + this.creditsLabel.AutoSize = true; + this.creditsLabel.Location = new System.Drawing.Point(37, 70); + this.creditsLabel.Name = "creditsLabel"; + this.creditsLabel.Size = new System.Drawing.Size(108, 78); + this.creditsLabel.TabIndex = 3; + this.creditsLabel.Text = "Brought to you by:\r\n\r\nArt Yerkes\r\nChristoph von Wittich\r\nGed Murphy\r\nGregor Schne" + + "ider\r\n"; // // AboutDlg // @@ -69,8 +71,8 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(284, 264); - this.Controls.Add(this.versionLabel); - this.Controls.Add(this.label1); + this.Controls.Add(this.creditsLabel); + this.Controls.Add(this.rosDbgLabel); this.Controls.Add(this.btnOK); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -88,7 +90,7 @@ #endregion
private System.Windows.Forms.Button btnOK; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label versionLabel; + private System.Windows.Forms.Label rosDbgLabel; + private System.Windows.Forms.Label creditsLabel; } }
Modified: trunk/tools/reactosdbg/RosDBG/AboutDlg.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/AboutDlg.cs... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/AboutDlg.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/AboutDlg.cs [iso-8859-1] Wed Jul 29 00:54:03 2009 @@ -24,7 +24,7 @@
private void AboutDlg_Load(object sender, EventArgs e) { - versionLabel.Text = Assembly.GetExecutingAssembly().GetName().Version.ToString(); + rosDbgLabel.Text += " " + Assembly.GetExecutingAssembly().GetName().Version.ToString(); } } }
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] Wed Jul 29 00:54:03 2009 @@ -137,7 +137,7 @@
private void SendCommandToDebugger() { - if (RawTrafficTextBox.Text.Length > 0) + if (RawTrafficTextBox.Text.Length > 0 && mConnection.Debugger != null) { RawTrafficText.AppendText(kdbPrompt); mConnection.Debugger.Write(RawTrafficTextBox.Text);
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] Wed Jul 29 00:54:03 2009 @@ -315,7 +315,10 @@ mConnection.StartTCP(newConnection.Host, newConnection.Port); break; } - connectToolStripMenuItem.Text = "&Disconnect"; + if (mConnection.ConnectionMode != DebugConnection.Mode.ClosedMode) + { + connectToolStripMenuItem.Text = "&Disconnect"; + } } } else
Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties/... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Jul 29 00:54:03 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.67")] -[assembly: AssemblyFileVersion("1.0.2.67")] +[assembly: AssemblyVersion("1.0.2.68")] +[assembly: AssemblyFileVersion("1.0.2.68")]