xmlsecurity/inc/certificatechooser.hxx | 3 ++- xmlsecurity/source/dialogs/certificatechooser.cxx | 5 +++++ xmlsecurity/uiconfig/ui/selectcertificatedialog.ui | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit 6283cd07d44d9aeacffbedb99d23e4ee760c6eb6 Author: Thorsten Behrens <thorsten.behr...@cib.de> Date: Thu Dec 7 23:06:54 2017 +0100 gpg4libre: multi-select encryption certs, hide desc entry Change-Id: I50ea6e82f18f296ea24f6e0d0e0e2eb381a5e54b Reviewed-on: https://gerrit.libreoffice.org/46052 Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> Tested-by: Thorsten Behrens <thorsten.behr...@cib.de> diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index 2ae3c1822b1f..be3828b5c5e9 100644 --- a/xmlsecurity/inc/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -68,7 +68,8 @@ private: VclPtr<SvSimpleTable> m_pCertLB; VclPtr<PushButton> m_pViewBtn; VclPtr<OKButton> m_pOKBtn; - VclPtr<Edit> m_pDescriptionED; + VclPtr<FixedText> m_pFTDescription; + VclPtr<Edit> m_pDescriptionED; bool mbInitialized; UserAction meAction; diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index a334e0250225..bf100c6d0401 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -46,6 +46,7 @@ CertificateChooser::CertificateChooser(vcl::Window* _pParent, get(m_pFTEncrypt, "encrypt"); get(m_pOKBtn, "ok"); get(m_pViewBtn, "viewcert"); + get(m_pFTDescription, "description-label"); get(m_pDescriptionED, "description"); Size aControlSize(475, 122); @@ -85,6 +86,7 @@ void CertificateChooser::dispose() m_pCertLB.disposeAndClear(); m_pViewBtn.clear(); m_pOKBtn.clear(); + m_pFTDescription.clear(); m_pDescriptionED.clear(); mvUserData.clear(); ModalDialog::dispose(); @@ -166,6 +168,9 @@ void CertificateChooser::ImplInitialize() case UserAction::Encrypt: m_pFTEncrypt->Show(); + m_pFTDescription->Hide(); + m_pDescriptionED->Hide(); + m_pCertLB->SetSelectionMode( SelectionMode::Multiple ); m_pOKBtn->SetText( get<FixedText>("str_encrypt")->GetText() ); break; diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui index 69398517ffd9..6ddeec32cfb6 100644 --- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui +++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui @@ -260,7 +260,7 @@ <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="description-label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" context="selectcertificatedialog|label2">Description:</property> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits