diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui index 3e8556e23..06b1177af 100644 --- a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui +++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui @@ -11,7 +11,7 @@ - Capture Executable + Launch Application diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp index 5b0192a72..7daf15cec 100644 --- a/qrenderdoc/Windows/MainWindow.cpp +++ b/qrenderdoc/Windows/MainWindow.cpp @@ -89,6 +89,9 @@ MainWindow::MainWindow(ICaptureContext &ctx) : QMainWindow(NULL), ui(new Ui::Mai QObject::connect(ui->action_Save_Layout_6, &QAction::triggered, this, &MainWindow::saveLayout_triggered); + QObject::connect(ui->action_Launch_Application_Window, &QAction::triggered, this, + &MainWindow::on_action_Launch_Application_triggered); + contextChooserMenu = new QMenu(this); FillRemotesMenu(contextChooserMenu, true); @@ -1336,7 +1339,7 @@ void MainWindow::on_action_Pipeline_State_triggered() ui->toolWindowManager->addToolWindow(pipelineViewer, mainToolArea()); } -void MainWindow::on_action_Capture_Log_triggered() +void MainWindow::on_action_Launch_Application_triggered() { ICaptureDialog *capDialog = m_Ctx.GetCaptureDialog(); diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h index 43a38667e..f5f575755 100644 --- a/qrenderdoc/Windows/MainWindow.h +++ b/qrenderdoc/Windows/MainWindow.h @@ -86,7 +86,7 @@ public: void showMeshPreview() { on_action_Mesh_Output_triggered(); } void showTextureViewer() { on_action_Texture_Viewer_triggered(); } void showPipelineViewer() { on_action_Pipeline_State_triggered(); } - void showCaptureDialog() { on_action_Capture_Log_triggered(); } + void showCaptureDialog() { on_action_Launch_Application_triggered(); } void showDebugMessageView() { on_action_Errors_and_Warnings_triggered(); } void showStatisticsViewer() { on_action_Statistics_Viewer_triggered(); } void showPythonShell() { on_action_Python_Shell_triggered(); } @@ -102,7 +102,7 @@ private slots: void on_action_Event_Browser_triggered(); void on_action_Texture_Viewer_triggered(); void on_action_Pipeline_State_triggered(); - void on_action_Capture_Log_triggered(); + void on_action_Launch_Application_triggered(); void on_action_Errors_and_Warnings_triggered(); void on_action_Statistics_Viewer_triggered(); void on_action_Python_Shell_triggered(); diff --git a/qrenderdoc/Windows/MainWindow.ui b/qrenderdoc/Windows/MainWindow.ui index 48e8046eb..62e5ec8dd 100644 --- a/qrenderdoc/Windows/MainWindow.ui +++ b/qrenderdoc/Windows/MainWindow.ui @@ -74,7 +74,7 @@ - + @@ -120,6 +120,7 @@ + @@ -152,9 +153,9 @@ - + - &Capture Log + &Launch Application Ctrl+N @@ -188,7 +189,7 @@ - C&lose Log + &Close Log Ctrl+W @@ -196,7 +197,7 @@ - &Exit + E&xit Alt+F4 @@ -402,6 +403,11 @@ Show Tips + + + &Launch Application + +