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-26458
Change-Id: I6dcdbf199259259416e4bfb11c3488f8594b0c0b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Leena Miettinen
2021-10-25 16:56:22 +02:00
parent 354c6405c3
commit 6739266a8e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,7 +356,7 @@ public:
DockerDeviceData &data = dockerDevice->data(); DockerDeviceData &data = dockerDevice->data();
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(data.imageId); m_idLineEdit->setText(data.imageId);
m_idLineEdit->setEnabled(false); m_idLineEdit->setEnabled(false);
@@ -368,8 +368,8 @@ public:
auto daemonStateLabel = new QLabel(tr("Daemon state:")); auto daemonStateLabel = new QLabel(tr("Daemon state:"));
m_daemonReset = new QToolButton; m_daemonReset = new QToolButton;
m_daemonReset->setToolTip(tr("Clear detected daemon state. " m_daemonReset->setToolTip(tr("Clears detected daemon state. "
"It will be automatically re-evaluated next time an access is needed.")); "It will be automatically re-evaluated next time access is needed."));
m_daemonState = new QLabel; m_daemonState = new QLabel;
updateDaemonStateTexts(); updateDaemonStateTexts();
@@ -380,7 +380,7 @@ public:
}); });
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("Uses user ID and group ID of the user running Qt Creator "
"in the Docker container.")); "in the Docker container."));
m_runAsOutsideUser->setChecked(data.useLocalUidGid); m_runAsOutsideUser->setChecked(data.useLocalUidGid);
m_runAsOutsideUser->setEnabled(HostOsInfo::isLinuxHost()); m_runAsOutsideUser->setEnabled(HostOsInfo::isLinuxHost());
@@ -390,7 +390,7 @@ public:
}); });
m_usePathMapping = new QCheckBox(tr("Use local file path mapping")); m_usePathMapping = new QCheckBox(tr("Use local file path mapping"));
m_usePathMapping->setToolTip(tr("Map docker filesystem to a local directory.")); m_usePathMapping->setToolTip(tr("Maps docker filesystem to a local directory."));
m_usePathMapping->setChecked(data.useFilePathMapping); m_usePathMapping->setChecked(data.useFilePathMapping);
m_usePathMapping->setEnabled(HostOsInfo::isLinuxHost()); m_usePathMapping->setEnabled(HostOsInfo::isLinuxHost());
connect(m_usePathMapping, &QCheckBox::toggled, this, [&, dockerDevice](bool on) { connect(m_usePathMapping, &QCheckBox::toggled, this, [&, dockerDevice](bool on) {
@@ -399,7 +399,7 @@ public:
}); });
m_pathsListEdit = new PathListEditor; m_pathsListEdit = new PathListEditor;
m_pathsListEdit->setToolTip(tr("Paths in this list will be mapped one-to-one into the " m_pathsListEdit->setToolTip(tr("Maps paths in this list one-to-one to the "
"Docker container.")); "Docker container."));
m_pathsListEdit->setPathList(data.mounts); m_pathsListEdit->setPathList(data.mounts);
@@ -931,8 +931,8 @@ void DockerDevicePrivate::tryCreateLocalFileAccess()
MessageManager::writeFlashing( MessageManager::writeFlashing(
tr("Local read access to Docker container %1 unavailable through directory \"%2\".") tr("Local read access to Docker container %1 unavailable through directory \"%2\".")
.arg(m_container, m_mergedDir) .arg(m_container, m_mergedDir)
+ '\n' + tr("Output: '%1'").arg(out) + '\n' + tr("Output: \"%1\"").arg(out)
+ '\n' + tr("Error: '%1'").arg(proc.stdErr())); + '\n' + tr("Error: \"%1\"").arg(proc.stdErr()));
if (HostOsInfo::isWindowsHost()) { if (HostOsInfo::isWindowsHost()) {
// Disabling merged layer access. This is not supported and anything // Disabling merged layer access. This is not supported and anything
// related to accessing merged layers on Windows fails due to the need // related to accessing merged layers on Windows fails due to the need