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

Android: Use Utils::InfoLabel in AndroidBuildApk*

Browse Source 
Task-number: QTCREATORBUG-23346
Change-Id: Ie923d9e8f774613c1e9d0bb7dc1255acfce39cef
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Alessandro Portale
2019-12-13 00:06:34 +01:00
parent f5b92c865b
commit b250c879af
3 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -50,9 +50,9 @@
#include <qtsupport/qtkitinformation.h>
#include <utils/algorithm.h>
#include <utils/infolabel.h>
#include <utils/qtcprocess.h>
#include <utils/synchronousprocess.h>
#include <utils/utilsicons.h>
#include <QDateTime>
#include <QDialogButtonBox>
@@ -118,8 +118,8 @@ private:
std::function<bool (const QString &)> verifyCallback = [](const QString &) { return true; };
QLabel *inputContextlabel = new QLabel(this);
QLineEdit *inputEdit = new QLineEdit(this);
QLabel *warningIcon = new QLabel(this);
QLabel *warningLabel = new QLabel(this);
Utils::InfoLabel *warningLabel = new Utils::InfoLabel(tr("Incorrect password."),
Utils::InfoLabel::Warning, this);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
this);
};
@@ -633,20 +633,12 @@ PasswordInputDialog::PasswordInputDialog(PasswordInputDialog::Context context,
{
inputEdit->setEchoMode(QLineEdit::Password);
warningIcon->setPixmap(Utils::Icons::WARNING.pixmap());
warningIcon->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
warningIcon->hide();
warningLabel->hide();
auto warningLayout = new QHBoxLayout;
warningLayout->addWidget(warningIcon);
warningLayout->addWidget(warningLabel);
auto mainLayout = new QVBoxLayout(this);
mainLayout->addWidget(inputContextlabel);
mainLayout->addWidget(inputEdit);
mainLayout->addLayout(warningLayout);
mainLayout->addWidget(warningLabel);
mainLayout->addWidget(buttonBox);
connect(inputEdit, &QLineEdit::textChanged,[this](const QString &text) {
@@ -657,9 +649,7 @@ PasswordInputDialog::PasswordInputDialog(PasswordInputDialog::Context context,
if (verifyCallback(inputEdit->text())) {
accept(); // Dialog accepted.
} else {
warningIcon->show();
warningLabel->show();
warningLabel->setText(tr("Incorrect password."));
inputEdit->clear();
adjustSize();
}