move frame and shape definition of copyable labels to copylabel

- drop label styles from UIs and c++-files
 - set sigAlg and serial to copyable label
This commit is contained in:
Christian Hohnstaedt 2010-04-12 19:35:53 +02:00
parent 9ecf9e001a
commit 4398b2afc5
7 changed files with 20 additions and 106 deletions

View File

@ -128,17 +128,7 @@
<number>6</number>
</property>
<item row="3" column="1">
<widget class="QLabel" name="sigAlgo">
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="text">
<string/>
</property>
</widget>
<widget class="CopyLabel" name="sigAlgo"/>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout">
@ -165,7 +155,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="serialNr">
<widget class="CopyLabel" name="serialNr">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
@ -175,12 +165,6 @@
<property name="toolTip">
<string>The serial number of the certificate</string>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
</layout>
@ -270,12 +254,6 @@
<property name="toolTip">
<string>A SHA-1 hashsum of the certificate</string>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
<item row="0" column="1">
@ -283,12 +261,6 @@
<property name="toolTip">
<string>An md5 hashsum of the certificate</string>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
</layout>
@ -311,12 +283,6 @@
<property name="toolTip">
<string>The time since the certificate is valid</string>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
<item>
@ -324,12 +290,6 @@
<property name="toolTip">
<string>The time until the certificate is valid</string>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
<item>

View File

@ -152,19 +152,13 @@
</widget>
</item>
<item>
<widget class="QLabel" name="version">
<widget class="CopyLabel" name="version">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
</layout>
@ -230,24 +224,10 @@
</widget>
</item>
<item row="1" column="1">
<widget class="CopyLabel" name="nUpdate">
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
<widget class="CopyLabel" name="nUpdate"/>
</item>
<item row="0" column="1">
<widget class="CopyLabel" name="lUpdate">
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
<widget class="CopyLabel" name="lUpdate"/>
</item>
</layout>
</widget>

View File

@ -157,14 +157,7 @@
</widget>
</item>
<item>
<widget class="CopyLabel" name="keyPubEx">
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
<widget class="CopyLabel" name="keyPubEx"/>
</item>
<item>
<spacer>
@ -190,19 +183,13 @@
</widget>
</item>
<item>
<widget class="QLabel" name="keyLength">
<widget class="CopyLabel" name="keyLength">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
</layout>
@ -255,15 +242,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>

View File

@ -83,7 +83,7 @@
<item>
<widget class="QTabWidget" name="tabwidget">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="unnamed">
<attribute name="title">
@ -128,17 +128,7 @@
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="sigAlgo">
<property name="frameShape">
<enum>QFrame::WinPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="text">
<string/>
</property>
</widget>
<widget class="CopyLabel" name="sigAlgo"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel2">
@ -308,6 +298,11 @@
<header>widgets/distname.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>CopyLabel</class>
<extends>QLabel</extends>
<header>widgets/clicklabel.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>

View File

@ -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;
}

View File

@ -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
}

View File

@ -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]);