Kaydet (Commit) 59269d02 authored tarafından Miklos Vajna's avatar Miklos Vajna

xmlsecurity: show signature description in DigitalSignaturesDialog

Change-Id: Ic98c731eb381ee3b6ff198381b63e48b786e3fe6
üst ee2b08ed
...@@ -201,11 +201,13 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( ...@@ -201,11 +201,13 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
m_pSignaturesLB = VclPtr<SvSimpleTable>::Create(*pSignatures); m_pSignaturesLB = VclPtr<SvSimpleTable>::Create(*pSignatures);
// #i48253# the tablistbox needs its own unique id // #i48253# the tablistbox needs its own unique id
m_pSignaturesLB->Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG ); 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->SetTabs(aTabs);
m_pSignaturesLB->InsertHeaderEntry("\t" + get<FixedText>("signed")->GetText() + "\t" 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; mbVerifySignatures = true;
mbSignaturesChanged = false; mbSignaturesChanged = false;
...@@ -618,6 +620,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() ...@@ -618,6 +620,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
OUString aSubject; OUString aSubject;
OUString aIssuer; OUString aIssuer;
OUString aDateTimeStr; OUString aDateTimeStr;
OUString aDescription;
bool bSigValid = false; bool bSigValid = false;
bool bCertValid = false; bool bCertValid = false;
...@@ -641,6 +644,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() ...@@ -641,6 +644,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
aIssuer = XmlSec::GetContentPart( xCert->getIssuerName() ); aIssuer = XmlSec::GetContentPart( xCert->getIssuerName() );
// String with date and time information (#i20172#) // String with date and time information (#i20172#)
aDateTimeStr = XmlSec::GetDateTimeString( rInfo.stDateTime ); aDateTimeStr = XmlSec::GetDateTimeString( rInfo.stDateTime );
aDescription = rInfo.ouDescription;
} }
bSigValid = ( rInfo.nStatus == ::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED ); bSigValid = ( rInfo.nStatus == ::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
...@@ -687,6 +691,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() ...@@ -687,6 +691,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
m_pSignaturesLB->SetEntryText( aSubject, pEntry, 1 ); m_pSignaturesLB->SetEntryText( aSubject, pEntry, 1 );
m_pSignaturesLB->SetEntryText( aIssuer, pEntry, 2 ); m_pSignaturesLB->SetEntryText( aIssuer, pEntry, 2 );
m_pSignaturesLB->SetEntryText( aDateTimeStr, pEntry, 3 ); m_pSignaturesLB->SetEntryText( aDateTimeStr, pEntry, 3 );
m_pSignaturesLB->SetEntryText(aDescription, pEntry, 4);
pEntry->SetUserData( reinterpret_cast<void*>(n) ); // missuse user data as index pEntry->SetUserData( reinterpret_cast<void*>(n) ); // missuse user data as index
} }
} }
......
...@@ -192,6 +192,19 @@ ...@@ -192,6 +192,19 @@
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
</child> </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> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment