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

Docker: Fix UI text

Browse Source 
Task-number: QTCREATORBUG-25915
Change-Id: I8f0b368f77af39a586963765a63e1618a0ee9bd6
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Leena Miettinen
2021-07-02 14:56:41 +02:00
parent 32f67f6c83
commit 67ac04bdce
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/docker/dockerbuildstep.cpp
View File

@@ -56,7 +56,7 @@ public:
m_dockerCommand = addAspect<StringAspect>(); m_dockerCommand = addAspect<StringAspect>();
m_dockerCommand->setDisplayStyle(StringAspect::DisplayStyle::TextEditDisplay); m_dockerCommand->setDisplayStyle(StringAspect::DisplayStyle::TextEditDisplay);
m_dockerCommand->setLabelText(tr("Docker Command:")); m_dockerCommand->setLabelText(tr("Docker command:"));
m_dockerCommand->setMacroExpanderProvider([=] { return macroExpander(); }); m_dockerCommand->setMacroExpanderProvider([=] { return macroExpander(); });
m_dockerCommand->setDefaultValue(QLatin1String(DEFAULT_DOCKER_COMMAND)); m_dockerCommand->setDefaultValue(QLatin1String(DEFAULT_DOCKER_COMMAND));
m_dockerCommand->setPlaceHolderText(QLatin1String(DEFAULT_DOCKER_COMMAND)); m_dockerCommand->setPlaceHolderText(QLatin1String(DEFAULT_DOCKER_COMMAND));
@@ -72,7 +72,7 @@ public:
}; };
setupField(m_command, tr("Command:"), "Command"); setupField(m_command, tr("Command:"), "Command");
setupField(m_arguments, tr("Arguments:"), "Arguments"); setupField(m_arguments, tr("Arguments:"), "Arguments");
setupField(m_workingDirectory, tr("Working Directory:"), "WorkingDirectory"); setupField(m_workingDirectory, tr("Working directory:"), "WorkingDirectory");
setCommandLineProvider([=] { return commandLine(); }); setCommandLineProvider([=] { return commandLine(); });
setWorkingDirectoryProvider([=] { setWorkingDirectoryProvider([=] {

14
src/plugins/docker/dockerdevice.cpp
View File

@@ -288,7 +288,7 @@ public:
auto dockerDevice = device.dynamicCast<DockerDevice>(); auto dockerDevice = device.dynamicCast<DockerDevice>();
QTC_ASSERT(dockerDevice, return); QTC_ASSERT(dockerDevice, return);
auto idLabel = new QLabel(tr("Image Id:")); auto idLabel = new QLabel(tr("Image ID:"));
m_idLineEdit = new QLineEdit; m_idLineEdit = new QLineEdit;
m_idLineEdit->setText(dockerDevice->data().imageId); m_idLineEdit->setText(dockerDevice->data().imageId);
m_idLineEdit->setEnabled(false); m_idLineEdit->setEnabled(false);
@@ -299,8 +299,8 @@ public:
m_repoLineEdit->setEnabled(false); m_repoLineEdit->setEnabled(false);
m_runAsOutsideUser = new QCheckBox(tr("Run as outside user")); m_runAsOutsideUser = new QCheckBox(tr("Run as outside user"));
m_runAsOutsideUser->setToolTip(tr("Use user id and group id of the user running Qt Creator " m_runAsOutsideUser->setToolTip(tr("Use user ID and group ID of the user running Qt Creator "
"in the docker container.")); "in the Docker container."));
m_runAsOutsideUser->setChecked(dockerDevice->data().useLocalUidGid); m_runAsOutsideUser->setChecked(dockerDevice->data().useLocalUidGid);
m_runAsOutsideUser->setEnabled(HostOsInfo::isLinuxHost()); m_runAsOutsideUser->setEnabled(HostOsInfo::isLinuxHost());
@@ -311,7 +311,7 @@ public:
m_pathsLineEdit = new QLineEdit; m_pathsLineEdit = new QLineEdit;
m_pathsLineEdit->setText(dockerDevice->data().repo); m_pathsLineEdit->setText(dockerDevice->data().repo);
m_pathsLineEdit->setToolTip(tr("Paths in this semi-colon separated list will be " m_pathsLineEdit->setToolTip(tr("Paths in this semi-colon separated list will be "
"mapped one-to-one into the docker container.")); "mapped one-to-one into the Docker container."));
m_pathsLineEdit->setText(dockerDevice->data().mounts.join(';')); m_pathsLineEdit->setText(dockerDevice->data().mounts.join(';'));
connect(m_pathsLineEdit, &QLineEdit::textChanged, this, [dockerDevice](const QString &text) { connect(m_pathsLineEdit, &QLineEdit::textChanged, this, [dockerDevice](const QString &text) {
@@ -343,7 +343,7 @@ public:
Column { Column {
Space(20), Space(20),
Row { autoDetectButton, undoAutoDetectButton, Stretch() }, Row { autoDetectButton, undoAutoDetectButton, Stretch() },
new QLabel(tr("Detection Log:")), new QLabel(tr("Detection log:")),
logView logView
} }
}.attachTo(this); }.attachTo(this);
@@ -492,7 +492,7 @@ QList<ToolChain *> DockerDevicePrivate::autoDetectToolChains(QTextBrowser *log)
const QList<ToolChain *> newToolChains = factory->autoDetect(toolChains, q->sharedFromThis()); const QList<ToolChain *> newToolChains = factory->autoDetect(toolChains, q->sharedFromThis());
log->append(tr("Searching tool chains of type %1").arg(factory->displayName())); log->append(tr("Searching tool chains of type %1").arg(factory->displayName()));
for (ToolChain *toolChain : newToolChains) { for (ToolChain *toolChain : newToolChains) {
log->append(tr("Found ToolChain: %1").arg(toolChain->compilerCommand().toUserOutput())); log->append(tr("Found tool chain: %1").arg(toolChain->compilerCommand().toUserOutput()));
ToolChainManager::registerToolChain(toolChain); ToolChainManager::registerToolChain(toolChain);
toolChains.append(toolChain); toolChains.append(toolChain);
} }
@@ -577,7 +577,7 @@ void DockerDevicePrivate::autoDetect(QTextBrowser *log)
Kit *kit = KitManager::registerKit(initializeKit); Kit *kit = KitManager::registerKit(initializeKit);
if (log) if (log)
log->append('\n' + tr("Registered Kit %1").arg(kit->displayName())); log->append('\n' + tr("Registered kit %1").arg(kit->displayName()));
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
} }

2
src/plugins/docker/dockersettings.cpp
View File

@@ -119,7 +119,7 @@ DockerOptionsPage::DockerOptionsPage(DockerSettings *settings)
Column { Column {
Group { Group {
Title(DockerSettings::tr("Search images on Docker Hub")), Title(DockerSettings::tr("Search Images on Docker Hub")),
Form { Form {
s.imageListFilter, s.imageListFilter,
s.imageList s.imageList