[cwittich] 35470: -add categories to settings dialog -allow to change the defaultPipeName -some small UI improvements
Author: cwittich Date: Wed Aug 20 00:49:00 2008 New Revision: 35470
URL: http://svn.reactos.org/svn/reactos?rev=35470&view=rev Log: -add categories to settings dialog -allow to change the defaultPipeName -some small UI improvements
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs trunk/tools/reactosdbg/RosDBG/SerialTargetSelect.Designer.cs trunk/tools/reactosdbg/RosDBG/Settings.cs trunk/tools/reactosdbg/RosDBG/TCPTargetSelect.Designer.cs
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 Aug 20 00:49:00 2008 @@ -313,7 +313,7 @@ { SelectTabFromPosition(mMousePosition); closeCurrentTabToolStripMenuItem_Click(this, null); - } + }
private void helpToolStripMenuItem_Click(object sender, EventArgs e) {
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] Wed Aug 20 00:49:00 2008 @@ -33,11 +33,13 @@ 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.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.Name = "bOK"; this.bOK.Size = new System.Drawing.Size(75, 23); @@ -49,6 +51,7 @@ // bCancel // 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.Name = "bCancel"; this.bCancel.Size = new System.Drawing.Size(75, 23); @@ -88,11 +91,22 @@ this.CustomRadioBtn.UseVisualStyleBackColor = true; this.CustomRadioBtn.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); // + // DefaultNameLabel + // + 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; + // // PipeTargetSelect // + this.AcceptButton = this.bOK; 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.Controls.Add(this.CustomRadioBtn); this.Controls.Add(this.DefaultRadioBtn); this.Controls.Add(this.PipeNameTextBox); @@ -102,6 +116,7 @@ this.Name = "PipeTargetSelect"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Named Pipe"; + this.Load += new System.EventHandler(this.PipeTargetSelect_Load); this.ResumeLayout(false); this.PerformLayout();
@@ -114,5 +129,6 @@ private System.Windows.Forms.TextBox PipeNameTextBox; private System.Windows.Forms.RadioButton DefaultRadioBtn; private System.Windows.Forms.RadioButton CustomRadioBtn; + private System.Windows.Forms.Label DefaultNameLabel; } }
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] Wed Aug 20 00:49:00 2008 @@ -5,7 +5,7 @@ { public partial class PipeTargetSelect : Form { - private const string defaultPipeName = @"\.\Pipe\RosDbg"; + private string defaultPipeName = Settings.Pipe; private string pipeName;
public string PipeName @@ -50,5 +50,10 @@
PipeNameTextBox.Enabled = rb.Checked; } + + private void PipeTargetSelect_Load(object sender, EventArgs e) + { + DefaultNameLabel.Text = "[" + defaultPipeName + "]"; + } } }
Modified: trunk/tools/reactosdbg/RosDBG/SerialTargetSelect.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/SerialTarge... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/SerialTargetSelect.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/SerialTargetSelect.Designer.cs [iso-8859-1] Wed Aug 20 00:49:00 2008 @@ -39,7 +39,7 @@ // cPort // this.cPort.FormattingEnabled = true; - this.cPort.Location = new System.Drawing.Point(50, 9); + this.cPort.Location = new System.Drawing.Point(77, 9); this.cPort.Name = "cPort"; this.cPort.Size = new System.Drawing.Size(121, 21); this.cPort.TabIndex = 0; @@ -53,7 +53,7 @@ "38400", "57600", "115200"}); - this.cBaud.Location = new System.Drawing.Point(50, 48); + this.cBaud.Location = new System.Drawing.Point(77, 48); this.cBaud.Name = "cBaud"; this.cBaud.Size = new System.Drawing.Size(121, 21); this.cBaud.TabIndex = 1; @@ -61,7 +61,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 12); + this.label1.Location = new System.Drawing.Point(39, 12); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(26, 13); this.label1.TabIndex = 5; @@ -70,7 +70,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 51); + this.label2.Location = new System.Drawing.Point(39, 51); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(32, 13); this.label2.TabIndex = 6; @@ -79,6 +79,7 @@ // bCancel // 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, 90); this.bCancel.Name = "bCancel"; this.bCancel.Size = new System.Drawing.Size(75, 23); @@ -90,6 +91,7 @@ // 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, 90); this.bOK.Name = "bOK"; this.bOK.Size = new System.Drawing.Size(75, 23); @@ -100,8 +102,10 @@ // // SerialTargetSelect // + this.AcceptButton = this.bOK; 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, 125); this.Controls.Add(this.bOK); this.Controls.Add(this.bCancel); @@ -112,7 +116,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "SerialTargetSelect"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "SerialTargetSelect"; + this.Text = "Serial"; this.ResumeLayout(false); this.PerformLayout();
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] Wed Aug 20 00:49:00 2008 @@ -15,6 +15,7 @@ { public class SettingsPropertyValues : ApplicationSettingsBase { + [CategoryAttribute("Directories"), DescriptionAttribute("Directory settings")] [UserScopedSetting, DefaultSettingValue("."), Editor(typeof(DirectoryEditor), typeof(UITypeEditor))] public string SourceDirectory { @@ -22,11 +23,20 @@ set { this["SourceDirectory"] = value; } }
+ [CategoryAttribute("Directories"), DescriptionAttribute("Directory settings")] [UserScopedSetting,DefaultSettingValue(".\output-i386"),Editor(typeof(DirectoryEditor), typeof(UITypeEditor))] public string OutputDirectory { get { return this["OutputDirectory"].ToString(); } set { this["OutputDirectory"] = value; } + } + + [CategoryAttribute("Connection"), DescriptionAttribute("Connection settings")] + [UserScopedSetting, DefaultSettingValue(@"\.\Pipe\RosDbg")] + public string Pipe + { + get { return this["Pipe"].ToString(); } + set { this["Pipe"] = value; } }
public SettingsPropertyValues() @@ -39,6 +49,7 @@
public static string SourceDirectory { get { return mProperties.SourceDirectory; } } public static string OutputDirectory { get { return mProperties.OutputDirectory; } } + public static string Pipe { get { return mProperties.Pipe; } }
Settings() {
Modified: trunk/tools/reactosdbg/RosDBG/TCPTargetSelect.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/TCPTargetSe... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/TCPTargetSelect.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/TCPTargetSelect.Designer.cs [iso-8859-1] Wed Aug 20 00:49:00 2008 @@ -42,7 +42,7 @@ this.HostChoice.FormattingEnabled = true; this.HostChoice.Location = new System.Drawing.Point(47, 9); this.HostChoice.Name = "HostChoice"; - this.HostChoice.Size = new System.Drawing.Size(121, 21); + this.HostChoice.Size = new System.Drawing.Size(164, 21); this.HostChoice.TabIndex = 0; this.HostChoice.Text = "localhost"; // @@ -78,7 +78,7 @@ 0, 0}); this.PortNumber.Name = "PortNumber"; - this.PortNumber.Size = new System.Drawing.Size(120, 20); + this.PortNumber.Size = new System.Drawing.Size(80, 20); this.PortNumber.TabIndex = 3; this.PortNumber.Value = new decimal(new int[] { 1235, @@ -100,6 +100,7 @@ // OKBtn // this.OKBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.OKBtn.DialogResult = System.Windows.Forms.DialogResult.OK; this.OKBtn.Location = new System.Drawing.Point(69, 90); this.OKBtn.Name = "OKBtn"; this.OKBtn.Size = new System.Drawing.Size(75, 23); @@ -110,8 +111,10 @@ // // TCPTargetSelect // + this.AcceptButton = this.OKBtn; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.CancelBtn; this.ClientSize = new System.Drawing.Size(237, 125); this.Controls.Add(this.OKBtn); this.Controls.Add(this.CancelBtn); @@ -122,7 +125,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "TCPTargetSelect"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "TCPTargetSelect"; + this.Text = "TCP/IP"; ((System.ComponentModel.ISupportInitialize)(this.PortNumber)).EndInit(); this.ResumeLayout(false); this.PerformLayout();
-
cwittich＠svn.reactos.org