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

Boot2Qt: Edit UI text

Browse Source 
- Replace "Boot2Qt" with "Boot to Qt"
- Add dots to ends of messages

Change-Id: I0c4a795199bf6dee41cc69c5eea34bf28246f0b6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Leena Miettinen
2024-06-25 10:39:56 +02:00
parent a9a611e21e
commit 9cc4c6a93e
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ void DeviceDetector::handleDeviceEvent(QdbDeviceTracker::DeviceEventType eventTy
DeviceManager * const dm = DeviceManager::instance(); DeviceManager * const dm = DeviceManager::instance();
if (eventType == QdbDeviceTracker::NewDevice) { if (eventType == QdbDeviceTracker::NewDevice) {
const QString name = Tr::tr("Qt Debug Bridge device %1").arg(serial); const QString name = Tr::tr("Boot to Qt device %1").arg(serial);
QdbDevice::Ptr device = QdbDevice::create(); QdbDevice::Ptr device = QdbDevice::create();
device->setupId(IDevice::AutoDetected, deviceId); device->setupId(IDevice::AutoDetected, deviceId);
device->settings()->displayName.setValue(name); device->settings()->displayName.setValue(name);

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

@@ -88,9 +88,9 @@ private:
} }
showMessage(errorString, true); showMessage(errorString, true);
if (!stdOut.isEmpty()) if (!stdOut.isEmpty())
showMessage(Tr::tr("stdout was: \"%1\"").arg(stdOut)); showMessage(Tr::tr("stdout was: \"%1\".").arg(stdOut));
if (!stdErr.isEmpty()) if (!stdErr.isEmpty())
showMessage(Tr::tr("stderr was: \"%1\"").arg(stdErr)); showMessage(Tr::tr("stderr was: \"%1\".").arg(stdErr));
} else { } else {
showMessage(Tr::tr("Commands on device \"%1\" finished successfully.") showMessage(Tr::tr("Commands on device \"%1\" finished successfully.")
.arg(m_deviceName)); .arg(m_deviceName));
@@ -107,7 +107,7 @@ private:
QdbDevice::QdbDevice() QdbDevice::QdbDevice()
{ {
setDisplayType(Tr::tr("Boot2Qt Device")); setDisplayType(Tr::tr("Boot to Qt Device"));
setType(Constants::QdbLinuxOsType); setType(Constants::QdbLinuxOsType);
addDeviceAction({Tr::tr("Reboot Device"), [](const IDevice::Ptr &device, QWidget *) { addDeviceAction({Tr::tr("Reboot Device"), [](const IDevice::Ptr &device, QWidget *) {
@@ -218,7 +218,7 @@ public:
QdbDeviceWizard(QWidget *parent) QdbDeviceWizard(QWidget *parent)
: QWizard(parent) : QWizard(parent)
{ {
setWindowTitle(Tr::tr("Boot2Qt Network Device Setup")); setWindowTitle(Tr::tr("Boot to Qt Network Device Setup"));
settingsPage.setCommitPage(true); settingsPage.setCommitPage(true);
enum { SettingsPageId }; enum { SettingsPageId };
@@ -253,7 +253,7 @@ public:
QdbLinuxDeviceFactory() QdbLinuxDeviceFactory()
: IDeviceFactory(Constants::QdbLinuxOsType) : IDeviceFactory(Constants::QdbLinuxOsType)
{ {
setDisplayName(Tr::tr("Boot2Qt Device")); setDisplayName(Tr::tr("Boot to Qt Device"));
setCombinedIcon(":/qdb/images/qdbdevicesmall.png", ":/qdb/images/qdbdevice.png"); setCombinedIcon(":/qdb/images/qdbdevicesmall.png", ":/qdb/images/qdbdevice.png");
setQuickCreationAllowed(true); setQuickCreationAllowed(true);
setConstructionFunction(&QdbDevice::create); setConstructionFunction(&QdbDevice::create);

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

@@ -106,7 +106,7 @@ public:
{ {
setConfigBaseId(Constants::QdbDeployConfigurationId); setConfigBaseId(Constants::QdbDeployConfigurationId);
addSupportedTargetDeviceType(Constants::QdbLinuxOsType); addSupportedTargetDeviceType(Constants::QdbLinuxOsType);
setDefaultDisplayName(Tr::tr("Deploy to Boot2Qt target")); setDefaultDisplayName(Tr::tr("Deploy to Boot to Qt target"));
setUseDeploymentDataView(); setUseDeploymentDataView();
addInitialStep(RemoteLinux::Constants::MakeInstallStepId, [](Target *target) { addInitialStep(RemoteLinux::Constants::MakeInstallStepId, [](Target *target) {

4
src/plugins/boot2qt/qdbrunconfiguration.cpp
View File

@@ -33,7 +33,7 @@ public:
QdbRunConfiguration(Target *target, Id id) QdbRunConfiguration(Target *target, Id id)
: RunConfiguration(target, id) : RunConfiguration(target, id)
{ {
setDefaultDisplayName(Tr::tr("Run on Boot2Qt Device")); setDefaultDisplayName(Tr::tr("Run on Boot to Qt Device"));
executable.setDeviceSelector(target, ExecutableAspect::RunDevice); executable.setDeviceSelector(target, ExecutableAspect::RunDevice);
executable.setSettingsKey("QdbRunConfig.RemoteExecutable"); executable.setSettingsKey("QdbRunConfig.RemoteExecutable");
@@ -87,7 +87,7 @@ private:
Tasks tasks; Tasks tasks;
if (executable().isEmpty()) { if (executable().isEmpty()) {
tasks << BuildSystemTask(Task::Warning, Tr::tr("The remote executable must be set " tasks << BuildSystemTask(Task::Warning, Tr::tr("The remote executable must be set "
"in order to run on a Boot2Qt device.")); "to run on a Boot to Qt device."));
} }
return tasks; return tasks;
} }

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

@@ -65,7 +65,7 @@ QString overridingEnvironmentVariable(QdbTool tool)
void showMessage(const QString &message, bool important) void showMessage(const QString &message, bool important)
{ {
const QString fullMessage = Tr::tr("Boot2Qt: %1").arg(message); const QString fullMessage = Tr::tr("Boot to Qt: %1").arg(message);
if (important) if (important)
Core::MessageManager::writeFlashing(fullMessage); Core::MessageManager::writeFlashing(fullMessage);
else else