Author: cwittich Date: Thu May 28 16:56:29 2009 New Revision: 41178 URL: http://svn.reactos.org/svn/reactos?rev=41178&view=rev Log: -check if reactos sources and .nostrip files can be found on directory selection and warn otherwise -add missing resource files -add an icon for continue
Added: trunk/tools/reactosdbg/RosDBG/Resources/ (with props) trunk/tools/reactosdbg/RosDBG/Resources/Pause.bmp (with props) trunk/tools/reactosdbg/RosDBG/Resources/Run.bmp (with props) trunk/tools/reactosdbg/RosDBG/Resources/copyToolStripMenuItem.Image.png (with props) trunk/tools/reactosdbg/RosDBG/Resources/emblem-system.ico (with props) trunk/tools/reactosdbg/RosDBG/Resources/internet-web-browser.ico (with props) trunk/tools/reactosdbg/RosDBG/Resources/utilities-terminal.ico (with props) Removed: trunk/tools/reactosdbg/RosDBG/res/ Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/Resources.Designer.cs trunk/tools/reactosdbg/RosDBG/Properties/Resources.resx trunk/tools/reactosdbg/RosDBG/RosDBG.csproj trunk/tools/reactosdbg/RosDBG/Settings.cs Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs?rev=41178&r1=41177&r2=41178&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 16:56:29 2009 @@ -29,6 +29,7 @@ private void InitializeComponent() { 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(); @@ -44,12 +45,14 @@ 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(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.printSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -65,6 +68,8 @@ this.consoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.memoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.registerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.modulesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.procThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.localsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.backtraceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.webbrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -78,21 +83,19 @@ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip = new System.Windows.Forms.ToolStrip(); + this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.printToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.helpToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + 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.modulesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.procThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.printToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.helpToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip.SuspendLayout(); this.toolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); @@ -129,10 +132,30 @@ this.fileMenu.Size = new System.Drawing.Size(37, 20); this.fileMenu.Text = "&File"; // + // openToolStripMenuItem + // + this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); + this.openToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; + this.openToolStripMenuItem.Name = "openToolStripMenuItem"; + this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.openToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.openToolStripMenuItem.Text = "&Open"; + this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); + // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6); + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); + this.saveToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveToolStripMenuItem.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // saveAsToolStripMenuItem // @@ -145,6 +168,15 @@ // this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Size = new System.Drawing.Size(145, 6); + // + // printToolStripMenuItem + // + this.printToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripMenuItem.Image"))); + this.printToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; + this.printToolStripMenuItem.Name = "printToolStripMenuItem"; + this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); + this.printToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printToolStripMenuItem.Text = "&Print"; // // printSetupToolStripMenuItem // @@ -182,20 +214,22 @@ // connectToolStripMenuItem // this.connectToolStripMenuItem.Name = "connectToolStripMenuItem"; - this.connectToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.connectToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.connectToolStripMenuItem.Text = "C&onnect"; this.connectToolStripMenuItem.Click += new System.EventHandler(this.connectToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(120, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 6); // // continueToolStripMenuItem // this.continueToolStripMenuItem.Enabled = false; + this.continueToolStripMenuItem.Image = global::RosDBG.Properties.Resources.Run; + this.continueToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia; 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); // @@ -203,7 +237,7 @@ // 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); // @@ -211,21 +245,25 @@ // 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); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(120, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem1.Visible = false; // // breakToolStripMenuItem // this.breakToolStripMenuItem.Enabled = false; + this.breakToolStripMenuItem.Image = global::RosDBG.Properties.Resources.Pause; + this.breakToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia; 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.Visible = false; this.breakToolStripMenuItem.Click += new System.EventHandler(this.breakToolStripMenuItem_Click); // // viewMenu @@ -267,6 +305,20 @@ this.registerToolStripMenuItem.Text = "&Register"; this.registerToolStripMenuItem.Click += new System.EventHandler(this.registerToolStripMenuItem_Click); // + // modulesToolStripMenuItem + // + this.modulesToolStripMenuItem.Name = "modulesToolStripMenuItem"; + this.modulesToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.modulesToolStripMenuItem.Text = "M&odules"; + this.modulesToolStripMenuItem.Click += new System.EventHandler(this.modulesToolStripMenuItem_Click); + // + // procThreadToolStripMenuItem + // + this.procThreadToolStripMenuItem.Name = "procThreadToolStripMenuItem"; + this.procThreadToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.procThreadToolStripMenuItem.Text = "&Processes / Threads"; + this.procThreadToolStripMenuItem.Click += new System.EventHandler(this.procThreadToolStripMenuItem_Click); + // // localsToolStripMenuItem // this.localsToolStripMenuItem.Name = "localsToolStripMenuItem"; @@ -366,22 +418,89 @@ this.toolStripSeparator1, this.printToolStripButton, this.toolStripSeparator2, - this.helpToolStripButton}); + this.helpToolStripButton, + this.toolStripSeparator6, + this.continueToolStripButton, + this.breakToolStripButton}); this.toolStrip.Location = new System.Drawing.Point(0, 24); this.toolStrip.Name = "toolStrip"; this.toolStrip.Size = new System.Drawing.Size(784, 25); this.toolStrip.TabIndex = 1; this.toolStrip.Text = "ToolStrip"; // + // openToolStripButton + // + this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); + this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.openToolStripButton.Name = "openToolStripButton"; + this.openToolStripButton.Size = new System.Drawing.Size(23, 22); + this.openToolStripButton.Text = "Open"; + this.openToolStripButton.Click += new System.EventHandler(this.OpenFile); + // + // saveToolStripButton + // + this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); + this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.saveToolStripButton.Name = "saveToolStripButton"; + this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); + this.saveToolStripButton.Text = "Save"; + // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); // + // printToolStripButton + // + this.printToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.printToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripButton.Image"))); + this.printToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.printToolStripButton.Name = "printToolStripButton"; + this.printToolStripButton.Size = new System.Drawing.Size(23, 22); + this.printToolStripButton.Text = "Print"; + // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // helpToolStripButton + // + this.helpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.helpToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("helpToolStripButton.Image"))); + this.helpToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.helpToolStripButton.Name = "helpToolStripButton"; + this.helpToolStripButton.Size = new System.Drawing.Size(23, 22); + this.helpToolStripButton.Text = "Help"; + this.helpToolStripButton.Click += new System.EventHandler(this.contentsToolStripMenuItem_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); + // + // continueToolStripButton + // + this.continueToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.continueToolStripButton.Enabled = false; + this.continueToolStripButton.Image = global::RosDBG.Properties.Resources.Run; + this.continueToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.continueToolStripButton.Name = "continueToolStripButton"; + this.continueToolStripButton.Size = new System.Drawing.Size(23, 22); + this.continueToolStripButton.Text = "Continue"; + // + // breakToolStripButton + // + this.breakToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.breakToolStripButton.Enabled = false; + this.breakToolStripButton.Image = global::RosDBG.Properties.Resources.Pause; + this.breakToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.breakToolStripButton.Name = "breakToolStripButton"; + this.breakToolStripButton.Size = new System.Drawing.Size(23, 22); + this.breakToolStripButton.Text = "Break"; + this.breakToolStripButton.Visible = false; // // statusStrip // @@ -457,87 +576,6 @@ this.dockPanel.TabIndex = 4; this.dockPanel.ActiveContentChanged += new System.EventHandler(this.dockPanel_ActiveContentChanged); // - // modulesToolStripMenuItem - // - this.modulesToolStripMenuItem.Name = "modulesToolStripMenuItem"; - this.modulesToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.modulesToolStripMenuItem.Text = "M&odules"; - this.modulesToolStripMenuItem.Click += new System.EventHandler(this.modulesToolStripMenuItem_Click); - // - // procThreadToolStripMenuItem - // - this.procThreadToolStripMenuItem.Name = "procThreadToolStripMenuItem"; - this.procThreadToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.procThreadToolStripMenuItem.Text = "&Processes / Threads"; - this.procThreadToolStripMenuItem.Click += new System.EventHandler(this.procThreadToolStripMenuItem_Click); - // - // openToolStripButton - // - this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); - this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.openToolStripButton.Name = "openToolStripButton"; - this.openToolStripButton.Size = new System.Drawing.Size(23, 22); - this.openToolStripButton.Text = "Ãffnen"; - this.openToolStripButton.Click += new System.EventHandler(this.OpenFile); - // - // saveToolStripButton - // - this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); - this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.saveToolStripButton.Name = "saveToolStripButton"; - this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); - this.saveToolStripButton.Text = "Speichern"; - // - // printToolStripButton - // - this.printToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.printToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripButton.Image"))); - this.printToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.printToolStripButton.Name = "printToolStripButton"; - this.printToolStripButton.Size = new System.Drawing.Size(23, 22); - this.printToolStripButton.Text = "Drucken"; - // - // helpToolStripButton - // - this.helpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.helpToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("helpToolStripButton.Image"))); - this.helpToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.helpToolStripButton.Name = "helpToolStripButton"; - this.helpToolStripButton.Size = new System.Drawing.Size(23, 22); - this.helpToolStripButton.Text = "Hilfe"; - this.helpToolStripButton.Click += new System.EventHandler(this.contentsToolStripMenuItem_Click); - // - // openToolStripMenuItem - // - this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); - this.openToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; - this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(148, 22); - this.openToolStripMenuItem.Text = "&Open"; - this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - this.saveToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(148, 22); - this.saveToolStripMenuItem.Text = "&Save"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // printToolStripMenuItem - // - this.printToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripMenuItem.Image"))); - this.printToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; - this.printToolStripMenuItem.Name = "printToolStripMenuItem"; - this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.printToolStripMenuItem.Size = new System.Drawing.Size(148, 22); - this.printToolStripMenuItem.Text = "&Print"; - // // MainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -614,6 +652,9 @@ private System.Windows.Forms.ToolStripMenuItem backtraceToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem modulesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem procThreadToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; + private System.Windows.Forms.ToolStripButton continueToolStripButton; + private System.Windows.Forms.ToolStripButton breakToolStripButton; } } Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.cs?rev=41178&r1=41177&r2=41178&view=diff ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Thu May 28 16:56:29 2009 @@ -164,13 +164,17 @@ nextToolStripMenuItem.Enabled = false; stepToolStripMenuItem.Enabled = false; continueToolStripMenuItem.Enabled = false; + continueToolStripButton.Enabled = false; + breakToolStripButton.Enabled = false; } else { breakToolStripMenuItem.Enabled = mRunning; + breakToolStripButton.Enabled = mRunning; nextToolStripMenuItem.Enabled = !mRunning; stepToolStripMenuItem.Enabled = !mRunning; continueToolStripMenuItem.Enabled = !mRunning; + continueToolStripButton.Enabled = !mRunning; } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/Resources.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties/Resources.Designer.cs?rev=41178&r1=41177&r2=41178&view=diff ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/Resources.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/Resources.Designer.cs [iso-8859-1] Thu May 28 16:56:29 2009 @@ -66,5 +66,19 @@ return ((System.Drawing.Bitmap)(obj)); } } + + internal static System.Drawing.Bitmap Pause { + get { + object obj = ResourceManager.GetObject("Pause", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap Run { + get { + object obj = ResourceManager.GetObject("Run", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/Resources.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties/Resources.resx?rev=41178&r1=41177&r2=41178&view=diff ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/Resources.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/Resources.resx [iso-8859-1] Thu May 28 16:56:29 2009 @@ -118,7 +118,13 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="Run" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Run.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="copyToolStripMenuItem.Image" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\res\copyToolStripMenuItem.Image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Resources\copyToolStripMenuItem.Image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Pause.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> Propchange: trunk/tools/reactosdbg/RosDBG/Resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu May 28 16:56:29 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/reactosdbg/RosDBG/Resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/tools/reactosdbg/RosDBG/Resources/Pause.bmp URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/Pause.bmp?rev=41178&view=auto ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/Pause.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/Run.bmp URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/Run.bmp?rev=41178&view=auto ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/Run.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/copyToolStripMenuItem.Image.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/copyToolStripMenuItem.Image.png?rev=41178&view=auto ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/copyToolStripMenuItem.Image.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/emblem-system.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/emblem-system.ico?rev=41178&view=auto ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/emblem-system.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/internet-web-browser.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/internet-web-browser.ico?rev=41178&view=auto ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/internet-web-browser.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/utilities-terminal.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/utilities-terminal.ico?rev=41178&view=auto ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/utilities-terminal.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csproj?rev=41178&r1=41177&r2=41178&view=diff ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Thu May 28 16:56:29 2009 @@ -294,10 +294,12 @@ </ItemGroup> <ItemGroup> <Content Include="app-rosdbg.ico" /> - <None Include="res\copyToolStripMenuItem.Image.png" /> - <Content Include="res\emblem-system.ico" /> - <Content Include="res\internet-web-browser.ico" /> - <Content Include="res\utilities-terminal.ico" /> + <None Include="Resources\copyToolStripMenuItem.Image.png" /> + <None Include="Resources\Run.bmp" /> + <None Include="Resources\Pause.bmp" /> + <Content Include="Resources\emblem-system.ico" /> + <Content Include="Resources\internet-web-browser.ico" /> + <Content Include="Resources\utilities-terminal.ico" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.cs?rev=41178&r1=41177&r2=41178&view=diff ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Thu May 28 16:56:29 2009 @@ -8,6 +8,7 @@ using System.Configuration; using System.Windows.Forms; using System.Drawing.Design; +using System.IO; using System.IO.Ports; namespace RosDBG @@ -70,7 +71,12 @@ public string SourceDirectory { get { return this["SourceDirectory"].ToString(); } - set { this["SourceDirectory"] = value; } + set + { + if (!File.Exists(value + "\\ReactOS-generic.rbuild")) + MessageBox.Show("Can not find ReactOS sources in this directory!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + this["SourceDirectory"] = value; + } } [CategoryAttribute("Directories"), DescriptionAttribute("Directory settings")] @@ -78,7 +84,12 @@ public string OutputDirectory { get { return this["OutputDirectory"].ToString(); } - set { this["OutputDirectory"] = value; } + set + { + if (!File.Exists(value + "\\ntoskrnl\\ntoskrnl.nostrip.exe")) + MessageBox.Show("Can not find .nostrip files!\nThe Debugger will not work properly without them.\n\nPlease enable building of .nostrip files in RosBE options." , "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + this["OutputDirectory"] = value; + } } [CategoryAttribute("Connection"), DescriptionAttribute("Connection settings")]