diff --git a/client/dialogs/SignatureDialog.cpp b/client/dialogs/SignatureDialog.cpp
index fc8b0b09..da38c74d 100644
--- a/client/dialogs/SignatureDialog.cpp
+++ b/client/dialogs/SignatureDialog.cpp
@@ -128,22 +128,22 @@ SignatureDialog::SignatureDialog(const DigiDocSignature &signature, QWidget *par
lbl->setFocusPolicy(cnt->text().isEmpty() ? Qt::NoFocus : Qt::TabFocus);
cnt->setFocusPolicy(cnt->text().isEmpty() ? Qt::NoFocus : Qt::TabFocus);
};
- setFocus(d->lblSigningCity, d->signerCity);
- setFocus(d->lblSigningState, d->signerState);
- setFocus(d->lblSigningCountry, d->signerCountry);
- setFocus(d->lblSigningZip, d->signerZip);
- setFocus(d->lblRole, d->signerRoles);
+ setFocus(d->labelCity, d->signerCity);
+ setFocus(d->labelState, d->signerState);
+ setFocus(d->labelCountry, d->signerCountry);
+ setFocus(d->labelZip, d->signerZip);
+ setFocus(d->labelRoles, d->signerRoles);
// Certificate info
QTreeWidget *t = d->signatureView;
t->header()->setSectionResizeMode(0, QHeaderView::Fixed);
t->header()->resizeSection(0, 244);
- auto addCert = [this](QTreeWidget *t, const QString &title, const QString &title2, const SslCertificate &cert) {
+ auto addCert = [this](QTreeWidget *t, const QString &title, const QString &title2, const QSslCertificate &cert) {
if(cert.isNull())
return;
addItem(t, title, cert);
- addItem(t, title2, cert.issuerInfo(QSslCertificate::CommonName));
+ addItem(t, title2, cert.issuerInfo(QSslCertificate::CommonName).join(' '));
};
auto addTime = [this](QTreeWidget *t, const QString &title, const QDateTime &time) {
if(time.isNull())
diff --git a/client/dialogs/SignatureDialog.ui b/client/dialogs/SignatureDialog.ui
index 6317e201..84a03ae7 100644
--- a/client/dialogs/SignatureDialog.ui
+++ b/client/dialogs/SignatureDialog.ui
@@ -9,21 +9,25 @@
0
0
- 1013
- 600
+ 1090
+ 816
- #SignatureDialog {
-background-color: #ffffff;
+ QWidget {
+font-family: Roboto, Helvetica;
+font-size: 14px;
+color: #07142A;
+}
+#SignatureDialog {
+background-color: #FFFFFF;
+border-radius: 4px;
}
#lblSignerHeader, #lblSignatureHeader {
-font-family: Roboto, Helvetica;
font-size: 22px;
-color: #003168
+color: #003168;
}
#status, #warning, #lblNotice {
-font-family: Roboto, Helvetica;
font-size: 12px;
color: #091A36;
padding: 2px 10px;
@@ -67,28 +71,11 @@ background-color: #EAF8EA;
-
-
-
- 505
- 0
-
-
#leftPane {
border-right: 1px solid #E7EAEF;
}
-#info, #error {
-font-family: Roboto, Helvetica;
-font-size: 14px;
-color: #07142A;
-}
-#lblSigningCity, #lblSigningCounty, #lblSigningState, #lblSigningZip, #lblRole {
-font-family: Roboto, Helvetica;
-font-size: 14px;
-color: #07142A;
-}
#signerCity, #signerCountry, #signerState, #signerZip, #signerRoles {
-font-family: Roboto, Helvetica;
font-size: 16px;
color: #607496;
border: 1px solid #C4CBD8;
@@ -96,7 +83,9 @@ border-radius: 4px;
background-color: #F3F5F7;
padding: 10px 14px;
}
-
+#showErrors, #showRole {
+border-right: none; /*Workaround for right padding*/
+}
@@ -112,10 +101,16 @@ padding: 10px 14px;
24
- 32
+ 24
-
+
+
+ 506
+ 0
+
+
Qt::TabFocus
@@ -161,6 +156,12 @@ padding: 10px 14px;
-
+
+
+ 0
+ 40
+
+
PointingHandCursor
@@ -207,6 +208,12 @@ background: none;
-
+
+
+ 0
+ 40
+
+
PointingHandCursor
@@ -237,12 +244,12 @@ background: none;
0
-
-
+
6
-
-
+
Role / resolution
@@ -270,12 +277,12 @@ background: none;
-
-
+
6
-
-
+
City
@@ -294,12 +301,12 @@ background: none;
-
-
+
6
-
-
+
State
@@ -318,12 +325,12 @@ background: none;
-
-
+
6
-
-
+
Country
@@ -342,12 +349,12 @@ background: none;
-
-
+
6
-
-
+
Zip
@@ -358,6 +365,9 @@ background: none;
Qt::PlainText
+
+ true
+
Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
@@ -399,10 +409,16 @@ background: none;
24
- 32
+ 24
-
+
+
+ 488
+ 0
+
+
Qt::TabFocus
@@ -416,20 +432,11 @@ background: none;
-
-
-
- 460
- 450
-
-
QLabel {
-font-family: Roboto, Helvetica;
font-size: 12px;
-color: #07142A;
}
QPushButton {
-font-family: Roboto, Helvetica;
font-size: 12px;
text-align: left;
text-decoration: underline;
@@ -437,10 +444,9 @@ color: #2F70B6;
border: none;
}
QHeaderView::section {
-font-family: Roboto, Helvetica;
-font-size: 14px;
-border: none;
-border-bottom: 1px solid #E7EAEF;
+border: 1px solid #E7EAEF;
+border-width: 0px 0px 1px 0px;
+padding: 0px 0px 8px 5px;
background-color: #FFFFFF;
}
@@ -457,7 +463,10 @@ background-color: #FFFFFF;
QAbstractItemView::SelectRows
- 0
+ 5
+
+
+ false
2
@@ -496,17 +505,11 @@ border-top: 1px solid #E7EAEF;
background-color: #F3F5F7;
}
#title {
-font-family: Roboto, Helvetica;
-color: #07142A;
-font-size: 14px;
font-weight: 700;
}
-#navigationArea {
-border-top: 1px solid #E7EAEF;
-background-color: #F3F5F7;
-}
QPushButton {
padding: 10px 12px;
+border: 1px solid #2F70B6;
border-radius: 4px;
color: #ffffff;
background-color: #2F70B6;
@@ -514,9 +517,11 @@ font-size: 12px;
font-weight: 700;
}
QPushButton:hover, QPushButton:focus {
+border-color: #2B66A6;
background-color: #2B66A6;
}
QPushButton:pressed {
+border-color: #215081;
background-color: #215081;
}
@@ -605,6 +610,9 @@ background-color: #215081;
Close
+
+ true
+
diff --git a/client/widgets/VerifyCert.ui b/client/widgets/VerifyCert.ui
index 5e2a6784..7b68884e 100644
--- a/client/widgets/VerifyCert.ui
+++ b/client/widgets/VerifyCert.ui
@@ -301,26 +301,9 @@ background-color: #BFD3E8;
PointingHandCursor
-
- Qt::RightToLeft
-
Change with PUK code
-
-
- :/images/icon_Abi.svg
-
-
-
-
- 14
- 14
-
-
-
- Qt::ToolButtonTextBesideIcon
-
-
@@ -328,26 +311,9 @@ background-color: #BFD3E8;
PointingHandCursor
-
- Qt::RightToLeft
-
Check the details of the certificate
-
-
- :/images/icon_Abi.svg
-
-
-
-
- 14
- 14
-
-
-
- Qt::ToolButtonTextBesideIcon
-
-
@@ -355,26 +321,9 @@ background-color: #BFD3E8;
PointingHandCursor
-
- Qt::RightToLeft
-
Check certificate status
-
-
- :/images/icon_Abi.svg
-
-
-
-
- 14
- 14
-
-
-
- Qt::ToolButtonTextBesideIcon
-