diff --git a/BizHawk.MultiClient/tools/InputPrompt.cs b/BizHawk.MultiClient/tools/InputPrompt.cs index ee4bb99596..94aa7070da 100644 --- a/BizHawk.MultiClient/tools/InputPrompt.cs +++ b/BizHawk.MultiClient/tools/InputPrompt.cs @@ -17,7 +17,7 @@ namespace BizHawk.MultiClient public enum InputType { HEX, UNSIGNED, SIGNED, TEXT }; public bool UserOK; //Will be true if the user selects Ok public string UserText = ""; //What the user selected - + public Point _Location = new Point(-1, -1); private InputType itype = InputType.TEXT; public InputType TextInputType @@ -53,7 +53,10 @@ namespace BizHawk.MultiClient private void InputPrompt_Load(object sender, EventArgs e) { - + if (_Location.X > 0 && _Location.Y > 0) + { + this.Location = _Location; + } } private void OK_Click(object sender, EventArgs e) diff --git a/BizHawk.MultiClient/tools/TraceLogger.Designer.cs b/BizHawk.MultiClient/tools/TraceLogger.Designer.cs index 46853a3afa..483f397c3f 100644 --- a/BizHawk.MultiClient/tools/TraceLogger.Designer.cs +++ b/BizHawk.MultiClient/tools/TraceLogger.Designer.cs @@ -86,6 +86,7 @@ this.TraceView.selectedItem = -1; this.TraceView.Size = new System.Drawing.Size(603, 414); this.TraceView.TabIndex = 4; + this.TraceView.TabStop = false; this.TraceView.UseCompatibleStateImageBehavior = false; this.TraceView.View = System.Windows.Forms.View.Details; this.TraceView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TraceView_KeyDown); @@ -126,20 +127,20 @@ // this.saveLogToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveLogToolStripMenuItem.Name = "saveLogToolStripMenuItem"; - this.saveLogToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveLogToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.saveLogToolStripMenuItem.Text = "&Save Log"; this.saveLogToolStripMenuItem.Click += new System.EventHandler(this.saveLogToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(131, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -204,7 +205,7 @@ this.BrowseBox.Location = new System.Drawing.Point(477, 19); this.BrowseBox.Name = "BrowseBox"; this.BrowseBox.Size = new System.Drawing.Size(54, 23); - this.BrowseBox.TabIndex = 5; + this.BrowseBox.TabIndex = 20; this.BrowseBox.Text = "&Browse"; this.BrowseBox.UseVisualStyleBackColor = true; this.BrowseBox.Visible = false; @@ -218,7 +219,8 @@ this.FileBox.Name = "FileBox"; this.FileBox.ReadOnly = true; this.FileBox.Size = new System.Drawing.Size(242, 20); - this.FileBox.TabIndex = 4; + this.FileBox.TabIndex = 15; + this.FileBox.TabStop = false; this.FileBox.Visible = false; // // ToFileRadio @@ -227,7 +229,7 @@ this.ToFileRadio.Location = new System.Drawing.Point(173, 22); this.ToFileRadio.Name = "ToFileRadio"; this.ToFileRadio.Size = new System.Drawing.Size(50, 17); - this.ToFileRadio.TabIndex = 3; + this.ToFileRadio.TabIndex = 10; this.ToFileRadio.Text = "to file"; this.ToFileRadio.UseVisualStyleBackColor = true; this.ToFileRadio.CheckedChanged += new System.EventHandler(this.ToFileRadio_CheckedChanged); @@ -239,7 +241,7 @@ this.ToWindowRadio.Location = new System.Drawing.Point(94, 22); this.ToWindowRadio.Name = "ToWindowRadio"; this.ToWindowRadio.Size = new System.Drawing.Size(73, 17); - this.ToWindowRadio.TabIndex = 2; + this.ToWindowRadio.TabIndex = 5; this.ToWindowRadio.TabStop = true; this.ToWindowRadio.Text = "to window"; this.ToWindowRadio.UseVisualStyleBackColor = true; @@ -250,7 +252,7 @@ this.ClearButton.Location = new System.Drawing.Point(564, 19); this.ClearButton.Name = "ClearButton"; this.ClearButton.Size = new System.Drawing.Size(47, 23); - this.ClearButton.TabIndex = 1; + this.ClearButton.TabIndex = 25; this.ClearButton.Text = "&Clear"; this.ClearButton.UseVisualStyleBackColor = true; this.ClearButton.Click += new System.EventHandler(this.ClearButton_Click); @@ -262,7 +264,7 @@ this.LoggingEnabled.Location = new System.Drawing.Point(9, 19); this.LoggingEnabled.Name = "LoggingEnabled"; this.LoggingEnabled.Size = new System.Drawing.Size(55, 23); - this.LoggingEnabled.TabIndex = 0; + this.LoggingEnabled.TabIndex = 1; this.LoggingEnabled.Text = "&Logging"; this.LoggingEnabled.UseVisualStyleBackColor = true; this.LoggingEnabled.CheckedChanged += new System.EventHandler(this.LoggingEnabled_CheckedChanged); diff --git a/BizHawk.MultiClient/tools/TraceLogger.cs b/BizHawk.MultiClient/tools/TraceLogger.cs index c45b4d4bb3..7f3f3c950a 100644 --- a/BizHawk.MultiClient/tools/TraceLogger.cs +++ b/BizHawk.MultiClient/tools/TraceLogger.cs @@ -178,12 +178,21 @@ namespace BizHawk.MultiClient Global.Config.TraceLoggerSaveWindowPosition ^= true; } + private Point GetPromptPoint() + { + Point p = new Point(TraceView.Location.X + 30, TraceView.Location.Y + 30); + Point q = new Point(); + q = PointToScreen(p); + return q; + } + private void setMaxWindowLinesToolStripMenuItem_Click(object sender, EventArgs e) { InputPrompt p = new InputPrompt(); p.SetMessage("Max lines to display in the window"); p.SetInitialValue(Global.Config.TraceLoggerMaxLines.ToString()); p.TextInputType = InputPrompt.InputType.UNSIGNED; + p._Location = GetPromptPoint(); DialogResult result = p.ShowDialog(); if (p.UserOK) {