Skip to content

Commit fe0c321

Browse files
metsmametsma
committed
Update icons
WE2-993 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 536496e commit fe0c321

27 files changed

+95
-233
lines changed

‎src/controller/utils/utils.hpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626

2727
#define REQUIRE_NOT_EMPTY_CONTAINS_NON_NULL_PTRS(vec) \
2828
if (vec.empty()) { \
29-
throw std::logic_error(std::string(#vec) + " is empty in " \
30-
+ pcsc_cpp::removeAbsolutePathPrefix(__FILE__) + ':' \
31-
+ std::to_string(__LINE__) + ':' + __func__); \
29+
THROW(std::logic_error, #vec " is empty"); \
3230
} \
3331
for (const auto& ptr : vec) { \
3432
REQUIRE_NON_NULL(ptr) \

‎src/ui/certificatewidget.cpp‎

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,20 @@ inline QString displayInRed(const QString& text)
4444
// support screen readers.
4545

4646
CertificateWidgetInfo::CertificateWidgetInfo(QWidget* self) :
47-
icon(new QLabel(self)), info(new QLabel(self)), warnIcon(new QLabel(self)),
47+
icon(new QLabel(self)), info(new QLabel(self)),
4848
warn(new QLabel(CertificateWidget::tr("Pin locked"), self))
4949
{
50-
if (Application::isDarkTheme()) {
51-
icon->setPixmap(QStringLiteral(":/images/id-card_dark.svg"));
52-
warnIcon->setPixmap(QStringLiteral(":/images/fatal_dark.svg"));
53-
} else {
54-
icon->setPixmap(QStringLiteral(":/images/id-card.svg"));
55-
warnIcon->setPixmap(QStringLiteral(":/images/fatal.svg"));
56-
}
57-
warnIcon->hide();
58-
warnIcon->installEventFilter(self);
50+
icon->setPixmap(Application::isDarkTheme() ? QStringLiteral(":/images/id-card_dark.svg")
51+
: QStringLiteral(":/images/id-card.svg"));
5952
warn->setObjectName(QStringLiteral("warn"));
6053
warn->hide();
6154
auto* layout = new QHBoxLayout(self);
6255
layout->setContentsMargins(20, 0, 20, 0);
6356
layout->setSpacing(10);
6457
layout->addWidget(icon);
6558
layout->addWidget(info, 1);
66-
layout->addWidget(warnIcon);
6759
auto* warnLayout = new QHBoxLayout;
6860
warnLayout->setSpacing(6);
69-
warnLayout->addWidget(warnIcon);
7061
warnLayout->addWidget(warn);
7162
layout->addItem(warnLayout);
7263
}
@@ -86,21 +77,15 @@ std::tuple<QString, QString, QString, QString> CertificateWidgetInfo::certData()
8677
certAndPinInfo.certificate.expiryDate().date().toString(Qt::ISODate)};
8778
}
8879

89-
void CertificateWidgetInfo::drawWarnIcon()
90-
{
91-
QPainter p(warnIcon);
92-
QRect cr = warnIcon->contentsRect();
93-
cr.adjust(warnIcon->margin(), warnIcon->margin(), -warnIcon->margin(), -warnIcon->margin());
94-
warnIcon->style()->drawItemPixmap(&p, cr, Qt::AlignCenter, warnIcon->pixmap());
95-
}
96-
9780
void CertificateWidgetInfo::setCertificateInfo(const EidCertificateAndPinInfo& cardCertPinInfo)
9881
{
9982
warn->setText(CertificateWidget::tr("Pin locked"));
10083
certAndPinInfo = cardCertPinInfo;
10184
const auto& certInfo = cardCertPinInfo.certInfo;
10285
QString warning;
10386
auto [subject, issuer, effectiveDate, expiryDate] = certData();
87+
bool isError =
88+
certInfo.notEffective || certInfo.isExpired || cardCertPinInfo.pinInfo.pinIsBlocked();
10489
if (certInfo.notEffective) {
10590
effectiveDate = displayInRed(effectiveDate);
10691
warning = displayInRed(CertificateWidget::tr(" (Not effective)"));
@@ -111,10 +96,12 @@ void CertificateWidgetInfo::setCertificateInfo(const EidCertificateAndPinInfo& c
11196
}
11297
info->setText(CertificateWidget::tr("<b>%1</b><br />Issuer: %2<br />Valid: %3 to %4%5")
11398
.arg(subject, issuer, effectiveDate, expiryDate, warning));
114-
info->parentWidget()->setDisabled(certInfo.notEffective || certInfo.isExpired
115-
|| cardCertPinInfo.pinInfo.pinIsBlocked());
116-
warnIcon->setVisible(warning.isEmpty() && cardCertPinInfo.pinInfo.pinIsBlocked());
117-
warn->setVisible(warning.isEmpty() && cardCertPinInfo.pinInfo.pinIsBlocked());
99+
info->parentWidget()->setDisabled(isError);
100+
warn->setVisible(isError);
101+
if (isError) {
102+
icon->setPixmap(Application::isDarkTheme() ? QStringLiteral(":/images/id-card-err_dark.svg")
103+
: QStringLiteral(":/images/id-card-err.svg"));
104+
}
118105
}
119106

120107
void CertificateWidgetInfo::languageChange()
@@ -127,15 +114,6 @@ CertificateWidget::CertificateWidget(QWidget* parent) : QWidget(parent), Certifi
127114
info->setFocusPolicy(Qt::TabFocus);
128115
}
129116

130-
bool CertificateWidget::eventFilter(QObject* object, QEvent* event)
131-
{
132-
if (qobject_cast<QLabel*>(object) && event->type() == QEvent::Paint) {
133-
drawWarnIcon();
134-
return true;
135-
}
136-
return QWidget::eventFilter(object, event);
137-
}
138-
139117
void CertificateWidget::paintEvent(QPaintEvent* /*event*/)
140118
{
141119
QPainter p(this);
@@ -156,15 +134,6 @@ CertificateButton::CertificateButton(const EidCertificateAndPinInfo& cardCertPin
156134
setCertificateInfo(cardCertPinInfo);
157135
}
158136

159-
bool CertificateButton::eventFilter(QObject* object, QEvent* event)
160-
{
161-
if (qobject_cast<QLabel*>(object) && event->type() == QEvent::Paint) {
162-
drawWarnIcon();
163-
return true;
164-
}
165-
return QAbstractButton::eventFilter(object, event);
166-
}
167-
168137
void CertificateButton::setCertificateInfo(const EidCertificateAndPinInfo& cardCertPinInfo)
169138
{
170139
CertificateWidgetInfo::setCertificateInfo(cardCertPinInfo);

‎src/ui/certificatewidget.hpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ class CertificateWidgetInfo
4141
explicit CertificateWidgetInfo(QWidget* self);
4242
Q_DISABLE_COPY_MOVE(CertificateWidgetInfo)
4343

44-
void drawWarnIcon();
4544
std::tuple<QString, QString, QString, QString> certData() const;
4645

4746
QLabel* icon;
4847
QLabel* info;
49-
QLabel* warnIcon;
5048
QLabel* warn;
5149
EidCertificateAndPinInfo certAndPinInfo;
5250
};
@@ -59,7 +57,6 @@ class CertificateWidget final : public QWidget, public CertificateWidgetInfo
5957
explicit CertificateWidget(QWidget* parent);
6058

6159
private:
62-
bool eventFilter(QObject* object, QEvent* event) final;
6360
void paintEvent(QPaintEvent* event) final;
6461
};
6562

@@ -71,7 +68,6 @@ class CertificateButton final : public QAbstractButton, public CertificateWidget
7168
CertificateButton(const EidCertificateAndPinInfo& certAndPinInfo, QWidget* parent);
7269

7370
private:
74-
bool eventFilter(QObject* object, QEvent* event) final;
7571
void setCertificateInfo(const EidCertificateAndPinInfo& certAndPinInfo) final;
7672
void paintEvent(QPaintEvent* event) final;
7773
};

