Skip to content

Commit 6b5b80f

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

22 files changed

Lines changed: 70 additions & 220 deletions

‎src/ui/certificatewidget.cpp‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,23 @@ 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
{
5050
if (Application::isDarkTheme()) {
5151
icon->setPixmap(QStringLiteral(":/images/id-card_dark.svg"));
52-
warnIcon->setPixmap(QStringLiteral(":/images/fatal_dark.svg"));
5352
} else {
5453
icon->setPixmap(QStringLiteral(":/images/id-card.svg"));
55-
warnIcon->setPixmap(QStringLiteral(":/images/fatal.svg"));
5654
}
57-
warnIcon->hide();
58-
warnIcon->installEventFilter(self);
5955
warn->setObjectName(QStringLiteral("warn"));
6056
warn->hide();
6157
auto* layout = new QHBoxLayout(self);
6258
layout->setContentsMargins(20, 0, 20, 0);
6359
layout->setSpacing(10);
6460
layout->addWidget(icon);
6561
layout->addWidget(info, 1);
66-
layout->addWidget(warnIcon);
6762
auto* warnLayout = new QHBoxLayout;
6863
warnLayout->setSpacing(6);
69-
warnLayout->addWidget(warnIcon);
7064
warnLayout->addWidget(warn);
7165
layout->addItem(warnLayout);
7266
}
@@ -86,14 +80,6 @@ std::tuple<QString, QString, QString, QString> CertificateWidgetInfo::certData()
8680
certAndPinInfo.certificate.expiryDate().date().toString(Qt::ISODate)};
8781
}
8882

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-
9783
void CertificateWidgetInfo::setCertificateInfo(const EidCertificateAndPinInfo& cardCertPinInfo)
9884
{
9985
warn->setText(CertificateWidget::tr("Pin locked"));
@@ -113,7 +99,6 @@ void CertificateWidgetInfo::setCertificateInfo(const EidCertificateAndPinInfo& c
11399
.arg(subject, issuer, effectiveDate, expiryDate, warning));
114100
info->parentWidget()->setDisabled(certInfo.notEffective || certInfo.isExpired
115101
|| cardCertPinInfo.pinInfo.pinIsBlocked());
116-
warnIcon->setVisible(warning.isEmpty() && cardCertPinInfo.pinInfo.pinIsBlocked());
117102
warn->setVisible(warning.isEmpty() && cardCertPinInfo.pinInfo.pinIsBlocked());
118103
}
119104

@@ -127,15 +112,6 @@ CertificateWidget::CertificateWidget(QWidget* parent) : QWidget(parent), Certifi
127112
info->setFocusPolicy(Qt::TabFocus);
128113
}
129114

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-
139115
void CertificateWidget::paintEvent(QPaintEvent* /*event*/)
140116
{
141117
QPainter p(this);
@@ -156,15 +132,6 @@ CertificateButton::CertificateButton(const EidCertificateAndPinInfo& cardCertPin
156132
setCertificateInfo(cardCertPinInfo);
157133
}
158134

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-
168135
void CertificateButton::setCertificateInfo(const EidCertificateAndPinInfo& cardCertPinInfo)
169136
{
170137
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>
@@ -523,14 +496,11 @@ border-radius: 4px;</string>
523496
</widget>
524497
</item>
525498
<item>
526-
<layout class="QGridLayout" name="pinInputLabelLayout" columnstretch="0,1">
527-
<property name="horizontalSpacing">
499+
<layout class="QVBoxLayout" name="pinInputLabelLayout">
500+
<property name="spacing">
528501
<number>10</number>
529502
</property>
530-
<property name="verticalSpacing">
531-
<number>9</number>
532-
</property>
533-
<item row="0" column="0" colspan="2">
503+
<item>
534504
<widget class="QLabel" name="pinInputDescriptionLabel">
535505
<property name="focusPolicy">
536506
<enum>Qt::TabFocus</enum>
@@ -543,14 +513,7 @@ border-radius: 4px;</string>
543513
</property>
544514
</widget>
545515
</item>
546-
<item row="1" column="0">
547-
<widget class="QLabel" name="pinInputOriginLabelIcon">
548-
<property name="pixmap">
549-
<pixmap resource="web-eid-resources.qrc">:/images/origin.svg</pixmap>
550-
</property>
551-
</widget>
552-
</item>
553-
<item row="1" column="1">
516+
<item>
554517
<widget class="QLabel" name="pinInputOriginLabel">
555518
<property name="focusPolicy">
556519
<enum>Qt::TabFocus</enum>
@@ -575,19 +538,6 @@ border-radius: 4px;</string>
575538
<property name="text">
576539
<string>Select another certificate</string>
577540
</property>
578-
<property name="icon">
579-
<iconset resource="web-eid-resources.qrc">
580-
<normaloff>:/images/left.svg</normaloff>:/images/left.svg</iconset>
581-
</property>
582-
<property name="iconSize">
583-
<size>
584-
<width>24</width>
585-
<height>24</height>
586-
</size>
587-
</property>
588-
<property name="toolButtonStyle">
589-
<enum>Qt::ToolButtonTextBesideIcon</enum>
590-
</property>
591541
</widget>
592542
</item>
593543
<item row="1" column="1">
@@ -764,14 +714,11 @@ border-radius: 4px;</string>
764714
</item>
765715
<item>
766716
<widget class="QWidget" name="aboutContent" native="true">
767-
<layout class="QGridLayout" name="aboutContentLayout">
768-
<property name="horizontalSpacing">
769-
<number>10</number>
770-
</property>
771-
<property name="verticalSpacing">
717+
<layout class="QVBoxLayout" name="aboutContentLayout">
718+
<property name="spacing">
772719
<number>20</number>
773720
</property>
774-
<item row="1" column="1">
721+
<item>
775722
<widget class="QLabel" name="aboutAlert">
776723
<property name="focusPolicy">
777724
<enum>Qt::TabFocus</enum>
@@ -784,7 +731,7 @@ border-radius: 4px;</string>
784731
</property>
785732
</widget>
786733
</item>
787-
<item row="0" column="1">
734+
<item>
788735
<widget class="QLabel" name="aboutText">
789736
<property name="focusPolicy">
790737
<enum>Qt::TabFocus</enum>
@@ -797,25 +744,6 @@ border-radius: 4px;</string>
797744
</property>
798745
</widget>
799746
</item>
800-
<item row="0" column="0" rowspan="2">
801-
<widget class="QLabel" name="aboutIcon">
802-
<property name="minimumSize">
803-
<size>
804-
<width>24</width>
805-
<height>24</height>
806-
</size>
807-
</property>
808-
<property name="maximumSize">
809-
<size>
810-
<width>24</width>
811-
<height>24</height>
812-
</size>
813-
</property>
814-
<property name="pixmap">
815-
<pixmap resource="web-eid-resources.qrc">:/images/fatal.svg</pixmap>
816-
</property>
817-
</widget>
818-
</item>
819747
</layout>
820748
</widget>
821749
</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.

‎src/ui/images/fatal_dark.svg‎

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

0 commit comments

Comments
 (0)