Skip to content

Commit 2f1d3aa

Browse files
metsmametsma
committed
Update text fields with new UI guidlines
IB-7972 Signed-off-by: Raul Metsma <[email protected]>
1 parent 4c30e83 commit 2f1d3aa

22 files changed

+250
-388
lines changed

‎client/MainWindow.cpp‎

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

336-
void MainWindow::onSignAction(int action, const QString &info1, const QString &info2)
336+
void MainWindow::onSignAction(int action, const QString &idCode, const QString &info2)
337337
{
338338
switch(action)
339339
{
@@ -344,16 +344,16 @@ void MainWindow::onSignAction(int action, const QString &info1, const QString &i
344344
});
345345
break;
346346
case SignatureMobile:
347-
sign([this, info1, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
347+
sign([this, idCode, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
348348
MobileProgress m(this);
349-
return m.init(info1, info2) &&
349+
return m.init(idCode, info2) &&
350350
digiDoc->sign(city, state, zip, country, role, &m);
351351
});
352352
break;
353353
case SignatureSmartID:
354-
sign([this, info1, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
354+
sign([this, idCode, info2](const QString &city, const QString &state, const QString &zip, const QString &country, const QString &role) {
355355
SmartIDProgress s(this);
356-
return s.init(info1, info2, digiDoc->fileName()) &&
356+
return s.init(info2, idCode, digiDoc->fileName()) &&
357357
digiDoc->sign(city, state, zip, country, role, &s);
358358
});
359359
break;

‎client/MainWindow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class MainWindow final : public QWidget
7070
void moveSignatureContainer();
7171
void navigateToPage( ria::qdigidoc4::Pages page, const QStringList &files = QStringList(), bool create = true );
7272
void onCryptoAction(int action, const QString &id, const QString &phone);
73-
void onSignAction(int action, const QString &info1, const QString &info2);
73+
void onSignAction(int action, const QString &idCode, const QString &info2);
7474
void openContainer(bool signature);
7575
void pageSelected(int page, bool checked = true);
7676
void resetDigiDoc(DigiDoc *doc = nullptr, 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;
@@ -1608,22 +1608,22 @@ max-height: 22px;
16081608
<widget class="QTextEdit" name="txtDiagnostics">
16091609
<property name="styleSheet">
16101610
<string notr="true">QTextEdit {
1611-
color: #363739;
1612-
background: #FFFFFF;
1613-
border-bottom: 1px solid #E7EAEF;
1611+
color: #07142A;
1612+
background: #FFFFFF;
1613+
border-bottom: 1px solid #E7EAEF;
16141614
}
16151615
QScrollBar {
1616-
width: 10px;
1617-
padding: 5px 5px 5px 0;
1618-
margin: 2px 0px 2px 0;
1619-
border: none;
1620-
background: #FFFFFF;
1616+
width: 10px;
1617+
padding: 5px 5px 5px 0px;
1618+
margin: 2px 0px 2px 0px;
1619+
border: none;
1620+
background: #FFFFFF;
16211621
}
16221622
QScrollBar::handle:vertical {
1623-
background-color: #8E969D;
1624-
margin: 0 0 0 0;
1625-
border-radius: 2px;
1626-
height: 145px;
1623+
background-color: #C4CBD8;
1624+
margin: 0px;
1625+
border-radius: 2px;
1626+
height: 145px;
16271627
}
16281628
QScrollBar::add-line:vertical,
16291629
QScrollBar::sub-line:vertical {
@@ -1712,21 +1712,21 @@ Additional licenses and components</string>
17121712
<widget class="QTextBrowser" name="txtInfo">
17131713
<property name="styleSheet">
17141714
<string notr="true">QTextEdit {
1715-
color: #363739;
1716-
background: #FFFFFF;
1715+
color: #07142A;
1716+
background: #FFFFFF;
17171717
}
17181718
QScrollBar {
1719-
width: 10px;
1720-
padding: 5px 5px 5px 0;
1721-
margin: 2px 0px 2px 0;
1722-
border: none;
1723-
background: #FFFFFF;
1719+
width: 10px;
1720+
padding: 5px 5px 5px 0px;
1721+
margin: 2px 0px 2px 0px;
1722+
border: none;
1723+
background: #FFFFFF;
17241724
}
17251725
QScrollBar::handle:vertical {
1726-
background-color: #8E969D;
1727-
margin: 0 0 0 0;
1728-
border-radius: 2px;
1729-
height: 145px;
1726+
background-color: #C4CBD8;
1727+
margin: 0px;
1728+
border-radius: 2px;
1729+
height: 145px;
17301730
}
17311731
QScrollBar::add-line:vertical,
17321732
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
@@ -1130,10 +1130,6 @@
11301130
<translation>&lt;p align=center&gt;Who is recipient?&lt;/p&gt;
11311131
&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>
11321132
</message>
1133-
<message>
1134-
<source>Enter personal code, company or registry code</source>
1135-
<translation>Enter personal code, company or registry code</translation>
1136-
</message>
11371133
<message>
11381134
<source>Add recipients</source>
11391135
<translation>Add recipients</translation>

‎client/translations/et.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,10 +1130,6 @@
11301130
<translation>&lt;p align=center&gt;Kes on adressaat?&lt;/p&gt;
11311131
&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>
11321132
</message>
1133-
<message>
1134-
<source>Enter personal code, company or registry code</source>
1135-
<translation>Sisesta isikukood, asutus või registrikood</translation>
1136-
</message>
11371133
<message>
11381134
<source>Add recipients</source>
11391135
<translation>Lisa adressaadid</translation>

0 commit comments

Comments
 (0)