mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmlsecurity: fix alignment for XAdES checkbox

Browse Source 
And rename it to AdES, as the PDF PAdES generation will be affected by
this checkbox in the near future.

Change-Id: I06121e4eb9debac7a55a737a71780c2fa5c4d084
Reviewed-on: https://gerrit.libreoffice.org/30908
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Miklos Vajna
2016-11-16 16:25:00 +01:00
committed by Tor Lillqvist
parent f3c42669a5
commit ece5862b5d
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xmlsecurity/inc/digitalsignaturesdialog.hxx
View File

@@ -70,7 +70,7 @@ private:
VclPtr<FixedImage> m_pSigsOldSignatureImg; VclPtr<FixedImage> m_pSigsOldSignatureImg;
VclPtr<FixedText> m_pSigsOldSignatureFI; VclPtr<FixedText> m_pSigsOldSignatureFI;
VclPtr<CheckBox> m_pXAdESCompliantCB; VclPtr<CheckBox> m_pAdESCompliantCB;
VclPtr<PushButton> m_pViewBtn; VclPtr<PushButton> m_pViewBtn;
VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pAddBtn;
@@ -84,9 +84,9 @@ private:
bool m_bHasDocumentSignature; bool m_bHasDocumentSignature;
bool m_bWarningShowSignMacro; bool m_bWarningShowSignMacro;
bool m_bXAdESCompliant; bool m_bAdESCompliant;
DECL_LINK(XAdESCompliantCheckBoxHdl, CheckBox&, void); DECL_LINK(AdESCompliantCheckBoxHdl, CheckBox&, void);
DECL_LINK(ViewButtonHdl, Button*, void); DECL_LINK(ViewButtonHdl, Button*, void);
DECL_LINK(AddButtonHdl, Button*, void); DECL_LINK(AddButtonHdl, Button*, void);
DECL_LINK(RemoveButtonHdl, Button*, void); DECL_LINK(RemoveButtonHdl, Button*, void);

18
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
View File

@@ -116,7 +116,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
get(m_pHintDocFT, "dochint"); get(m_pHintDocFT, "dochint");
get(m_pHintBasicFT, "macrohint"); get(m_pHintBasicFT, "macrohint");
get(m_pHintPackageFT, "packagehint"); get(m_pHintPackageFT, "packagehint");
get(m_pXAdESCompliantCB, "xadescompliant"); get(m_pAdESCompliantCB, "adescompliant");
get(m_pViewBtn, "view"); get(m_pViewBtn, "view");
get(m_pAddBtn, "sign"); get(m_pAddBtn, "sign");
get(m_pRemoveBtn, "remove"); get(m_pRemoveBtn, "remove");
@@ -130,7 +130,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
get(m_pSigsOldSignatureImg, "oldsignatureimg"); get(m_pSigsOldSignatureImg, "oldsignatureimg");
get(m_pSigsOldSignatureFI, "oldsignatureft"); get(m_pSigsOldSignatureFI, "oldsignatureft");
m_bXAdESCompliant = !DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion); m_bAdESCompliant = !DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion);
Size aControlSize(275, 109); Size aControlSize(275, 109);
const long nControlWidth = aControlSize.Width(); const long nControlWidth = aControlSize.Width();
@@ -154,8 +154,8 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
m_pSignaturesLB->SetSelectHdl( LINK( this, DigitalSignaturesDialog, SignatureHighlightHdl ) ); m_pSignaturesLB->SetSelectHdl( LINK( this, DigitalSignaturesDialog, SignatureHighlightHdl ) );
m_pSignaturesLB->SetDoubleClickHdl( LINK( this, DigitalSignaturesDialog, SignatureSelectHdl ) ); m_pSignaturesLB->SetDoubleClickHdl( LINK( this, DigitalSignaturesDialog, SignatureSelectHdl ) );
m_pXAdESCompliantCB->SetToggleHdl( LINK( this, DigitalSignaturesDialog, XAdESCompliantCheckBoxHdl ) ); m_pAdESCompliantCB->SetToggleHdl( LINK( this, DigitalSignaturesDialog, AdESCompliantCheckBoxHdl ) );
m_pXAdESCompliantCB->Check(m_bXAdESCompliant); m_pAdESCompliantCB->Check(m_bAdESCompliant);
m_pViewBtn->SetClickHdl( LINK( this, DigitalSignaturesDialog, ViewButtonHdl ) ); m_pViewBtn->SetClickHdl( LINK( this, DigitalSignaturesDialog, ViewButtonHdl ) );
m_pViewBtn->Disable(); m_pViewBtn->Disable();
@@ -202,7 +202,7 @@ void DigitalSignaturesDialog::dispose()
m_pSigsNotvalidatedFI.clear(); m_pSigsNotvalidatedFI.clear();
m_pSigsOldSignatureImg.clear(); m_pSigsOldSignatureImg.clear();
m_pSigsOldSignatureFI.clear(); m_pSigsOldSignatureFI.clear();
m_pXAdESCompliantCB.clear(); m_pAdESCompliantCB.clear();
m_pViewBtn.clear(); m_pViewBtn.clear();
m_pAddBtn.clear(); m_pAddBtn.clear();
m_pRemoveBtn.clear(); m_pRemoveBtn.clear();
@@ -357,7 +357,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeListBox*,
IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl, Button*, void) IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl, Button*, void)
{ {
maSignatureManager.write(m_bXAdESCompliant); maSignatureManager.write(m_bAdESCompliant);
EndDialog(RET_OK); EndDialog(RET_OK);
} }
@@ -368,9 +368,9 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl, SvTreeListBox*, boo
return false; return false;
} }
IMPL_LINK_NOARG(DigitalSignaturesDialog, XAdESCompliantCheckBoxHdl, CheckBox&, void) IMPL_LINK_NOARG(DigitalSignaturesDialog, AdESCompliantCheckBoxHdl, CheckBox&, void)
{ {
m_bXAdESCompliant = m_pXAdESCompliantCB->IsChecked(); m_bAdESCompliant = m_pAdESCompliantCB->IsChecked();
} }
IMPL_LINK_NOARG(DigitalSignaturesDialog, ViewButtonHdl, Button*, void) IMPL_LINK_NOARG(DigitalSignaturesDialog, ViewButtonHdl, Button*, void)
@@ -390,7 +390,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl, Button*, void)
if ( aChooser->Execute() == RET_OK ) if ( aChooser->Execute() == RET_OK )
{ {
sal_Int32 nSecurityId; sal_Int32 nSecurityId;
if (!maSignatureManager.add(aChooser->GetSelectedCertificate(), aChooser->GetDescription(), nSecurityId, m_bXAdESCompliant)) if (!maSignatureManager.add(aChooser->GetSelectedCertificate(), aChooser->GetDescription(), nSecurityId, m_bAdESCompliant))
return; return;
mbSignaturesChanged = true; mbSignaturesChanged = true;

5
xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
View File

@@ -367,11 +367,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="xadescompliant"> <object class="GtkCheckButton" id="adescompliant">
<property name="label" translatable="yes">Use XAdES-compliant signature when there is a choice</property> <property name="label" translatable="yes">Use AdES-compliant signature when there is a choice</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="halign">start</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>