[ros-diffs] [cwittich] 35229: -reworked webbrowser page -allow custom names for property pages instead of controlnames only -some other minor changes
cwittich at svn.reactos.org
cwittich at svn.reactos.org
Sat Aug 9 15:50:14 CEST 2008
Author: cwittich
Date: Sat Aug 9 08:50:13 2008
New Revision: 35229
URL: http://svn.reactos.org/svn/reactos?rev=35229&view=rev
Log:
-reworked webbrowser page
-allow custom names for property pages instead of controlnames only
-some other minor changes
Modified:
trunk/tools/reactosdbg/RosDBG/BackTrace.cs
trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs
trunk/tools/reactosdbg/RosDBG/MainWindow.cs
trunk/tools/reactosdbg/RosDBG/RawTraffic.cs
trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs
trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs
trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx
trunk/tools/reactosdbg/RosDBG/RegisterView.cs
trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs
Modified: trunk/tools/reactosdbg/RosDBG/BackTrace.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/BackTrace.cs?rev=35229&r1=35228&r2=35229&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/BackTrace.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/BackTrace.cs [iso-8859-1] Sat Aug 9 08:50:13 2008
@@ -28,6 +28,7 @@
public BackTrace()
{
InitializeComponent();
+ this.Tag = "Backtrace";
}
public void SetShell(IShell shell)
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs?rev=35229&r1=35228&r2=35229&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Sat Aug 9 08:50:13 2008
@@ -32,11 +32,11 @@
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openSourceFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.symbolDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.connectSerialToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.connectPipeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.connectTCPIPToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.symbolDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -59,6 +59,7 @@
this.WorkTabs = new System.Windows.Forms.TabControl();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.RunStatus = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -106,66 +107,68 @@
//
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.openSourceFileToolStripMenuItem,
- this.symbolDirectoryToolStripMenuItem,
this.toolStripSeparator2,
this.connectSerialToolStripMenuItem,
this.connectPipeToolStripMenuItem,
this.connectTCPIPToolStripMenuItem,
+ this.toolStripMenuItem1,
+ this.symbolDirectoryToolStripMenuItem,
this.toolStripSeparator1,
this.exitToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
- this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
+ this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Text = "File";
//
// openSourceFileToolStripMenuItem
//
this.openSourceFileToolStripMenuItem.Enabled = false;
this.openSourceFileToolStripMenuItem.Name = "openSourceFileToolStripMenuItem";
- this.openSourceFileToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
+ this.openSourceFileToolStripMenuItem.Size = new System.Drawing.Size(175, 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);
+ //
+ // connectSerialToolStripMenuItem
+ //
+ this.connectSerialToolStripMenuItem.Name = "connectSerialToolStripMenuItem";
+ this.connectSerialToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+ this.connectSerialToolStripMenuItem.Text = "Connect Serial ...";
+ this.connectSerialToolStripMenuItem.Click += new System.EventHandler(this.connectSerialToolStripMenuItem_Click);
+ //
+ // connectPipeToolStripMenuItem
+ //
+ this.connectPipeToolStripMenuItem.Enabled = false;
+ this.connectPipeToolStripMenuItem.Name = "connectPipeToolStripMenuItem";
+ this.connectPipeToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+ this.connectPipeToolStripMenuItem.Text = "Connect Pipe ...";
+ //
+ // connectTCPIPToolStripMenuItem
+ //
+ this.connectTCPIPToolStripMenuItem.Name = "connectTCPIPToolStripMenuItem";
+ this.connectTCPIPToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+ this.connectTCPIPToolStripMenuItem.Text = "Connect TCP/IP ...";
+ this.connectTCPIPToolStripMenuItem.Click += new System.EventHandler(this.connectTCPIPToolStripMenuItem_Click);
//
// symbolDirectoryToolStripMenuItem
//
this.symbolDirectoryToolStripMenuItem.Name = "symbolDirectoryToolStripMenuItem";
- this.symbolDirectoryToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
+ this.symbolDirectoryToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
this.symbolDirectoryToolStripMenuItem.Text = "Settings ...";
this.symbolDirectoryToolStripMenuItem.Click += new System.EventHandler(this.symbolDirectoryToolStripMenuItem_Click);
//
- // toolStripSeparator2
- //
- this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(178, 6);
- //
- // connectSerialToolStripMenuItem
- //
- this.connectSerialToolStripMenuItem.Name = "connectSerialToolStripMenuItem";
- this.connectSerialToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
- this.connectSerialToolStripMenuItem.Text = "Connect Serial ...";
- this.connectSerialToolStripMenuItem.Click += new System.EventHandler(this.connectSerialToolStripMenuItem_Click);
- //
- // connectPipeToolStripMenuItem
- //
- this.connectPipeToolStripMenuItem.Enabled = false;
- this.connectPipeToolStripMenuItem.Name = "connectPipeToolStripMenuItem";
- this.connectPipeToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
- this.connectPipeToolStripMenuItem.Text = "Connect Pipe ...";
- //
- // connectTCPIPToolStripMenuItem
- //
- this.connectTCPIPToolStripMenuItem.Name = "connectTCPIPToolStripMenuItem";
- this.connectTCPIPToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
- this.connectTCPIPToolStripMenuItem.Text = "Connect TCP/IP ...";
- this.connectTCPIPToolStripMenuItem.Click += new System.EventHandler(this.connectTCPIPToolStripMenuItem_Click);
- //
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(178, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(172, 6);
//
// exitToolStripMenuItem
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
- this.exitToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
+ this.exitToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
@@ -176,28 +179,28 @@
this.pasteToInteractionToolStripMenuItem,
this.memoryToolStripMenuItem});
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
- this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+ this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
this.editToolStripMenuItem.Text = "Edit";
//
// copyToolStripMenuItem
//
this.copyToolStripMenuItem.Enabled = false;
this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
- this.copyToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.copyToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
this.copyToolStripMenuItem.Text = "Copy";
//
// pasteToInteractionToolStripMenuItem
//
this.pasteToInteractionToolStripMenuItem.Enabled = false;
this.pasteToInteractionToolStripMenuItem.Name = "pasteToInteractionToolStripMenuItem";
- this.pasteToInteractionToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.pasteToInteractionToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
this.pasteToInteractionToolStripMenuItem.Text = "Paste to Interaction";
//
// memoryToolStripMenuItem
//
this.memoryToolStripMenuItem.Enabled = false;
this.memoryToolStripMenuItem.Name = "memoryToolStripMenuItem";
- this.memoryToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.memoryToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
this.memoryToolStripMenuItem.Text = "Memory at Clipboard";
//
// debugToolStripMenuItem
@@ -211,13 +214,13 @@
this.breakpointClipboardToolStripMenuItem,
this.followListToolStripMenuItem});
this.debugToolStripMenuItem.Name = "debugToolStripMenuItem";
- this.debugToolStripMenuItem.Size = new System.Drawing.Size(50, 20);
+ 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(184, 22);
+ this.continueToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.continueToolStripMenuItem.Text = "Continue";
this.continueToolStripMenuItem.Click += new System.EventHandler(this.continueToolStripMenuItem_Click);
//
@@ -225,20 +228,20 @@
//
this.bugcheckToolStripMenuItem.Enabled = false;
this.bugcheckToolStripMenuItem.Name = "bugcheckToolStripMenuItem";
- this.bugcheckToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.bugcheckToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.bugcheckToolStripMenuItem.Text = "Bugcheck";
//
// breakToolStripMenuItem
//
this.breakToolStripMenuItem.Name = "breakToolStripMenuItem";
- this.breakToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.breakToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.breakToolStripMenuItem.Text = "Break";
this.breakToolStripMenuItem.Click += new System.EventHandler(this.breakToolStripMenuItem_Click);
//
// stepToolStripMenuItem
//
this.stepToolStripMenuItem.Name = "stepToolStripMenuItem";
- this.stepToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.stepToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.stepToolStripMenuItem.Text = "Step";
this.stepToolStripMenuItem.Click += new System.EventHandler(this.stepToolStripMenuItem_Click);
//
@@ -246,21 +249,21 @@
//
this.breakHereToolStripMenuItem.Enabled = false;
this.breakHereToolStripMenuItem.Name = "breakHereToolStripMenuItem";
- this.breakHereToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.breakHereToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.breakHereToolStripMenuItem.Text = "Breakpoint Here";
//
// breakpointClipboardToolStripMenuItem
//
this.breakpointClipboardToolStripMenuItem.Enabled = false;
this.breakpointClipboardToolStripMenuItem.Name = "breakpointClipboardToolStripMenuItem";
- this.breakpointClipboardToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.breakpointClipboardToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.breakpointClipboardToolStripMenuItem.Text = "Breakpoint Clipboard";
//
// followListToolStripMenuItem
//
this.followListToolStripMenuItem.Enabled = false;
this.followListToolStripMenuItem.Name = "followListToolStripMenuItem";
- this.followListToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.followListToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
this.followListToolStripMenuItem.Text = "Follow List";
//
// windowToolStripMenuItem
@@ -270,26 +273,26 @@
this.detachCurrentTabToolStripMenuItem,
this.closeCurrentTabToolStripMenuItem});
this.windowToolStripMenuItem.Name = "windowToolStripMenuItem";
- this.windowToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
+ this.windowToolStripMenuItem.Size = new System.Drawing.Size(63, 20);
this.windowToolStripMenuItem.Text = "Window";
//
// NewWindowItem
//
this.NewWindowItem.Name = "NewWindowItem";
- this.NewWindowItem.Size = new System.Drawing.Size(180, 22);
+ this.NewWindowItem.Size = new System.Drawing.Size(177, 22);
this.NewWindowItem.Text = "New";
//
// detachCurrentTabToolStripMenuItem
//
this.detachCurrentTabToolStripMenuItem.Name = "detachCurrentTabToolStripMenuItem";
- this.detachCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.detachCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(177, 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(180, 22);
+ this.closeCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
this.closeCurrentTabToolStripMenuItem.Text = "Close Current Tab";
this.closeCurrentTabToolStripMenuItem.Click += new System.EventHandler(this.closeCurrentTabToolStripMenuItem_Click);
//
@@ -336,6 +339,11 @@
//
this.RunStatus.Name = "RunStatus";
this.RunStatus.Size = new System.Drawing.Size(0, 17);
+ //
+ // toolStripMenuItem1
+ //
+ this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(172, 6);
//
// MainWindow
//
@@ -395,6 +403,7 @@
private System.Windows.Forms.ToolStripStatusLabel RunStatus;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
}
}
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.cs?rev=35229&r1=35228&r2=35229&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Sat Aug 9 08:50:13 2008
@@ -261,6 +261,16 @@
mConnection.Start(targetSelect.Baudrate, targetSelect.Port);
}
}
+
+ private void openSourceFileToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ OpenFileDialog fileDialog = new OpenFileDialog();
+ fileDialog.Filter = "Sourcefiles (*.c;*.cpp)|*.c;*.cpp";
+ if (fileDialog.ShowDialog() == DialogResult.OK)
+ {
+ Console.WriteLine("open sourcefile");
+ }
+ }
}
Modified: trunk/tools/reactosdbg/RosDBG/RawTraffic.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RawTraffic.cs?rev=35229&r1=35228&r2=35229&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] Sat Aug 9 08:50:13 2008
@@ -46,6 +46,7 @@
public RawTraffic()
{
InitializeComponent();
+ this.Tag = "Raw Traffic";
}
private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e)
Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs?rev=35229&r1=35228&r2=35229&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs [iso-8859-1] Sat Aug 9 08:50:13 2008
@@ -28,16 +28,24 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ReactOSWeb));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
- this.Paste = new System.Windows.Forms.LinkLabel();
- this.label2 = new System.Windows.Forms.Label();
- this.BugzillaNumber = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.AddressInput = new System.Windows.Forms.TextBox();
+ this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+ this.navBack = new System.Windows.Forms.ToolStripButton();
+ this.navForward = new System.Windows.Forms.ToolStripButton();
+ this.navReload = new System.Windows.Forms.ToolStripButton();
+ this.navHome = new System.Windows.Forms.ToolStripButton();
+ this.AddressInput = new System.Windows.Forms.ToolStripComboBox();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.navPaste = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+ this.toolStripTextBox1 = new System.Windows.Forms.ToolStripTextBox();
this.BrowserView = new System.Windows.Forms.WebBrowser();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
+ this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
@@ -51,11 +59,7 @@
//
// splitContainer1.Panel1
//
- this.splitContainer1.Panel1.Controls.Add(this.Paste);
- this.splitContainer1.Panel1.Controls.Add(this.label2);
- this.splitContainer1.Panel1.Controls.Add(this.BugzillaNumber);
- this.splitContainer1.Panel1.Controls.Add(this.label1);
- this.splitContainer1.Panel1.Controls.Add(this.AddressInput);
+ this.splitContainer1.Panel1.Controls.Add(this.toolStrip1);
//
// splitContainer1.Panel2
//
@@ -64,50 +68,107 @@
this.splitContainer1.SplitterDistance = 27;
this.splitContainer1.TabIndex = 0;
//
- // Paste
- //
- this.Paste.AutoSize = true;
- this.Paste.Location = new System.Drawing.Point(223, 6);
- this.Paste.Name = "Paste";
- this.Paste.Size = new System.Drawing.Size(34, 13);
- this.Paste.TabIndex = 4;
- this.Paste.TabStop = true;
- this.Paste.Text = "Paste";
- this.Paste.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.Paste_LinkClicked);
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(291, 6);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(43, 13);
- this.label2.TabIndex = 3;
- this.label2.Text = "Bugzilla";
- //
- // BugzillaNumber
- //
- this.BugzillaNumber.Location = new System.Drawing.Point(340, 3);
- this.BugzillaNumber.Name = "BugzillaNumber";
- this.BugzillaNumber.Size = new System.Drawing.Size(100, 20);
- this.BugzillaNumber.TabIndex = 2;
- this.BugzillaNumber.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.BugzillaNumber_KeyPress);
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(5, 6);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(45, 13);
- this.label1.TabIndex = 1;
- this.label1.Text = "Address";
+ // toolStrip1
+ //
+ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.navBack,
+ this.navForward,
+ this.navReload,
+ this.navHome,
+ this.AddressInput,
+ this.toolStripSeparator2,
+ this.navPaste,
+ this.toolStripSeparator1,
+ this.toolStripLabel1,
+ this.toolStripTextBox1});
+ this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+ this.toolStrip1.Name = "toolStrip1";
+ this.toolStrip1.Size = new System.Drawing.Size(443, 25);
+ this.toolStrip1.TabIndex = 0;
+ this.toolStrip1.Text = "toolStrip1";
+ this.toolStrip1.KeyUp += new System.Windows.Forms.KeyEventHandler(this.toolStrip1_KeyUp);
+ //
+ // navBack
+ //
+ this.navBack.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.navBack.Enabled = false;
+ this.navBack.Image = ((System.Drawing.Image)(resources.GetObject("navBack.Image")));
+ this.navBack.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.navBack.Name = "navBack";
+ this.navBack.Size = new System.Drawing.Size(23, 22);
+ this.navBack.Text = "toolStripButton3";
+ this.navBack.Click += new System.EventHandler(this.navBack_Click);
+ //
+ // navForward
+ //
+ this.navForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.navForward.Enabled = false;
+ this.navForward.Image = ((System.Drawing.Image)(resources.GetObject("navForward.Image")));
+ this.navForward.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.navForward.Name = "navForward";
+ this.navForward.Size = new System.Drawing.Size(23, 22);
+ this.navForward.Text = "toolStripButton2";
+ this.navForward.Click += new System.EventHandler(this.navForward_Click);
+ //
+ // navReload
+ //
+ this.navReload.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.navReload.Image = ((System.Drawing.Image)(resources.GetObject("navReload.Image")));
+ this.navReload.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.navReload.Name = "navReload";
+ this.navReload.Size = new System.Drawing.Size(23, 22);
+ this.navReload.Text = "toolStripButton1";
+ this.navReload.Click += new System.EventHandler(this.navReload_Click);
+ //
+ // navHome
+ //
+ this.navHome.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.navHome.Image = ((System.Drawing.Image)(resources.GetObject("navHome.Image")));
+ this.navHome.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.navHome.Name = "navHome";
+ this.navHome.Size = new System.Drawing.Size(23, 22);
+ this.navHome.Text = "toolStripButton6";
+ this.navHome.Click += new System.EventHandler(this.navHome_Click);
//
// AddressInput
//
- this.AddressInput.Location = new System.Drawing.Point(56, 3);
+ this.AddressInput.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.AddressInput.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.AllUrl;
this.AddressInput.Name = "AddressInput";
- this.AddressInput.Size = new System.Drawing.Size(161, 20);
- this.AddressInput.TabIndex = 0;
- this.AddressInput.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.AddressInput_KeyPress);
+ this.AddressInput.Size = new System.Drawing.Size(200, 25);
+ this.AddressInput.Sorted = true;
+ this.AddressInput.KeyUp += new System.Windows.Forms.KeyEventHandler(this.AddressInput_KeyUp);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+ //
+ // navPaste
+ //
+ this.navPaste.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.navPaste.Image = ((System.Drawing.Image)(resources.GetObject("navPaste.Image")));
+ this.navPaste.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.navPaste.Name = "navPaste";
+ this.navPaste.Size = new System.Drawing.Size(23, 22);
+ this.navPaste.Text = "toolStripButton4";
+ this.navPaste.Click += new System.EventHandler(this.navPaste_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+ //
+ // toolStripLabel1
+ //
+ this.toolStripLabel1.Name = "toolStripLabel1";
+ this.toolStripLabel1.Size = new System.Drawing.Size(48, 22);
+ this.toolStripLabel1.Text = "Bugzilla";
+ //
+ // toolStripTextBox1
+ //
+ this.toolStripTextBox1.Name = "toolStripTextBox1";
+ this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23);
//
// BrowserView
//
@@ -130,6 +191,8 @@
this.splitContainer1.Panel1.PerformLayout();
this.splitContainer1.Panel2.ResumeLayout(false);
this.splitContainer1.ResumeLayout(false);
+ this.toolStrip1.ResumeLayout(false);
+ this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
}
@@ -137,11 +200,17 @@
#endregion
private System.Windows.Forms.SplitContainer splitContainer1;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.TextBox AddressInput;
- private System.Windows.Forms.LinkLabel Paste;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox BugzillaNumber;
private System.Windows.Forms.WebBrowser BrowserView;
+ private System.Windows.Forms.ToolStrip toolStrip1;
+ private System.Windows.Forms.ToolStripButton navBack;
+ private System.Windows.Forms.ToolStripButton navForward;
+ private System.Windows.Forms.ToolStripComboBox AddressInput;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripButton navPaste;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+ private System.Windows.Forms.ToolStripTextBox toolStripTextBox1;
+ private System.Windows.Forms.ToolStripButton navReload;
+ private System.Windows.Forms.ToolStripButton navHome;
}
}
Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs?rev=35229&r1=35228&r2=35229&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] Sat Aug 9 08:50:13 2008
@@ -15,34 +15,66 @@
public ReactOSWeb()
{
InitializeComponent();
+ this.Tag = "Web";
+
+ BrowserView.CanGoBackChanged += BrowserView_CanGoBackChanged;
+ BrowserView.CanGoForwardChanged += BrowserView_CanGoForwardChanged;
+
+ BrowserView.GoHome();
}
-
- private void AddressInput_KeyPress(object sender, KeyPressEventArgs e)
- {
- if (e.KeyChar == 13)
- {
- e.Handled = true;
- BrowserView.Navigate(((TextBox)sender).Text);
- }
- }
-
+
private void BrowserView_Navigating(object sender, WebBrowserNavigatingEventArgs e)
{
AddressInput.Text = e.Url.ToString();
}
- private void BugzillaNumber_KeyPress(object sender, KeyPressEventArgs e)
- {
- if (e.KeyChar == 13)
- {
- e.Handled = true;
- BrowserView.Navigate("http://www.reactos.org/bugzilla/show_bug.cgi?id=" + ((TextBox)sender).Text);
- }
- }
-
- private void Paste_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ private void navPaste_Click(object sender, EventArgs e)
{
BrowserView.Navigate("http://www.reactos.org/paste");
}
+
+ private void navHome_Click(object sender, EventArgs e)
+ {
+ BrowserView.GoHome();
+ }
+
+ private void navBack_Click(object sender, EventArgs e)
+ {
+ BrowserView.GoBack();
+ }
+
+ private void navForward_Click(object sender, EventArgs e)
+ {
+ BrowserView.GoForward();
+ }
+
+ private void navReload_Click(object sender, EventArgs e)
+ {
+ BrowserView.Refresh();
+ }
+
+ private void BrowserView_CanGoBackChanged(object sender, EventArgs e)
+ {
+ navBack.Enabled = BrowserView.CanGoBack;
+ }
+
+ private void BrowserView_CanGoForwardChanged(object sender, EventArgs e)
+ {
+ navForward.Enabled = BrowserView.CanGoForward;
+ }
+
+
+ private void AddressInput_KeyUp(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Return)
+ BrowserView.Navigate(((ToolStripComboBox)sender).Text);
+ }
+
+ private void toolStrip1_KeyUp(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Return)
+ BrowserView.Navigate("http://www.reactos.org/bugzilla/show_bug.cgi?id=" + ((TextBox)sender).Text);
+ }
+
}
}
Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx?rev=35229&r1=35228&r2=35229&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx [iso-8859-1] Sat Aug 9 08:50:13 2008
@@ -117,4 +117,88 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="navBack.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAnFJREFUOE+dk11I
+ U2Ecxs+GtpaZX6uJW5CeNCtn2UpLhRZTZjdRdlHsYhCpoYFFH7MiXGhE4VosmM2oqJze+DnbhzjcarYt
+ W1QofrQPWinRRTdJdePFU+fsu0kXvfCHl/85z+95zv+8L4OIWd7FSdiWXETvt+HYNr2Xcg4TorR9RAGv
+ jJHwkGq4AxaI7CIcdEug9lxHr08J9XQTFO5DOGEToFTPhcQohvuzBQmAsPjaXAsGAlpo5+S48VaK845y
+ nLYXR0o2XoiCR9nxECo25dw+exGPPW1QTTXg8qsq6DwK/FpeQr//VhykzrYdWztJOAPmYJKe2S5UWkug
+ mTmHtje1OPtyD7o/XEV4WRd1cYAmuwAVnULoXJog4IBFhHpnFeSu/fSLseKFH/O44KyIABpeFEFqy8cx
+ K4miDjIKaJ4QJoipBJS78dM9uvQBDfo/3sWR8VxUj/GRpWCFAKMiWtz6uiYS+1+bqjEeyke54LSyQwB9
+ EPB3/J/L32lHqrr9Kjz138ZDXwd2mznYYcpAektyFCCzFEYgT2IGaPvSD4mFD/FYDvaOrsdOUya2GdOw
+ cWQNtlzJC/2FqS6U6bg0IDwkzaw88hV9gfsoMWWh+I9r7rMU8EfYyFSxcKevPQjwLkyiRifGUTOJ49bN
+ kSHdnD5DQ6xfjSgwrKNds/UspA4ywWlMx7zXET2Rz98PgVRyUW3iIzwkKm7tRCUE5hzwRlYjYygJ7AEC
+ yacION4ZE48zBSlV7kKedi09pHxDKh13w/AqpAwywFIT4NSnrywOX44Znx0qgwJCRRHYjUyw6phIkhEg
+ T27CpQfN8bFXvJL/0fwNxnQBNzBy4S0AAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="navForward.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlJJREFUOE+dk11I
+ k1EYx98NbS0zZ40mbUG6tqymUZaSRC1UVjfSB1ENGlRqaCBhNKuLFhp90FgNMidEdLFWUH5s7UMcbrWa
+ Q5aV1jZxK5banVczuunin+fd9s6XGUQPHDg85/x/z/885xwOtSiis6PwJgKUZW5gcZqeq4WHKGXBbkou
+ ruJkLZJEMO7GfrcSB4MqGKduwBLTw/i5BbpgPU57y1BpFUHlqEFw2o0sQFp8PdKO3rgJpogWNz+ocdFf
+ jfO+cmZohkshf1zEhhDbpHJn+BKeTHXAMNHECBzfu1kAAmvwbsXmh1KMxF1JJ0/DPdjj2Y6uUBs63h/B
+ hXe7aNH4nAckZn5OsiAtvjLsfbYO5kBXEkCqN47UQhvYx9p4a+wYfv1OsCBNbxRQe2U47pFCcVeaAbS+
+ rciySly8/HqHBpCYno/Qew4PF6NuSII1Ol4KMKikF+6Pn2E2/23ybT6E2iExqgdFEF7jpwDWfwc4fzzH
+ TpcQ25yFELTnZgAadylzBJVbAjJOemToDmsZM9ZZCy3e4ijAetsKbLpakrqFiR5UmUU0IN0kAniwcK3p
+ IOLyharFr/IgsfGx2sDDvRedSUB0ZhQHzDU46pLihGcj06RY4gutJ2K5fRVdtcjKQ34fF8JmASaj/syL
+ fP2pH1K9CHVOCdOktrFTuB26QlcV25ajsD8H/F4Kueco+D86sp8zgVTqd6DEtJJuksyeT9tdO7AMeX0c
+ 8IwUhI2CpcXpzxGK+WCw61ChU4DfzAWvgYscDQXp2Q24/KiVbXvJL/kfyT8MggC1E+F79AAAAABJRU5E
+ rkJggg==
+</value>
+ </data>
+ <data name="navReload.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAfdJREFUOE9jYBj0
+ YPrOP/9BuH/Tt//Ny9/+L5v1+H9W/63/WB1eu+J3cPn8j6v96q9LwRSANHds+P+/bNGv/4l9z/67lZ2d
+ ilVz5aKfOi2r/pxK7X/y3yxp0x2Yop71X/4XzPv2P6bv43+3itv/bXOPHzFPPqCJYUjFkm8TKhZ/+++c
+ f/q/atDcdzAFtQtf/A9rvfffOfvmJ4vsC/+Nk/b9143e1INhQNXSjxdypr//b5q8/79u5Pq5MAW5k+78
+ t887neNUemmabd65/3ox2/7rhi09j2FA4/xPn9Onvv1vnLD3v0HMDiuQgrS0M6xJHVfAARbWesc6uOke
+ 2AAFr9mfMQwoBRqQNvXdf7PU/XADkBVlzXxnkzblzX/DuF3YDahY8PFC6pS3/+1zT/+3Sj8yE92GmmW/
+ 52VM+/BfP2bHf52QJRcwXJA99WVffO/T/15VN/77Vtx8mzrxxZw8oK3lC7/ZNKz+O798+ff3wc33/+uG
+ r/qvFbZiIoYBEU23tQNrrx71KLvy37f2zv+43uf/M6e9+5838+P/nFmf/oM060Vv/q8ZuuS0RthaHaxp
+ wbX4gq9d9rGjxvG7/+vGbAVjUKDpxWwBhvxyoOZFp/XClgbjzT6Gsbs0dcLW9GkGzL2o5DflCwhrBc6+
+ pBu6ZJJ6yErdwZf3AFRBDhnH2f/eAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="navHome.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAalJREFUOE+1k1so
+ g2EYx5fIMRfalRS7IiFyMR+K2meOn5p9S9JM4oqSO1y64wYRTTmENjktW7IN+TQmouxGORRCIjklRenP
+ +9a37GDceOq5et/f7zm8vRLJf0WdlmfqdWrwHAs1p9CROm3yFJD8taYIn5pScGSUUQlfpmAIXJWUEFgg
+ wg+WGDTXlKOxuhRnRimVNGUkokQW+7PAG7baVmCcMaNWxeJwOIJKcmKl/gXe8OqqADFsywLUymzs94dS
+ iaaMzfXYQyBYlFjtAopyM7HbE+IrIdsWZ/5eWYTf3j/w9PKORasAlknHXreEStxdNGj5vHx5KgTB4W7b
+ G76+e8XJ5TPGDSYkyuKg4QpqPcao0DZ5wLOT3Zga7cKEvgPDve0Udh3fY25pC/HJjO8iucoGDwGBHy3R
+ uDNF0ecksNN1A4PZ6V9QzNe5BWRmUvl2NhIXhnDU80oKL29fYWz+B0GhSkcF4sJI22cTYehq1UDFZlF4
+ Yf0cQ9Ob/jtgy7UUXnPswL62jcHOFhzog+HqC4KCScPInBP6L3jAuOFfoOCq6cFf89cP9dcLn6EcnES2
+ SdzTAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="navPaste.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmNJREFUOE+1k11I
+ U2EYxw90YTdFH9RVVwXRTRQVVBctCrXQ2WKR2CJtEdskzdlJc6NpzSa6/FqaNqO5jWnTWYnSpGgIiaPv
+ GZvRh0Rq5FrWzubmXBb/znnjYKOvi+iBP8/N+//9n/fhfSnqf9RAbwVc17ToblXheE76xj9mdNlq6C5b
+ HXi11hxE0N+GiP8yxoarUSxLRZ2OxkW9GgZdEep1xSkJQM4YYxyIhzoRC7bD2kwjOmkBLRf5ng2W4HSe
+ ECXSTfAP5GDSuRIF2XvwE4Azx0N2NFUcgsddDeZtAyaG1XjtPoKeFhHkEgHaNCvwuI5C7oH0RECnpYak
+ x5mr0GuyUUZnQZ2fiVO5YtAyEZRSIRSSZNQXrCKArDRBIqDdpMcM04GZgBHR8UoEnubDZ1lK5DUvgad5
+ AR4YkoiZU/LW9YkAq7EC04FWTI+WI/r8GCJP9oHpXYhasxOVxm6cudCBEr0VSm0L5CoDsgurEgGmRi2m
+ xgyIDMsw9VCI8N0NeH9jGTHzFZ/9gmAohtGJIDIVZ5FxWD0HaaktBfOiHOH7qQj3r0WobznGzBRJ5sp0
+ fYDIaHfBO+In5tuDPuwSS79DGqtU+Dh0EiHXGjA3FyPgSMLIFYqM/Xn2Kz6F2eR3QXhf+eEeeoM0iRKp
+ rHnn7r0QbNsOqv5cEQL3FKx5ET50zce4bR58TRQK2DtzY/MTXGInaLD2oaffRzqnLetWgzpfVkgeCL9l
+ vsvYhf2YfMf9kpgdtzywOx/NAao1J1JqS4+yL0wEqTgFGTs2EzK3be7OfNqvOpngd7Wf3TZ34G/658/8
+ DRuN9dviyqNcAAAAAElFTkSuQmCC
+</value>
+ </data>
</root>
Modified: trunk/tools/reactosdbg/RosDBG/RegisterView.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RegisterView.cs?rev=35229&r1=35228&r2=35229&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/RegisterView.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/RegisterView.cs [iso-8859-1] Sat Aug 9 08:50:13 2008
@@ -21,6 +21,7 @@
{
InitializeComponent();
RegisterGrid.SelectedObject = new Registers();
+ this.Tag = "Registers";
}
public void SetDebugConnection(DebugConnection conn)
Modified: trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs?rev=35229&r1=35228&r2=35229&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs [iso-8859-1] Sat Aug 9 08:50:13 2008
@@ -95,6 +95,8 @@
this.ClientSize = new System.Drawing.Size(415, 317);
this.Controls.Add(this.splitContainer1);
this.Name = "Settings";
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Settings";
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
More information about the Ros-diffs
mailing list