‎src/ui/dark.qss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ background-color: #232325;
1111
}
1212
#langButton {
1313
color: #FFFFFF;
14-
background-image: url(:images/down_dark.svg);
1514
}
1615
#langButton::hover {
1716
background-color: #4E4E53;

‎src/ui/dialog.ui‎

Lines changed: 19 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,9 @@ background-color: #215081;
5858
color: #003168;
5959
border: 0px;
6060
border-radius: 3px;
61-
max-height: 22px;
6261
max-width: 55px;
63-
padding-left: 0px;
64-
padding-right: 0px;
6562
font-size: 14px;
66-
text-align: left;
67-
background-position: right;
68-
background-repeat: no-repeat;
69-
background-origin: content;
70-
background-image: url(:images/down.svg);
71-
}
72-
#langButton::hover {
73-
background-color: #EFEFEF;
63+
padding: 8px;
7464
}
7565
CertificateButton, CertificateWidget {
7666
border: 1px solid rgba(0,49,104,0.1);
@@ -311,20 +301,20 @@ border-radius: 4px;</string>
311301
<item>
312302
<layout class="QHBoxLayout" name="messageInfoLayout" stretch="0,1">
313303
<property name="spacing">
314-
<number>20</number>
304+
<number>10</number>
315305
</property>
316306
<item alignment="Qt::AlignTop">
317307
<widget class="QLabel" name="cardChipIcon">
318308
<property name="minimumSize">
319309
<size>
320-
<width>50</width>
321-
<height>32</height>
310+
<width>24</width>
311+
<height>24</height>
322312
</size>
323313
</property>
324314
<property name="maximumSize">
325315
<size>
326-
<width>50</width>
327-
<height>32</height>
316+
<width>24</width>
317+
<height>24</height>
328318
</size>
329319
</property>
330320
<property name="pixmap">
@@ -349,7 +339,7 @@ border-radius: 4px;</string>
349339
</item>
350340
<item>
351341
<widget class="QWidget" name="fatalError" native="true">
352-
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
342+
<layout class="QHBoxLayout" name="horizontalLayout">
353343
<property name="spacing">
354344
<number>8</number>
355345
</property>
@@ -365,13 +355,6 @@ border-radius: 4px;</string>
365355
<property name="bottomMargin">
366356
<number>10</number>
367357
</property>
368-
<item>
369-
<widget class="QLabel" name="fatalErrorIcon">
370-
<property name="pixmap">
371-
<pixmap resource="web-eid-resources.qrc">:/images/fatal.svg</pixmap>
372-
</property>
373-
</widget>
374-
</item>
375358
<item>
376359
<widget class="QLabel" name="fatalErrorLabel">
377360
<property name="focusPolicy">
@@ -441,14 +424,11 @@ border-radius: 4px;</string>
441424
</widget>
442425
</item>
443426
<item>
444-
<layout class="QGridLayout" name="selectCertificateLabelLayout" columnstretch="0,1">
445-
<property name="horizontalSpacing">
446-
<number>9</number>
447-
</property>
448-
<property name="verticalSpacing">
427+
<layout class="QVBoxLayout" name="selectCertificateLabelLayout">
428+
<property name="spacing">
449429
<number>10</number>
450430
</property>
451-
<item row="0" column="0" colspan="2">
431+
<item>
452432
<widget class="QLabel" name="selectCertificateDescriptionLabel">
453433
<property name="minimumSize">
454434
<size>
@@ -470,14 +450,7 @@ border-radius: 4px;</string>
470450
</property>
471451
</widget>
472452
</item>
473-
<item row="1" column="0">
474-
<widget class="QLabel" name="selectCertificateOriginLabelIcon">
475-
<property name="pixmap">
476-
<pixmap resource="web-eid-resources.qrc">:/images/origin.svg</pixmap>
477-
</property>
478-
</widget>
479-
</item>
480-
<item row="1" column="1">
453+
<item>
481454
<widget class="QLabel" name="selectCertificateOriginLabel">
482455
<property name="focusPolicy">
483456
<enum>Qt::TabFocus</enum>
@@ -526,14 +499,11 @@ border-radius: 4px;</string>
526499
</widget>
527500
</item>
528501
<item>
529-
<layout class="QGridLayout" name="pinInputLabelLayout" columnstretch="0,1">
530-
<property name="horizontalSpacing">
502+
<layout class="QVBoxLayout" name="pinInputLabelLayout">
503+
<property name="spacing">
531504
<number>10</number>
532505
</property>
533-
<property name="verticalSpacing">
534-
<number>9</number>
535-
</property>
536-
<item row="0" column="0" colspan="2">
506+
<item>
537507
<widget class="QLabel" name="pinInputDescriptionLabel">
538508
<property name="focusPolicy">
539509
<enum>Qt::TabFocus</enum>
@@ -546,14 +516,7 @@ border-radius: 4px;</string>
546516
</property>
547517
</widget>
548518
</item>
549-
<item row="1" column="0">
550-
<widget class="QLabel" name="pinInputOriginLabelIcon">
551-
<property name="pixmap">
552-
<pixmap resource="web-eid-resources.qrc">:/images/origin.svg</pixmap>
553-
</property>
554-
</widget>
555-
</item>
556-
<item row="1" column="1">
519+
<item>
557520
<widget class="QLabel" name="pinInputOriginLabel">
558521
<property name="focusPolicy">
559522
<enum>Qt::TabFocus</enum>
@@ -581,19 +544,6 @@ border-radius: 4px;</string>
581544
<property name="text">
582545
<string>Select another certificate</string>
583546
</property>
584-
<property name="icon">
585-
<iconset resource="web-eid-resources.qrc">
586-
<normaloff>:/images/left.svg</normaloff>:/images/left.svg</iconset>
587-
</property>
588-
<property name="iconSize">
589-
<size>
590-
<width>24</width>
591-
<height>24</height>
592-
</size>
593-
</property>
594-
<property name="toolButtonStyle">
595-
<enum>Qt::ToolButtonTextBesideIcon</enum>
596-
</property>
597547
</widget>
598548
</item>
599549
<item row="1" column="1">
@@ -770,14 +720,11 @@ border-radius: 4px;</string>
770720
</item>
771721
<item>
772722
<widget class="QWidget" name="aboutContent" native="true">
773-
<layout class="QGridLayout" name="aboutContentLayout">
774-
<property name="horizontalSpacing">
775-
<number>10</number>
776-
</property>
777-
<property name="verticalSpacing">
723+
<layout class="QVBoxLayout" name="aboutContentLayout">
724+
<property name="spacing">
778725
<number>20</number>
779726
</property>
780-
<item row="1" column="1">
727+
<item>
781728
<widget class="QLabel" name="aboutAlert">
782729
<property name="focusPolicy">
783730
<enum>Qt::TabFocus</enum>
@@ -790,7 +737,7 @@ border-radius: 4px;</string>
790737
</property>
791738
</widget>
792739
</item>
793-
<item row="0" column="1">
740+
<item>
794741
<widget class="QLabel" name="aboutText">
795742
<property name="focusPolicy">
796743
<enum>Qt::TabFocus</enum>
@@ -803,25 +750,6 @@ border-radius: 4px;</string>
803750
</property>
804751
</widget>
805752
</item>
806-
<item row="0" column="0" rowspan="2">
807-
<widget class="QLabel" name="aboutIcon">
808-
<property name="minimumSize">
809-
<size>
810-
<width>24</width>
811-
<height>24</height>
812-
</size>
813-
</property>
814-
<property name="maximumSize">
815-
<size>
816-
<width>24</width>
817-
<height>24</height>
818-
</size>
819-
</property>
820-
<property name="pixmap">
821-
<pixmap resource="web-eid-resources.qrc">:/images/fatal.svg</pixmap>
822-
</property>
823-
</widget>
824-
</item>
825753
</layout>
826754
</widget>
827755
</item>

‎src/ui/images/cardreader.svg‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/ui/images/cardreader_dark.svg‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/ui/images/down.svg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/ui/images/down_dark.svg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/ui/images/fatal.svg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)