Skip to content

Use correct fonts #1383

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

Merged
kristelmerilain merged 1 commit into from
Mar 27, 2026
Merged

Use correct fonts #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion COPYING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ client/pkcs11.h


_______________________________________________________________________________
client/fonts/Open_Sans
client/fonts

Apache License
Version 2.0, January 2004
Expand Down
9 changes: 8 additions & 1 deletion client/dialogs/CertificateDetails.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,14 @@ font-size: 22px;
</size>
</property>
<property name="styleSheet">
<string notr="true">QHeaderView::section {
<string notr="true">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;
Expand Down
7 changes: 6 additions & 1 deletion client/dialogs/CertificateHistory.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -139,7 +144,7 @@ QHeaderView::down-arrow {
<string>Expiry date</string>
</property>
<property name="textAlignment">
<set>AlignCenter</set>
<set>AlignLeading|AlignVCenter</set>
</property>
</column>
</widget>
Expand Down
84 changes: 34 additions & 50 deletions client/dialogs/FirstRun.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,65 +113,49 @@ color: #041E42;
</property>
<property name="styleSheet">
<string notr="true">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;
}</string>
</property>
<property name="maxVisibleItems">
Expand Down Expand Up @@ -640,7 +624,7 @@ border-radius: 3px;</string>
<x>363</x>
<y>500</y>
<width>298</width>
<height>30</height>
<height>32</height>
</rect>
</property>
<property name="cursor">
Expand All @@ -657,9 +641,9 @@ border-radius: 3px;</string>
<property name="geometry">
<rect>
<x>363</x>
<y>535</y>
<y>537</y>
<width>298</width>
<height>30</height>
<height>32</height>
</rect>
</property>
<property name="cursor">
Expand Down Expand Up @@ -1083,9 +1067,9 @@ border-radius: 3px;</string>
<property name="geometry">
<rect>
<x>363</x>
<y>535</y>
<y>537</y>
<width>298</width>
<height>30</height>
<height>32</height>
</rect>
</property>
<property name="cursor">
Expand All @@ -1104,7 +1088,7 @@ border-radius: 3px;</string>
<x>363</x>
<y>500</y>
<width>298</width>
<height>30</height>
<height>32</height>
</rect>
</property>
<property name="cursor">
Expand Down Expand Up @@ -1340,7 +1324,7 @@ border-radius: 3px;</string>
<x>363</x>
<y>500</y>
<width>298</width>
<height>30</height>
<height>32</height>
</rect>
</property>
<property name="cursor">
Expand Down
3 changes: 3 additions & 0 deletions client/dialogs/KeyDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ background-color: #82A9D3;
</property>
<item>
<widget class="QTreeWidget" name="view">
<property name="styleSheet">
<string notr="true">QWidget { background-color: #FFFFFF; }</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
Expand Down
2 changes: 1 addition & 1 deletion client/dialogs/SettingsDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
7 changes: 7 additions & 0 deletions client/dialogs/SignatureDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/dialogs/SmartIDDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions client/translations/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,8 +1174,8 @@
</message>
<message>
<source>RECIPIENT_MESSAGE</source>
<translation>&lt;p align=center&gt;Who is recipient?&lt;/p&gt;
&lt;p align=center&gt;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.&lt;/p&gt;</translation>
<translation>&lt;p align=&quot;left&quot;&gt;Who is recipient?&lt;/p&gt;
&lt;p align=&quot;left&quot;&gt;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.&lt;/p&gt;</translation>
</message>
<message>
<source>Add recipients</source>
Expand Down
4 changes: 2 additions & 2 deletions client/translations/et.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,8 +1174,8 @@
</message>
<message>
<source>RECIPIENT_MESSAGE</source>
<translation>&lt;p align=center&gt;Kes on adressaat?&lt;/p&gt;
&lt;p align=center&gt;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.&lt;/p&gt;</translation>
<translation>&lt;p align=&quot;left&quot;&gt;Kes on adressaat?&lt;/p&gt;
&lt;p align=&quot;left&quot;&gt;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.&lt;/p&gt;</translation>
</message>
<message>
<source>Add recipients</source>
Expand Down
4 changes: 2 additions & 2 deletions client/translations/ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,8 +1174,8 @@
</message>
<message>
<source>RECIPIENT_MESSAGE</source>
<translation>&lt;p align=center&gt;Кто является получателем?&lt;/p&gt;
&lt;p align=center&gt;Получатель - физическое или юридическое лицо, для которого документ может быть зашифрован. Если документ зашифрован, только указанный получатель может видеть его содержимое.&lt;/p&gt;</translation>
<translation>&lt;p align=&quot;left&quot;&gt;Кто является получателем?&lt;/p&gt;
&lt;p align=&quot;left&quot;&gt;Получатель - физическое или юридическое лицо, для которого документ может быть зашифрован. Если документ зашифрован, только указанный получатель может видеть его содержимое.&lt;/p&gt;</translation>
</message>
<message>
<source>Add recipients</source>
Expand Down
1 change: 1 addition & 0 deletions client/widgets/CardWidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ font-weight: 400;
}
#cardName {
color: #003168;
font-family: Roboto, Helvetica;
font-size: 16px;
font-weight: 700;
}</string>
Expand Down
7 changes: 0 additions & 7 deletions client/widgets/ItemList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") + "<br />");
#else
ui->infoIcon->setToolTip(tr("RECIPIENT_MESSAGE"));
#endif
}

void ItemList::stateChange( ContainerState state )
Expand Down
12 changes: 5 additions & 7 deletions client/widgets/ItemList.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,11 @@ icon: url(:/images/icon_download_clicked.svg);
</property>
<property name="styleSheet">
<string notr="true">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;
}</string>
</property>
</widget>
Expand Down
Loading