diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-05 14:39:00 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-05 14:55:40 +0100 |
| commit | 59269d02adcfc3b892438c3ba7ad18eba1be36ce (patch) | |
| tree | 2a4e0f9069468fa52eb02a102af062aefd21f4bd | |
| parent | ee2b08ed8a1a6a588b01d6c5e845fc92c651af5d (diff) | |
xmlsecurity: show signature description in DigitalSignaturesDialog
Change-Id: Ic98c731eb381ee3b6ff198381b63e48b786e3fe6
| -rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 9 | ||||
| -rw-r--r-- | xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui | 13 |
2 files changed, 20 insertions, 2 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index f1928c838939..872cd903668a 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -201,11 +201,13 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( m_pSignaturesLB = VclPtr<SvSimpleTable>::Create(*pSignatures); // #i48253# the tablistbox needs its own unique id m_pSignaturesLB->Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG ); - static long aTabs[] = { 4, 0, 6*nControlWidth/100, 36*nControlWidth/100, 74*nControlWidth/100 }; + // Give the first column 6 percent, try to distribute the rest equally. + static long aTabs[] = { 5, 0, 6*nControlWidth/100, 30*nControlWidth/100, 54*nControlWidth/100, 78*nControlWidth/100 }; m_pSignaturesLB->SetTabs(aTabs); m_pSignaturesLB->InsertHeaderEntry("\t" + get<FixedText>("signed")->GetText() + "\t" - + get<FixedText>("issued")->GetText() + "\t" + get<FixedText>("date")->GetText()); + + get<FixedText>("issued")->GetText() + "\t" + get<FixedText>("date")->GetText() + "\t" + + get<FixedText>("description")->GetText()); mbVerifySignatures = true; mbSignaturesChanged = false; @@ -618,6 +620,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() OUString aSubject; OUString aIssuer; OUString aDateTimeStr; + OUString aDescription; bool bSigValid = false; bool bCertValid = false; @@ -641,6 +644,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() aIssuer = XmlSec::GetContentPart( xCert->getIssuerName() ); // String with date and time information (#i20172#) aDateTimeStr = XmlSec::GetDateTimeString( rInfo.stDateTime ); + aDescription = rInfo.ouDescription; } bSigValid = ( rInfo.nStatus == ::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED ); @@ -687,6 +691,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() m_pSignaturesLB->SetEntryText( aSubject, pEntry, 1 ); m_pSignaturesLB->SetEntryText( aIssuer, pEntry, 2 ); m_pSignaturesLB->SetEntryText( aDateTimeStr, pEntry, 3 ); + m_pSignaturesLB->SetEntryText(aDescription, pEntry, 4); pEntry->SetUserData( reinterpret_cast<void*>(n) ); // missuse user data as index } } diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui index f5b7d73583dc..4eebb5ea6887 100644 --- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui +++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui @@ -192,6 +192,19 @@ <property name="height">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="description"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Description</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> |