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

Utils: Use more FilePath in TerminalCommand

Browse Source 
Change-Id: Ide9a09f61f3b2c10378d90a4a907e1e37d7407df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2023-02-07 17:19:01 +01:00
parent 49561eaeb8
commit 85bed557f3
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/systemsettings.cpp
View File

@@ -197,7 +197,7 @@ public:
const QVector<TerminalCommand> availableTerminals
= TerminalCommand::availableTerminalEmulators();
for (const TerminalCommand &term : availableTerminals)
m_terminalComboBox->addItem(term.command, QVariant::fromValue(term));
m_terminalComboBox->addItem(term.command.toUserOutput(), QVariant::fromValue(term));
updateTerminalUi(TerminalCommand::terminalEmulator());
connect(m_terminalComboBox, &QComboBox::currentIndexChanged, this, [this](int index) {
updateTerminalUi(m_terminalComboBox->itemData(index).value<TerminalCommand>());
@@ -373,9 +373,11 @@ void SystemSettingsWidget::apply()
QtcSettings *settings = ICore::settings();
EditorManager::setReloadSetting(IDocument::ReloadSetting(m_reloadBehavior->currentIndex()));
if (HostOsInfo::isAnyUnixHost()) {
TerminalCommand::setTerminalEmulator({m_terminalComboBox->lineEdit()->text(),
m_terminalOpenArgs->text(),
m_terminalExecuteArgs->text()});
TerminalCommand::setTerminalEmulator({
FilePath::fromUserInput(m_terminalComboBox->lineEdit()->text()),
m_terminalOpenArgs->text(),
m_terminalExecuteArgs->text()
});
if (!HostOsInfo::isMacHost()) {
UnixUtils::setFileBrowser(settings, m_externalFileBrowserEdit->text());
}
@@ -423,7 +425,7 @@ void SystemSettingsWidget::resetTerminal()
void SystemSettingsWidget::updateTerminalUi(const TerminalCommand &term)
{
m_terminalComboBox->lineEdit()->setText(term.command);
m_terminalComboBox->lineEdit()->setText(term.command.toUserOutput());
m_terminalOpenArgs->setText(term.openArgs);
m_terminalExecuteArgs->setText(term.executeArgs);
}