summaryrefslogtreecommitdiffstats
path: root/src/b2qt-flashing-wizard
diff options
context:
space:
mode:
authorRainer Keller <rainer.keller@theqtcompany.com>2014-11-19 13:53:11 +0100
committerRainer Keller <rainer.keller@theqtcompany.com>2014-11-19 16:24:43 +0200
commit0c321e850d9442c384768e06a740d15882841968 (patch)
treea634974f832fc0bb5f1bcffdc8a0256b12ad56f7 /src/b2qt-flashing-wizard
parente395cbeece280cf11733a68f28234089e8da288e (diff)
b2qt-flashing-wizard: Fix strings
Change-Id: Id56e2c3f9cb77b65ea2aa9d3c968b180142b8ff1 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/b2qt-flashing-wizard')
-rw-r--r--src/b2qt-flashing-wizard/commit_page.cpp10
-rw-r--r--src/b2qt-flashing-wizard/device_page.cpp4
-rw-r--r--src/b2qt-flashing-wizard/disk_page.cpp25
-rw-r--r--src/b2qt-flashing-wizard/finish_page.cpp4
-rw-r--r--src/b2qt-flashing-wizard/introduction_page.cpp4
-rw-r--r--src/b2qt-flashing-wizard/mainwindow.cpp3
-rw-r--r--src/b2qt-flashing-wizard/platform_page.cpp11
-rw-r--r--src/b2qt-flashing-wizard/progress_page.cpp12
-rw-r--r--src/b2qt-flashing-wizard/scriptwriter.cpp14
9 files changed, 46 insertions, 41 deletions
diff --git a/src/b2qt-flashing-wizard/commit_page.cpp b/src/b2qt-flashing-wizard/commit_page.cpp
index e7a3c16..527c1db 100644
--- a/src/b2qt-flashing-wizard/commit_page.cpp
+++ b/src/b2qt-flashing-wizard/commit_page.cpp
@@ -42,10 +42,10 @@ CommitPage::CommitPage(QWidget *parent)
, mLayout(new QVBoxLayout(this))
, mComplete(false)
{
- setButtonText(QWizard::CommitButton, "Write");
+ setButtonText(QWizard::CommitButton, tr("Write"));
setCommitPage(true);
- setTitle("Confirm action");
- setSubTitle("Confirm the action to be done");
+ setTitle(tr("Confirm Action"));
+ setSubTitle(tr("Confirm the action to continue."));
mLayout->addWidget(mText);
mLayout->addSpacerItem(new QSpacerItem(40,40,QSizePolicy::Minimum, QSizePolicy::Expanding));
mLayout->addWidget(mError);
@@ -75,7 +75,7 @@ void CommitPage::initializePage()
{
qDebug() << "platform:" << G_platform << "version:" << G_version << "os:" << G_os
<< "device:" << G_device << "board:" << G_board << "mode:" << G_mode;
- QString text("Write %1-%2 (%3) to device %4.");
+ QString text(tr("Write %1-%2 (%3) to device %4."));
mText->setText(text.arg(G_platform, G_os, G_version, G_device));
mComplete = true;
@@ -142,7 +142,7 @@ void CommitPage::initializePage()
i->setEnvironment("VERBOSE","1");
mActor = i;
} else {
- mError->setText("Unsupported platform combination");
+ mError->setText(tr("Unsupported platform combination"));
mComplete = false;
}
}
diff --git a/src/b2qt-flashing-wizard/device_page.cpp b/src/b2qt-flashing-wizard/device_page.cpp
index 313ccce..37358bb 100644
--- a/src/b2qt-flashing-wizard/device_page.cpp
+++ b/src/b2qt-flashing-wizard/device_page.cpp
@@ -42,8 +42,8 @@ DevicePage::DevicePage(QWidget *parent)
, mError(createErrorLabel(this))
, mLayout(new QVBoxLayout(this))
{
- setTitle("Device selection");
- setSubTitle("Select a device to be used");
+ setTitle(tr("Device"));
+ setSubTitle(tr("Select a device to be used"));
mLayout->addWidget(mListWidget);
mLayout->addSpacerItem(new QSpacerItem(40,40,QSizePolicy::Minimum, QSizePolicy::Expanding));
mLayout->addWidget(mError);
diff --git a/src/b2qt-flashing-wizard/disk_page.cpp b/src/b2qt-flashing-wizard/disk_page.cpp
index c96e347..4435d33 100644
--- a/src/b2qt-flashing-wizard/disk_page.cpp
+++ b/src/b2qt-flashing-wizard/disk_page.cpp
@@ -40,8 +40,8 @@ DiskPage::DiskPage(QWidget *parent)
, mError(createErrorLabel(this))
, mLayout(new QVBoxLayout(this))
{
- setTitle("Disk selection");
- setSubTitle("Select a disk to be used");
+ setTitle(tr("Disk"));
+ setSubTitle(tr("Select a disk to be used"));
mLayout->addWidget(mListWidget);
mLayout->addSpacerItem(new QSpacerItem(40,40,QSizePolicy::Minimum, QSizePolicy::Expanding));
mLayout->addWidget(mError);
@@ -161,21 +161,24 @@ void DiskPage::updateDeviceList()
if (!currentDevices.contains(di.path))
continue;
- QString text = "<h3>%1</h3><table style=\"margin-left:10px\"><tr><td>Size</td><td style=\"padding-left:10\">%2</td></tr><tr><td>Removable</td><td style=\"padding-left:10\">%3</td><tr><td>Mounted</td><td style=\"padding-left:10\">%4</td></tr></table>";
+ QString text = tr("<h3>%1</h3><table style=\"margin-left:10px\"><tr><td>Size</td>"
+ "<td style=\"padding-left:10\">%2</td></tr><tr><td>Removable</td>"
+ "<td style=\"padding-left:10\">%3</td><tr><td>Mounted</td>"
+ "<td style=\"padding-left:10\">%4</td></tr></table>");
double size = di.logicalBlockSize * di.blocks;
QString sizeText;
if (size < 1000) {
- sizeText = QString::number(size) + QLatin1String(" B");
+ sizeText = QString::number(size) + tr(" B");
} else if (size < 1000000) {
- sizeText = QString::number(size / 1000) + QLatin1String(" KB");
+ sizeText = QString::number(size / 1000) + tr(" KB");
} else if (size < 1000000000) {
- sizeText = QString::number(size / 1000000) + QLatin1String(" MB");
+ sizeText = QString::number(size / 1000000) + tr(" MB");
} else {
- sizeText = QString::number(qRound(size / 1000 / 1000 / 1000)) + QLatin1String(" GB");
+ sizeText = QString::number(qRound(size / 1000 / 1000 / 1000)) + tr(" GB");
}
- text = text.arg(di.name, sizeText, di.removable?QLatin1String("yes"):QLatin1String("no"), di.mountPoint.isEmpty()?"no":di.mountPoint);
+ text = text.arg(di.name, sizeText, di.removable?tr("yes"):tr("no"), di.mountPoint.isEmpty()?tr("no"):di.mountPoint);
mDiskInfo[di.path] = di;
if (mListItems.contains(di.path)) {
@@ -197,7 +200,7 @@ void DiskPage::updateDeviceList()
}
if (mListWidget->count() == 0)
- mError->setText("No suitable disk device found. Insert device now.");
+ mError->setText(tr("No suitable disk device found. Connect a device."));
else
mError->setText("");
@@ -223,7 +226,7 @@ bool DiskPage::validatePage()
if (!di.mountPoint.isEmpty()) {
// Ask the user before unmount
- if (QMessageBox::Ok != QMessageBox::warning(this, "Unmount action", "The disk you selected is mounted at " + di.mountPoint + ". It will be unmounted now.", QMessageBox::Ok | QMessageBox::Cancel))
+ if (QMessageBox::Ok != QMessageBox::warning(this, tr("Unmount action"), tr("The disk you selected is mounted at '%1'. It will be unmounted now.").arg(di.mountPoint), QMessageBox::Ok | QMessageBox::Cancel))
return false;
QStringList args = elevate();
@@ -231,7 +234,7 @@ bool DiskPage::validatePage()
int rc = QProcess::execute(args.takeFirst(), args);
if (rc != 0) {
- QMessageBox::critical(this, "Unmount failed", "Could not umount the disk.");
+ QMessageBox::critical(this, tr("Unmount failed"), tr("Could not umount the disk."));
return false;
}
}
diff --git a/src/b2qt-flashing-wizard/finish_page.cpp b/src/b2qt-flashing-wizard/finish_page.cpp
index 854f21b..aa5932a 100644
--- a/src/b2qt-flashing-wizard/finish_page.cpp
+++ b/src/b2qt-flashing-wizard/finish_page.cpp
@@ -24,8 +24,8 @@ FinishPage::FinishPage(QWidget *parent)
: QWizardPage(parent)
{
setCommitPage(true);
- setTitle("Finish");
- new QLabel("Setting up a Boot to Qt device completed.", this);
+ setTitle(tr("Finish"));
+ new QLabel(tr("The Qt device setup is complete."), this);
}
FinishPage::~FinishPage()
diff --git a/src/b2qt-flashing-wizard/introduction_page.cpp b/src/b2qt-flashing-wizard/introduction_page.cpp
index 1417fe7..56ae6a1 100644
--- a/src/b2qt-flashing-wizard/introduction_page.cpp
+++ b/src/b2qt-flashing-wizard/introduction_page.cpp
@@ -23,9 +23,9 @@
IntroductionPage::IntroductionPage(QWidget *parent)
: QWizardPage(parent)
{
- setTitle("Introduction");
+ setTitle(tr("Boot to Qt Flashing Wizard"));
// setSubTitle(" ");
- new QLabel("This wizard helps you setting up a Boot to Qt device", this);
+ new QLabel(tr("The wizard helps you set up your device"), this);
}
IntroductionPage::~IntroductionPage()
diff --git a/src/b2qt-flashing-wizard/mainwindow.cpp b/src/b2qt-flashing-wizard/mainwindow.cpp
index 000a710..17114c1 100644
--- a/src/b2qt-flashing-wizard/mainwindow.cpp
+++ b/src/b2qt-flashing-wizard/mainwindow.cpp
@@ -40,7 +40,8 @@ QString G_mode; // adb or fastboot
MainWindow::MainWindow()
: QWizard()
{
- setPixmap(QWizard::LogoPixmap, QPixmap(":logo.png"));
+ setWindowTitle(tr("Boot to Qt Flashing Wizard"));
+ setPixmap(QWizard::LogoPixmap, QPixmap(":logo.png").scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
setPixmap(QWizard::BackgroundPixmap, QPixmap(":background.png"));
setPixmap(QWizard::WatermarkPixmap, QPixmap(":watermark.png"));
G_SDKDIR = qgetenv("SDKDIR");
diff --git a/src/b2qt-flashing-wizard/platform_page.cpp b/src/b2qt-flashing-wizard/platform_page.cpp
index 3adf9b9..6a0ea11 100644
--- a/src/b2qt-flashing-wizard/platform_page.cpp
+++ b/src/b2qt-flashing-wizard/platform_page.cpp
@@ -55,8 +55,8 @@ PlatformPage::PlatformPage(QWidget *parent)
, mError(createErrorLabel(this))
, mLayout(new QVBoxLayout(this))
{
- setTitle("Platform");
- setSubTitle("Select a platform to create a disk for");
+ setTitle(tr("Platform"));
+ setSubTitle(tr("Select a platform to create a disk for"));
mLayout->addSpacerItem(new QSpacerItem(40,40,QSizePolicy::Minimum, QSizePolicy::Expanding));
mLayout->addWidget(mError);
setLayout(mLayout);
@@ -73,11 +73,11 @@ bool PlatformPage::isComplete() const
return false;
if (data[0] == "nexus7") {
- mError->setText("The selected platform is currently not supported.");
+ mError->setText(tr("The selected platform is not supported."));
return false;
}
if (data[0] == "iMX6" && data[1] == "eAndroid") {
- mError->setText("The selected platform is currently not supported.");
+ mError->setText(tr("The selected platform is not supported."));
return false;
}
@@ -140,7 +140,8 @@ void PlatformPage::initializePage()
}
}
if (mButtons.isEmpty()) {
- mError->setText("No suitable platform found.\nMake sure you have installed at least one hardware platform.");
+ mError->setText(tr("No suitable platform found in '%1'.\nMake sure you have"
+ "installed at least one hardware platform.").arg(G_SDKDIR));
}
}
diff --git a/src/b2qt-flashing-wizard/progress_page.cpp b/src/b2qt-flashing-wizard/progress_page.cpp
index 85192cd..988ba03 100644
--- a/src/b2qt-flashing-wizard/progress_page.cpp
+++ b/src/b2qt-flashing-wizard/progress_page.cpp
@@ -37,16 +37,16 @@ ProgressPage::ProgressPage(QWidget *parent)
, mToggleDetailsButton(new QPushButton(this))
, mCopyToClipboardButton(new QPushButton(this))
{
- setTitle("Disk creation");
- setSubTitle("Progress of writing the disk");
+ setTitle(tr("Disk Creation"));
+ setSubTitle(tr("Progress of writing to the disk"));
setLayout(new QVBoxLayout(this));
mProgress->setWordWrap(true);
mProgress->setText(tr("Starting"));
layout()->addWidget(mProgress);
- mToggleDetailsButton->setText("Show details");
+ mToggleDetailsButton->setText(tr("Show details"));
layout()->addWidget(mToggleDetailsButton);
layout()->addWidget(mTextEdit);
- mCopyToClipboardButton->setText("Copy to clipboard");
+ mCopyToClipboardButton->setText(tr("Copy to clipboard"));
layout()->addWidget(mCopyToClipboardButton);
mTextEdit->hide();
@@ -111,11 +111,11 @@ void ProgressPage::toggleDetails()
if (mTextEdit->isHidden()) {
mTextEdit->show();
mCopyToClipboardButton->show();
- mToggleDetailsButton->setText("Hide details");
+ mToggleDetailsButton->setText(tr("Hide details"));
} else {
mTextEdit->hide();
mCopyToClipboardButton->hide();
- mToggleDetailsButton->setText("Show details");
+ mToggleDetailsButton->setText(tr("Show details"));
}
}
diff --git a/src/b2qt-flashing-wizard/scriptwriter.cpp b/src/b2qt-flashing-wizard/scriptwriter.cpp
index 063c35a..3c5f213 100644
--- a/src/b2qt-flashing-wizard/scriptwriter.cpp
+++ b/src/b2qt-flashing-wizard/scriptwriter.cpp
@@ -49,29 +49,29 @@ void ScriptWriter::setScriptFile(const QString &fileName)
bool ScriptWriter::ready(QString &error) const
{
if (mScriptName.isEmpty()) {
- error = "File name is empty";
+ error = tr("File name is empty");
return false;
}
QFileInfo file(mScriptName);
if (!file.exists()) {
- error = "File does not exist: " + mScriptName;
+ error = tr("File does not exist: %1").arg(mScriptName);
return false;
}
if (!file.isFile()) {
- error = "File " + mScriptName + " is not a file";
+ error = tr("File %1 is not a file").arg(mScriptName);
return false;
}
if (!file.isReadable()) {
- error = "File is not readable";
+ error = tr("File is not readable");
return false;
}
if (!file.isExecutable()) {
- error = "File is not executable";
+ error = tr("File is not executable");
return false;
}
if (file.size() == 0) {
- error = "File is empty";
+ error = tr("File is empty");
return false;
}
@@ -119,7 +119,7 @@ void ScriptWriter::readOutput()
void ScriptWriter::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
{
if (exitStatus != QProcess::NormalExit || exitCode != 0) {
- emit failed("Image creation failed");
+ emit failed(tr("Image creation failed"));
return;
}
emit finished();