Skip to content

Update colors to new UI guidelines #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsma wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update colors to new UI guidelines #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95289a9
Update line edit to new UI guidlines
metsma Mar 16, 2026
0ed2dbc
Adjust labels to new style guidelines
metsma Aug 4, 2026
a3ccc9f
Update colors to new UI guidelines
metsma Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/controller/command-handlers/certificatereader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ EidCertificateAndPinInfo getCertificateWithStatusAndInfo(ElectronicID::ptr&& eid
subject = QStringLiteral("%1, %2, %3").arg(surName, givenName, serialNumber);
}

CertificateInfo certInfo {
certificateType, certificate.expiryDate() < QDateTime::currentDateTimeUtc(),
certificate.effectiveDate() > QDateTime::currentDateTimeUtc(), std::move(subject)};
auto info = certificateType.isAuthentication() ? eid->authPinInfo() : eid->signingPinInfo();
PinInfo pinInfo {.pinMinMaxLength = certificateType.isAuthentication()
? eid->authPinMinMaxLength()
Expand All @@ -83,7 +80,13 @@ EidCertificateAndPinInfo getCertificateWithStatusAndInfo(ElectronicID::ptr&& eid
.eid = std::move(eid),
.certificateBytesInDer = std::move(certificateDer),
.certificate = certificate,
.certInfo = std::move(certInfo),
.certInfo =
{
.type = certificateType,
.isExpired = certificate.expiryDate() < QDateTime::currentDateTimeUtc(),
.notEffective = certificate.effectiveDate() > QDateTime::currentDateTimeUtc(),
.subject = std::move(subject),
},
.pinInfo = std::move(pinInfo),
.pin1Active = pin1Active,
.pin2Active = pin2Active,
Expand Down
78 changes: 39 additions & 39 deletions src/ui/certificatewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,39 +25,36 @@
#include "application.hpp"

#include <QEvent>
#include <QHBoxLayout>
#include <QGridLayout>
#include <QLabel>
#include <QPainter>
#include <QStyleOption>

namespace
{

inline QString displayInRed(const QString& text)
{
return QStringLiteral("<span style=\"color: #CD2541\">%1</span>").arg(text);
}

} // namespace

// We use two separate widgets, CertificateWidget and CertificateButton, for accessibility, to
// support screen readers.

CertificateWidgetInfo::CertificateWidgetInfo(QWidget* self) :
icon(new QLabel(self)), info(new QLabel(self)),
warn(new QLabel(CertificateWidget::tr("Pin locked"), self))
icon(new QLabel(self)), info(new QLabel(self)), issuer(new QLabel(self)),
status(new QLabel(self))
{
warn->setObjectName(QStringLiteral("warn"));
warn->hide();
auto* layout = new QHBoxLayout(self);
layout->setContentsMargins(20, 0, 20, 0);
layout->setSpacing(10);
layout->addWidget(icon);
layout->addWidget(info, 1);
auto* warnLayout = new QHBoxLayout;
warnLayout->setSpacing(6);
warnLayout->addWidget(warn);
layout->addItem(warnLayout);
info->setObjectName(QStringLiteral("certificateName"));
info->setTextFormat(Qt::PlainText);
info->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
issuer->setObjectName(QStringLiteral("certificateIssuer"));
issuer->setTextFormat(Qt::PlainText);
issuer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
status->setObjectName(QStringLiteral("certificateStatus"));
status->setTextFormat(Qt::PlainText);
issuer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
auto* layout = new QGridLayout(self);
layout->setContentsMargins(16, 16, 16, 16);
layout->setHorizontalSpacing(16);
layout->setVerticalSpacing(2);
layout->addWidget(icon, 0, 0, 3, 1, Qt::AlignVCenter);
layout->addWidget(info, 0, 1);
layout->addWidget(issuer, 1, 1);
layout->addWidget(status, 2, 1, Qt::AlignLeft);
layout->setColumnStretch(1, 1);
}

EidCertificateAndPinInfo CertificateWidgetInfo::certificateInfo() const
Expand All @@ -67,35 +64,36 @@ EidCertificateAndPinInfo CertificateWidgetInfo::certificateInfo() const

std::tuple<QString, QString, QString, QString> CertificateWidgetInfo::certData() const
{
return {certAndPinInfo.certInfo.subject.toHtmlEscaped(),
certAndPinInfo.certificate.issuerInfo(QSslCertificate::CommonName)
.join(' ')
.toHtmlEscaped(),
return {certAndPinInfo.certInfo.subject,
certAndPinInfo.certificate.issuerInfo(QSslCertificate::CommonName).join(' '),
certAndPinInfo.certificate.effectiveDate().date().toString(Qt::ISODate),
certAndPinInfo.certificate.expiryDate().date().toString(Qt::ISODate)};
}

void CertificateWidgetInfo::setCertificateInfo(const EidCertificateAndPinInfo& cardCertPinInfo)
{
warn->setText(CertificateWidget::tr("Pin locked"));
certAndPinInfo = cardCertPinInfo;
const auto& certInfo = cardCertPinInfo.certInfo;
QString warning;
auto [subject, issuer, effectiveDate, expiryDate] = certData();
const auto& [subject, issuerName, effectiveDate, expiryDate] = certData();
Q_UNUSED(effectiveDate)
bool isError =
certInfo.notEffective || certInfo.isExpired || cardCertPinInfo.pinInfo.pinIsBlocked();
if (certInfo.notEffective) {
effectiveDate = displayInRed(effectiveDate);
warning = displayInRed(CertificateWidget::tr(" (Not effective)"));
warning = CertificateWidget::tr(" (Not effective)");
}
if (certInfo.isExpired) {
expiryDate = displayInRed(expiryDate);
warning = displayInRed(CertificateWidget::tr(" (Expired)"));
warning = CertificateWidget::tr(" (Expired)");
}
info->setText(CertificateWidget::tr("<b>%1</b><br />Issuer: %2<br />Valid: %3 to %4%5")
.arg(subject, issuer, effectiveDate, expiryDate, warning));
info->setText(subject);
issuer->setText(CertificateWidget::tr("Issuer: %1").arg(issuerName));
status->setText(cardCertPinInfo.pinInfo.pinIsBlocked()
? CertificateWidget::tr("Pin locked")
: CertificateWidget::tr("Valid until: %1%2").arg(expiryDate, warning));
status->setProperty("warning", isError);
status->style()->unpolish(status);
status->style()->polish(status);
info->parentWidget()->setDisabled(isError);
warn->setVisible(warning.isEmpty() && cardCertPinInfo.pinInfo.pinIsBlocked());
if (isError) {
icon->setPixmap(Application::isDarkTheme() ? QStringLiteral(":/images/id-card-err_dark.svg")
: QStringLiteral(":/images/id-card-err.svg"));
Expand Down Expand Up @@ -132,14 +130,16 @@ CertificateButton::CertificateButton(const EidCertificateAndPinInfo& cardCertPin
setAutoExclusive(true);
CertificateWidgetInfo::icon->setAttribute(Qt::WA_TransparentForMouseEvents);
info->setAttribute(Qt::WA_TransparentForMouseEvents);
issuer->setAttribute(Qt::WA_TransparentForMouseEvents);
setCertificateInfo(cardCertPinInfo);
}

void CertificateButton::setCertificateInfo(const EidCertificateAndPinInfo& cardCertPinInfo)
{
CertificateWidgetInfo::setCertificateInfo(cardCertPinInfo);
auto [subject, issuer, effectiveDate, expiryDate] = certData();
setText(tr("%1 Issuer: %2 Valid: %3 to %4").arg(subject, issuer, effectiveDate, expiryDate));
auto [subject, issuerName, effectiveDate, expiryDate] = certData();
setText(
tr("%1 Issuer: %2 Valid: %3 to %4").arg(subject, issuerName, effectiveDate, expiryDate));
}

void CertificateButton::paintEvent(QPaintEvent* /*event*/)
Expand Down
3 changes: 2 additions & 1 deletion src/ui/certificatewidget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ class CertificateWidgetInfo

QLabel* icon;
QLabel* info;
QLabel* warn;
QLabel* issuer;
QLabel* status;
EidCertificateAndPinInfo certAndPinInfo;
};

Expand Down
32 changes: 21 additions & 11 deletions src/ui/dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,32 @@ color: #FFFFFF;
#langButton::hover {
background-color: #4E4E53;
}
CertificateButton, CertificateWidget {
border-color: #4E4E53;
CertificateWidget {
border-color: transparent;
}
CertificateButton {
background-color: rgba(255,255,255,0.1);
border-color: black;
border-color: #749FCE;
}
CertificateButton:checked {
border-color: #008EEA;
border-color: #749FCE;
background-color: #1A3E64;
}
/* CertificateButton QWidget:disabled, CertificateWidget QWidget:disabled */
CertificateButton #warn, CertificateWidget #warn {
color: #F54A67;
#certificateStatus {
color: white;
background-color: #415982;
}
#certificateStatus[warning="true"] {
color: #FF5C79;
background-color: #4A2830;
}
QLineEdit {
background-color: rgba(255,255,255,0.1);
border-color: #008EEA;
border-color: #909299;
color: #FFFFFF;
}
QLineEdit[warning="true"] {
border-color: #F54A67;
color: #F54A67;
border-color: #FF5C79;
}
QProgressBar {
background-color: rgba(255,255,255,0.1);
Expand All @@ -49,10 +54,15 @@ border-color: #003168;
color: #FFFFFF;
}
#selectCertificateOriginLabel, #pinInputOriginLabel {
color: #B5BFCF;
background-color: #091A36;
border-color: #415982;
}
#pinTitleLabel {
color: white;
}
#pinErrorLabel {
color: #F54A67;
color: #FF5C79;
}
#aboutContent {
border-color: #4E4E53;
Expand Down
Loading
Loading