From 11db51370588fbac16e5015eef31ed2e7c87bfe7 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 26 Jan 2017 10:51:24 +0000 Subject: [PATCH] Rename 'capture' button to 'launch' on CaptureDialog to clarify usage --- qrenderdoc/Windows/Dialogs/CaptureDialog.cpp | 6 ++--- qrenderdoc/Windows/Dialogs/CaptureDialog.h | 2 +- qrenderdoc/Windows/Dialogs/CaptureDialog.ui | 4 +-- .../Windows/Dialogs/CaptureDialog.Designer.cs | 26 +++++++++---------- renderdocui/Windows/Dialogs/CaptureDialog.cs | 14 +++++----- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp index d8639feac..710671d18 100644 --- a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp @@ -196,7 +196,7 @@ void CaptureDialog::setInjectMode(bool inject) fillProcessList(); - ui->capture->setText("Inject"); + ui->launch->setText("Inject"); this->setWindowTitle("Inject into Process"); } else @@ -209,7 +209,7 @@ void CaptureDialog::setInjectMode(bool inject) ui->globalGroup->setVisible(m_Ctx->Config.AllowGlobalHook); - ui->capture->setText("Capture"); + ui->launch->setText("Launch"); this->setWindowTitle("Capture Executable"); } } @@ -382,7 +382,7 @@ void CaptureDialog::on_loadSettings_clicked() } } -void CaptureDialog::on_capture_clicked() +void CaptureDialog::on_launch_clicked() { triggerCapture(); } diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.h b/qrenderdoc/Windows/Dialogs/CaptureDialog.h index 6e66ee3d9..254cd0ed7 100644 --- a/qrenderdoc/Windows/Dialogs/CaptureDialog.h +++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.h @@ -87,7 +87,7 @@ private slots: void on_saveSettings_clicked(); void on_loadSettings_clicked(); - void on_capture_clicked(); + void on_launch_clicked(); void on_close_clicked(); void on_toggleGlobal_clicked(); diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui index 5d5485c47..6a69c971e 100644 --- a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui +++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui @@ -696,9 +696,9 @@ Click here to set up Vulkan capture. - + - Capture + Launch diff --git a/renderdocui/Windows/Dialogs/CaptureDialog.Designer.cs b/renderdocui/Windows/Dialogs/CaptureDialog.Designer.cs index a7ff8796b..f2800b577 100644 --- a/renderdocui/Windows/Dialogs/CaptureDialog.Designer.cs +++ b/renderdocui/Windows/Dialogs/CaptureDialog.Designer.cs @@ -64,7 +64,7 @@ this.load = new System.Windows.Forms.Button(); this.save = new System.Windows.Forms.Button(); this.close = new System.Windows.Forms.Button(); - this.capture = new System.Windows.Forms.Button(); + this.launch = new System.Windows.Forms.Button(); this.exeBrowser = new System.Windows.Forms.OpenFileDialog(); this.workDirBrowser = new System.Windows.Forms.FolderBrowserDialog(); this.saveDialog = new System.Windows.Forms.SaveFileDialog(); @@ -472,7 +472,7 @@ this.panel2.Controls.Add(this.load); this.panel2.Controls.Add(this.save); this.panel2.Controls.Add(this.close); - this.panel2.Controls.Add(this.capture); + this.panel2.Controls.Add(this.launch); this.panel2.Location = new System.Drawing.Point(3, 709); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(209, 26); @@ -516,16 +516,16 @@ // // capture // - this.capture.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.capture.Location = new System.Drawing.Point(104, 3); - this.capture.Margin = new System.Windows.Forms.Padding(0); - this.capture.Name = "capture"; - this.capture.Size = new System.Drawing.Size(52, 23); - this.capture.TabIndex = 21; - this.capture.Text = "Capture"; - this.toolTip.SetToolTip(this.capture, "Trigger a capture of the selected program"); - this.capture.UseVisualStyleBackColor = true; - this.capture.Click += new System.EventHandler(this.capture_Click); + this.launch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.launch.Location = new System.Drawing.Point(104, 3); + this.launch.Margin = new System.Windows.Forms.Padding(0); + this.launch.Name = "capture"; + this.launch.Size = new System.Drawing.Size(52, 23); + this.launch.TabIndex = 21; + this.launch.Text = "Launch"; + this.toolTip.SetToolTip(this.launch, "Trigger a capture of the selected program"); + this.launch.UseVisualStyleBackColor = true; + this.launch.Click += new System.EventHandler(this.launch_Click); // // exeBrowser // @@ -819,7 +819,7 @@ #endregion - private System.Windows.Forms.Button capture; + private System.Windows.Forms.Button launch; private System.Windows.Forms.Button close; private System.Windows.Forms.CheckBox AllowVSync; private System.Windows.Forms.CheckBox APIValidation; diff --git a/renderdocui/Windows/Dialogs/CaptureDialog.cs b/renderdocui/Windows/Dialogs/CaptureDialog.cs index 619226358..96537e4ac 100644 --- a/renderdocui/Windows/Dialogs/CaptureDialog.cs +++ b/renderdocui/Windows/Dialogs/CaptureDialog.cs @@ -197,7 +197,7 @@ namespace renderdocui.Windows.Dialogs mainTableLayout.RowStyles[1].SizeType = SizeType.Percent; mainTableLayout.RowStyles[1].Height = 100.0f; - capture.Text = "Inject"; + launch.Text = "Inject"; FillProcessList(); @@ -213,7 +213,7 @@ namespace renderdocui.Windows.Dialogs globalGroup.Visible = m_Core.Config.AllowGlobalHook; - capture.Text = "Capture"; + launch.Text = "Launch"; Text = "Capture Executable"; } @@ -633,7 +633,7 @@ namespace renderdocui.Windows.Dialogs workDirBrowser.SelectedPath = workDirPath.Text; } - private void capture_Click(object sender, EventArgs e) + private void launch_Click(object sender, EventArgs e) { TriggerCapture(); } @@ -975,7 +975,7 @@ namespace renderdocui.Windows.Dialogs exePath.Enabled = exeBrowse.Enabled = workDirPath.Enabled = workDirBrowse.Enabled = cmdline.Enabled = - capture.Enabled = save.Enabled = load.Enabled = false; + launch.Enabled = save.Enabled = load.Enabled = false; foreach (Control c in capOptsFlow.Controls) c.Enabled = false; @@ -1047,7 +1047,7 @@ namespace renderdocui.Windows.Dialogs exePath.Enabled = exeBrowse.Enabled = workDirPath.Enabled = workDirBrowse.Enabled = cmdline.Enabled = - capture.Enabled = save.Enabled = load.Enabled = true; + launch.Enabled = save.Enabled = load.Enabled = true; foreach (Control c in capOptsFlow.Controls) c.Enabled = true; @@ -1082,7 +1082,7 @@ namespace renderdocui.Windows.Dialogs exePath.Enabled = exeBrowse.Enabled = workDirPath.Enabled = workDirBrowse.Enabled = cmdline.Enabled = - capture.Enabled = save.Enabled = load.Enabled = true; + launch.Enabled = save.Enabled = load.Enabled = true; foreach (Control c in capOptsFlow.Controls) c.Enabled = true; @@ -1136,7 +1136,7 @@ namespace renderdocui.Windows.Dialogs exePath.Enabled = exeBrowse.Enabled = workDirPath.Enabled = workDirBrowse.Enabled = cmdline.Enabled = - capture.Enabled = save.Enabled = load.Enabled = true; + launch.Enabled = save.Enabled = load.Enabled = true; foreach (Control c in capOptsFlow.Controls) c.Enabled = true;