feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Terminal: Use QtcProcess to start terminal window

Browse Source 
Previously DesktopDevice::openTerminal used custom code to open a
terminal window. This patch changes it to use QtcProcess with
TerminalMode::On.

This also removes the need for "openTerminal.py" on macOS.

Change-Id: Iec978bdd19487ff8e59dcd88c35c2d01b0681022
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-03-14 09:09:55 +01:00
parent 50a214de9e
commit 44074accc7
19 changed files with 102 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/terminal/terminalpane.cpp
View File

@@ -6,6 +6,7 @@
#include "shellmodel.h"
#include "terminaltr.h"
#include "terminalwidget.h"
#include "utils/terminalhooks.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/icontext.h>
@@ -175,7 +176,6 @@ QWidget *TerminalPane::outputWidget(QWidget *parent)
auto terminalWidget = new TerminalWidget(parent);
m_tabWidget->addTab(terminalWidget, Tr::tr("Terminal"));
setupTerminalWidget(terminalWidget);
}
return m_tabWidget;
@@ -201,12 +201,13 @@ void TerminalPane::setupTerminalWidget(TerminalWidget *terminal)
if (!terminal)
return;
auto setTabText = [this](TerminalWidget * terminal) {
auto setTabText = [this](TerminalWidget *terminal) {
auto index = m_tabWidget->indexOf(terminal);
const FilePath cwd = terminal->cwd();
const QString exe = terminal->currentCommand().isEmpty() ? terminal->shellName()
: terminal->currentCommand().executable().fileName();
const QString exe = terminal->currentCommand().isEmpty()
? terminal->shellName()
: terminal->currentCommand().executable().fileName();
if (cwd.isEmpty())
m_tabWidget->setTabText(index, exe);