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

Docker: Fix UI text

Browse Source 
- Write Docker with an initial capital letter
- Rewrite a tooltip to add reasons for adding a flag first, and
  then the flag.

Change-Id: I8b4f3775ad618999faddec90b62ba7bb11ac23ae
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Leena Miettinen
2023-06-19 11:08:32 +02:00
parent 7da84e1734
commit 942f30d461
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -749,7 +749,7 @@ bool DockerDevicePrivate::startContainer()
DockerApi::recheckDockerDaemon(); DockerApi::recheckDockerDaemon();
MessageManager::writeFlashing(Tr::tr("Docker daemon appears to be not running. " MessageManager::writeFlashing(Tr::tr("Docker daemon appears to be not running. "
"Verify daemon is up and running and reset the " "Verify daemon is up and running and reset the "
"docker daemon on the docker device settings page " "Docker daemon in Docker device preferences "
"or restart Qt Creator.")); "or restart Qt Creator."));
}); });

10
src/plugins/docker/dockerdevicewidget.cpp
View File

@@ -80,9 +80,9 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
}); });
m_enableLldbFlags = new QCheckBox(Tr::tr("Enable flags needed for LLDB")); m_enableLldbFlags = new QCheckBox(Tr::tr("Enable flags needed for LLDB"));
m_enableLldbFlags->setToolTip(Tr::tr("Adds the following flags to the container: " m_enableLldbFlags->setToolTip(Tr::tr("Adds the following flags to the container "
"--cap-add=SYS_PTRACE --security-opt seccomp=unconfined, " "to allow LLDB to run: "
"this is necessary to allow lldb to run")); "--cap-add=SYS_PTRACE --security-opt seccomp=unconfined"));
m_enableLldbFlags->setChecked(m_data.enableLldbFlags); m_enableLldbFlags->setChecked(m_data.enableLldbFlags);
m_enableLldbFlags->setEnabled(true); m_enableLldbFlags->setEnabled(true);
@@ -159,7 +159,7 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
searchDirsLineEdit->setPlaceholderText(Tr::tr("Semicolon-separated list of directories")); searchDirsLineEdit->setPlaceholderText(Tr::tr("Semicolon-separated list of directories"));
searchDirsLineEdit->setToolTip( searchDirsLineEdit->setToolTip(
Tr::tr("Select the paths in the docker image that should be scanned for kit entries.")); Tr::tr("Select the paths in the Docker image that should be scanned for kit entries."));
searchDirsLineEdit->setHistoryCompleter("DockerMounts", true); searchDirsLineEdit->setHistoryCompleter("DockerMounts", true);
auto searchPaths = [searchDirsComboBox, searchDirsLineEdit, dockerDevice] { auto searchPaths = [searchDirsComboBox, searchDirsLineEdit, dockerDevice] {
@@ -195,7 +195,7 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
m_kitItemDetector.autoDetect(dockerDevice->id().toString(), searchPaths()); m_kitItemDetector.autoDetect(dockerDevice->id().toString(), searchPaths());
if (DockerApi::instance()->dockerDaemonAvailable().value_or(false) == false) if (DockerApi::instance()->dockerDaemonAvailable().value_or(false) == false)
logView->append(Tr::tr("Docker daemon appears to be not running.")); logView->append(Tr::tr("Docker daemon appears to be stopped."));
else else
logView->append(Tr::tr("Docker daemon appears to be running.")); logView->append(Tr::tr("Docker daemon appears to be running."));