Skip to content

Commit 8f37b88

Browse files
metsmametsma
committed
Update icons
WE2-993 Signed-off-by: Raul Metsma <[email protected]>
1 parent 75e1e72 commit 8f37b88

22 files changed

+70
-220
lines changed

‎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 CardCertificateAndPinInfo& cardCertPinInfo)
9884
{
9985
warn->setText(CertificateWidget::tr("Pin locked"));
@@ -114,7 +100,6 @@ void CertificateWidgetInfo::setCertificateInfo(const CardCertificateAndPinInfo&
114100
info->parentWidget()->setDisabled(certInfo.notEffective || certInfo.isExpired
115101
|| cardCertPinInfo.pinInfo.pinIsBlocked);
116102
if (warning.isEmpty() && cardCertPinInfo.pinInfo.pinIsBlocked) {
117-
warnIcon->show();
118103
warn->show();
119104
}
120105
}
@@ -129,15 +114,6 @@ CertificateWidget::CertificateWidget(QWidget* parent) : QWidget(parent), Certifi
129114
info->setFocusPolicy(Qt::TabFocus);
130115
}
131116

132-
bool CertificateWidget::eventFilter(QObject* object, QEvent* event)
133-
{
134-
if (qobject_cast<QLabel*>(object) && event->type() == QEvent::Paint) {
135-
drawWarnIcon();
136-
return true;
137-
}
138-
return QWidget::eventFilter(object, event);
139-
}
140-
141117
void CertificateWidget::paintEvent(QPaintEvent* /*event*/)
142118
{
143119
QPainter p(this);
@@ -158,15 +134,6 @@ CertificateButton::CertificateButton(const CardCertificateAndPinInfo& cardCertPi
158134
setCertificateInfo(cardCertPinInfo);
159135
}
160136

161-
bool CertificateButton::eventFilter(QObject* object, QEvent* event)
162-
{
163-
if (qobject_cast<QLabel*>(object) && event->type() == QEvent::Paint) {
164-
drawWarnIcon();
165-
return true;
166-
}
167-
return QAbstractButton::eventFilter(object, event);
168-
}
169-
170137
void CertificateButton::setCertificateInfo(const CardCertificateAndPinInfo& cardCertPinInfo)
171138
{
172139
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
CardCertificateAndPinInfo 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 CardCertificateAndPinInfo& cardCertPinInfo, QWidget* parent);
7269

7370
private:
74-
bool eventFilter(QObject* object, QEvent* event) final;
7571
void setCertificateInfo(const CardCertificateAndPinInfo& cardCertPinInfo) 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);
@@ -289,20 +279,20 @@ height: 24px;
289279
<item>
290280
<layout class="QHBoxLayout" name="messageInfoLayout" stretch="0,1">
291281
<property name="spacing">
292-
<number>20</number>
282+
<number>10</number>
293283
</property>
294284
<item alignment="Qt::AlignTop">
295285
<widget class="QLabel" name="cardChipIcon">
296286
<property name="minimumSize">
297287
<size>
298-
<width>50</width>
299-
<height>32</height>
288+
<width>24</width>
289+
<height>24</height>
300290
</size>
301291
</property>
302292
<property name="maximumSize">
303293
<size>
304-
<width>50</width>
305-
<height>32</height>
294+
<width>24</width>
295+
<height>24</height>
306296
</size>
307297
</property>
308298
<property name="pixmap">
@@ -327,7 +317,7 @@ height: 24px;
327317
</item>
328318
<item>
329319
<widget class="QWidget" name="fatalError" native="true">
330-
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
320+
<layout class="QHBoxLayout" name="horizontalLayout">
331321
<property name="spacing">
332322
<number>8</number>
333323
</property>
@@ -343,13 +333,6 @@ height: 24px;
343333
<property name="bottomMargin">
344334
<number>10</number>
345335
</property>
346-
<item>
347-
<widget class="QLabel" name="fatalErrorIcon">
348-
<property name="pixmap">
349-
<pixmap resource="web-eid-resources.qrc">:/images/fatal.svg</pixmap>
350-
</property>
351-
</widget>
352-
</item>
353336
<item>
354337
<widget class="QLabel" name="fatalErrorLabel">
355338
<property name="focusPolicy">
@@ -419,14 +402,11 @@ height: 24px;
419402
</widget>
420403
</item>
421404
<item>
422-
<layout class="QGridLayout" name="selectCertificateLabelLayout" columnstretch="0,1">
423-
<property name="horizontalSpacing">
424-
<number>9</number>
425-
</property>
426-
<property name="verticalSpacing">
405+
<layout class="QVBoxLayout" name="selectCertificateLabelLayout">
406+
<property name="spacing">
427407
<number>10</number>
428408
</property>
429-
<item row="0" column="0" colspan="2">
409+
<item>
430410
<widget class="QLabel" name="selectCertificateDescriptionLabel">
431411
<property name="minimumSize">
432412
<size>
@@ -448,14 +428,7 @@ height: 24px;
448428
</property>
449429
</widget>
450430
</item>
451-
<item row="1" column="0">
452-
<widget class="QLabel" name="selectCertificateOriginLabelIcon">
453-
<property name="pixmap">
454-
<pixmap resource="web-eid-resources.qrc">:/images/origin.svg</pixmap>
455-
</property>
456-
</widget>
457-
</item>
458-
<item row="1" column="1">
431+
<item>
459432
<widget class="QLabel" name="selectCertificateOriginLabel">
460433
<property name="focusPolicy">
461434
<enum>Qt::TabFocus</enum>
@@ -501,14 +474,11 @@ height: 24px;
501474
</widget>
502475
</item>
503476
<item>
504-
<layout class="QGridLayout" name="pinInputLabelLayout" columnstretch="0,1">
505-
<property name="horizontalSpacing">
477+
<layout class="QVBoxLayout" name="pinInputLabelLayout">
478+
<property name="spacing">
506479
<number>10</number>
507480
</property>
508-
<property name="verticalSpacing">
509-
<number>9</number>
510-
</property>
511-
<item row="0" column="0" colspan="2">
481+
<item>
512482
<widget class="QLabel" name="pinInputDescriptionLabel">
513483
<property name="focusPolicy">
514484
<enum>Qt::TabFocus</enum>
@@ -521,14 +491,7 @@ height: 24px;
521491
</property>
522492
</widget>
523493
</item>
524-
<item row="1" column="0">
525-
<widget class="QLabel" name="pinInputOriginLabelIcon">
526-
<property name="pixmap">
527-
<pixmap resource="web-eid-resources.qrc">:/images/origin.svg</pixmap>
528-
</property>
529-
</widget>
530-
</item>
531-
<item row="1" column="1">
494+
<item>
532495
<widget class="QLabel" name="pinInputOriginLabel">
533496
<property name="focusPolicy">
534497
<enum>Qt::TabFocus</enum>
@@ -553,19 +516,6 @@ height: 24px;
553516
<property name="text">
554517
<string>Select another certificate</string>
555518
</property>
556-
<property name="icon">
557-
<iconset resource="web-eid-resources.qrc">
558-
<normaloff>:/images/left.svg</normaloff>:/images/left.svg</iconset>
559-
</property>
560-
<property name="iconSize">
561-
<size>
562-
<width>24</width>
563-
<height>24</height>
564-
</size>
565-
</property>
566-
<property name="toolButtonStyle">
567-
<enum>Qt::ToolButtonTextBesideIcon</enum>
568-
</property>
569519
</widget>
570520
</item>
571521
<item row="1" column="1">
@@ -742,14 +692,11 @@ height: 24px;
742692
</item>
743693
<item>
744694
<widget class="QWidget" name="aboutContent" native="true">
745-
<layout class="QGridLayout" name="aboutContentLayout">
746-
<property name="horizontalSpacing">
747-
<number>10</number>
748-
</property>
749-
<property name="verticalSpacing">
695+
<layout class="QVBoxLayout" name="aboutContentLayout">
696+
<property name="spacing">
750697
<number>20</number>
751698
</property>
752-
<item row="1" column="1">
699+
<item>
753700
<widget class="QLabel" name="aboutAlert">
754701
<property name="focusPolicy">
755702
<enum>Qt::TabFocus</enum>
@@ -762,7 +709,7 @@ height: 24px;
762709
</property>
763710
</widget>
764711
</item>
765-
<item row="0" column="1">
712+
<item>
766713
<widget class="QLabel" name="aboutText">
767714
<property name="focusPolicy">
768715
<enum>Qt::TabFocus</enum>
@@ -775,25 +722,6 @@ height: 24px;
775722
</property>
776723
</widget>
777724
</item>
778-
<item row="0" column="0" rowspan="2">
779-
<widget class="QLabel" name="aboutIcon">
780-
<property name="minimumSize">
781-
<size>
782-
<width>24</width>
783-
<height>24</height>
784-
</size>
785-
</property>
786-
<property name="maximumSize">
787-
<size>
788-
<width>24</width>
789-
<height>24</height>
790-
</size>
791-
</property>
792-
<property name="pixmap">
793-
<pixmap resource="web-eid-resources.qrc">:/images/fatal.svg</pixmap>
794-
</property>
795-
</widget>
796-
</item>
797725
</layout>
798726
</widget>
799727
</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.

‎src/ui/images/id-card.svg

Lines changed: 3 additions & 10 deletions
Loading

0 commit comments

Comments
 (0)