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

Android: Remove html code from tr-strings in keystore creation dialog

Browse Source 
This change removes markup with its unthemed color values from
translatable strings. Terminates error messages with a ".". Adjusts the
message strings in the .ts files, accordingly.

The error label is changed from QLabel to Utils::InfoLabel.

Change-Id: Ifdd65de8d9e0ae311b494e70b9dc77ca0a3e4f46
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
Alessandro Portale
2022-01-29 00:36:49 +01:00
parent d5eed0480d
commit e58f50df2a
11 changed files with 128 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/android/androidcreatekeystorecertificate.cpp
View File

@@ -42,6 +42,9 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare
ui(new Ui::AndroidCreateKeystoreCertificate)
{
ui->setupUi(this);
ui->infoLabel->setType(InfoLabel::Error);
ui->infoLabel->hide();
connect(ui->keystorePassLineEdit, &QLineEdit::textChanged,
this, &AndroidCreateKeystoreCertificate::checkKeystorePassword);
connect(ui->keystoreRetypePassLineEdit, &QLineEdit::textChanged,
@@ -100,15 +103,17 @@ QString AndroidCreateKeystoreCertificate::certificatePassword()
AndroidCreateKeystoreCertificate::PasswordStatus AndroidCreateKeystoreCertificate::checkKeystorePassword()
{
if (ui->keystorePassLineEdit->text().length() < 6) {
ui->infoLabel->setText(tr("<span style=\" color:#ff0000;\">Keystore password is too short</span>"));
ui->infoLabel->show();
ui->infoLabel->setText(tr("Keystore password is too short."));
return Invalid;
}
if (ui->keystorePassLineEdit->text() != ui->keystoreRetypePassLineEdit->text()) {
ui->infoLabel->setText(tr("<span style=\" color:#ff0000;\">Keystore passwords do not match</span>"));
return NoMatch;
ui->infoLabel->show();
ui->infoLabel->setText(tr("Keystore passwords do not match."));
return NoMatch;
}
ui->infoLabel->clear();
ui->infoLabel->hide();
return Match;
}
@@ -118,37 +123,41 @@ AndroidCreateKeystoreCertificate::PasswordStatus AndroidCreateKeystoreCertificat
return Match;
if (ui->certificatePassLineEdit->text().length() < 6) {
ui->infoLabel->setText(tr("<span style=\" color:#ff0000;\">Certificate password is too short</span>"));
ui->infoLabel->show();
ui->infoLabel->setText(tr("Certificate password is too short."));
return Invalid;
}
if (ui->certificatePassLineEdit->text() != ui->certificateRetypePassLineEdit->text()) {
ui->infoLabel->setText(tr("<span style=\" color:#ff0000;\">Certificate passwords do not match</span>"));
ui->infoLabel->show();
ui->infoLabel->setText(tr("Certificate passwords do not match."));
return NoMatch;
}
ui->infoLabel->clear();
ui->infoLabel->hide();
return Match;
}
bool AndroidCreateKeystoreCertificate::checkCertificateAlias()
{
if (ui->certificateAliasLineEdit->text().length() == 0) {
ui->infoLabel->setText(tr("<span style=\" color:#ff0000;\">Certificate alias is missing</span>"));
ui->infoLabel->show();
ui->infoLabel->setText(tr("Certificate alias is missing."));
return false;
}
ui->infoLabel->clear();
ui->infoLabel->hide();
return true;
}
bool AndroidCreateKeystoreCertificate::checkCountryCode()
{
if (!ui->countryLineEdit->text().contains(QRegularExpression("[A-Z]{2}"))) {
ui->infoLabel->setText(tr("<span style=\" color:#ff0000;\">Invalid country code</span>"));
ui->infoLabel->show();
ui->infoLabel->setText(tr("Invalid country code."));
return false;
}
ui->infoLabel->clear();
ui->infoLabel->hide();
return true;
}