From 8db62b6f2c77eb761ed096b591cb0cfe550c2bd2 Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 22 Feb 2016 05:52:31 -0600 Subject: [PATCH] make two listviews more consistent --- .../Debugger/GenericDebugger.Designer.cs | 19 ++++++----- .../tools/TraceLogger.Designer.cs | 33 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs index fa34d68a4c..5d060a031e 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs @@ -89,7 +89,7 @@ // this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.ExitMenuItem.Size = new System.Drawing.Size(151, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(140, 22); this.ExitMenuItem.Text = "&Close"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -111,7 +111,7 @@ this.StepIntoMenuItem.Enabled = false; this.StepIntoMenuItem.Name = "StepIntoMenuItem"; this.StepIntoMenuItem.ShortcutKeyDisplayString = "F11"; - this.StepIntoMenuItem.Size = new System.Drawing.Size(183, 22); + this.StepIntoMenuItem.Size = new System.Drawing.Size(172, 22); this.StepIntoMenuItem.Text = "Step &Into"; this.StepIntoMenuItem.Click += new System.EventHandler(this.StepIntoMenuItem_Click); // @@ -120,7 +120,7 @@ this.StepOverMenuItem.Enabled = false; this.StepOverMenuItem.Name = "StepOverMenuItem"; this.StepOverMenuItem.ShortcutKeyDisplayString = "F10"; - this.StepOverMenuItem.Size = new System.Drawing.Size(183, 22); + this.StepOverMenuItem.Size = new System.Drawing.Size(172, 22); this.StepOverMenuItem.Text = "Step O&ver"; this.StepOverMenuItem.Click += new System.EventHandler(this.StepOverMenuItem_Click); // @@ -129,20 +129,20 @@ this.StepOutMenuItem.Enabled = false; this.StepOutMenuItem.Name = "StepOutMenuItem"; this.StepOutMenuItem.ShortcutKeyDisplayString = "Shift+F11"; - this.StepOutMenuItem.Size = new System.Drawing.Size(183, 22); + this.StepOutMenuItem.Size = new System.Drawing.Size(172, 22); this.StepOutMenuItem.Text = "Step Ou&t"; this.StepOutMenuItem.Click += new System.EventHandler(this.StepOutMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(169, 6); // // RefreshMenuItem // this.RefreshMenuItem.Name = "RefreshMenuItem"; this.RefreshMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.RefreshMenuItem.Size = new System.Drawing.Size(183, 22); + this.RefreshMenuItem.Size = new System.Drawing.Size(172, 22); this.RefreshMenuItem.Text = "Refresh"; this.RefreshMenuItem.Click += new System.EventHandler(this.RefreshMenuItem_Click); // @@ -243,9 +243,10 @@ this.Address, this.Instruction}); this.DisassemblerView.ContextMenuStrip = this.DisassemblerContextMenu; - this.DisassemblerView.Font = new System.Drawing.Font("Courier New", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.DisassemblerView.Font = new System.Drawing.Font("Courier New", 8F); this.DisassemblerView.FullRowSelect = true; this.DisassemblerView.GridLines = true; + this.DisassemblerView.HideSelection = false; this.DisassemblerView.ItemCount = 0; this.DisassemblerView.Location = new System.Drawing.Point(6, 39); this.DisassemblerView.Name = "DisassemblerView"; @@ -275,13 +276,13 @@ this.DisassemblerContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AddBreakpointContextMenuItem}); this.DisassemblerContextMenu.Name = "DisassemblerContextMenu"; - this.DisassemblerContextMenu.Size = new System.Drawing.Size(157, 26); + this.DisassemblerContextMenu.Size = new System.Drawing.Size(148, 26); this.DisassemblerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.DisassemblerContextMenu_Opening); // // AddBreakpointContextMenuItem // this.AddBreakpointContextMenuItem.Name = "AddBreakpointContextMenuItem"; - this.AddBreakpointContextMenuItem.Size = new System.Drawing.Size(156, 22); + this.AddBreakpointContextMenuItem.Size = new System.Drawing.Size(147, 22); this.AddBreakpointContextMenuItem.Text = "Add Breakpoint"; this.AddBreakpointContextMenuItem.Click += new System.EventHandler(this.AddBreakpointContextMenuItem_Click); // diff --git a/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs index 1e45f46883..fa917677c7 100644 --- a/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs @@ -32,6 +32,7 @@ this.TracerBox = new System.Windows.Forms.GroupBox(); this.TraceView = new BizHawk.Client.EmuHawk.VirtualListView(); this.Disasm = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.Registers = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.menuStrip1 = new MenuStripEx(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); @@ -50,7 +51,6 @@ this.ToWindowRadio = new System.Windows.Forms.RadioButton(); this.ClearButton = new System.Windows.Forms.Button(); this.LoggingEnabled = new System.Windows.Forms.CheckBox(); - this.Registers = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.TracerBox.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -75,11 +75,10 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.TraceView.BlazingFast = false; - this.TraceView.CheckBoxes = true; this.TraceView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.Disasm, this.Registers}); - this.TraceView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.TraceView.Font = new System.Drawing.Font("Courier New", 8F); this.TraceView.FullRowSelect = true; this.TraceView.GridLines = true; this.TraceView.HideSelection = false; @@ -100,6 +99,11 @@ this.Disasm.Text = "Disasm"; this.Disasm.Width = 239; // + // Registers + // + this.Registers.Text = "Registers"; + this.Registers.Width = 357; + // // menuStrip1 // this.menuStrip1.ClickThrough = true; @@ -126,27 +130,27 @@ this.toolStripSeparator1, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 20); + this.FileSubMenu.Size = new System.Drawing.Size(35, 20); this.FileSubMenu.Text = "&File"; // // SaveLogMenuItem // this.SaveLogMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveLogMenuItem.Name = "SaveLogMenuItem"; - this.SaveLogMenuItem.Size = new System.Drawing.Size(134, 22); + this.SaveLogMenuItem.Size = new System.Drawing.Size(132, 22); this.SaveLogMenuItem.Text = "&Save Log"; this.SaveLogMenuItem.Click += new System.EventHandler(this.SaveLogMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(131, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(129, 6); // // ExitMenuItem // this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.ExitMenuItem.Size = new System.Drawing.Size(134, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(132, 22); this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -156,7 +160,7 @@ this.CopyMenuItem, this.SelectAllMenuItem}); this.EditSubMenu.Name = "EditSubMenu"; - this.EditSubMenu.Size = new System.Drawing.Size(39, 20); + this.EditSubMenu.Size = new System.Drawing.Size(37, 20); this.EditSubMenu.Text = "Edit"; // // CopyMenuItem @@ -164,7 +168,7 @@ this.CopyMenuItem.Name = "CopyMenuItem"; this.CopyMenuItem.ShortcutKeyDisplayString = ""; this.CopyMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.CopyMenuItem.Size = new System.Drawing.Size(164, 22); + this.CopyMenuItem.Size = new System.Drawing.Size(156, 22); this.CopyMenuItem.Text = "&Copy"; this.CopyMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click); // @@ -173,7 +177,7 @@ this.SelectAllMenuItem.Name = "SelectAllMenuItem"; this.SelectAllMenuItem.ShortcutKeyDisplayString = ""; this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.SelectAllMenuItem.Size = new System.Drawing.Size(164, 22); + this.SelectAllMenuItem.Size = new System.Drawing.Size(156, 22); this.SelectAllMenuItem.Text = "Select &All"; this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); // @@ -182,13 +186,13 @@ this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MaxLinesMenuItem}); this.OptionsSubMenu.Name = "OptionsSubMenu"; - this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); + this.OptionsSubMenu.Size = new System.Drawing.Size(58, 20); this.OptionsSubMenu.Text = "&Settings"; // // MaxLinesMenuItem // this.MaxLinesMenuItem.Name = "MaxLinesMenuItem"; - this.MaxLinesMenuItem.Size = new System.Drawing.Size(154, 22); + this.MaxLinesMenuItem.Size = new System.Drawing.Size(152, 22); this.MaxLinesMenuItem.Text = "&Set Max Lines..."; this.MaxLinesMenuItem.Click += new System.EventHandler(this.MaxLinesMenuItem_Click); // @@ -279,11 +283,6 @@ this.LoggingEnabled.UseVisualStyleBackColor = true; this.LoggingEnabled.CheckedChanged += new System.EventHandler(this.LoggingEnabled_CheckedChanged); // - // Registers - // - this.Registers.Text = "Registers"; - this.Registers.Width = 357; - // // TraceLogger // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);