diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index f0ea6449907..b7e0efc99e3 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -54911,28 +54911,28 @@ Nainstalujte, prosím, jedno SDK s API verze alespoň %1.
<span style=" color:#ff0000;">Heslo je OK</span>
- <span style=" color:#ff0000;">Keystore password is too short</span>
- <span style=" color:#ff0000;">Heslo k úložišti klíče je příliš krátké</span>
+ Keystore password is too short.
+ Heslo k úložišti klíče je příliš krátké.
- <span style=" color:#ff0000;">Keystore passwords do not match</span>
- <span style=" color:#ff0000;">Hesla k úložišti klíče neodpovídají</span>
+ Keystore passwords do not match.
+ Hesla k úložišti klíče neodpovídají.
- <span style=" color:#ff0000;">Certificate password is too short</span>
- <span style=" color:#ff0000;">Heslo k certifikátu je příliš krátké</span>
+ Certificate password is too short.
+ Heslo k certifikátu je příliš krátké.
- <span style=" color:#ff0000;">Certificate passwords do not match</span>
- <span style=" color:#ff0000;">Hesla k certifikátům neodpovídají</span>
+ Certificate passwords do not match.
+ Hesla k certifikátům neodpovídají.
- <span style=" color:#ff0000;">Certificate alias is missing</span>
- <span style=" color:#ff0000;">Alias certifikátu chybí</span>
+ Certificate alias is missing.
+ Alias certifikátu chybí.
- <span style=" color:#ff0000;">Invalid country code</span>
- <span style=" color:#ff0000;">Neplatné číslo země (mezinárodní předvolba)</span>
+ Invalid country code.
+ Neplatné číslo země (mezinárodní předvolba).Keystore file name
diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index 41fd7c673ca..4cfd3841b60 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -268,28 +268,28 @@ Minimum API-niveauet krævet af kittet er %1.
Android::Internal::AndroidCreateKeystoreCertificate
- <span style=" color:#ff0000;">Keystore password is too short</span>
- <span style=" color:#ff0000;">Keystore adgangskode er for kort</span>
+ Keystore password is too short.
+ Keystore adgangskode er for kort.
- <span style=" color:#ff0000;">Keystore passwords do not match</span>
- <span style=" color:#ff0000;">Keystore adgangskoder matcher ikke</span>
+ Keystore passwords do not match.
+ Keystore adgangskoder matcher ikke.
- <span style=" color:#ff0000;">Certificate password is too short</span>
- <span style=" color:#ff0000;">Certifikat adgangskode er for kort</span>
+ Certificate password is too short.
+ Certifikat adgangskode er for kort.
- <span style=" color:#ff0000;">Certificate passwords do not match</span>
- <span style=" color:#ff0000;">Certifikat adgangskoder matcher ikke</span>
+ Certificate passwords do not match.
+ Certifikat adgangskoder matcher ikke.
- <span style=" color:#ff0000;">Certificate alias is missing</span>
- <span style=" color:#ff0000;">Certifikat-alias mangler</span>
+ Certificate alias is missing.
+ Certifikat-alias mangler.
- <span style=" color:#ff0000;">Invalid country code</span>
- <span style=" color:#ff0000;">Ugyldig sprogkode</span>
+ Invalid country code.
+ Ugyldig sprogkode.Keystore Filename
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 8eaec177f8d..dece10295e4 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -19510,28 +19510,28 @@ should a repository require SSH-authentication (see documentation on SSH and the
Android::Internal::AndroidCreateKeystoreCertificate
- <span style=" color:#ff0000;">Keystore password is too short</span>
- <span style=" color:#ff0000;">Das Keystore-Passwort ist zu kurz</span>
+ Keystore password is too short.
+ Das Keystore-Passwort ist zu kurz.
- <span style=" color:#ff0000;">Keystore passwords do not match</span>
- <span style=" color:#ff0000;">Die Keystore-Passwörter stimmen nicht überein</span>
+ Keystore passwords do not match.
+ Die Keystore-Passwörter stimmen nicht überein.
- <span style=" color:#ff0000;">Certificate password is too short</span>
- <span style=" color:#ff0000;">Das Passwort des Zertifikats ist zu kurz</span>
+ Certificate password is too short.
+ Das Passwort des Zertifikats ist zu kurz.
- <span style=" color:#ff0000;">Certificate passwords do not match</span>
- <span style=" color:#ff0000;">Die Passwörter des Zertifikats stimmen nicht überein</span>
+ Certificate passwords do not match.
+ Die Passwörter des Zertifikats stimmen nicht überein.
- <span style=" color:#ff0000;">Certificate alias is missing</span>
- <span style=" color:#ff0000;">Der Alias des Zertifikats fehlt</span>
+ Certificate alias is missing.
+ Der Alias des Zertifikats fehlt.
- <span style=" color:#ff0000;">Invalid country code</span>
- <span style=" color:#ff0000;">Ungültiger Ländercode</span>
+ Invalid country code.
+ Ungültiger Ländercode.Keystore Filename
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 95808e6d7b9..ec42c365792 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -60828,28 +60828,28 @@ Veuillez installer un SDK supérieur à la version %1.
<span style=" color:#00ff00;">Mot de passe correct</span>
- <span style=" color:#ff0000;">Keystore password is too short</span>
- <span style=" color:#ff0000;">Le mot de passe du trousseau de clés est trop court</span>
+ Keystore password is too short.
+ Le mot de passe du trousseau de clés est trop court.
- <span style=" color:#ff0000;">Keystore passwords do not match</span>
- <span style=" color:#ff0000;">Les mots de passe du trousseau de clés ne correspondent pas</span>
+ Keystore passwords do not match.
+ Les mots de passe du trousseau de clés ne correspondent pas.
- <span style=" color:#ff0000;">Certificate password is too short</span>
- <span style=" color:#ff0000;">Le mot de passe du certificat est manquant</span>
+ Certificate password is too short.
+ Le mot de passe du certificat est manquant.
- <span style=" color:#ff0000;">Certificate passwords do not match</span>
- <span style=" color:#ff0000;">Les mots de passe du certificat ne correspondent pas</span>
+ Certificate passwords do not match.
+ Les mots de passe du certificat ne correspondent pas.
- <span style=" color:#ff0000;">Certificate alias is missing</span>
- <span style=" color:#ff0000;">L'alias du certificat est manquant</span>
+ Certificate alias is missing.
+ L'alias du certificat est manquant.
- <span style=" color:#ff0000;">Invalid country code</span>
- <span style=" color:#ff0000;">Le code de pays est invalide</span>
+ Invalid country code.
+ Le code de pays est invalide.Keystore file name
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index 405ef04c3d0..e7a14f06a9c 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -14265,27 +14265,27 @@ The minimum API level required by the kit is %1.
Android::Internal::AndroidCreateKeystoreCertificate
- <span style=" color:#ff0000;">Keystore password is too short</span>
+ Keystore password is too short.
- <span style=" color:#ff0000;">Keystore passwords do not match</span>
+ Keystore passwords do not match.
- <span style=" color:#ff0000;">Certificate password is too short</span>
+ Certificate password is too short.
- <span style=" color:#ff0000;">Certificate passwords do not match</span>
+ Certificate passwords do not match.
- <span style=" color:#ff0000;">Certificate alias is missing</span>
+ Certificate alias is missing.
- <span style=" color:#ff0000;">Invalid country code</span>
+ Invalid country code.
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 890908ed99a..c65ccab4138 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -9625,28 +9625,28 @@ with a password, which you can enter below.
Android::Internal::AndroidCreateKeystoreCertificate
- <span style=" color:#ff0000;">Keystore password is too short</span>
- <span style=" color:#ff0000;">キーストアパスワードが短すぎます</span>
+ Keystore password is too short.
+ キーストアパスワードが短すぎます。
- <span style=" color:#ff0000;">Keystore passwords do not match</span>
- <span style=" color:#ff0000;">キーストアパスワードが一致しません</span>
+ Keystore passwords do not match.
+ キーストアパスワードが一致しません。
- <span style=" color:#ff0000;">Certificate password is too short</span>
- <span style=" color:#ff0000;">証明書のパスワードが短すぎます</span>
+ Certificate password is too short.
+ 証明書のパスワードが短すぎます。
- <span style=" color:#ff0000;">Certificate passwords do not match</span>
- <span style=" color:#ff0000;">証明書のパスワードが一致しません</span>
+ Certificate passwords do not match.
+ 証明書のパスワードが一致しません。
- <span style=" color:#ff0000;">Certificate alias is missing</span>
- <span style=" color:#ff0000;">証明書のエイリアスが見つかりません</span>
+ Certificate alias is missing.
+ 証明書のエイリアスが見つかりません。
- <span style=" color:#ff0000;">Invalid country code</span>
- <span style=" color:#ff0000;">無効な国コードです</span>
+ Invalid country code.
+ 無効な国コードです。Keystore file name
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index a088b92e294..4bd2dfddc49 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -21525,28 +21525,28 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS.
Android::Internal::AndroidCreateKeystoreCertificate
- <span style=" color:#ff0000;">Keystore password is too short</span>
+ Keystore password is too short.
- <span style=" color:#ff0000;">Keystore passwords do not match</span>
+ Keystore passwords do not match.
- <span style=" color:#ff0000;">Certificate password is too short</span>
- <span style=" color:#ff0000;">Hasło certyfikatu jest zbyt krótkie</span>
+ Certificate password is too short.
+ Hasło certyfikatu jest zbyt krótkie.
- <span style=" color:#ff0000;">Certificate passwords do not match</span>
- <span style=" color:#ff0000;">Hasła certyfikatu nie zgadzają się</span>
+ Certificate passwords do not match.
+ Hasła certyfikatu nie zgadzają się.
- <span style=" color:#ff0000;">Certificate alias is missing</span>
- <span style=" color:#ff0000;">Brak aliasu certyfikatu</span>
+ Certificate alias is missing.
+ Brak aliasu certyfikatu.
- <span style=" color:#ff0000;">Invalid country code</span>
- <span style=" color:#ff0000;">Niepoprawny kod kraju</span>
+ Invalid country code.
+ Niepoprawny kod kraju.Keystore Filename
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 343f1c468e4..1305808ff41 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -887,28 +887,28 @@ The files in the Android package source directory are copied to the build direct
Android::Internal::AndroidCreateKeystoreCertificate
- <span style=" color:#ff0000;">Keystore password is too short</span>
- <span style=" color:#ff0000;">Пароль связки ключей слишком короткий</span>
+ Keystore password is too short.
+ Пароль связки ключей слишком короткий.
- <span style=" color:#ff0000;">Keystore passwords do not match</span>
- <span style=" color:#ff0000;">Неверный пароль связки ключей</span>
+ Keystore passwords do not match.
+ Неверный пароль связки ключей.
- <span style=" color:#ff0000;">Certificate password is too short</span>
- <span style=" color:#ff0000;">Пароль сертификата слишком короткий</span>
+ Certificate password is too short.
+ Пароль сертификата слишком короткий.
- <span style=" color:#ff0000;">Certificate passwords do not match</span>
- <span style=" color:#ff0000;">Неверный пароль сертификата</span>
+ Certificate passwords do not match.
+ Неверный пароль сертификата.
- <span style=" color:#ff0000;">Certificate alias is missing</span>
- <span style=" color:#ff0000;">Отсутствует алиас сертификата</span>
+ Certificate alias is missing.
+ Отсутствует алиас сертификата.
- <span style=" color:#ff0000;">Invalid country code</span>
- <span style=" color:#ff0000;">Неверный код страны</span>
+ Invalid country code.
+ Неверный код страны.Keystore Filename
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index f7de935b70e..7ed2f44691f 100644
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@ -32522,28 +32522,28 @@ Please install an SDK of at least API version %1.
<span style=" color:#00ff00;">Пароль вдалий</span>
- <span style=" color:#ff0000;">Keystore password is too short</span>
- <span style=" color:#ff0000;">Пароль сховища ключів закороткий</span>
+ Keystore password is too short.
+ Пароль сховища ключів закороткий.
- <span style=" color:#ff0000;">Keystore passwords do not match</span>
- <span style=" color:#ff0000;">Паролі сховища ключів не співпадають</span>
+ Keystore passwords do not match.
+ Паролі сховища ключів не співпадають.
- <span style=" color:#ff0000;">Certificate password is too short</span>
- <span style=" color:#ff0000;">Пароль сертифіката закороткий</span>
+ Certificate password is too short.
+ Пароль сертифіката закороткий.
- <span style=" color:#ff0000;">Certificate passwords do not match</span>
- <span style=" color:#ff0000;">Паролі сертифіката не співпадають</span>
+ Certificate passwords do not match.
+ Паролі сертифіката не співпадають.
- <span style=" color:#ff0000;">Certificate alias is missing</span>
- <span style=" color:#ff0000;">Відсутній псевдонім сертифіката</span>
+ Certificate alias is missing.
+ Відсутній псевдонім сертифіката.
- <span style=" color:#ff0000;">Invalid country code</span>
- <span style=" color:#ff0000;">Неправильний код країни</span>
+ Invalid country code.
+ Неправильний код країни.Keystore file name
diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp
index 42296720ed3..48c91c6bae8 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.cpp
+++ b/src/plugins/android/androidcreatekeystorecertificate.cpp
@@ -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("Keystore password is too short"));
+ 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("Keystore passwords do not match"));
- 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("Certificate password is too short"));
+ 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("Certificate passwords do not match"));
+ 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("Certificate alias is missing"));
+ 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("Invalid country code"));
+ ui->infoLabel->show();
+ ui->infoLabel->setText(tr("Invalid country code."));
return false;
}
- ui->infoLabel->clear();
+ ui->infoLabel->hide();
return true;
}
diff --git a/src/plugins/android/androidcreatekeystorecertificate.ui b/src/plugins/android/androidcreatekeystorecertificate.ui
index 4c62e9e9414..639275329c1 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.ui
+++ b/src/plugins/android/androidcreatekeystorecertificate.ui
@@ -299,17 +299,17 @@
-
-
-
-
-
- Qt::AlignCenter
-
-
+
+
+
+ Utils::InfoLabel
+ QLabel
+ utils/infolabel.h
+
+ keystorePassLineEditkeystoreRetypePassLineEdit