Skip to content

Commit 01676a9

Browse files
metsmametsma
committed
Update text fields with new UI guidlines
IB-7972 Signed-off-by: Raul Metsma <[email protected]>
1 parent 63703b0 commit 01676a9

22 files changed

+244
-380
lines changed

‎client/MainWindow.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ void MainWindow::navigateToPage( Pages page, const QStringList &files, bool crea
336336
selectPage(page);
337337
}
338338

339-
void MainWindow::onSignAction(int action, const QString &info1, const QString &info2)
339+
void MainWindow::onSignAction(int action, const QString &idCode, const QString &info2)
340340
{
341341
switch(action)
342342
{
@@ -347,16 +347,16 @@ void MainWindow::onSignAction(int action, const QString &info1, const QString &i
347347
});
348348
break;
349349
case SignatureMobile:
350-
sign([this, info1, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
350+
sign([this, idCode, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
351351
MobileProgress m(this);
352-
return m.init(info1, info2) &&
352+
return m.init(idCode, info2) &&
353353
digiDoc->sign(city, state, zip, country, role, &m);
354354
});
355355
break;
356356
case SignatureSmartID:
357-
sign([this, info1, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
357+
sign([this, idCode, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
358358
SmartIDProgress s(this);
359-
return s.init(info1, info2, digiDoc->fileName()) &&
359+
return s.init(info2, idCode, digiDoc->fileName()) &&
360360
digiDoc->sign(city, state, zip, country, role, &s);
361361
});
362362
break;

‎client/MainWindow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class MainWindow final : public QWidget
6767
void loadPicture();
6868
void navigateToPage( ria::qdigidoc4::Pages page, const QStringList &files = QStringList(), bool create = true );
6969
void onCryptoAction(int action, const QString &id, const QString &phone);
70-
void onSignAction(int action, const QString &info1, const QString &info2);
70+
void onSignAction(int action, const QString &idCode, const QString &info2);
7171
void openContainer(bool signature);
7272
void pageSelected(int page, bool checked = true);
7373
void resetDigiDoc(std::unique_ptr<DigiDoc> &&doc, bool warnOnChange = true);

‎client/Styles.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ class FontDatabase
8282
{
8383
switch( font )
8484
{
85-
case Styles::Bold: return bold;
8685
case Styles::Condensed: return condensed;
87-
case Styles::CondensedBold: return condensedBold;
8886
default: return regular;
8987
}
9088
}
@@ -129,12 +127,8 @@ class FontDatabase
129127
};
130128
#endif
131129

132-
QString bold = QFontDatabase::applicationFontFamilies(
133-
QFontDatabase::addApplicationFont(QStringLiteral(":/fonts/Roboto-Bold.ttf"))).at(0);
134130
QString condensed = QFontDatabase::applicationFontFamilies(
135131
QFontDatabase::addApplicationFont(QStringLiteral(":/fonts/RobotoCondensed-Regular.ttf"))).at(0);
136-
QString condensedBold = QFontDatabase::applicationFontFamilies(
137-
QFontDatabase::addApplicationFont(QStringLiteral(":/fonts/RobotoCondensed-Bold.ttf"))).at(0);
138132
QString regular = QFontDatabase::applicationFontFamilies(
139133
QFontDatabase::addApplicationFont(QStringLiteral(":/fonts/Roboto-Regular.ttf"))).at(0);
140134
#ifndef Q_OS_MAC

‎client/Styles.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class Styles
2525
{
2626
public:
2727
enum Font {
28-
Bold,
2928
Condensed,
30-
CondensedBold,
3129
Regular
3230
};
3331

‎client/dialogs/AddRecipients.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ AddRecipients::AddRecipients(ItemList* itemList, QWidget *parent)
7777
connect(ldap_corp, &LdapSearch::error, this, &AddRecipients::showError);
7878
connect(this, &AddRecipients::finished, this, &AddRecipients::close);
7979

80-
connect(ui->leftPane, &ItemList::addAll, this, [this] {
80+
connect(ui->leftPane, &ItemList::add, this, [this] {
8181
for(Item *item: ui->leftPane->items)
8282
addRecipientToRightPane(item);
8383
});

‎client/dialogs/MobileDialog.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ font-size: 16px;
4444
}
4545
QCheckBox {
4646
spacing: 8px;
47-
border: none; /*Workaround for right padding*/
47+
border-right: none; /*Workaround for right padding*/
4848
}
4949
QCheckBox:disabled {
5050
color: #C4CBD8;

‎client/dialogs/SettingsDialog.ui‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ color: transparent;
8989
selection-color: transparent;
9090
}
9191
QRadioButton:checked {
92-
background-color: #E9ECF3;
92+
background-color: #EAF1F8;
9393
}</string>
9494
</property>
9595
<layout class="QVBoxLayout" name="leftPaneLayout">
@@ -417,7 +417,7 @@ border: 2px solid transparent;
417417
border-radius: 4px;
418418
}
419419
QCheckBox:disabled, QRadioButton:disabled {
420-
color: #BDBDBD;
420+
color: #C4CBD8;
421421
}
422422
QCheckBox::indicator, QRadioButton::indicator {
423423
width: 16px;
@@ -1558,22 +1558,22 @@ max-height: 22px;
15581558
<widget class="QTextEdit" name="txtDiagnostics">
15591559
<property name="styleSheet">
15601560
<string notr="true">QTextEdit {
1561-
color: #363739;
1562-
background: #FFFFFF;
1563-
border-bottom: 1px solid #E7EAEF;
1561+
color: #07142A;
1562+
background: #FFFFFF;
1563+
border-bottom: 1px solid #E7EAEF;
15641564
}
15651565
QScrollBar {
1566-
width: 10px;
1567-
padding: 5px 5px 5px 0;
1568-
margin: 2px 0px 2px 0;
1569-
border: none;
1570-
background: #FFFFFF;
1566+
width: 10px;
1567+
padding: 5px 5px 5px 0px;
1568+
margin: 2px 0px 2px 0px;
1569+
border: none;
1570+
background: #FFFFFF;
15711571
}
15721572
QScrollBar::handle:vertical {
1573-
background-color: #8E969D;
1574-
margin: 0 0 0 0;
1575-
border-radius: 2px;
1576-
height: 145px;
1573+
background-color: #C4CBD8;
1574+
margin: 0px;
1575+
border-radius: 2px;
1576+
height: 145px;
15771577
}
15781578
QScrollBar::add-line:vertical,
15791579
QScrollBar::sub-line:vertical {
@@ -1662,21 +1662,21 @@ Additional licenses and components</string>
16621662
<widget class="QTextBrowser" name="txtInfo">
16631663
<property name="styleSheet">
16641664
<string notr="true">QTextEdit {
1665-
color: #363739;
1666-
background: #FFFFFF;
1665+
color: #07142A;
1666+
background: #FFFFFF;
16671667
}
16681668
QScrollBar {
1669-
width: 10px;
1670-
padding: 5px 5px 5px 0;
1671-
margin: 2px 0px 2px 0;
1672-
border: none;
1673-
background: #FFFFFF;
1669+
width: 10px;
1670+
padding: 5px 5px 5px 0px;
1671+
margin: 2px 0px 2px 0px;
1672+
border: none;
1673+
background: #FFFFFF;
16741674
}
16751675
QScrollBar::handle:vertical {
1676-
background-color: #8E969D;
1677-
margin: 0 0 0 0;
1678-
border-radius: 2px;
1679-
height: 145px;
1676+
background-color: #C4CBD8;
1677+
margin: 0px;
1678+
border-radius: 2px;
1679+
height: 145px;
16801680
}
16811681
QScrollBar::add-line:vertical,
16821682
QScrollBar::sub-line:vertical {

‎client/dialogs/SignatureDialog.ui‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -179,25 +179,22 @@ padding: 10px 14px;
179179
</property>
180180
<property name="styleSheet">
181181
<string notr="true">QScrollBar {
182-
width: 10px;
183-
padding: 5px 5px 5px 0;
184-
margin: 2px 0px 2px 0;
185-
border: none;
186-
background: #FFFFFF;
187-
}
188-
QScrollBar::handle:vertical{
189-
background-color: #8E969D;
190-
margin: 0 0 0 0;
191-
border-radius: 2px;
192-
height: 145px;
182+
width: 10px;
183+
padding: 5px 5px 5px 0px;
184+
margin: 2px 0px 2px 0;
185+
border: none;
186+
background: #FFFFFF;
193187
}
194-
QScrollBar::add-line:vertical {
195-
border: none;
196-
background: none;
188+
QScrollBar::handle:vertical {
189+
background-color: #C4CBD8;
190+
margin: 0px;
191+
border-radius: 2px;
192+
height: 145px;
197193
}
194+
QScrollBar::add-line:vertical,
198195
QScrollBar::sub-line:vertical {
199-
border: none;
200-
background: none;
196+
border: none;
197+
background: none;
201198
}</string>
202199
</property>
203200
<property name="frameShape">

‎client/translations/en.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,10 +1126,6 @@
11261126
<translation>&lt;p align=center&gt;Who is recipient?&lt;/p&gt;
11271127
&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>
11281128
</message>
1129-
<message>
1130-
<source>Enter personal code, company or registry code</source>
1131-
<translation>Enter personal code, company or registry code</translation>
1132-
</message>
11331129
<message>
11341130
<source>Add recipients</source>
11351131
<translation>Add recipients</translation>

‎client/translations/et.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,10 +1126,6 @@
11261126
<translation>&lt;p align=center&gt;Kes on adressaat?&lt;/p&gt;
11271127
&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>
11281128
</message>
1129-
<message>
1130-
<source>Enter personal code, company or registry code</source>
1131-
<translation>Sisesta isikukood, asutus või registrikood</translation>
1132-
</message>
11331129
<message>
11341130
<source>Add recipients</source>
11351131
<translation>Lisa adressaadid</translation>

0 commit comments

Comments
 (0)