From 105bf94d18df0b22f3f2216407497af1467dee07 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Wed, 14 Jan 2026 13:31:12 +0200 Subject: [PATCH] Use correct fonts IB-7968 Signed-off-by: Raul Metsma --- COPYING | 2 +- client/dialogs/CertificateDetails.ui | 9 ++- client/dialogs/CertificateHistory.ui | 7 ++- client/dialogs/FirstRun.ui | 84 +++++++++++----------------- client/dialogs/KeyDialog.ui | 3 + client/dialogs/SettingsDialog.ui | 2 +- client/dialogs/SignatureDialog.ui | 7 +++ client/dialogs/SmartIDDialog.ui | 2 +- client/translations/en.ts | 4 +- client/translations/et.ts | 4 +- client/translations/ru.ts | 4 +- client/widgets/CardWidget.ui | 1 + client/widgets/ItemList.cpp | 7 --- client/widgets/ItemList.ui | 12 ++-- 14 files changed, 73 insertions(+), 75 deletions(-) diff --git a/COPYING b/COPYING index 65c39965f..415d5c33c 100644 --- a/COPYING +++ b/COPYING @@ -61,7 +61,7 @@ client/pkcs11.h _______________________________________________________________________________ -client/fonts/Open_Sans +client/fonts Apache License Version 2.0, January 2004 diff --git a/client/dialogs/CertificateDetails.ui b/client/dialogs/CertificateDetails.ui index 6878a66a7..6b43af9af 100644 --- a/client/dialogs/CertificateDetails.ui +++ b/client/dialogs/CertificateDetails.ui @@ -115,7 +115,14 @@ font-size: 22px; - QHeaderView::section { + QTableWidget { +background-color: #FFFFFF; +} +QTableWidget::item:selected { +background-color: #E7EAEF; +color: #07142A; +} +QHeaderView::section { border: 1px solid #E7EAEF; border-width: 0px 0px 1px 0px; padding: 0px 0px 8px 5px; diff --git a/client/dialogs/CertificateHistory.ui b/client/dialogs/CertificateHistory.ui index fbf8f66f6..f0a5650f3 100644 --- a/client/dialogs/CertificateHistory.ui +++ b/client/dialogs/CertificateHistory.ui @@ -75,6 +75,7 @@ background-color: #FFFFFF; font-family: Roboto, Helvetica; font-size: 12px; color: #07142A; +background-color: #FFFFFF; } QHeaderView::section { font-family: Roboto, Helvetica; @@ -83,6 +84,10 @@ border: none; border-bottom: 1px solid #E7EAEF; background-color: #FFFFFF; } +QTreeWidget::item:selected { +background-color: #E7EAEF; +color: #07142A; +} QHeaderView::up-arrow, QHeaderView::down-arrow { subcontrol-origin: padding; @@ -139,7 +144,7 @@ QHeaderView::down-arrow { Expiry date - AlignCenter + AlignLeading|AlignVCenter diff --git a/client/dialogs/FirstRun.ui b/client/dialogs/FirstRun.ui index 866c6d7e0..8b1f44ce6 100644 --- a/client/dialogs/FirstRun.ui +++ b/client/dialogs/FirstRun.ui @@ -113,65 +113,49 @@ color: #041E42; QComboBox { - padding: 0px 10px; - image: none; - border: 1px solid #8E969D; - border-radius: 2px; - background-color: #FFFFFF; - color: #353739; - padding: 0px; - padding-left:12px; +padding: 0px 14px; +border: 1px solid #C4CBD8; +border-radius: 4px; +background-color: #FFFFFF; +color: #07142A; +font-size: 16px; } - -/* list */ QComboBox QWidget#popup { - background-color: transparent; +background-color: transparent; } QComboBox QWidget#content { - border: 1px solid #8E969D; - border-radius: 2px; - background-color: #FFFFFF; +border: 1px solid #C4CBD8; +border-radius: 4px; +background-color: #FFFFFF; } - -/* rows */ QComboBox QPushButton { - margin: 3px; - padding: 0px 8px 0px 4px; - border: 0px; - color: #353739; - background-color: #FFFFFF; - text-align: left; - qproperty-iconSize: 14px 9px; - qproperty-layoutDirection: RightToLeft; +margin: 3px; +padding: 0px 12px 0px 4px; +border: 0px; +color: #07142A; +background-color: #FFFFFF; +text-align: left; +font-weight: normal; +font-size: 16px; +qproperty-iconSize: 14px 9px; +qproperty-layoutDirection: RightToLeft; } QComboBox QPushButton#selected { - qproperty-icon: url(:/images/arrow_up.svg); -} - -/* hover row */ -QComboBox QPushButton:hover, QComboBox QPushButton:focus { - background-color: #006EB5; - color: #FFFFFF; +qproperty-icon: url(:/images/arrow_up.svg); } QComboBox QPushButton:hover#selected, QComboBox QPushButton:focus#selected { - qproperty-icon: url(:/images/arrow_up_white.svg); +qproperty-icon: url(:/images/arrow_up_white.svg); } - -/* drop-down button*/ QComboBox::drop-down { - background-color: #FFFFFF; - width: 25px; +background-color: #FFFFFF; +width: 25px; } - -/* drop-down button image*/ QComboBox::down-arrow { - image: url(:/images/arrow_down.svg); +image: url(:/images/arrow_down.svg); } - -/* drop-down button image on clicked*/ QComboBox::down-arrow:on { - top: 1px; - left: 1px; +top: 1px; +left: 1px; } @@ -640,7 +624,7 @@ border-radius: 3px; 363 500 298 - 30 + 32 @@ -657,9 +641,9 @@ border-radius: 3px; 363 - 535 + 537 298 - 30 + 32 @@ -1083,9 +1067,9 @@ border-radius: 3px; 363 - 535 + 537 298 - 30 + 32 @@ -1104,7 +1088,7 @@ border-radius: 3px; 363 500 298 - 30 + 32 @@ -1340,7 +1324,7 @@ border-radius: 3px; 363 500 298 - 30 + 32 diff --git a/client/dialogs/KeyDialog.ui b/client/dialogs/KeyDialog.ui index 098255961..ea07b4dd8 100644 --- a/client/dialogs/KeyDialog.ui +++ b/client/dialogs/KeyDialog.ui @@ -84,6 +84,9 @@ background-color: #82A9D3; + + QWidget { background-color: #FFFFFF; } + QFrame::NoFrame diff --git a/client/dialogs/SettingsDialog.ui b/client/dialogs/SettingsDialog.ui index 0c93780d8..72099060c 100644 --- a/client/dialogs/SettingsDialog.ui +++ b/client/dialogs/SettingsDialog.ui @@ -366,7 +366,7 @@ QLineEdit, QComboBox { padding: 10px 14px; border: 1px solid #C4CBD8; border-radius: 4px; -background-color: white; +background-color: #FFFFFF; placeholder-text-color: #607496; font-size: 16px; } diff --git a/client/dialogs/SignatureDialog.ui b/client/dialogs/SignatureDialog.ui index 6317e2016..0330ac54c 100644 --- a/client/dialogs/SignatureDialog.ui +++ b/client/dialogs/SignatureDialog.ui @@ -436,6 +436,13 @@ text-decoration: underline; color: #2F70B6; border: none; } +QTreeWidget { +background-color: #FFFFFF; +} +QTreeWidget::item:selected { +background-color: #E7EAEF; +color: #07142A; +} QHeaderView::section { font-family: Roboto, Helvetica; font-size: 14px; diff --git a/client/dialogs/SmartIDDialog.ui b/client/dialogs/SmartIDDialog.ui index 5eebdf8ec..2afbc4495 100644 --- a/client/dialogs/SmartIDDialog.ui +++ b/client/dialogs/SmartIDDialog.ui @@ -38,7 +38,7 @@ QLineEdit, QComboBox { padding: 10px 14px; border: 1px solid #C4CBD8; border-radius: 4px; -background-color: white; +background-color: #FFFFFF; placeholder-text-color: #607496; font-size: 16px; } diff --git a/client/translations/en.ts b/client/translations/en.ts index 70b4618a2..ee897b53f 100644 --- a/client/translations/en.ts +++ b/client/translations/en.ts @@ -1174,8 +1174,8 @@ RECIPIENT_MESSAGE - <p align=center>Who is recipient?</p> - <p align=center>The recipient is a physical person or legal entity for whom the document can be encrypted. If the document is encrypted, only the specified recipient can see its content.</p> + <p align="left">Who is recipient?</p> +<p align="left">The recipient is a physical person or legal entity for whom the document can be encrypted. If the document is encrypted, only the specified recipient can see its content.</p> Add recipients diff --git a/client/translations/et.ts b/client/translations/et.ts index 62d31d948..e476e9e41 100644 --- a/client/translations/et.ts +++ b/client/translations/et.ts @@ -1174,8 +1174,8 @@ RECIPIENT_MESSAGE - <p align=center>Kes on adressaat?</p> - <p align=center>Adressaat on füüsiline või juriidiline isik või asutus, kelle jaoks saab dokumendi krüpteerida. Kui dokument on krüpteeritud, siis saab ainult konkreetne adressaat selle sisu näha.</p> + <p align="left">Kes on adressaat?</p> +<p align="left">Adressaat on füüsiline või juriidiline isik või asutus, kelle jaoks saab dokumendi krüpteerida. Kui dokument on krüpteeritud, siis saab ainult konkreetne adressaat selle sisu näha.</p> Add recipients diff --git a/client/translations/ru.ts b/client/translations/ru.ts index f5fe53306..273a42f99 100644 --- a/client/translations/ru.ts +++ b/client/translations/ru.ts @@ -1174,8 +1174,8 @@ RECIPIENT_MESSAGE - <p align=center>Кто является получателем?</p> - <p align=center>Получатель - физическое или юридическое лицо, для которого документ может быть зашифрован. Если документ зашифрован, только указанный получатель может видеть его содержимое.</p> + <p align="left">Кто является получателем?</p> +<p align="left">Получатель - физическое или юридическое лицо, для которого документ может быть зашифрован. Если документ зашифрован, только указанный получатель может видеть его содержимое.</p> Add recipients diff --git a/client/widgets/CardWidget.ui b/client/widgets/CardWidget.ui index 3ae9a4245..136cd114d 100644 --- a/client/widgets/CardWidget.ui +++ b/client/widgets/CardWidget.ui @@ -24,6 +24,7 @@ font-weight: 400; } #cardName { color: #003168; +font-family: Roboto, Helvetica; font-size: 16px; font-weight: 700; } diff --git a/client/widgets/ItemList.cpp b/client/widgets/ItemList.cpp index c151afa1c..395bc5be4 100644 --- a/client/widgets/ItemList.cpp +++ b/client/widgets/ItemList.cpp @@ -192,14 +192,7 @@ void ItemList::removeItem(int row) void ItemList::setRecipientTooltip() { -#ifdef Q_OS_WIN - // Windows might not show the tooltip correctly (does not fit) in case of tooltip stylesheet; - // Add empty paragraph in order to avoid cutting the text. - // See https://bugreports.qt.io/browse/QTBUG-26576 - ui->infoIcon->setToolTip(tr("RECIPIENT_MESSAGE") + "
"); -#else ui->infoIcon->setToolTip(tr("RECIPIENT_MESSAGE")); -#endif } void ItemList::stateChange( ContainerState state ) diff --git a/client/widgets/ItemList.ui b/client/widgets/ItemList.ui index 9c697dd3e..b815b2252 100644 --- a/client/widgets/ItemList.ui +++ b/client/widgets/ItemList.ui @@ -174,13 +174,11 @@ icon: url(:/images/icon_download_clicked.svg); QToolTip { - color: #fcfcfc; - background-color: #474747; - border-radius: 2px; - text-align: center; - font-weight: 400; - text-decoration: none solid #fcfcfc; - padding: 5px; font-size: 13px; +color: #fcfcfc; +background-color: #474747; +border-radius: 4px; +text-decoration: none solid #fcfcfc; +padding: 5px; }