Skip to content

Adjust SignatureDialog UI #1466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adjust SignatureDialog UI #1466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions client/DigiDoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,20 +109,15 @@ bool DigiDocSignature::isInvalid() const

QString DigiDocSignature::lastError() const { return m_lastError; }

QString DigiDocSignature::location() const
{
QStringList l = locations();
l.removeAll({});
return l.join(QStringLiteral(", "));
}

QStringList DigiDocSignature::locations() const
DigiDocSignature::Location DigiDocSignature::location() const
{
return {
from( s->city() ).trimmed(),
from( s->stateOrProvince() ).trimmed(),
from( s->postalCode() ).trimmed(),
from( s->countryName() ).trimmed()};
from(s->city()).trimmed(),
from(s->stateOrProvince()).trimmed(),
from(s->postalCode()).trimmed(),
from(s->countryName()).trimmed(),
from(s->streetAddress()).trimmed(),
};
}

QByteArray DigiDocSignature::messageImprint() const
Expand Down
11 changes: 9 additions & 2 deletions client/DigiDoc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,22 @@ class DigiDocSignature
{
DigestWeak = 1 << 2
};
struct Location
{
QString city;
QString stateOrProvince;
QString postalCode;
QString countryName;
QString streetAddress;
};
DigiDocSignature(const digidoc::Signature *signature = {}, const DigiDoc *parent = {}, bool isTimeStamped = false);

QSslCertificate cert() const;
QDateTime claimedTime() const;
const DigiDoc *container() const;
bool isInvalid() const;
QString lastError() const;
QString location() const;
QStringList locations() const;
Location location() const;
QByteArray messageImprint() const;
QSslCertificate ocspCert() const;
QDateTime ocspTime() const;
Expand Down
9 changes: 6 additions & 3 deletions client/PrintSheet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,10 @@ PrintSheet::PrintSheet( DigiDoc *doc, QPrinter *printer )
}
customText( tr("VALIDITY OF SIGNATURE"), valid );
customText( tr("ROLE / RESOLUTION"), sig.role() );
customText( tr("PLACE OF CONFIRMATION (CITY, STATE, ZIP, COUNTRY)"), sig.location() );
const auto l = sig.location();
QStringList location{l.city, l.streetAddress, l.stateOrProvince, l.postalCode, l.countryName};
location.removeAll({});
customText(tr("PLACE OF CONFIRMATION (CITY, STREET, STATE, ZIP, COUNTRY)"), location.join(QStringLiteral(", ")));
customText( tr("SERIAL NUMBER OF SIGNER CERTIFICATE"), cert.serialNumber() );

newPage( 50 );
Expand All @@ -172,10 +175,10 @@ PrintSheet::PrintSheet( DigiDoc *doc, QPrinter *printer )
int issuerHeight = drawTextRect( QRect( left, top, 200, 20 ),
cert.issuerInfo( QSslCertificate::CommonName ) );
drawTextRect( QRect( left+200, top, right - left - 200, issuerHeight ),
SslCertificate::toHex(cert.authorityKeyIdentifier()));
cert.authorityKeyIdentifier().toHex(' ').toUpper());
top += 20 + issuerHeight;

customText(tr("HASH VALUE OF SIGNATURE"), SslCertificate::toHex(sig.messageImprint()));
customText(tr("HASH VALUE OF SIGNATURE"), sig.messageImprint().toHex(' ').toUpper());
top += 15;
}
save();
Expand Down
5 changes: 0 additions & 5 deletions client/SslCertificate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,6 @@ QByteArray SslCertificate::subjectKeyIdentifier() const
return !id ? QByteArray() : toQByteArray(id);
}

QByteArray SslCertificate::toHex(const QByteArray &in, char separator)
{
return in.toHex(separator).toUpper();
}

