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

Terminal: use shell name as terminal tab name

Browse Source 
This way cmd, bash, powershell are more descriptive than "Terminal"

Change-Id: I19310f423cd4188ecc48580a30ed414833a15aee
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Cristian Adam
2023-03-02 16:59:03 +01:00
parent 0a0827da41
commit d387802a3e
4 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,8 +74,9 @@ TerminalPane::TerminalPane(QObject *parent)
void TerminalPane::openTerminal(const Utils::Terminal::OpenTerminalParameters &parameters)
{
showPage(0);
m_tabWidget->setCurrentIndex(
m_tabWidget->addTab(new TerminalWidget(m_tabWidget, parameters), Tr::tr("Terminal")));
auto terminalWidget = new TerminalWidget(m_tabWidget, parameters);
m_tabWidget->setCurrentIndex(m_tabWidget->addTab(terminalWidget, Tr::tr("Terminal")));
setupTerminalWidget(terminalWidget);
m_tabWidget->currentWidget()->setFocus();
@@ -87,6 +88,7 @@ void TerminalPane::addTerminal(TerminalWidget *terminal, const QString &title)
{
showPage(0);
m_tabWidget->setCurrentIndex(m_tabWidget->addTab(terminal, title));
setupTerminalWidget(terminal);
m_closeTerminal.setEnabled(m_tabWidget->count() > 1);
emit navigateStateUpdate();
@@ -106,7 +108,10 @@ QWidget *TerminalPane::outputWidget(QWidget *parent)
removeTab(index);
});
m_tabWidget->addTab(new TerminalWidget(parent), Tr::tr("Terminal"));
auto terminalWidget = new TerminalWidget(parent);
m_tabWidget->addTab(terminalWidget, Tr::tr("Terminal"));
setupTerminalWidget(terminalWidget);
}
return m_tabWidget;
@@ -127,6 +132,24 @@ void TerminalPane::removeTab(int index)
emit navigateStateUpdate();
}
void TerminalPane::setupTerminalWidget(TerminalWidget *terminal)
{
if (!terminal)
return;
auto setTabText = [this](TerminalWidget * terminal) {
auto index = m_tabWidget->indexOf(terminal);
m_tabWidget->setTabText(index, terminal->shellName());
};
connect(terminal, &TerminalWidget::started, [setTabText, terminal](qint64 /*pid*/) {
setTabText(terminal);
});
if (!terminal->shellName().isEmpty())
setTabText(terminal);
}
QList<QWidget *> TerminalPane::toolBarWidgets() const
{
return {m_newTerminalButton, m_closeTerminalButton};