Skip to content

Commit 7dca67c

Browse files
metsmametsma
authored
Change all buttons to lowercase (#1333)
IB-8455 Signed-off-by: Raul Metsma <[email protected]>
1 parent 97801ff commit 7dca67c

File tree

15 files changed

+243
-473
lines changed

15 files changed

+243
-473
lines changed

‎client/MainWindow.ui‎

Lines changed: 17 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,21 @@ border-top: 1px solid #E7EAEF;
3737
background-image: url(:/images/bg_lovid.svg);
3838
background-repeat: repeat-x;
3939
background-position: bottom;
40+
}
41+
#signIntroButton, #cryptoIntroButton {
42+
padding: 14px 26px;
43+
border-radius: 4px;
44+
font-family: Roboto, Helvetica;
45+
font-size: 16px;
46+
font-weight: 700;
47+
color: #ffffff;
48+
background-color: #2F70B6;
49+
}
50+
#signIntroButton:hover, #cryptoIntroButton:hover {
51+
background-color: #2B66A6;
52+
}
53+
#signIntroButton:pressed, #cryptoIntroButton:pressed {
54+
background-color: #215081;
4055
}</string>
4156
</property>
4257
<layout class="QGridLayout" name="MainWindowLayout">
@@ -554,52 +569,14 @@ QToolButton:hover {
554569
</item>
555570
<item alignment="Qt::AlignHCenter">
556571
<widget class="QPushButton" name="signIntroButton">
557-
<property name="minimumSize">
558-
<size>
559-
<width>240</width>
560-
<height>45</height>
561-
</size>
562-
</property>
563-
<property name="maximumSize">
564-
<size>
565-
<width>240</width>
566-
<height>45</height>
567-
</size>
568-
</property>
569-
<property name="font">
570-
<font>
571-
<pointsize>14</pointsize>
572-
<underline>false</underline>
573-
<strikeout>false</strikeout>
574-
</font>
575-
</property>
576572
<property name="cursor">
577573
<cursorShape>PointingHandCursor</cursorShape>
578574
</property>
579575
<property name="accessibleName">
580576
<string comment="accessible">Load file from disk for signing or verifying</string>
581577
</property>
582-
<property name="styleSheet">
583-
<string notr="true">QPushButton {
584-
padding: 6px 10px;
585-
border-radius: 2px;
586-
background-color: #006eb5;
587-
color: #ffffff;
588-
text-decoration: none solid rgb(255, 255, 255);
589-
text-align: center;
590-
}
591-
QPushButton:pressed {
592-
background-color: #41B6E6;
593-
}
594-
QPushButton:hover:!pressed {
595-
background-color: #008DCF;
596-
}
597-
QPushButton:disabled {
598-
background-color: #BEDBED;
599-
}</string>
600-
</property>
601578
<property name="text">
602-
<string>Open file for signing or verifying</string>
579+
<string>... or load file from disk</string>
603580
</property>
604581
</widget>
605582
</item>
@@ -664,52 +641,14 @@ background-color: #BEDBED;
664641
</item>
665642
<item alignment="Qt::AlignHCenter">
666643
<widget class="QPushButton" name="cryptoIntroButton">
667-
<property name="minimumSize">
668-
<size>
669-
<width>240</width>
670-
<height>45</height>
671-
</size>
672-
</property>
673-
<property name="maximumSize">
674-
<size>
675-
<width>240</width>
676-
<height>45</height>
677-
</size>
678-
</property>
679-
<property name="font">
680-
<font>
681-
<pointsize>14</pointsize>
682-
<underline>false</underline>
683-
<strikeout>false</strikeout>
684-
</font>
685-
</property>
686644
<property name="cursor">
687645
<cursorShape>PointingHandCursor</cursorShape>
688646
</property>
689647
<property name="accessibleName">
690648
<string comment="accessible">Load file from disk for encryption or decryption</string>
691649
</property>
692-
<property name="styleSheet">
693-
<string notr="true">QPushButton {
694-
padding: 6px 10px;
695-
border-radius: 2px;
696-
background-color: #006eb5;
697-
color: #ffffff;
698-
text-decoration: none solid rgb(255, 255, 255);
699-
text-align: center;
700-
}
701-
QPushButton:pressed {
702-
background-color: #41B6E6;
703-
}
704-
QPushButton:hover:!pressed {
705-
background-color: #008DCF;
706-
}
707-
QPushButton:disabled {
708-
background-color: #BEDBED;
709-
}</string>
710-
</property>
711650
<property name="text">
712-
<string>Open file for encryption or decryption</string>
651+
<string>... or load file from disk</string>
713652
</property>
714653
</widget>
715654
</item>

‎client/dialogs/SignatureDialog.ui‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -524,9 +524,6 @@ background-color: #f7f7f7;</string>
524524
<property name="cursor">
525525
<cursorShape>PointingHandCursor</cursorShape>
526526
</property>
527-
<property name="accessibleName">
528-
<string extracomment="accessible">Close</string>
529-
</property>
530527
<property name="styleSheet">
531528
<string notr="true">QPushButton {
532529
border-radius: 2px;
@@ -545,7 +542,7 @@ QPushButton:disabled {
545542
}</string>
546543
</property>
547544
<property name="text">
548-
<string>CLOSE</string>
545+
<string>Close</string>
549546
</property>
550547
</widget>
551548
</item>

‎client/dialogs/WarningDialog.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,7 @@ WarningDialog::WarningDialog(const QString &text, const QString &details, QWidge
4747
resetCancelStyle(true);
4848

4949
if(!details.isEmpty())
50-
{
5150
ui->showDetails->init(false, tr("Details"), ui->details);
52-
connect(ui->showDetails, &AccordionTitle::closed, this, &WarningDialog::adjustSize);
53-
connect(ui->showDetails, &AccordionTitle::opened, this, &WarningDialog::adjustSize);
54-
}
55-
adjustSize();
5651
}
5752

5853
WarningDialog::WarningDialog(const QString &text, QWidget *parent)
@@ -151,6 +146,7 @@ void WarningDialog::setCancelText(ButtonText label)
151146
void WarningDialog::setCancelText(const QString &label)
152147
{
153148
cancel->setText(label);
149+
ui->buttonBox->addButton(cancel, QDialogButtonBox::RejectRole);
154150
}
155151

156152
WarningDialog* WarningDialog::show(const QString &text, const QString &details)

‎client/dialogs/WarningDialog.ui‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ border-color: #E1C1C6;
6060
<property name="spacing">
6161
<number>24</number>
6262
</property>
63+
<property name="sizeConstraint">
64+
<enum>QLayout::SetFixedSize</enum>
65+
</property>
6366
<property name="leftMargin">
6467
<number>24</number>
6568
</property>

‎client/translations/en.ts‎

Lines changed: 47 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,26 +1123,10 @@
11231123
</context>
11241124
<context>
11251125
<name>ItemList</name>
1126-
<message>
1127-
<source>SEARCH</source>
1128-
<translation>SEARCH</translation>
1129-
</message>
11301126
<message>
11311127
<source>Enter the personal code, institution or registry code</source>
11321128
<translation>Enter the personal code, institution or registry code</translation>
11331129
</message>
1134-
<message>
1135-
<source>+ ADD MORE FILES</source>
1136-
<translation>+ ADD MORE FILES</translation>
1137-
</message>
1138-
<message>
1139-
<source>+ ADD RECIPIENT</source>
1140-
<translation>+ ADD RECIPIENT</translation>
1141-
</message>
1142-
<message>
1143-
<source>ADD ALL</source>
1144-
<translation>ADD ALL</translation>
1145-
</message>
11461130
<message>
11471131
<source>Container is not signed</source>
11481132
<translation>Container&apos;s signatures are missing</translation>
@@ -1186,13 +1170,24 @@
11861170
</message>
11871171
<message>
11881172
<source>Search</source>
1189-
<extracomment>accessible</extracomment>
11901173
<translation>Search</translation>
11911174
</message>
11921175
<message>
11931176
<source>Download all files</source>
11941177
<translation>Download all files</translation>
11951178
</message>
1179+
<message>
1180+
<source>+ Add more files</source>
1181+
<translation>+ Add more files</translation>
1182+
</message>
1183+
<message>
1184+
<source>+ Add recipient</source>
1185+
<translation>+ Add recipient</translation>
1186+
</message>
1187+
<message>
1188+
<source>Add all</source>
1189+
<translation>Add all</translation>
1190+
</message>
11961191
</context>
11971192
<context>
11981193
<name>KeyDialog</name>
@@ -1295,42 +1290,47 @@ LDAP server is unavailable.</translation>
12951290
<context>
12961291
<name>MainAction</name>
12971292
<message>
1298-
<source>SignatureMobile</source>
1299-
<translation>SIGN WITH
1300-
MOBILE-ID</translation>
1293+
<source>Token selection</source>
1294+
<comment>accessible</comment>
1295+
<translation>Token selection</translation>
13011296
</message>
13021297
<message>
1303-
<source>SignatureSmartID</source>
1304-
<translation>SIGN WITH
1305-
SMART-ID</translation>
1298+
<source>Sign with
1299+
Mobile-ID</source>
1300+
<translation>Sign with
1301+
Mobile-ID</translation>
13061302
</message>
13071303
<message>
1308-
<source>SignatureAdd</source>
1309-
<translation>SIGN WITH
1310-
ID-CARD</translation>
1304+
<source>Sign with
1305+
Smart-ID</source>
1306+
<translation>Sign with
1307+
Smart-ID</translation>
13111308
</message>
13121309
<message>
1313-
<source>SignatureToken</source>
1314-
<translation>SIGN WITH
1315-
E-SEAL</translation>
1310+
<source>Sign with
1311+
E-Seal</source>
1312+
<translation>Sign with
1313+
E-Seal</translation>
13161314
</message>
13171315
<message>
1318-
<source>EncryptContainer</source>
1319-
<translation>ENCRYPT</translation>
1316+
<source>Encrypt</source>
1317+
<translation>Encrypt</translation>
13201318
</message>
13211319
<message>
1322-
<source>DecryptContainer</source>
1323-
<translation>DECRYPT WITH
1324-
ID-CARD</translation>
1320+
<source>Decrypt</source>
1321+
<translation>Decrypt</translation>
13251322
</message>
13261323
<message>
1327-
<source>DECRYPT</source>
1328-
<translation>DECRYPT</translation>
1324+
<source>Decrypt with
1325+
ID-Card</source>
1326+
<translation>Decrypt with
1327+
ID-Card</translation>
13291328
</message>
13301329
<message>
1331-
<source>Token selection</source>
1332-
<comment>accessible</comment>
1333-
<translation>Token selection</translation>
1330+
<source>Sign with
1331+
ID-Card</source>
1332+
<translation>Sign with
1333+
ID-Card</translation>
13341334
</message>
13351335
</context>
13361336
<context>
@@ -1348,17 +1348,13 @@ ID-CARD</translation>
13481348
<translation>Drag file here for signing or verification ...</translation>
13491349
</message>
13501350
<message>
1351-
<source>Open file for signing or verifying</source>
1352-
<translation>... OR LOAD FILE FROM DISK</translation>
1351+
<source>... or load file from disk</source>
1352+
<translation>... or load file from disk</translation>
13531353
</message>
13541354
<message>
13551355
<source>Drag file here for encryption ...</source>
13561356
<translation>Drag file here for encryption or decryption ...</translation>
13571357
</message>
1358-
<message>
1359-
<source>Open file for encryption or decryption</source>
1360-
<translation>... OR LOAD FILE FROM DISK</translation>
1361-
</message>
13621358
<message>
13631359
<source>Decryption succeeded!</source>
13641360
<translation>Decryption succeeded!</translation>
@@ -2528,10 +2524,6 @@ Additional licenses and components</translation>
25282524
<source>Signature</source>
25292525
<translation>Signature</translation>
25302526
</message>
2531-
<message>
2532-
<source>CLOSE</source>
2533-
<translation>CLOSE</translation>
2534-
</message>
25352527
<message>
25362528
<source>Attribute</source>
25372529
<translation>Attribute</translation>
@@ -2680,7 +2672,6 @@ Additional licenses and components</translation>
26802672
</message>
26812673
<message>
26822674
<source>Close</source>
2683-
<extracomment>accessible</extracomment>
26842675
<translation>Close</translation>
26852676
</message>
26862677
<message>
@@ -2878,12 +2869,12 @@ Additional licenses and components</translation>
28782869
<translation>Authentication certificate</translation>
28792870
</message>
28802871
<message>
2881-
<source>UNBLOCK</source>
2882-
<translation>UNBLOCK</translation>
2872+
<source>Unblock</source>
2873+
<translation>Unblock</translation>
28832874
</message>
28842875
<message>
2885-
<source>CHANGE PIN%1</source>
2886-
<translation>CHANGE PIN%1</translation>
2876+
<source>Change PIN%1</source>
2877+
<translation>Change PIN%1</translation>
28872878
</message>
28882879
<message>
28892880
<source>Forgot PIN%1?</source>
@@ -2906,8 +2897,8 @@ Additional licenses and components</translation>
29062897
<translation>The PUK code is located in your envelope</translation>
29072898
</message>
29082899
<message>
2909-
<source>CHANGE PUK</source>
2910-
<translation>CHANGE PUK</translation>
2900+
<source>Change PUK</source>
2901+
<translation>Change PUK</translation>
29112902
</message>
29122903
<message>
29132904
<source>PUK code is blocked because the PUK code has been entered 3 times incorrectly. You can not unblock the PUK code yourself. As long as the PUK code is blocked, all eID options can be used, except PUK code. Please visit the service center to obtain new codes. &lt;a href=&quot;https://www.politsei.ee/en/instructions/applying-for-an-id-card-for-an-adult/reminders-for-id-card-holders/&quot;&gt;Additional information&lt;/a&gt;.</source>

0 commit comments

Comments
 (0)