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

Boot2Qt: Fix UI text

Browse Source 
Change-Id: Ibc25722d16691ffb35cedaadba9c7049975d5836
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
This commit is contained in:
Leena Miettinen
2019-10-28 16:05:17 +01:00
parent 63d03afb95
commit 3db95cd694
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/boot2qt/device-detection/qdbmessagetracker.cpp
View File

@@ -80,7 +80,7 @@ void QdbMessageTracker::handleWatchMessage(const QJsonDocument &document)
}
m_messageCache.append(message);
showMessage(tr("Qdb message: %1").arg(message), true);
showMessage(tr("QDB message: %1").arg(message), true);
}
}

6
src/plugins/boot2qt/device-detection/qdbwatcher.cpp
View File

@@ -109,7 +109,7 @@ void QdbWatcher::handleWatchError(QLocalSocket::LocalSocketError error)
if (m_retried) {
stop();
emit watcherError(tr("Could not connect to QDB host server even after trying to start it"));
emit watcherError(tr("Could not connect to QDB host server even after trying to start it."));
return;
}
retry();
@@ -142,7 +142,7 @@ void QdbWatcher::forkHostServer()
return;
}
if (QProcess::startDetached(qdbFilePath.toString(), {"server"}))
showMessage(tr("QDB host server started"), false);
showMessage(tr("QDB host server started."), false);
else
showMessage(tr("Could not start QDB host server in %1").arg(qdbFilePath.toString()), true);
}
@@ -153,7 +153,7 @@ void QdbWatcher::retry()
{
QMutexLocker lock(&s_startMutex);
if (!s_startedServer) {
showMessage(tr("Starting QDB host server"), false);
showMessage(tr("Starting QDB host server."), false);
forkHostServer();
s_startedServer = true;
}

12
src/plugins/boot2qt/qdbdevice.cpp
View File

@@ -93,7 +93,7 @@ public:
Runnable r;
r.setCommandLine(command);
m_appRunner.start(r, device);
showMessage(QdbDevice::tr("Starting command '%1' on device '%2'.")
showMessage(QdbDevice::tr("Starting command \"%1\" on device \"%2\".")
.arg(command.toUserOutput(), m_deviceName));
}
@@ -112,18 +112,18 @@ private:
if (!success) {
QString errorString;
if (!m_error.isEmpty()) {
errorString = QdbDevice::tr("Command failed on device '%1': %2")
errorString = QdbDevice::tr("Command failed on device \"%1\": %2")
.arg(m_deviceName, m_error);
} else {
errorString = QdbDevice::tr("Command failed on device '%1'.").arg(m_deviceName);
errorString = QdbDevice::tr("Command failed on device \"%1\".").arg(m_deviceName);
}
showMessage(errorString, true);
if (!m_stdout.isEmpty())
showMessage(QdbDevice::tr("stdout was: '%1'").arg(m_stdout));
showMessage(QdbDevice::tr("stdout was: \"%1\"").arg(m_stdout));
if (!m_stderr.isEmpty())
showMessage(QdbDevice::tr("stderr was: '%1'").arg(m_stderr));
showMessage(QdbDevice::tr("stderr was: \"%1\"").arg(m_stderr));
} else {
showMessage(QdbDevice::tr("Commands on device '%1' finished successfully.")
showMessage(QdbDevice::tr("Commands on device \"%1\" finished successfully.")
.arg(m_deviceName));
}
deleteLater();

2
src/plugins/boot2qt/qdbmakedefaultappservice.cpp
View File

@@ -77,7 +77,7 @@ void QdbMakeDefaultAppService::handleProcessFinished(const QString &error)
QByteArray processOutput = d->processRunner->readAllStandardOutput();
if (d->makeDefault)
emit progressMessage(tr("Application made as the default one."));
emit progressMessage(tr("Application set as the default one."));
else
emit progressMessage(tr("Reset the default application."));