Skip to content

Commit 4729b35

Browse files
authored
Update dialogs with new UI guidlines (#1298)
* SmartID * MobileID * MobileProgress * PinPopup * PinUnblock * RoleAddress IB-7965 Signed-off-by: Raul Metsma <[email protected]>
1 parent 4cc35e0 commit 4729b35

29 files changed

+1369
-1829
lines changed

client/MainWindow.ui

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ QToolButton:checked {
9898
background-color: #ffffff;
9999
color: #003168;
100100
}
101-
#version {
101+
#version, #version:pressed {
102+
border: none;
102103
color: #BFD3E8;
103104
font-family: Roboto, Helvetica;
104105
font-size: 10px;

client/dialogs/MobileDialog.cpp

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,43 +22,31 @@
2222

2323
#include "IKValidator.h"
2424
#include "Settings.h"
25-
#include "Styles.h"
2625
#include "effects/Overlay.h"
2726

28-
MobileDialog::MobileDialog(QWidget *parent) :
29-
QDialog(parent),
30-
ui(new Ui::MobileDialog)
27+
MobileDialog::MobileDialog(QWidget *parent)
28+
: QDialog(parent)
29+
, ui(new Ui::MobileDialog)
3130
{
3231
static const QStringList countryCodes {QStringLiteral("372"), QStringLiteral("370")};
3332
new Overlay(this);
33+
3434
ui->setupUi(this);
3535
setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint);
36-
setFixedSize(size());
3736
#ifdef Q_OS_WIN
3837
ui->buttonLayout->setDirection(QBoxLayout::RightToLeft);
3938
#endif
4039

41-
QFont condensed = Styles::font(Styles::Condensed, 14);
42-
QFont regularFont = Styles::font(Styles::Regular, 14);
43-
ui->labelNameId->setFont(Styles::font(Styles::Regular, 16, QFont::DemiBold));
44-
ui->labelPhone->setFont(regularFont);
45-
ui->labelCode->setFont(regularFont);
46-
ui->errorCode->setFont(regularFont);
47-
ui->errorPhone->setFont(regularFont);
48-
ui->phoneNo->setFont(regularFont);
49-
ui->idCode->setFont(regularFont);
50-
ui->cbRemember->setFont(regularFont);
51-
ui->sign->setFont(condensed);
52-
ui->cancel->setFont(condensed);
53-
5440
// Mobile
5541
ui->idCode->setValidator(new NumberValidator(ui->idCode));
5642
ui->idCode->setText(Settings::MOBILEID_CODE);
5743
ui->idCode->setAttribute(Qt::WA_MacShowFocusRect, false);
44+
ui->errorCode->hide();
5845
ui->phoneNo->setValidator(new NumberValidator(ui->phoneNo));
5946
ui->phoneNo->setText(Settings::MOBILEID_NUMBER.value(countryCodes[0]));
6047
ui->phoneNo->setAttribute(Qt::WA_MacShowFocusRect, false);
6148
ui->phoneNo->setFocus();
49+
ui->errorPhone->hide();
6250
ui->cbRemember->setChecked(Settings::MOBILEID_REMEMBER);
6351
ui->cbRemember->setAttribute(Qt::WA_MacShowFocusRect, false);
6452
auto saveSettings = [this] {
@@ -68,9 +56,9 @@ MobileDialog::MobileDialog(QWidget *parent) :
6856
Settings::MOBILEID_NUMBER = checked ? ui->phoneNo->text() : QString();
6957
};
7058
auto setError = [](QLineEdit *input, QLabel *error, const QString &msg) {
71-
input->setStyleSheet(msg.isEmpty() ? QString() :QStringLiteral("border-color: #c53e3e"));
72-
error->setFocusPolicy(msg.isEmpty() ? Qt::NoFocus : Qt::TabFocus);
59+
input->setStyleSheet(msg.isEmpty() ? QString() : QStringLiteral("border-color: #BE7884"));
7360
error->setText(msg);
61+
error->setHidden(msg.isEmpty());
7462
};
7563
connect(ui->idCode, &QLineEdit::returnPressed, ui->sign, &QPushButton::click);
7664
connect(ui->idCode, &QLineEdit::textEdited, this, saveSettings);

0 commit comments

Comments
 (0)