From 942f30d46165596cf395e2a0d7ee51be00c6f7f1 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 19 Jun 2023 11:08:32 +0200 Subject: [PATCH] Docker: Fix UI text - 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 Reviewed-by: --- src/plugins/docker/dockerdevice.cpp | 2 +- src/plugins/docker/dockerdevicewidget.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 2dd2a589f72..b4cd5d3ca53 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -749,7 +749,7 @@ bool DockerDevicePrivate::startContainer() DockerApi::recheckDockerDaemon(); MessageManager::writeFlashing(Tr::tr("Docker daemon appears to be not running. " "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.")); }); diff --git a/src/plugins/docker/dockerdevicewidget.cpp b/src/plugins/docker/dockerdevicewidget.cpp index cd32fead6fb..259325274c0 100644 --- a/src/plugins/docker/dockerdevicewidget.cpp +++ b/src/plugins/docker/dockerdevicewidget.cpp @@ -80,9 +80,9 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device) }); m_enableLldbFlags = new QCheckBox(Tr::tr("Enable flags needed for LLDB")); - m_enableLldbFlags->setToolTip(Tr::tr("Adds the following flags to the container: " - "--cap-add=SYS_PTRACE --security-opt seccomp=unconfined, " - "this is necessary to allow lldb to run")); + m_enableLldbFlags->setToolTip(Tr::tr("Adds the following flags to the container " + "to allow LLDB to run: " + "--cap-add=SYS_PTRACE --security-opt seccomp=unconfined")); m_enableLldbFlags->setChecked(m_data.enableLldbFlags); m_enableLldbFlags->setEnabled(true); @@ -159,7 +159,7 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device) searchDirsLineEdit->setPlaceholderText(Tr::tr("Semicolon-separated list of directories")); 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); auto searchPaths = [searchDirsComboBox, searchDirsLineEdit, dockerDevice] { @@ -195,7 +195,7 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device) m_kitItemDetector.autoDetect(dockerDevice->id().toString(), searchPaths()); 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 logView->append(Tr::tr("Docker daemon appears to be running."));