diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-07 23:06:54 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-08 23:26:58 +0100 |
| commit | 955b59e8720951821ed84ba79d8e8c22999b2bd3 (patch) | |
| tree | 7e46b648220ce02df510d204456b96babd3bd94f /xmlsecurity | |
| parent | c5b7e99758553d8d4f1a149bcc3d0b2d5835d312 (diff) | |
gpg4libre: multi-select encryption certs, hide desc entry
Change-Id: I50ea6e82f18f296ea24f6e0d0e0e2eb381a5e54b
Reviewed-on: https://gerrit.libreoffice.org/46052
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 6283cd07d44d9aeacffbedb99d23e4ee760c6eb6)
Reviewed-on: https://gerrit.libreoffice.org/46083
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/inc/certificatechooser.hxx | 3 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/certificatechooser.cxx | 5 | ||||
| -rw-r--r-- | xmlsecurity/uiconfig/ui/selectcertificatedialog.ui | 2 |
3 files changed, 8 insertions, 2 deletions
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> |