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

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Change-Id: I04104ef638b28d99da11b9b7a22f31f8d0ddf460
This commit is contained in:
Eike Ziller
2023-10-24 13:05:55 +02:00
parent 03acf2810d 5e3d14e2e9
commit df80454d26
277 changed files with 2282 additions and 2346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@
#include <utils/utilsicons.h>
#include <QFileIconProvider>
#include <QGuiApplication>
#include <QMenu>
#include <QStandardPaths>
#include <QToolButton>
@@ -81,7 +82,9 @@ TerminalPane::TerminalPane(QObject *parent)
.toString(QKeySequence::NativeText);
if (settings().sendEscapeToTerminal()) {
m_escSettingButton->setText(escKey);
m_escSettingButton->setToolTip(Tr::tr("Sends Esc to terminal instead of Qt Creator."));
//: %1 is the application name (Qt Creator)
m_escSettingButton->setToolTip(Tr::tr("Sends Esc to terminal instead of %1.")
.arg(QGuiApplication::applicationDisplayName()));
} else {
m_escSettingButton->setText(shiftEsc);
m_escSettingButton->setToolTip(
@@ -106,10 +109,14 @@ TerminalPane::TerminalPane(QObject *parent)
if (settings().lockKeyboard()) {
m_lockKeyboardButton->setIcon(LOCK_KEYBOARD_ICON.icon());
m_lockKeyboardButton->setToolTip(
Tr::tr("Qt Creator shortcuts are blocked when focus is inside the terminal."));
//: %1 is the application name (Qt Creator)
Tr::tr("%1 shortcuts are blocked when focus is inside the terminal.")
.arg(QGuiApplication::applicationDisplayName()));
} else {
m_lockKeyboardButton->setIcon(UNLOCK_KEYBOARD_ICON.icon());
m_lockKeyboardButton->setToolTip(Tr::tr("Qt Creator shortcuts take precedence."));
//: %1 is the application name (Qt Creator)
m_lockKeyboardButton->setToolTip(Tr::tr("%1 shortcuts take precedence.")
.arg(QGuiApplication::applicationDisplayName()));
}
};

7
src/plugins/terminal/terminalsettings.cpp
View File

@@ -482,15 +482,14 @@ TerminalSettings::TerminalSettings()
sendEscapeToTerminal.setSettingsKey("SendEscapeToTerminal");
sendEscapeToTerminal.setLabelText(Tr::tr("Send escape key to terminal"));
sendEscapeToTerminal.setToolTip(
Tr::tr("Sends the escape key to the terminal when pressed"
"instead of closing the terminal."));
sendEscapeToTerminal.setToolTip(Tr::tr("Sends the escape key to the terminal when pressed "
"instead of closing the terminal."));
sendEscapeToTerminal.setDefaultValue(false);
lockKeyboard.setSettingsKey("LockKeyboard");
lockKeyboard.setLabelText(Tr::tr("Block shortcuts in terminal"));
lockKeyboard.setToolTip(
Tr::tr("Keeps Qt Creator short cuts from interfering with the terminal."));
Tr::tr("Keeps Qt Creator shortcuts from interfering with the terminal."));
lockKeyboard.setDefaultValue(true);
audibleBell.setSettingsKey("AudibleBell");

4
src/plugins/terminal/terminalwidget.cpp
View File

@@ -85,7 +85,7 @@ void TerminalWidget::setupPty()
CommandLine{settings().shell(), settings().shellArguments(), CommandLine::Raw});
if (shellCommand.executable().isRootPath()) {
writeToTerminal(Tr::tr("Connecting ...\r\n").toUtf8(), true);
writeToTerminal((Tr::tr("Connecting...") + "\r\n").toUtf8(), true);
// We still have to find the shell to start ...
m_findShellWatcher.reset(new QFutureWatcher<expected_str<FilePath>>());
connect(m_findShellWatcher.get(), &QFutureWatcher<FilePath>::finished, this, [this] {
@@ -107,7 +107,7 @@ void TerminalWidget::setupPty()
shellCommand.executable());
if (result && !result->isExecutableFile())
return make_unexpected(
Tr::tr("'%1' is not executable.").arg(result->toUserOutput()));
Tr::tr("\"%1\" is not executable.").arg(result->toUserOutput()));
return result;
}));