From d3f867d5d350d6b119eafc2a7a96c5211106ad00 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 6 Aug 2014 22:21:27 +0100 Subject: [PATCH] Set a sane tab order on dialogs --- renderdocui/Windows/APIInspector.Designer.cs | 4 +- .../Dialogs/BufferFormatSpecifier.Designer.cs | 26 ++-- .../Windows/Dialogs/CaptureDialog.Designer.cs | 38 +++--- .../Windows/Dialogs/CaptureDialog.resx | 3 - .../Windows/Dialogs/LiveCapture.Designer.cs | 104 +++++++-------- .../Dialogs/SettingsDialog.Designer.cs | 122 +++++++++--------- 6 files changed, 147 insertions(+), 150 deletions(-) diff --git a/renderdocui/Windows/APIInspector.Designer.cs b/renderdocui/Windows/APIInspector.Designer.cs index f8499fc16..625593411 100644 --- a/renderdocui/Windows/APIInspector.Designer.cs +++ b/renderdocui/Windows/APIInspector.Designer.cs @@ -81,7 +81,7 @@ this.apiEvents.Name = "apiEvents"; this.apiEvents.RowOptions.ShowHeader = false; this.apiEvents.Size = new System.Drawing.Size(286, 152); - this.apiEvents.TabIndex = 2; + this.apiEvents.TabIndex = 1; this.apiEvents.Text = "API Calls"; this.apiEvents.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect); this.apiEvents.KeyDown += new System.Windows.Forms.KeyEventHandler(this.apiEvents_KeyDown); @@ -152,7 +152,7 @@ this.callstack.Name = "callstack"; this.callstack.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; this.callstack.Size = new System.Drawing.Size(292, 95); - this.callstack.TabIndex = 0; + this.callstack.TabIndex = 2; this.callstack.KeyDown += new System.Windows.Forms.KeyEventHandler(this.callstack_KeyDown); // // APIInspector diff --git a/renderdocui/Windows/Dialogs/BufferFormatSpecifier.Designer.cs b/renderdocui/Windows/Dialogs/BufferFormatSpecifier.Designer.cs index deb9f12d4..07e561379 100644 --- a/renderdocui/Windows/Dialogs/BufferFormatSpecifier.Designer.cs +++ b/renderdocui/Windows/Dialogs/BufferFormatSpecifier.Designer.cs @@ -33,8 +33,8 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BufferFormatSpecifier)); this.formatText = new System.Windows.Forms.TextBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.apply = new System.Windows.Forms.Button(); this.errors = new System.Windows.Forms.Label(); + this.apply = new System.Windows.Forms.Button(); groupBox1 = new System.Windows.Forms.GroupBox(); label1 = new System.Windows.Forms.Label(); groupBox1.SuspendLayout(); @@ -95,18 +95,6 @@ this.tableLayoutPanel1.Size = new System.Drawing.Size(656, 300); this.tableLayoutPanel1.TabIndex = 0; // - // apply - // - this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(585, 269); - this.apply.Margin = new System.Windows.Forms.Padding(8); - this.apply.Name = "apply"; - this.apply.Size = new System.Drawing.Size(63, 23); - this.apply.TabIndex = 2; - this.apply.Text = "Apply"; - this.apply.UseVisualStyleBackColor = true; - this.apply.Click += new System.EventHandler(this.apply_Click); - // // errors // this.tableLayoutPanel1.SetColumnSpan(this.errors, 2); @@ -118,6 +106,18 @@ this.errors.Size = new System.Drawing.Size(650, 46); this.errors.TabIndex = 3; // + // apply + // + this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.apply.Location = new System.Drawing.Point(585, 269); + this.apply.Margin = new System.Windows.Forms.Padding(8); + this.apply.Name = "apply"; + this.apply.Size = new System.Drawing.Size(63, 23); + this.apply.TabIndex = 1; + this.apply.Text = "Apply"; + this.apply.UseVisualStyleBackColor = true; + this.apply.Click += new System.EventHandler(this.apply_Click); + // // BufferFormatSpecifier // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/renderdocui/Windows/Dialogs/CaptureDialog.Designer.cs b/renderdocui/Windows/Dialogs/CaptureDialog.Designer.cs index 4ad451228..83635e050 100644 --- a/renderdocui/Windows/Dialogs/CaptureDialog.Designer.cs +++ b/renderdocui/Windows/Dialogs/CaptureDialog.Designer.cs @@ -161,7 +161,7 @@ this.queueFrameCap.Location = new System.Drawing.Point(3, 3); this.queueFrameCap.Name = "queueFrameCap"; this.queueFrameCap.Size = new System.Drawing.Size(151, 24); - this.queueFrameCap.TabIndex = 1; + this.queueFrameCap.TabIndex = 19; this.queueFrameCap.Text = "Queue Capture of Frame"; this.queueFrameCap.UseVisualStyleBackColor = true; // @@ -181,7 +181,7 @@ 0}); this.queuedCapFrame.Name = "queuedCapFrame"; this.queuedCapFrame.Size = new System.Drawing.Size(120, 20); - this.queuedCapFrame.TabIndex = 0; + this.queuedCapFrame.TabIndex = 20; this.queuedCapFrame.ThousandsSeparator = true; this.queuedCapFrame.Value = new decimal(new int[] { 2, @@ -232,7 +232,7 @@ this.AllowFullscreen.Location = new System.Drawing.Point(3, 3); this.AllowFullscreen.Name = "AllowFullscreen"; this.AllowFullscreen.Size = new System.Drawing.Size(130, 20); - this.AllowFullscreen.TabIndex = 8; + this.AllowFullscreen.TabIndex = 7; this.AllowFullscreen.Text = "Allow Fullscreen"; this.toolTip.SetToolTip(this.AllowFullscreen, "Allows the application to switch to full-screen mode"); this.AllowFullscreen.UseVisualStyleBackColor = true; @@ -242,7 +242,7 @@ this.AllowVSync.Location = new System.Drawing.Point(139, 3); this.AllowVSync.Name = "AllowVSync"; this.AllowVSync.Size = new System.Drawing.Size(130, 20); - this.AllowVSync.TabIndex = 9; + this.AllowVSync.TabIndex = 8; this.AllowVSync.Text = "Allow VSync"; this.toolTip.SetToolTip(this.AllowVSync, "Allows the application to enable v-sync"); this.AllowVSync.UseVisualStyleBackColor = true; @@ -265,7 +265,7 @@ this.DelayForDebugger.Margin = new System.Windows.Forms.Padding(0, 0, 3, 3); this.DelayForDebugger.Name = "DelayForDebugger"; this.DelayForDebugger.Size = new System.Drawing.Size(48, 20); - this.DelayForDebugger.TabIndex = 12; + this.DelayForDebugger.TabIndex = 9; this.toolTip.SetToolTip(this.DelayForDebugger, "Pauses for N seconds after launching the process,\r\nto allow a debugger to attach"); // // label4 @@ -296,7 +296,7 @@ this.CaptureCallstacksOnlyDraws.Location = new System.Drawing.Point(3, 29); this.CaptureCallstacksOnlyDraws.Name = "CaptureCallstacksOnlyDraws"; this.CaptureCallstacksOnlyDraws.Size = new System.Drawing.Size(130, 20); - this.CaptureCallstacksOnlyDraws.TabIndex = 19; + this.CaptureCallstacksOnlyDraws.TabIndex = 11; this.CaptureCallstacksOnlyDraws.Text = "Only Drawcall stacks"; this.toolTip.SetToolTip(this.CaptureCallstacksOnlyDraws, "Only collect callstacks on \'drawcall\' level api calls"); this.CaptureCallstacksOnlyDraws.UseVisualStyleBackColor = true; @@ -306,7 +306,7 @@ this.DebugDeviceMode.Location = new System.Drawing.Point(139, 29); this.DebugDeviceMode.Name = "DebugDeviceMode"; this.DebugDeviceMode.Size = new System.Drawing.Size(130, 20); - this.DebugDeviceMode.TabIndex = 9; + this.DebugDeviceMode.TabIndex = 12; this.DebugDeviceMode.Text = "Create Debug Device"; this.toolTip.SetToolTip(this.DebugDeviceMode, "D3D11: Create a debug device - allows capturing and reading of D3D errors and war" + "nings"); @@ -317,7 +317,7 @@ this.CacheStateObjects.Location = new System.Drawing.Point(275, 29); this.CacheStateObjects.Name = "CacheStateObjects"; this.CacheStateObjects.Size = new System.Drawing.Size(130, 20); - this.CacheStateObjects.TabIndex = 11; + this.CacheStateObjects.TabIndex = 13; this.CacheStateObjects.Text = "Cache State Objects"; this.toolTip.SetToolTip(this.CacheStateObjects, "D3D11: Caches state objects so that rapid creation & destruction\r\ndoesn\'t inflate" + " memory used and log file size"); @@ -328,7 +328,7 @@ this.HookIntoChildren.Location = new System.Drawing.Point(411, 29); this.HookIntoChildren.Name = "HookIntoChildren"; this.HookIntoChildren.Size = new System.Drawing.Size(130, 20); - this.HookIntoChildren.TabIndex = 16; + this.HookIntoChildren.TabIndex = 14; this.HookIntoChildren.Text = "Hook Into Children"; this.toolTip.SetToolTip(this.HookIntoChildren, "Hook into child processes - useful with launchers or similar intermediate process" + "es"); @@ -339,7 +339,7 @@ this.SaveAllInitials.Location = new System.Drawing.Point(3, 55); this.SaveAllInitials.Name = "SaveAllInitials"; this.SaveAllInitials.Size = new System.Drawing.Size(130, 20); - this.SaveAllInitials.TabIndex = 17; + this.SaveAllInitials.TabIndex = 15; this.SaveAllInitials.Text = "Save All Initials"; this.toolTip.SetToolTip(this.SaveAllInitials, "Save the initial state of all API resources at the start of each captured frame"); this.SaveAllInitials.UseVisualStyleBackColor = true; @@ -349,7 +349,7 @@ this.RefAllResources.Location = new System.Drawing.Point(139, 55); this.RefAllResources.Name = "RefAllResources"; this.RefAllResources.Size = new System.Drawing.Size(130, 20); - this.RefAllResources.TabIndex = 18; + this.RefAllResources.TabIndex = 16; this.RefAllResources.Text = "Ref All Resources"; this.toolTip.SetToolTip(this.RefAllResources, "Consider all resources to be included, even if unused in the capture frame"); this.RefAllResources.UseVisualStyleBackColor = true; @@ -359,7 +359,7 @@ this.CaptureAllCmdLists.Location = new System.Drawing.Point(275, 55); this.CaptureAllCmdLists.Name = "CaptureAllCmdLists"; this.CaptureAllCmdLists.Size = new System.Drawing.Size(130, 20); - this.CaptureAllCmdLists.TabIndex = 21; + this.CaptureAllCmdLists.TabIndex = 17; this.CaptureAllCmdLists.Text = "Capture All Cmd Lists"; this.toolTip.SetToolTip(this.CaptureAllCmdLists, "When enabled, all deferred command lists will be saved even while idling.\r\nThis h" + "as an overhead but ensures if you hold onto a list it will be captured."); @@ -370,7 +370,7 @@ this.AutoStart.Location = new System.Drawing.Point(411, 55); this.AutoStart.Name = "AutoStart"; this.AutoStart.Size = new System.Drawing.Size(130, 20); - this.AutoStart.TabIndex = 20; + this.AutoStart.TabIndex = 18; this.AutoStart.Text = "Auto start"; this.toolTip.SetToolTip(this.AutoStart, "If these capture settings are saved & run, auto start the capture instantly on lo" + "ad"); @@ -395,7 +395,7 @@ this.load.Location = new System.Drawing.Point(104, 3); this.load.Name = "load"; this.load.Size = new System.Drawing.Size(86, 23); - this.load.TabIndex = 8; + this.load.TabIndex = 24; this.load.Text = "Load Settings"; this.toolTip.SetToolTip(this.load, "Load a saved set of capture settings"); this.load.UseVisualStyleBackColor = true; @@ -407,7 +407,7 @@ this.save.Location = new System.Drawing.Point(4, 3); this.save.Name = "save"; this.save.Size = new System.Drawing.Size(94, 23); - this.save.TabIndex = 7; + this.save.TabIndex = 23; this.save.Text = "Save Settings"; this.toolTip.SetToolTip(this.save, "Save these capture settings to file to load later"); this.save.UseVisualStyleBackColor = true; @@ -420,7 +420,7 @@ this.close.Margin = new System.Windows.Forms.Padding(0); this.close.Name = "close"; this.close.Size = new System.Drawing.Size(70, 23); - this.close.TabIndex = 6; + this.close.TabIndex = 22; this.close.Text = "Close"; this.close.UseVisualStyleBackColor = true; this.close.Click += new System.EventHandler(this.close_Click); @@ -432,7 +432,7 @@ this.capture.Margin = new System.Windows.Forms.Padding(0); this.capture.Name = "capture"; this.capture.Size = new System.Drawing.Size(70, 23); - this.capture.TabIndex = 5; + this.capture.TabIndex = 21; this.capture.Text = "Capture"; this.toolTip.SetToolTip(this.capture, "Trigger a capture of the selected program"); this.capture.UseVisualStyleBackColor = true; @@ -540,7 +540,7 @@ this.pidRefresh.Location = new System.Drawing.Point(518, 180); this.pidRefresh.Name = "pidRefresh"; this.pidRefresh.Size = new System.Drawing.Size(75, 23); - this.pidRefresh.TabIndex = 1; + this.pidRefresh.TabIndex = 6; this.pidRefresh.Text = "Refresh"; this.toolTip.SetToolTip(this.pidRefresh, "Refresh the list of processes"); this.pidRefresh.UseVisualStyleBackColor = true; @@ -561,7 +561,7 @@ this.pidList.MultiSelect = false; this.pidList.Name = "pidList"; this.pidList.Size = new System.Drawing.Size(584, 129); - this.pidList.TabIndex = 2; + this.pidList.TabIndex = 5; this.toolTip.SetToolTip(this.pidList, "Select the process to inject into - must not yet have utilised the target API"); this.pidList.UseCompatibleStateImageBehavior = false; this.pidList.View = System.Windows.Forms.View.Details; diff --git a/renderdocui/Windows/Dialogs/CaptureDialog.resx b/renderdocui/Windows/Dialogs/CaptureDialog.resx index 7b507dbd0..624222232 100644 --- a/renderdocui/Windows/Dialogs/CaptureDialog.resx +++ b/renderdocui/Windows/Dialogs/CaptureDialog.resx @@ -150,7 +150,4 @@ 382, 17 - - 485, 17 - \ No newline at end of file diff --git a/renderdocui/Windows/Dialogs/LiveCapture.Designer.cs b/renderdocui/Windows/Dialogs/LiveCapture.Designer.cs index b5091582b..99114a613 100644 --- a/renderdocui/Windows/Dialogs/LiveCapture.Designer.cs +++ b/renderdocui/Windows/Dialogs/LiveCapture.Designer.cs @@ -31,10 +31,12 @@ this.components = new System.ComponentModel.Container(); System.Windows.Forms.Label label1; System.Windows.Forms.GroupBox groupBox1; + System.Windows.Forms.Label label3; System.Windows.Forms.Label label2; System.Windows.Forms.ToolStrip toolStrip1; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LiveCapture)); - System.Windows.Forms.Label label3; + this.queueCap = new System.Windows.Forms.Button(); + this.captureFrame = new System.Windows.Forms.NumericUpDown(); this.captureDelay = new System.Windows.Forms.NumericUpDown(); this.triggerCapture = new System.Windows.Forms.Button(); this.deleteMenu = new System.Windows.Forms.ToolStripButton(); @@ -54,20 +56,18 @@ this.saveThisCaptureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.deleteThisCaptureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.captureCountdown = new System.Windows.Forms.Timer(this.components); - this.captureFrame = new System.Windows.Forms.NumericUpDown(); - this.queueCap = new System.Windows.Forms.Button(); label1 = new System.Windows.Forms.Label(); groupBox1 = new System.Windows.Forms.GroupBox(); + label3 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); toolStrip1 = new System.Windows.Forms.ToolStrip(); - label3 = new System.Windows.Forms.Label(); groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.captureFrame)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.captureDelay)).BeginInit(); toolStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); this.rightclickContext.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.captureFrame)).BeginInit(); this.SuspendLayout(); // // label1 @@ -98,6 +98,48 @@ groupBox1.TabStop = false; groupBox1.Text = "Tools"; // + // queueCap + // + this.queueCap.Location = new System.Drawing.Point(222, 44); + this.queueCap.Name = "queueCap"; + this.queueCap.Size = new System.Drawing.Size(92, 23); + this.queueCap.TabIndex = 4; + this.queueCap.Text = "Queue Capture"; + this.queueCap.UseVisualStyleBackColor = true; + this.queueCap.Click += new System.EventHandler(this.queueCap_Click); + // + // captureFrame + // + this.captureFrame.Location = new System.Drawing.Point(96, 46); + this.captureFrame.Maximum = new decimal(new int[] { + 10000000, + 0, + 0, + 0}); + this.captureFrame.Minimum = new decimal(new int[] { + 2, + 0, + 0, + 0}); + this.captureFrame.Name = "captureFrame"; + this.captureFrame.Size = new System.Drawing.Size(120, 20); + this.captureFrame.TabIndex = 3; + this.captureFrame.ThousandsSeparator = true; + this.captureFrame.Value = new decimal(new int[] { + 2, + 0, + 0, + 0}); + // + // label3 + // + label3.AutoSize = true; + label3.Location = new System.Drawing.Point(6, 50); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(86, 13); + label3.TabIndex = 3; + label3.Text = "Capture Frame #"; + // // label2 // label2.AutoSize = true; @@ -119,7 +161,7 @@ this.triggerCapture.Location = new System.Drawing.Point(222, 17); this.triggerCapture.Name = "triggerCapture"; this.triggerCapture.Size = new System.Drawing.Size(92, 23); - this.triggerCapture.TabIndex = 0; + this.triggerCapture.TabIndex = 2; this.triggerCapture.Text = "Trigger Capture"; this.triggerCapture.UseVisualStyleBackColor = true; this.triggerCapture.Click += new System.EventHandler(this.triggerCapture_Click); @@ -178,14 +220,14 @@ // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.openToolStripMenuItem.Text = "In &this instance"; this.openToolStripMenuItem.Click += new System.EventHandler(this.openCapture_Click); // // newInstanceToolStripMenuItem // this.newInstanceToolStripMenuItem.Name = "newInstanceToolStripMenuItem"; - this.newInstanceToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.newInstanceToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.newInstanceToolStripMenuItem.Text = "In &new instance"; this.newInstanceToolStripMenuItem.Click += new System.EventHandler(this.openNewWindow_Click); // @@ -219,7 +261,7 @@ this.captures.Location = new System.Drawing.Point(3, 147); this.captures.Name = "captures"; this.captures.Size = new System.Drawing.Size(543, 226); - this.captures.TabIndex = 0; + this.captures.TabIndex = 5; this.captures.TileSize = new System.Drawing.Size(300, 100); this.captures.UseCompatibleStateImageBehavior = false; this.captures.View = System.Windows.Forms.View.Tile; @@ -310,48 +352,6 @@ this.captureCountdown.Interval = 1000; this.captureCountdown.Tick += new System.EventHandler(this.captureCountdown_Tick); // - // label3 - // - label3.AutoSize = true; - label3.Location = new System.Drawing.Point(6, 50); - label3.Name = "label3"; - label3.Size = new System.Drawing.Size(86, 13); - label3.TabIndex = 3; - label3.Text = "Capture Frame #"; - // - // captureFrame - // - this.captureFrame.Location = new System.Drawing.Point(96, 46); - this.captureFrame.Maximum = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - this.captureFrame.Minimum = new decimal(new int[] { - 2, - 0, - 0, - 0}); - this.captureFrame.Name = "captureFrame"; - this.captureFrame.Size = new System.Drawing.Size(120, 20); - this.captureFrame.TabIndex = 4; - this.captureFrame.ThousandsSeparator = true; - this.captureFrame.Value = new decimal(new int[] { - 2, - 0, - 0, - 0}); - // - // queueCap - // - this.queueCap.Location = new System.Drawing.Point(222, 44); - this.queueCap.Name = "queueCap"; - this.queueCap.Size = new System.Drawing.Size(92, 23); - this.queueCap.TabIndex = 5; - this.queueCap.Text = "Queue Capture"; - this.queueCap.UseVisualStyleBackColor = true; - this.queueCap.Click += new System.EventHandler(this.queueCap_Click); - // // LiveCapture // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -366,6 +366,7 @@ this.Shown += new System.EventHandler(this.LiveCapture_Shown); groupBox1.ResumeLayout(false); groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.captureFrame)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.captureDelay)).EndInit(); toolStrip1.ResumeLayout(false); toolStrip1.PerformLayout(); @@ -374,7 +375,6 @@ this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); this.rightclickContext.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.captureFrame)).EndInit(); this.ResumeLayout(false); } diff --git a/renderdocui/Windows/Dialogs/SettingsDialog.Designer.cs b/renderdocui/Windows/Dialogs/SettingsDialog.Designer.cs index 9f3f768c9..8ac8f54d4 100644 --- a/renderdocui/Windows/Dialogs/SettingsDialog.Designer.cs +++ b/renderdocui/Windows/Dialogs/SettingsDialog.Designer.cs @@ -39,6 +39,7 @@ System.Windows.Forms.Label label5; System.Windows.Forms.Label label7; System.Windows.Forms.Label label3; + System.Windows.Forms.Label label11; System.Windows.Forms.GroupBox groupBox2; System.Windows.Forms.Label label10; System.Windows.Forms.GroupBox groupBox3; @@ -46,8 +47,10 @@ System.Windows.Forms.GroupBox groupBox4; System.Windows.Forms.Label label8; System.Windows.Forms.Label label9; - TreelistView.TreeListColumn treeListColumn1 = new TreelistView.TreeListColumn("Section", "Section"); - System.Windows.Forms.Label label11; + TreelistView.TreeListColumn treeListColumn1 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Section", "Section"))); + this.ok = new System.Windows.Forms.Button(); + this.toolTip = new System.Windows.Forms.ToolTip(this.components); + this.browserCaptureDialog = new System.Windows.Forms.FolderBrowserDialog(); this.settingsTabs = new renderdocui.Controls.TablessControl(); this.generalTab = new System.Windows.Forms.TabPage(); this.Formatter_PosExp = new System.Windows.Forms.NumericUpDown(); @@ -57,6 +60,7 @@ this.Formatter_MaxFigures = new System.Windows.Forms.NumericUpDown(); this.Formatter_MinFigures = new System.Windows.Forms.NumericUpDown(); this.CheckUpdate_AllowChecks = new System.Windows.Forms.CheckBox(); + this.browseCaptureDirectory = new System.Windows.Forms.Button(); this.texViewTab = new System.Windows.Forms.TabPage(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.TextureViewer_ResetRange = new System.Windows.Forms.CheckBox(); @@ -68,10 +72,6 @@ this.EventBrowser_TimeUnit = new System.Windows.Forms.ComboBox(); this.EventBrowser_HideEmpty = new System.Windows.Forms.CheckBox(); this.pagesTree = new TreelistView.TreeListView(); - this.ok = new System.Windows.Forms.Button(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.browseCaptureDirectory = new System.Windows.Forms.Button(); - this.browserCaptureDialog = new System.Windows.Forms.FolderBrowserDialog(); tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); groupBox1 = new System.Windows.Forms.GroupBox(); tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); @@ -82,6 +82,7 @@ label5 = new System.Windows.Forms.Label(); label7 = new System.Windows.Forms.Label(); label3 = new System.Windows.Forms.Label(); + label11 = new System.Windows.Forms.Label(); groupBox2 = new System.Windows.Forms.GroupBox(); label10 = new System.Windows.Forms.Label(); groupBox3 = new System.Windows.Forms.GroupBox(); @@ -89,7 +90,6 @@ groupBox4 = new System.Windows.Forms.GroupBox(); label8 = new System.Windows.Forms.Label(); label9 = new System.Windows.Forms.Label(); - label11 = new System.Windows.Forms.Label(); tableLayoutPanel1.SuspendLayout(); this.settingsTabs.SuspendLayout(); this.generalTab.SuspendLayout(); @@ -128,6 +128,21 @@ tableLayoutPanel1.Size = new System.Drawing.Size(580, 353); tableLayoutPanel1.TabIndex = 1; // + // ok + // + this.ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ok.Location = new System.Drawing.Point(502, 327); + this.ok.Name = "ok"; + this.ok.Size = new System.Drawing.Size(75, 23); + this.ok.TabIndex = 100; + this.ok.Text = "OK"; + this.ok.UseVisualStyleBackColor = true; + this.ok.Click += new System.EventHandler(this.ok_Click); + // + // browserCaptureDialog + // + this.browserCaptureDialog.RootFolder = System.Environment.SpecialFolder.MyComputer; + // // settingsTabs // this.settingsTabs.Alignment = System.Windows.Forms.TabAlignment.Left; @@ -212,7 +227,7 @@ 0}); this.Formatter_PosExp.Name = "Formatter_PosExp"; this.Formatter_PosExp.Size = new System.Drawing.Size(90, 20); - this.Formatter_PosExp.TabIndex = 11; + this.Formatter_PosExp.TabIndex = 6; this.toolTip.SetToolTip(this.Formatter_PosExp, "Any numbers larger than this exponent will be displayed in scientific notation.\r\n" + "e.g. 1000 * 10 = 1e4"); this.Formatter_PosExp.Value = new decimal(new int[] { @@ -232,7 +247,7 @@ 0}); this.Formatter_NegExp.Name = "Formatter_NegExp"; this.Formatter_NegExp.Size = new System.Drawing.Size(90, 20); - this.Formatter_NegExp.TabIndex = 10; + this.Formatter_NegExp.TabIndex = 5; this.toolTip.SetToolTip(this.Formatter_NegExp, "Any numbers smaller than this exponent will be displayed in scientific notation.\r" + "\nE.g. a value of 3 means 0.005 / 10 = 5E-4"); this.Formatter_NegExp.Value = new decimal(new int[] { @@ -319,7 +334,7 @@ this.capAssoc.Location = new System.Drawing.Point(268, 32); this.capAssoc.Name = "capAssoc"; this.capAssoc.Size = new System.Drawing.Size(90, 23); - this.capAssoc.TabIndex = 3; + this.capAssoc.TabIndex = 2; this.capAssoc.Text = "Associate .cap"; this.capAssoc.UseVisualStyleBackColor = true; this.capAssoc.Click += new System.EventHandler(this.capAssoc_Click); @@ -371,7 +386,7 @@ 0}); this.Formatter_MaxFigures.Name = "Formatter_MaxFigures"; this.Formatter_MaxFigures.Size = new System.Drawing.Size(90, 20); - this.Formatter_MaxFigures.TabIndex = 9; + this.Formatter_MaxFigures.TabIndex = 4; this.toolTip.SetToolTip(this.Formatter_MaxFigures, "No more significant figures than this will be displayed on floats.\r\ne.g. a value " + "of 5 means 0.123456789 will display as 0.12345\r\n"); this.Formatter_MaxFigures.Value = new decimal(new int[] { @@ -392,7 +407,7 @@ 0}); this.Formatter_MinFigures.Name = "Formatter_MinFigures"; this.Formatter_MinFigures.Size = new System.Drawing.Size(90, 20); - this.Formatter_MinFigures.TabIndex = 8; + this.Formatter_MinFigures.TabIndex = 3; this.toolTip.SetToolTip(this.Formatter_MinFigures, "Decimals will display at least this many digits.\r\ne.g. a value of 2 means 0 will " + "display as 0.00, 0.5 as 0.50\r\n"); this.Formatter_MinFigures.Value = new decimal(new int[] { @@ -425,11 +440,39 @@ this.CheckUpdate_AllowChecks.Location = new System.Drawing.Point(268, 194); this.CheckUpdate_AllowChecks.Name = "CheckUpdate_AllowChecks"; this.CheckUpdate_AllowChecks.Size = new System.Drawing.Size(15, 14); - this.CheckUpdate_AllowChecks.TabIndex = 13; + this.CheckUpdate_AllowChecks.TabIndex = 8; this.toolTip.SetToolTip(this.CheckUpdate_AllowChecks, "Allow periodic update checks"); this.CheckUpdate_AllowChecks.UseVisualStyleBackColor = true; this.CheckUpdate_AllowChecks.CheckedChanged += new System.EventHandler(this.CheckUpdate_AllowChecks_CheckedChanged); // + // label11 + // + label11.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + label11.AutoSize = true; + label11.Location = new System.Drawing.Point(3, 162); + label11.Name = "label11"; + label11.Size = new System.Drawing.Size(259, 29); + label11.TabIndex = 14; + label11.Text = "Directory for temporary capture files"; + label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolTip.SetToolTip(label11, "Changes the directory where capture files are saved after being created, until sa" + + "ved manually or deleted.\r\n\r\nDefaults to %TEMP%."); + // + // browseCaptureDirectory + // + this.browseCaptureDirectory.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.browseCaptureDirectory.Location = new System.Drawing.Point(268, 165); + this.browseCaptureDirectory.Name = "browseCaptureDirectory"; + this.browseCaptureDirectory.Size = new System.Drawing.Size(90, 23); + this.browseCaptureDirectory.TabIndex = 7; + this.browseCaptureDirectory.Text = "Browse"; + this.toolTip.SetToolTip(this.browseCaptureDirectory, "Changes the directory where capture files are saved after being created, until sa" + + "ved manually or deleted.\r\n\r\nDefaults to %TEMP%."); + this.browseCaptureDirectory.UseVisualStyleBackColor = true; + this.browseCaptureDirectory.Click += new System.EventHandler(this.browseCaptureDirectory_Click); + // // texViewTab // this.texViewTab.Controls.Add(groupBox2); @@ -476,7 +519,7 @@ this.TextureViewer_ResetRange.Location = new System.Drawing.Point(291, 3); this.TextureViewer_ResetRange.Name = "TextureViewer_ResetRange"; this.TextureViewer_ResetRange.Size = new System.Drawing.Size(67, 14); - this.TextureViewer_ResetRange.TabIndex = 0; + this.TextureViewer_ResetRange.TabIndex = 20; this.toolTip.SetToolTip(this.TextureViewer_ResetRange, "Reset visible range when changing event or texture"); this.TextureViewer_ResetRange.UseVisualStyleBackColor = true; this.TextureViewer_ResetRange.CheckedChanged += new System.EventHandler(this.TextureViewer_ResetRange_CheckedChanged); @@ -539,7 +582,7 @@ this.ShaderViewer_FriendlyNaming.Location = new System.Drawing.Point(291, 3); this.ShaderViewer_FriendlyNaming.Name = "ShaderViewer_FriendlyNaming"; this.ShaderViewer_FriendlyNaming.Size = new System.Drawing.Size(15, 14); - this.ShaderViewer_FriendlyNaming.TabIndex = 0; + this.ShaderViewer_FriendlyNaming.TabIndex = 40; this.toolTip.SetToolTip(this.ShaderViewer_FriendlyNaming, "In disassembly view, rename constant registers to their names from shader reflect" + "ion data"); this.ShaderViewer_FriendlyNaming.UseVisualStyleBackColor = true; @@ -621,7 +664,7 @@ this.EventBrowser_TimeUnit.Location = new System.Drawing.Point(291, 3); this.EventBrowser_TimeUnit.Name = "EventBrowser_TimeUnit"; this.EventBrowser_TimeUnit.Size = new System.Drawing.Size(67, 21); - this.EventBrowser_TimeUnit.TabIndex = 1; + this.EventBrowser_TimeUnit.TabIndex = 50; this.toolTip.SetToolTip(this.EventBrowser_TimeUnit, "The time unit to use when displaying the duration column in the event browser"); this.EventBrowser_TimeUnit.SelectionChangeCommitted += new System.EventHandler(this.EventBrowser_TimeUnit_SelectionChangeCommitted); // @@ -645,7 +688,7 @@ this.EventBrowser_HideEmpty.Location = new System.Drawing.Point(291, 30); this.EventBrowser_HideEmpty.Name = "EventBrowser_HideEmpty"; this.EventBrowser_HideEmpty.Size = new System.Drawing.Size(15, 14); - this.EventBrowser_HideEmpty.TabIndex = 8; + this.EventBrowser_HideEmpty.TabIndex = 51; this.toolTip.SetToolTip(this.EventBrowser_HideEmpty, "In the Event Browser and Timeline Bar, marker sections that contain no API calls " + "or drawcalls will be completely removed"); this.EventBrowser_HideEmpty.UseVisualStyleBackColor = true; @@ -667,55 +710,12 @@ this.pagesTree.Name = "pagesTree"; this.pagesTree.RowOptions.ShowHeader = false; this.pagesTree.Size = new System.Drawing.Size(168, 318); - this.pagesTree.TabIndex = 1; + this.pagesTree.TabIndex = 0; this.pagesTree.ViewOptions.ShowGridLines = false; this.pagesTree.ViewOptions.ShowLine = false; this.pagesTree.ViewOptions.ShowPlusMinus = false; this.pagesTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.pagesTree_AfterSelect); // - // ok - // - this.ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.ok.Location = new System.Drawing.Point(502, 327); - this.ok.Name = "ok"; - this.ok.Size = new System.Drawing.Size(75, 23); - this.ok.TabIndex = 2; - this.ok.Text = "OK"; - this.ok.UseVisualStyleBackColor = true; - this.ok.Click += new System.EventHandler(this.ok_Click); - // - // label11 - // - label11.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - label11.AutoSize = true; - label11.Location = new System.Drawing.Point(3, 162); - label11.Name = "label11"; - label11.Size = new System.Drawing.Size(259, 29); - label11.TabIndex = 14; - label11.Text = "Directory for temporary capture files"; - label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.toolTip.SetToolTip(label11, "Changes the directory where capture files are saved after being created, until sa" + - "ved manually or deleted.\r\n\r\nDefaults to %TEMP%."); - // - // browseCaptureDirectory - // - this.browseCaptureDirectory.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.browseCaptureDirectory.Location = new System.Drawing.Point(268, 165); - this.browseCaptureDirectory.Name = "browseCaptureDirectory"; - this.browseCaptureDirectory.Size = new System.Drawing.Size(90, 23); - this.browseCaptureDirectory.TabIndex = 15; - this.browseCaptureDirectory.Text = "Browse"; - this.toolTip.SetToolTip(this.browseCaptureDirectory, "Changes the directory where capture files are saved after being created, until sa" + - "ved manually or deleted.\r\n\r\nDefaults to %TEMP%."); - this.browseCaptureDirectory.UseVisualStyleBackColor = true; - this.browseCaptureDirectory.Click += new System.EventHandler(this.browseCaptureDirectory_Click); - // - // browserCaptureDialog - // - this.browserCaptureDialog.RootFolder = System.Environment.SpecialFolder.MyComputer; - // // SettingsDialog // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);