Skip to content

Commit 43c12b0

Browse files
metsmametsma
authored
Update text fields with new UI guidlines (open-eid#1362)
IB-7972 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent ab077df commit 43c12b0

36 files changed

Lines changed: 384 additions & 438 deletions

‎client/MainWindow.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ void MainWindow::navigateToPage( Pages page, const QStringList &files, bool crea
331331
selectPage(page);
332332
}
333333

334-
void MainWindow::onSignAction(int action, const QString &info1, const QString &info2)
334+
void MainWindow::onSignAction(int action, const QString &idCode, const QString &info2)
335335
{
336336
switch(action)
337337
{
@@ -342,16 +342,16 @@ void MainWindow::onSignAction(int action, const QString &info1, const QString &i
342342
});
343343
break;
344344
case SignatureMobile:
345-
sign([this, info1, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
345+
sign([this, idCode, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
346346
MobileProgress m(this);
347-
return m.init(info1, info2) &&
347+
return m.init(idCode, info2) &&
348348
digiDoc->sign(city, state, zip, country, role, &m);
349349
});
350350
break;
351351
case SignatureSmartID:
352-
sign([this, info1, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
352+
sign([this, idCode, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
353353
SmartIDProgress s(this);
354-
return s.init(info1, info2, digiDoc->fileName()) &&
354+
return s.init(info2, idCode, digiDoc->fileName()) &&
355355
digiDoc->sign(city, state, zip, country, role, &s);
356356
});
357357
break;

‎client/MainWindow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class MainWindow final : public QWidget
7070
void moveSignatureContainer();
7171
void navigateToPage( ria::qdigidoc4::Pages page, const QStringList &files = QStringList(), bool create = true );
7272
void onCryptoAction(int action, const QString &id, const QString &phone);
73-
void onSignAction(int action, const QString &info1, const QString &info2);
73+
void onSignAction(int action, const QString &idCode, const QString &info2);
7474
void openContainer(bool signature);
7575
void pageSelected(int page, bool checked = true);
7676
void resetDigiDoc(DigiDoc *doc = nullptr, bool warnOnChange = true);

‎client/QSmartCard.cpp‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,11 @@ const QByteArray IDEMIACard::AID_QSCD = APDU("00A4040C 10 51534344204170706C6963
191191
const QByteArray IDEMIACard::ATR_COSMO8 = QByteArrayLiteral("3BDB960080B1FE451F830012233F536549440F9000F1");
192192
const QByteArray IDEMIACard::ATR_COSMOX = QByteArrayLiteral("3BDC960080B1FE451F830012233F54654944320F9000C3");
193193

194-
QPCSCReader::Result IDEMIACard::change(QPCSCReader *reader, QSmartCardData::PinType type, const QString &pin_, const QString &newpin_) const
194+
QPCSCReader::Result IDEMIACard::change(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&pin, QByteArray &&newpin) const
195195
{
196196
QByteArray cmd = CHANGE;
197-
QByteArray newpin = pinTemplate(newpin_);
198-
QByteArray pin = pinTemplate(pin_);
197+
newpin = pinTemplate(std::move(newpin));
198+
pin = pinTemplate(std::move(pin));
199199
switch (type) {
200200
case QSmartCardData::Pin1Type:
201201
cmd[3] = 1;
@@ -291,20 +291,19 @@ bool IDEMIACard::loadPerso(QPCSCReader *reader, QSmartCardDataPrivate *d) const
291291
return updateCounters(reader, d);
292292
}
293293

294-
QByteArray IDEMIACard::pinTemplate(const QString &pin)
294+
QByteArray IDEMIACard::pinTemplate(QByteArray &&pin)
295295
{
296-
QByteArray result = pin.toUtf8();
297296
#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
298-
result.resize(12, char(0xFF));
297+
pin.resize(12, char(0xFF));
299298
#else
300-
result += QByteArray(12 - result.size(), char(0xFF));
299+
pin += QByteArray(12 - pin.size(), char(0xFF));
301300
#endif
302-
return result;
301+
return std::move(pin);
303302
}
304303

305-
QPCSCReader::Result IDEMIACard::replace(QPCSCReader *reader, QSmartCardData::PinType type, const QString &puk_, const QString &pin_) const
304+
QPCSCReader::Result IDEMIACard::replace(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&puk, QByteArray &&pin) const
306305
{
307-
QByteArray puk = pinTemplate(puk_);
306+
puk = pinTemplate(std::move(puk));
308307
QByteArray cmd = VERIFY;
309308
cmd[3] = 2;
310309
cmd[4] = char(puk.size());
@@ -321,7 +320,7 @@ QPCSCReader::Result IDEMIACard::replace(QPCSCReader *reader, QSmartCardData::Pin
321320
}
322321
else
323322
cmd[3] = char(type);
324-
QByteArray pin = pinTemplate(pin_);
323+
pin = pinTemplate(std::move(pin));
325324
cmd[4] = char(pin.size());
326325
return transfer(reader, false, cmd + pin, type, 0, false);
327326
}
@@ -352,11 +351,11 @@ bool IDEMIACard::updateCounters(QPCSCReader *reader, QSmartCardDataPrivate *d) c
352351

353352
const QByteArray THALESCard::AID = APDU("00A4040C 0C A000000063504B43532D3135");
354353

355-
QPCSCReader::Result THALESCard::change(QPCSCReader *reader, QSmartCardData::PinType type, const QString &pin_, const QString &newpin_) const
354+
QPCSCReader::Result THALESCard::change(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&pin, QByteArray &&newpin) const
356355
{
357356
QByteArray cmd = CHANGE;
358-
QByteArray newpin = pinTemplate(newpin_);
359-
QByteArray pin = pinTemplate(pin_);
357+
newpin = pinTemplate(std::move(newpin));
358+
pin = pinTemplate(std::move(pin));
360359
cmd[3] = char(0x80 | type);
361360
cmd[4] = char(pin.size() + newpin.size());
362361
return transfer(reader, false, cmd + pin + newpin, type, quint8(pin.size()), true);
@@ -453,10 +452,10 @@ QByteArray THALESCard::pinTemplate(const QString &pin)
453452
return result;
454453
}
455454

456-
QPCSCReader::Result THALESCard::replace(QPCSCReader *reader, QSmartCardData::PinType type, const QString &puk_, const QString &pin_) const
455+
QPCSCReader::Result THALESCard::replace(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&puk, QByteArray &&pin) const
457456
{
458-
QByteArray puk = pinTemplate(puk_);
459-
QByteArray pin = pinTemplate(pin_);
457+
puk = pinTemplate(std::move(puk));
458+
pin = pinTemplate(std::move(pin));
460459
QByteArray cmd = REPLACE;
461460
cmd[3] = char(0x80 | type);
462461
cmd[4] = char(puk.size() + pin.size());
@@ -551,9 +550,9 @@ bool QSmartCard::pinChange(QSmartCardData::PinType type, QSmartCard::PinAction a
551550
FadeInNotification::warning(parent, tr("Changing %1 failed").arg(QSmartCardData::typeString(type)));
552551
return false;
553552
}
554-
QPCSCReader::Result response = src == QSmartCardData::PukType ?
555-
d->card->replace(&reader, type, oldPin, newPin) :
556-
d->card->change(&reader, type, oldPin, newPin);
553+
auto response = action == QSmartCard::ChangeWithPin || action == QSmartCard::ActivateWithPin ?
554+
d->card->change(&reader, type, std::move(oldPin), std::move(newPin)) :
555+
d->card->replace(&reader, type, std::move(oldPin), std::move(newPin));
557556
switch(response.SW)
558557
{
559558
case 0x9000:

‎client/QSmartCard_p.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class Card
3333
{
3434
public:
3535
virtual ~Card() noexcept = default;
36-
virtual QPCSCReader::Result change(QPCSCReader *reader, QSmartCardData::PinType type, const QString &pin, const QString &newpin) const = 0;
36+
virtual QPCSCReader::Result change(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&pin, QByteArray &&newpin) const = 0;
3737
virtual bool loadPerso(QPCSCReader *reader, QSmartCardDataPrivate *d) const = 0;
38-
virtual QPCSCReader::Result replace(QPCSCReader *reader, QSmartCardData::PinType type, const QString &puk, const QString &pin) const = 0;
38+
virtual QPCSCReader::Result replace(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&puk, QByteArray &&pin) const = 0;
3939
static QPCSCReader::Result transfer(QPCSCReader *reader, bool verify, const QByteArray &apdu,
4040
QSmartCardData::PinType type, quint8 newPINOffset, bool requestCurrentPIN);
4141
virtual bool updateCounters(QPCSCReader *reader, QSmartCardDataPrivate *d) const = 0;
@@ -51,23 +51,23 @@ class Card
5151
class IDEMIACard: public Card
5252
{
5353
public:
54-
QPCSCReader::Result change(QPCSCReader *reader, QSmartCardData::PinType type, const QString &pin, const QString &newpin) const final;
54+
QPCSCReader::Result change(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&pin, QByteArray &&newpin) const final;
5555
bool loadPerso(QPCSCReader *reader, QSmartCardDataPrivate *d) const final;
56-
QPCSCReader::Result replace(QPCSCReader *reader, QSmartCardData::PinType type, const QString &puk, const QString &pin) const final;
56+
QPCSCReader::Result replace(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&puk, QByteArray &&pin) const final;
5757
bool updateCounters(QPCSCReader *reader, QSmartCardDataPrivate *d) const final;
5858

5959
static bool isSupported(const QByteArray &atr);
60-
static QByteArray pinTemplate(const QString &pin);
60+
static QByteArray pinTemplate(QByteArray &&pin);
6161

6262
static const QByteArray AID, AID_OT, AID_QSCD, ATR_COSMO8, ATR_COSMOX;
6363
};
6464

6565
class THALESCard: public Card
6666
{
6767
public:
68-
QPCSCReader::Result change(QPCSCReader *reader, QSmartCardData::PinType type, const QString &pin, const QString &newpin) const final;
68+
QPCSCReader::Result change(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&pin, QByteArray &&newpin) const final;
6969
bool loadPerso(QPCSCReader *reader, QSmartCardDataPrivate *d) const final;
70-
QPCSCReader::Result replace(QPCSCReader *reader, QSmartCardData::PinType type, const QString &puk, const QString &pin) const final;
70+
QPCSCReader::Result replace(QPCSCReader *reader, QSmartCardData::PinType type, QByteArray &&puk, QByteArray &&pin) const final;
7171
bool updateCounters(QPCSCReader *reader, QSmartCardDataPrivate *d) const final;
7272

7373
static bool isSupported(const QByteArray &atr);

‎client/Styles.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ class FontDatabase
8282
{
8383
switch( font )
8484
{
85-
case Styles::Bold: return bold;
8685
case Styles::Condensed: return condensed;
87-
case Styles::CondensedBold: return condensedBold;
8886
default: return regular;
8987
}
9088
}
@@ -129,12 +127,8 @@ class FontDatabase
129127
};
130128
#endif
131129

132-
QString bold = QFontDatabase::applicationFontFamilies(
133-
QFontDatabase::addApplicationFont(QStringLiteral(":/fonts/Roboto-Bold.ttf"))).at(0);
134130
QString condensed = QFontDatabase::applicationFontFamilies(
135131
QFontDatabase::addApplicationFont(QStringLiteral(":/fonts/RobotoCondensed-Regular.ttf"))).at(0);
136-
QString condensedBold = QFontDatabase::applicationFontFamilies(
137-
QFontDatabase::addApplicationFont(QStringLiteral(":/fonts/RobotoCondensed-Bold.ttf"))).at(0);
138132
QString regular = QFontDatabase::applicationFontFamilies(
139133
QFontDatabase::addApplicationFont(QStringLiteral(":/fonts/Roboto-Regular.ttf"))).at(0);
140134
#ifndef Q_OS_MAC

‎client/Styles.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class Styles
2525
{
2626
public:
2727
enum Font {
28-
Bold,
2928
Condensed,
30-
CondensedBold,
3129
Regular
3230
};
3331

‎client/dialogs/AddRecipients.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ AddRecipients::AddRecipients(ItemList* itemList, QWidget *parent)
7777
connect(ldap_corp, &LdapSearch::error, this, &AddRecipients::showError);
7878
connect(this, &AddRecipients::finished, this, &AddRecipients::close);
7979

80-
connect(ui->leftPane, &ItemList::addAll, this, [this] {
80+
connect(ui->leftPane, &ItemList::add, this, [this] {
8181
for(Item *item: ui->leftPane->items)
8282
addRecipientToRightPane(item);
8383
});

‎client/dialogs/MobileDialog.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ MobileDialog::MobileDialog(QWidget *parent)
5555
Settings::MOBILEID_CODE = checked ? ui->idCode->text() : QString();
5656
Settings::MOBILEID_NUMBER = checked ? ui->phoneNo->text() : QString();
5757
};
58-
auto setError = [](QLineEdit *input, QLabel *error, const QString &msg) {
59-
input->setStyleSheet(msg.isEmpty() ? QString() : QStringLiteral("border-color: #BE7884"));
58+
auto setError = [](LineEdit *input, QLabel *error, const QString &msg) {
59+
input->setLabel(msg.isEmpty() ? QString() : QStringLiteral("error"));
6060
error->setText(msg);
6161
error->setHidden(msg.isEmpty());
6262
};

‎client/dialogs/MobileDialog.ui‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ background-color: white;
4242
placeholder-text-color: #607496;
4343
font-size: 16px;
4444
}
45+
QLineEdit[label=&quot;error&quot;] {
46+
border-color: #BE7884;
47+
}
4548
QCheckBox {
4649
spacing: 8px;
47-
border: none; /*Workaround for right padding*/
50+
border-right: none; /*Workaround for right padding*/
4851
}
4952
QCheckBox:disabled {
5053
color: #C4CBD8;
@@ -174,6 +177,9 @@ background-color: #82A9D3;
174177
<property name="placeholderText">
175178
<string notr="true">37254321</string>
176179
</property>
180+
<property name="label" stdset="0">
181+
<string notr="true"/>
182+
</property>
177183
</widget>
178184
</item>
179185
<item>
@@ -217,6 +223,9 @@ background-color: #82A9D3;
217223
<property name="placeholderText">
218224
<string notr="true">47101010033</string>
219225
</property>
226+
<property name="label" stdset="0">
227+
<string notr="true"/>
228+
</property>
220229
</widget>
221230
</item>
222231
<item>

‎client/dialogs/PinPopup.ui‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ background-color: white;
3939
placeholder-text-color: #607496;
4040
font-size: 16px;
4141
}
42+
QLineEdit[label=&quot;error&quot;] {
43+
border-color: #BE7884;
44+
}
4245
QPushButton {
4346
padding: 12px 12px;
4447
border-radius: 4px;
@@ -148,10 +151,13 @@ background-color: #82A9D3;
148151
</widget>
149152
</item>
150153
<item>
151-
<widget class="QLineEdit" name="pin">
154+
<widget class="LineEdit" name="pin">
152155
<property name="echoMode">
153156
<enum>QLineEdit::Password</enum>
154157
</property>
158+
<property name="label" stdset="0">
159+
<string notr="true"/>
160+
</property>
155161
</widget>
156162
</item>
157163
<item>
@@ -234,6 +240,13 @@ background-color: #82A9D3;
234240
</item>
235241
</layout>
236242
</widget>
243+
<customwidgets>
244+
<customwidget>
245+
<class>LineEdit</class>
246+
<extends>QLineEdit</extends>
247+
<header>widgets/LineEdit.h</header>
248+
</customwidget>
249+
</customwidgets>
237250
<resources/>
238251
<connections/>
239252
</ui>

0 commit comments

Comments
 (0)