Skip to content

Commit 80e0ee0

Browse files
committed
Use correct fonts
IB-7968 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent c680e2c commit 80e0ee0

File tree

10 files changed

+24
-29
lines changed

10 files changed

+24
-29
lines changed

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ client/pkcs11.h
6161

6262

6363
_______________________________________________________________________________
64-
client/fonts/Open_Sans
64+
client/fonts
6565

6666
Apache License
6767
Version 2.0, January 2004

client/dialogs/CertificateHistory.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ QHeaderView::down-arrow {
139139
<string>Expiry date</string>
140140
</property>
141141
<property name="textAlignment">
142-
<set>AlignCenter</set>
142+
<set>AlignLeading|AlignVCenter</set>
143143
</property>
144144
</column>
145145
</widget>

client/dialogs/FirstRun.ui

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ border-radius: 3px;</string>
640640
<x>363</x>
641641
<y>500</y>
642642
<width>298</width>
643-
<height>30</height>
643+
<height>32</height>
644644
</rect>
645645
</property>
646646
<property name="cursor">
@@ -657,9 +657,9 @@ border-radius: 3px;</string>
657657
<property name="geometry">
658658
<rect>
659659
<x>363</x>
660-
<y>535</y>
660+
<y>537</y>
661661
<width>298</width>
662-
<height>30</height>
662+
<height>32</height>
663663
</rect>
664664
</property>
665665
<property name="cursor">
@@ -1083,9 +1083,9 @@ border-radius: 3px;</string>
10831083
<property name="geometry">
10841084
<rect>
10851085
<x>363</x>
1086-
<y>535</y>
1086+
<y>537</y>
10871087
<width>298</width>
1088-
<height>30</height>
1088+
<height>32</height>
10891089
</rect>
10901090
</property>
10911091
<property name="cursor">
@@ -1104,7 +1104,7 @@ border-radius: 3px;</string>
11041104
<x>363</x>
11051105
<y>500</y>
11061106
<width>298</width>
1107-
<height>30</height>
1107+
<height>32</height>
11081108
</rect>
11091109
</property>
11101110
<property name="cursor">
@@ -1340,7 +1340,7 @@ border-radius: 3px;</string>
13401340
<x>363</x>
13411341
<y>500</y>
13421342
<width>298</width>
1343-
<height>30</height>
1343+
<height>32</height>
13441344
</rect>
13451345
</property>
13461346
<property name="cursor">

client/dialogs/KeyDialog.ui

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ background-color: #82A9D3;
8484
</property>
8585
<item>
8686
<widget class="QTreeWidget" name="view">
87+
<property name="styleSheet">
88+
<string notr="true">QWidget { background-color: #FFFFFF; }</string>
89+
</property>
8790
<property name="frameShape">
8891
<enum>QFrame::NoFrame</enum>
8992
</property>

client/translations/en.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,8 @@
11741174
</message>
11751175
<message>
11761176
<source>RECIPIENT_MESSAGE</source>
1177-
<translation>&lt;p align=center&gt;Who is recipient?&lt;/p&gt;
1178-
&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>
1177+
<translation>&lt;p align=&quot;left&quot;&gt;Who is recipient?&lt;/p&gt;
1178+
&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>
11791179
</message>
11801180
<message>
11811181
<source>Add recipients</source>

client/translations/et.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,8 @@
11741174
</message>
11751175
<message>
11761176
<source>RECIPIENT_MESSAGE</source>
1177-
<translation>&lt;p align=center&gt;Kes on adressaat?&lt;/p&gt;
1178-
&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>
1177+
<translation>&lt;p align=&quot;left&quot;&gt;Kes on adressaat?&lt;/p&gt;
1178+
&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>
11791179
</message>
11801180
<message>
11811181
<source>Add recipients</source>

client/translations/ru.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,8 @@
11741174
</message>
11751175
<message>
11761176
<source>RECIPIENT_MESSAGE</source>
1177-
<translation>&lt;p align=center&gt;Кто является получателем?&lt;/p&gt;
1178-
&lt;p align=center&gt;Получатель - физическое или юридическое лицо, для которого документ может быть зашифрован. Если документ зашифрован, только указанный получатель может видеть его содержимое.&lt;/p&gt;</translation>
1177+
<translation>&lt;p align=&quot;left&quot;&gt;Кто является получателем?&lt;/p&gt;
1178+
&lt;p align=&quot;left&quot;&gt;Получатель - физическое или юридическое лицо, для которого документ может быть зашифрован. Если документ зашифрован, только указанный получатель может видеть его содержимое.&lt;/p&gt;</translation>
11791179
</message>
11801180
<message>
11811181
<source>Add recipients</source>

client/widgets/CardWidget.ui

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ font-weight: 400;
2424
}
2525
#cardName {
2626
color: #003168;
27+
font-family: Roboto, Helvetica;
2728
font-size: 16px;
2829
font-weight: 700;
2930
}</string>

client/widgets/ItemList.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,7 @@ void ItemList::removeItem(int row)
192192

193193
void ItemList::setRecipientTooltip()
194194
{
195-
#ifdef Q_OS_WIN
196-
// Windows might not show the tooltip correctly (does not fit) in case of tooltip stylesheet;
197-
// Add empty paragraph in order to avoid cutting the text.
198-
// See https://bugreports.qt.io/browse/QTBUG-26576
199-
ui->infoIcon->setToolTip(tr("RECIPIENT_MESSAGE") + "<br />");
200-
#else
201195
ui->infoIcon->setToolTip(tr("RECIPIENT_MESSAGE"));
202-
#endif
203196
}
204197

205198
void ItemList::stateChange( ContainerState state )

client/widgets/ItemList.ui

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,11 @@ icon: url(:/images/icon_download_clicked.svg);
174174
</property>
175175
<property name="styleSheet">
176176
<string notr="true">QToolTip {
177-
color: #fcfcfc;
178-
background-color: #474747;
179-
border-radius: 2px;
180-
text-align: center;
181-
font-weight: 400;
182-
text-decoration: none solid #fcfcfc;
183-
padding: 5px; font-size: 13px;
177+
color: #fcfcfc;
178+
background-color: #474747;
179+
border-radius: 4px;
180+
text-decoration: none solid #fcfcfc;
181+
padding: 5px;
184182
}</string>
185183
</property>
186184
</widget>

0 commit comments

Comments
 (0)