diff --git a/ui/CertDetail.ui b/ui/CertDetail.ui index 4d0d0489..e592965e 100644 --- a/ui/CertDetail.ui +++ b/ui/CertDetail.ui @@ -128,17 +128,7 @@ 6 - - - QFrame::Panel - - - QFrame::Sunken - - - - - + @@ -165,7 +155,7 @@ - + 0 @@ -175,12 +165,6 @@ The serial number of the certificate - - QFrame::Panel - - - QFrame::Sunken - @@ -270,12 +254,6 @@ A SHA-1 hashsum of the certificate - - QFrame::Panel - - - QFrame::Sunken - @@ -283,12 +261,6 @@ An md5 hashsum of the certificate - - QFrame::Panel - - - QFrame::Sunken - @@ -311,12 +283,6 @@ The time since the certificate is valid - - QFrame::Panel - - - QFrame::Sunken - @@ -324,12 +290,6 @@ The time until the certificate is valid - - QFrame::Panel - - - QFrame::Sunken - diff --git a/ui/CrlDetail.ui b/ui/CrlDetail.ui index 56299cea..0915fd5b 100644 --- a/ui/CrlDetail.ui +++ b/ui/CrlDetail.ui @@ -152,19 +152,13 @@ - + 0 0 - - QFrame::Panel - - - QFrame::Sunken - @@ -230,24 +224,10 @@ - - - QFrame::Panel - - - QFrame::Sunken - - + - - - QFrame::Panel - - - QFrame::Sunken - - + diff --git a/ui/KeyDetail.ui b/ui/KeyDetail.ui index b4c7a6df..c5c0db71 100644 --- a/ui/KeyDetail.ui +++ b/ui/KeyDetail.ui @@ -157,14 +157,7 @@ - - - QFrame::Panel - - - QFrame::Sunken - - + @@ -190,19 +183,13 @@ - + 0 0 - - QFrame::Panel - - - QFrame::Sunken - @@ -255,15 +242,6 @@ 0 - - QFrame::Panel - - - QFrame::Sunken - - - - diff --git a/ui/ReqDetail.ui b/ui/ReqDetail.ui index 3c0ac57b..2b8e6a10 100644 --- a/ui/ReqDetail.ui +++ b/ui/ReqDetail.ui @@ -83,7 +83,7 @@ - 0 + 1 @@ -128,17 +128,7 @@ - - - QFrame::WinPanel - - - QFrame::Sunken - - - - - + @@ -308,6 +298,11 @@
widgets/distname.h
1 + + CopyLabel + QLabel +
widgets/clicklabel.h
+
diff --git a/widgets/ReqDetail.cpp b/widgets/ReqDetail.cpp index 26b25bed..8c07164e 100644 --- a/widgets/ReqDetail.cpp +++ b/widgets/ReqDetail.cpp @@ -127,8 +127,6 @@ QLabel *ReqDetail::labelFromAsn1String(ASN1_STRING *s) label = new CopyLabel(this); label->setText(asn1ToQString(s)); label->setToolTip(QString(ASN1_tag2str(s->type))); - label->setFrameShape(QFrame::Panel); - label->setFrameShadow(QFrame::Sunken); return label; } diff --git a/widgets/clicklabel.cpp b/widgets/clicklabel.cpp index d9ffce09..9b9177db 100644 --- a/widgets/clicklabel.cpp +++ b/widgets/clicklabel.cpp @@ -63,9 +63,14 @@ void ClickLabel::disableToolTip() CopyLabel::CopyLabel(QWidget *parent) :QLabel(parent) { + setFrameShape(QFrame::Panel); + setFrameShadow(QFrame::Sunken); + #if QT_VERSION >= 0x040200 setTextInteractionFlags( - Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); + Qt::TextSelectableByMouse | + Qt::TextSelectableByKeyboard + ); #endif } diff --git a/widgets/distname.cpp b/widgets/distname.cpp index a694e491..b97a7445 100644 --- a/widgets/distname.cpp +++ b/widgets/distname.cpp @@ -49,8 +49,6 @@ void DistName::setX509name(const x509name &n) if (l1->text().isEmpty()) l1->setText(sl[0]); l2->setText(sl[2]); - l2->setFrameShape(QFrame::Panel); - l2->setFrameShadow(QFrame::Sunken); l1->setToolTip(sl[0]); l2->setToolTip(sl[3]);