forked from qt-creator/qt-creator
Android: Remove html code from tr-strings in keystore creation dialog
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
@@ -54911,28 +54911,28 @@ Nainstalujte, prosím, jedno SDK s API verze alespoň %1.</translation>
|
||||
<translation><span style=" color:#ff0000;">Heslo je OK</span></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Heslo k úložišti klíče je příliš krátké</span></translation>
|
||||
<source>Keystore password is too short.</source>
|
||||
<translation>Heslo k úložišti klíče je příliš krátké.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Hesla k úložišti klíče neodpovídají</span></translation>
|
||||
<source>Keystore passwords do not match.</source>
|
||||
<translation>Hesla k úložišti klíče neodpovídají.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Heslo k certifikátu je příliš krátké</span></translation>
|
||||
<source>Certificate password is too short.</source>
|
||||
<translation>Heslo k certifikátu je příliš krátké.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Hesla k certifikátům neodpovídají</span></translation>
|
||||
<source>Certificate passwords do not match.</source>
|
||||
<translation>Hesla k certifikátům neodpovídají.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate alias is missing</span></source>
|
||||
<translation><span style=" color:#ff0000;">Alias certifikátu chybí</span></translation>
|
||||
<source>Certificate alias is missing.</source>
|
||||
<translation>Alias certifikátu chybí.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Invalid country code</span></source>
|
||||
<translation><span style=" color:#ff0000;">Neplatné číslo země (mezinárodní předvolba)</span></translation>
|
||||
<source>Invalid country code.</source>
|
||||
<translation>Neplatné číslo země (mezinárodní předvolba).</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Keystore file name</source>
|
||||
|
||||
@@ -268,28 +268,28 @@ Minimum API-niveauet krævet af kittet er %1.</translation>
|
||||
<context>
|
||||
<name>Android::Internal::AndroidCreateKeystoreCertificate</name>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Keystore adgangskode er for kort</span></translation>
|
||||
<source>Keystore password is too short.</source>
|
||||
<translation>Keystore adgangskode er for kort.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Keystore adgangskoder matcher ikke</span></translation>
|
||||
<source>Keystore passwords do not match.</source>
|
||||
<translation>Keystore adgangskoder matcher ikke.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Certifikat adgangskode er for kort</span></translation>
|
||||
<source>Certificate password is too short.</source>
|
||||
<translation>Certifikat adgangskode er for kort.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Certifikat adgangskoder matcher ikke</span></translation>
|
||||
<source>Certificate passwords do not match.</source>
|
||||
<translation>Certifikat adgangskoder matcher ikke.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate alias is missing</span></source>
|
||||
<translation><span style=" color:#ff0000;">Certifikat-alias mangler</span></translation>
|
||||
<source>Certificate alias is missing.</source>
|
||||
<translation>Certifikat-alias mangler.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Invalid country code</span></source>
|
||||
<translation><span style=" color:#ff0000;">Ugyldig sprogkode</span></translation>
|
||||
<source>Invalid country code.</source>
|
||||
<translation>Ugyldig sprogkode.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Keystore Filename</source>
|
||||
|
||||
@@ -19510,28 +19510,28 @@ should a repository require SSH-authentication (see documentation on SSH and the
|
||||
<context>
|
||||
<name>Android::Internal::AndroidCreateKeystoreCertificate</name>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Das Keystore-Passwort ist zu kurz</span></translation>
|
||||
<source>Keystore password is too short.</source>
|
||||
<translation>Das Keystore-Passwort ist zu kurz.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Die Keystore-Passwörter stimmen nicht überein</span></translation>
|
||||
<source>Keystore passwords do not match.</source>
|
||||
<translation>Die Keystore-Passwörter stimmen nicht überein.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Das Passwort des Zertifikats ist zu kurz</span></translation>
|
||||
<source>Certificate password is too short.</source>
|
||||
<translation>Das Passwort des Zertifikats ist zu kurz.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Die Passwörter des Zertifikats stimmen nicht überein</span></translation>
|
||||
<source>Certificate passwords do not match.</source>
|
||||
<translation>Die Passwörter des Zertifikats stimmen nicht überein.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate alias is missing</span></source>
|
||||
<translation><span style=" color:#ff0000;">Der Alias des Zertifikats fehlt</span></translation>
|
||||
<source>Certificate alias is missing.</source>
|
||||
<translation>Der Alias des Zertifikats fehlt.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Invalid country code</span></source>
|
||||
<translation><span style=" color:#ff0000;">Ungültiger Ländercode</span></translation>
|
||||
<source>Invalid country code.</source>
|
||||
<translation>Ungültiger Ländercode.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Keystore Filename</source>
|
||||
|
||||
@@ -60828,28 +60828,28 @@ Veuillez installer un SDK supérieur à la version %1.</translation>
|
||||
<translation><span style=" color:#00ff00;">Mot de passe correct</span></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Le mot de passe du trousseau de clés est trop court</span></translation>
|
||||
<source>Keystore password is too short.</source>
|
||||
<translation>Le mot de passe du trousseau de clés est trop court.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Les mots de passe du trousseau de clés ne correspondent pas</span></translation>
|
||||
<source>Keystore passwords do not match.</source>
|
||||
<translation>Les mots de passe du trousseau de clés ne correspondent pas.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Le mot de passe du certificat est manquant</span></translation>
|
||||
<source>Certificate password is too short.</source>
|
||||
<translation>Le mot de passe du certificat est manquant.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Les mots de passe du certificat ne correspondent pas</span></translation>
|
||||
<source>Certificate passwords do not match.</source>
|
||||
<translation>Les mots de passe du certificat ne correspondent pas.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate alias is missing</span></source>
|
||||
<translation><span style=" color:#ff0000;">L'alias du certificat est manquant</span></translation>
|
||||
<source>Certificate alias is missing.</source>
|
||||
<translation>L'alias du certificat est manquant.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Invalid country code</span></source>
|
||||
<translation><span style=" color:#ff0000;">Le code de pays est invalide</span></translation>
|
||||
<source>Invalid country code.</source>
|
||||
<translation>Le code de pays est invalide.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Keystore file name</source>
|
||||
|
||||
@@ -14265,27 +14265,27 @@ The minimum API level required by the kit is %1.</source>
|
||||
<context>
|
||||
<name>Android::Internal::AndroidCreateKeystoreCertificate</name>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore password is too short</span></source>
|
||||
<source>Keystore password is too short.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore passwords do not match</span></source>
|
||||
<source>Keystore passwords do not match.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate password is too short</span></source>
|
||||
<source>Certificate password is too short.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate passwords do not match</span></source>
|
||||
<source>Certificate passwords do not match.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate alias is missing</span></source>
|
||||
<source>Certificate alias is missing.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Invalid country code</span></source>
|
||||
<source>Invalid country code.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
||||
@@ -9625,28 +9625,28 @@ with a password, which you can enter below.</source>
|
||||
<context>
|
||||
<name>Android::Internal::AndroidCreateKeystoreCertificate</name>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">キーストアパスワードが短すぎます</span></translation>
|
||||
<source>Keystore password is too short.</source>
|
||||
<translation>キーストアパスワードが短すぎます。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">キーストアパスワードが一致しません</span></translation>
|
||||
<source>Keystore passwords do not match.</source>
|
||||
<translation>キーストアパスワードが一致しません。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">証明書のパスワードが短すぎます</span></translation>
|
||||
<source>Certificate password is too short.</source>
|
||||
<translation>証明書のパスワードが短すぎます。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">証明書のパスワードが一致しません</span></translation>
|
||||
<source>Certificate passwords do not match.</source>
|
||||
<translation>証明書のパスワードが一致しません。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate alias is missing</span></source>
|
||||
<translation><span style=" color:#ff0000;">証明書のエイリアスが見つかりません</span></translation>
|
||||
<source>Certificate alias is missing.</source>
|
||||
<translation>証明書のエイリアスが見つかりません。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Invalid country code</span></source>
|
||||
<translation><span style=" color:#ff0000;">無効な国コードです</span></translation>
|
||||
<source>Invalid country code.</source>
|
||||
<translation>無効な国コードです。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Keystore file name</source>
|
||||
|
||||
@@ -21525,28 +21525,28 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS.</translation>
|
||||
<context>
|
||||
<name>Android::Internal::AndroidCreateKeystoreCertificate</name>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore password is too short</span></source>
|
||||
<source>Keystore password is too short.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore passwords do not match</span></source>
|
||||
<source>Keystore passwords do not match.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Hasło certyfikatu jest zbyt krótkie</span></translation>
|
||||
<source>Certificate password is too short.</source>
|
||||
<translation>Hasło certyfikatu jest zbyt krótkie.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Hasła certyfikatu nie zgadzają się</span></translation>
|
||||
<source>Certificate passwords do not match.</source>
|
||||
<translation>Hasła certyfikatu nie zgadzają się.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate alias is missing</span></source>
|
||||
<translation><span style=" color:#ff0000;">Brak aliasu certyfikatu</span></translation>
|
||||
<source>Certificate alias is missing.</source>
|
||||
<translation>Brak aliasu certyfikatu.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Invalid country code</span></source>
|
||||
<translation><span style=" color:#ff0000;">Niepoprawny kod kraju</span></translation>
|
||||
<source>Invalid country code.</source>
|
||||
<translation>Niepoprawny kod kraju.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Keystore Filename</source>
|
||||
|
||||
@@ -887,28 +887,28 @@ The files in the Android package source directory are copied to the build direct
|
||||
<context>
|
||||
<name>Android::Internal::AndroidCreateKeystoreCertificate</name>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Пароль связки ключей слишком короткий</span></translation>
|
||||
<source>Keystore password is too short.</source>
|
||||
<translation>Пароль связки ключей слишком короткий.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Неверный пароль связки ключей</span></translation>
|
||||
<source>Keystore passwords do not match.</source>
|
||||
<translation>Неверный пароль связки ключей.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Пароль сертификата слишком короткий</span></translation>
|
||||
<source>Certificate password is too short.</source>
|
||||
<translation>Пароль сертификата слишком короткий.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Неверный пароль сертификата</span></translation>
|
||||
<source>Certificate passwords do not match.</source>
|
||||
<translation>Неверный пароль сертификата.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate alias is missing</span></source>
|
||||
<translation><span style=" color:#ff0000;">Отсутствует алиас сертификата</span></translation>
|
||||
<source>Certificate alias is missing.</source>
|
||||
<translation>Отсутствует алиас сертификата.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Invalid country code</span></source>
|
||||
<translation><span style=" color:#ff0000;">Неверный код страны</span></translation>
|
||||
<source>Invalid country code.</source>
|
||||
<translation>Неверный код страны.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Keystore Filename</source>
|
||||
|
||||
@@ -32522,28 +32522,28 @@ Please install an SDK of at least API version %1.</source>
|
||||
<translation type="vanished"><span style=" color:#00ff00;">Пароль вдалий</span></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Пароль сховища ключів закороткий</span></translation>
|
||||
<source>Keystore password is too short.</source>
|
||||
<translation>Пароль сховища ключів закороткий.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Keystore passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Паролі сховища ключів не співпадають</span></translation>
|
||||
<source>Keystore passwords do not match.</source>
|
||||
<translation>Паролі сховища ключів не співпадають.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate password is too short</span></source>
|
||||
<translation><span style=" color:#ff0000;">Пароль сертифіката закороткий</span></translation>
|
||||
<source>Certificate password is too short.</source>
|
||||
<translation>Пароль сертифіката закороткий.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate passwords do not match</span></source>
|
||||
<translation><span style=" color:#ff0000;">Паролі сертифіката не співпадають</span></translation>
|
||||
<source>Certificate passwords do not match.</source>
|
||||
<translation>Паролі сертифіката не співпадають.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Certificate alias is missing</span></source>
|
||||
<translation><span style=" color:#ff0000;">Відсутній псевдонім сертифіката</span></translation>
|
||||
<source>Certificate alias is missing.</source>
|
||||
<translation>Відсутній псевдонім сертифіката.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><span style=" color:#ff0000;">Invalid country code</span></source>
|
||||
<translation><span style=" color:#ff0000;">Неправильний код країни</span></translation>
|
||||
<source>Invalid country code.</source>
|
||||
<translation>Неправильний код країни.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Keystore file name</source>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -299,17 +299,17 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="infoLabel">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="Utils::InfoLabel" name="infoLabel"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>Utils::InfoLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header location="global">utils/infolabel.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>keystorePassLineEdit</tabstop>
|
||||
<tabstop>keystoreRetypePassLineEdit</tabstop>
|
||||
|
||||
Reference in New Issue
Block a user