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

Terminal: Add icons to tabs

Browse Source 
Change-Id: Id219366de16944daf83c3eb154d6b087c79b7fd9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Orgad Shaneh
2023-07-03 14:33:21 +03:00
committed by Orgad Shaneh
parent 9a7f45cc46
commit 2f6f9d2d33
4 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@
#include <utils/terminalhooks.h>
#include <utils/utilsicons.h>
#include <QFileIconProvider>
#include <QMenu>
#include <QStandardPaths>
#include <QToolButton>
@@ -134,7 +135,18 @@ void TerminalPane::openTerminal(const OpenTerminalParameters &parameters)
terminalWidget->unlockGlobalAction(NEXTTERMINAL);
terminalWidget->unlockGlobalAction(PREVTERMINAL);
m_tabWidget.setCurrentIndex(m_tabWidget.addTab(terminalWidget, Tr::tr("Terminal")));
QIcon icon;
if (HostOsInfo::isWindowsHost()) {
icon = parametersCopy.icon;
if (icon.isNull()) {
QFileIconProvider iconProvider;
const FilePath command = parametersCopy.shellCommand
? parametersCopy.shellCommand->executable()
: TerminalSettings::instance().shell.filePath();
icon = iconProvider.icon(command.toFileInfo());
}
}
m_tabWidget.setCurrentIndex(m_tabWidget.addTab(terminalWidget, icon, Tr::tr("Terminal")));
setupTerminalWidget(terminalWidget);
if (!m_isVisible)
@@ -306,7 +318,7 @@ void TerminalPane::createShellMenu()
const auto addItems = [this](const QList<Internal::ShellModelItem> &items) {
for (const Internal::ShellModelItem &item : items) {
QAction *action = new QAction(item.icon, item.name, &m_shellMenu);
QAction *action = new QAction(item.openParameters.icon, item.name, &m_shellMenu);
connect(action, &QAction::triggered, action, [item, this]() {
openTerminal(item.openParameters);