QString SslCertificate::toString( const QString &format ) const
{
static const QRegularExpression r(QStringLiteral("[a-zA-Z]+"));
Expand Down
1 change: 0 additions & 1 deletion client/SslCertificate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ class SslCertificate: public QSslCertificate
bool showCN() const;
QString signatureAlgorithm() const;
QByteArray subjectKeyIdentifier() const;
static QByteArray toHex(const QByteArray &in, char separator = ' ');
QString toString( const QString &format ) const;
CertType type() const;
Validity validateOnline() const;
Expand Down
64 changes: 59 additions & 5 deletions client/dialogs/CertificateDetails.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,50 @@
font-family: Roboto, Helvetica;
font-size: 14px;
}
QScrollBar {
border: none;
background: transparent;
}
QScrollBar:vertical {
width: 12px;
padding: 4px 4px 4px 0px;
margin: 0px;
}
QScrollBar:horizontal {
height: 10px;
padding: 0px 4px 4px 4px;
margin: 0px;
}
QScrollBar::handle:vertical {
background-color: #B5BFCF;
border: none;
margin: 0px;
border-radius: 4px;
min-height: 16px;
}
QScrollBar::handle:horizontal {
background-color: #B5BFCF;
border: none;
margin: 0px;
border-radius: 3px;
min-width: 16px;
}
QScrollBar::add-line:vertical,
QScrollBar::sub-line:vertical {
height: 0px;
border: none;
background: none;
}
QScrollBar::add-line:horizontal,
QScrollBar::sub-line:horizontal {
width: 0px;
border: none;
background: none;
}
QScrollBar::add-page,
QScrollBar::sub-page {
background: transparent;
}
#CertificateDetails {
background-color: #FFFFFF;
border-radius: 4px;
Expand Down Expand Up @@ -118,15 +162,25 @@ font-size: 22px;
<string notr="true">QTableWidget {
background-color: #FFFFFF;
}
QTableWidget::item {
padding: 0px 12px;
}
QTableWidget::item:selected {
background-color: #E7EAEF;
background-color: #EAF1F8;
color: #07142A;
}
QHeaderView::section {
border: 1px solid #E7EAEF;
border-width: 0px 0px 1px 0px;
padding: 0px 0px 8px 5px;
background-color: #FFFFFF;
border: none;
padding: 8px 12px;
background-color: #F5F5F5;
}
QHeaderView::section:first {
border-top-left-radius: 8px;
border-bottom-left-radius: 8px;
}
QHeaderView::section:last {
border-top-right-radius: 8px;
border-bottom-right-radius: 8px;
}</string>
</property>
<property name="frameShape">
Expand Down
67 changes: 61 additions & 6 deletions client/dialogs/CertificateHistory.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,50 @@ color: #07142A;
font-family: Roboto, Helvetica;
font-size: 14px;
}
QScrollBar {
border: none;
background: transparent;
}
QScrollBar:vertical {
width: 12px;
padding: 4px 4px 4px 0px;
margin: 0px;
}
QScrollBar:horizontal {
height: 10px;
padding: 0px 4px 4px 4px;
margin: 0px;
}
QScrollBar::handle:vertical {
background-color: #B5BFCF;
border: none;
margin: 0px;
border-radius: 4px;
min-height: 16px;
}
QScrollBar::handle:horizontal {
background-color: #B5BFCF;
border: none;
margin: 0px;
border-radius: 3px;
min-width: 16px;
}
QScrollBar::add-line:vertical,
QScrollBar::sub-line:vertical {
height: 0px;
border: none;
background: none;
}
QScrollBar::add-line:horizontal,
QScrollBar::sub-line:horizontal {
width: 0px;
border: none;
background: none;
}
QScrollBar::add-page,
QScrollBar::sub-page {
background: transparent;
}
#label {
color: #003168;
font-size: 20px;
Expand Down Expand Up @@ -77,24 +121,35 @@ font-size: 12px;
color: #07142A;
background-color: #FFFFFF;
}
QTreeWidget::item {
padding: 0px 12px;
}
QTreeWidget::item:selected {
background-color: #EAF1F8;
color: #07142A;
}
QHeaderView::section {
font-family: Roboto, Helvetica;
font-size: 14px;
border: none;
border-bottom: 1px solid #E7EAEF;
background-color: #FFFFFF;
padding: 8px 12px;
background-color: #F5F5F5;
}
QTreeWidget::item:selected {
background-color: #E7EAEF;
color: #07142A;
QHeaderView::section:first {
border-top-left-radius: 8px;
border-bottom-left-radius: 8px;
}
QHeaderView::section:last {
border-top-right-radius: 8px;
border-bottom-right-radius: 8px;
}
QHeaderView::up-arrow,
QHeaderView::down-arrow {
subcontrol-origin: padding;
subcontrol-position: center right;
height: 7px;
width: 7px;
padding-right: 5px;
padding-right: 12px;
}</string>
</property>
<property name="frameShape">
Expand Down
74 changes: 67 additions & 7 deletions client/dialogs/KeyDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,53 @@ color: #07142A;
font-family: Roboto, Helvetica;
font-size: 14px;
}
#KeyDialog {
background-color: #FFFFFF;
QScrollBar {
border: none;
background: transparent;
}
QScrollBar:vertical {
width: 12px;
padding: 4px 4px 4px 0px;
margin: 0px;
}
QScrollBar:horizontal {
height: 10px;
padding: 0px 4px 4px 4px;
margin: 0px;
}
QScrollBar::handle:vertical {
background-color: #B5BFCF;
border: none;
margin: 0px;
border-radius: 4px;
min-height: 16px;
}
QHeaderView::section {
border: 1px solid #E7EAEF;
border-width: 0px 0px 1px 0px;
padding: 0px 0px 8px 5px;
QScrollBar::handle:horizontal {
background-color: #B5BFCF;
border: none;
margin: 0px;
border-radius: 3px;
min-width: 16px;
}
QScrollBar::add-line:vertical,
QScrollBar::sub-line:vertical {
height: 0px;
border: none;
background: none;
}
QScrollBar::add-line:horizontal,
QScrollBar::sub-line:horizontal {
width: 0px;
border: none;
background: none;
}
QScrollBar::add-page,
QScrollBar::sub-page {
background: transparent;
}
#KeyDialog {
background-color: #FFFFFF;
border-radius: 4px;
}
QPushButton {
padding: 12px 12px;
Expand Down Expand Up @@ -85,7 +123,29 @@ background-color: #82A9D3;
<item>
<widget class="QTreeWidget" name="view">
<property name="styleSheet">
<string notr="true">QWidget { background-color: #FFFFFF; }</string>
<string notr="true">QTreeWidget {
background-color: #FFFFFF;
}
QTreeWidget::item {
padding: 0px 12px;
}
QTreeWidget::item:selected {
background-color: #EAF1F8;
color: #07142A;
}
QHeaderView::section {
border: none;
padding: 8px 12px;
background-color: #F5F5F5;
}
QHeaderView::section:first {
border-top-left-radius: 8px;
border-bottom-left-radius: 8px;
}
QHeaderView::section:last {
border-top-right-radius: 8px;
border-bottom-right-radius: 8px;
}</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
Expand Down
Loading
Loading