gpg4libre: Encrypt with GPG checkbox in SaveAs file dialog, 1st stab
LibO's own file dialog only so far Change-Id: Ic5f6c180afb5d4e0fc151ad57d769b99ad7fbdf3 Reviewed-on: https://gerrit.libreoffice.org/41292 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
committed by
Thorsten Behrens
parent
99fb14ef72
commit
4e825d97a8
@@ -405,6 +405,7 @@ namespace svt
|
|||||||
{
|
{
|
||||||
case CHECKBOX_AUTOEXTENSION:
|
case CHECKBOX_AUTOEXTENSION:
|
||||||
case CHECKBOX_PASSWORD:
|
case CHECKBOX_PASSWORD:
|
||||||
|
case CHECKBOX_GPGENCRYPTION:
|
||||||
case CHECKBOX_FILTEROPTIONS:
|
case CHECKBOX_FILTEROPTIONS:
|
||||||
case CHECKBOX_READONLY:
|
case CHECKBOX_READONLY:
|
||||||
case CHECKBOX_LINK:
|
case CHECKBOX_LINK:
|
||||||
|
@@ -555,6 +555,7 @@ void SvtFileDialog::Init_Impl
|
|||||||
get(pImpl->_pBtnConnectToServer, "connect_to_server");
|
get(pImpl->_pBtnConnectToServer, "connect_to_server");
|
||||||
get(pImpl->_pBtnNewFolder, "new_folder");
|
get(pImpl->_pBtnNewFolder, "new_folder");
|
||||||
get(pImpl->_pCbPassword, "password");
|
get(pImpl->_pCbPassword, "password");
|
||||||
|
get(pImpl->_pCbGPGEncrypt, "gpgencrypt");
|
||||||
get(pImpl->_pCbAutoExtension, "extension");
|
get(pImpl->_pCbAutoExtension, "extension");
|
||||||
get(pImpl->_pFtFileVersion, "shared_label");
|
get(pImpl->_pFtFileVersion, "shared_label");
|
||||||
get(pImpl->_pLbFileVersion, "shared");
|
get(pImpl->_pLbFileVersion, "shared");
|
||||||
@@ -638,6 +639,11 @@ void SvtFileDialog::Init_Impl
|
|||||||
pImpl->_pCbPassword->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
|
pImpl->_pCbPassword->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
|
||||||
pImpl->_pCbPassword->Show();
|
pImpl->_pCbPassword->Show();
|
||||||
}
|
}
|
||||||
|
if ( nStyle & PickerFlags::Password )
|
||||||
|
{
|
||||||
|
pImpl->_pCbGPGEncrypt->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
|
||||||
|
pImpl->_pCbGPGEncrypt->Show();
|
||||||
|
}
|
||||||
|
|
||||||
// set the ini file for extracting the size
|
// set the ini file for extracting the size
|
||||||
pImpl->_aIniKey = "FileDialog";
|
pImpl->_aIniKey = "FileDialog";
|
||||||
@@ -1529,6 +1535,8 @@ IMPL_LINK( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void )
|
|||||||
nId = CHECKBOX_READONLY;
|
nId = CHECKBOX_READONLY;
|
||||||
else if ( pCheckBox == pImpl->_pCbPassword )
|
else if ( pCheckBox == pImpl->_pCbPassword )
|
||||||
nId = CHECKBOX_PASSWORD;
|
nId = CHECKBOX_PASSWORD;
|
||||||
|
else if ( pCheckBox == pImpl->_pCbGPGEncrypt )
|
||||||
|
nId = CHECKBOX_GPGENCRYPTION;
|
||||||
else if ( pCheckBox == _pCbLinkBox )
|
else if ( pCheckBox == _pCbLinkBox )
|
||||||
nId = CHECKBOX_LINK;
|
nId = CHECKBOX_LINK;
|
||||||
else if ( pCheckBox == _pCbPreviewBox )
|
else if ( pCheckBox == _pCbPreviewBox )
|
||||||
@@ -2318,6 +2326,10 @@ Control* SvtFileDialog::getControl( sal_Int16 _nControlId, bool _bLabelControl )
|
|||||||
pReturn = pImpl->_pCbPassword;
|
pReturn = pImpl->_pCbPassword;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case CHECKBOX_GPGENCRYPTION:
|
||||||
|
pReturn = pImpl->_pCbGPGEncrypt;
|
||||||
|
break;
|
||||||
|
|
||||||
case CHECKBOX_FILTEROPTIONS:
|
case CHECKBOX_FILTEROPTIONS:
|
||||||
pReturn = pImpl->_pCbOptions;
|
pReturn = pImpl->_pCbOptions;
|
||||||
break;
|
break;
|
||||||
|
@@ -194,6 +194,7 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl() :
|
|||||||
_pBtnUp ( nullptr ),
|
_pBtnUp ( nullptr ),
|
||||||
_pBtnNewFolder ( nullptr ),
|
_pBtnNewFolder ( nullptr ),
|
||||||
_pCbPassword ( nullptr ),
|
_pCbPassword ( nullptr ),
|
||||||
|
_pCbGPGEncrypt ( nullptr ),
|
||||||
_pEdCurrentPath ( nullptr ),
|
_pEdCurrentPath ( nullptr ),
|
||||||
_pCbAutoExtension ( nullptr ),
|
_pCbAutoExtension ( nullptr ),
|
||||||
_pCbOptions ( nullptr ),
|
_pCbOptions ( nullptr ),
|
||||||
|
@@ -145,6 +145,7 @@ public:
|
|||||||
VclPtr<SvtUpButton_Impl> _pBtnUp;
|
VclPtr<SvtUpButton_Impl> _pBtnUp;
|
||||||
VclPtr<PushButton> _pBtnNewFolder;
|
VclPtr<PushButton> _pBtnNewFolder;
|
||||||
VclPtr<CheckBox> _pCbPassword;
|
VclPtr<CheckBox> _pCbPassword;
|
||||||
|
VclPtr<CheckBox> _pCbGPGEncrypt;
|
||||||
VclPtr<SvtURLBox> _pEdCurrentPath;
|
VclPtr<SvtURLBox> _pEdCurrentPath;
|
||||||
VclPtr<CheckBox> _pCbAutoExtension;
|
VclPtr<CheckBox> _pCbAutoExtension;
|
||||||
VclPtr<CheckBox> _pCbOptions;
|
VclPtr<CheckBox> _pCbOptions;
|
||||||
|
@@ -433,7 +433,7 @@
|
|||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">0</property>
|
<property name="left_attach">0</property>
|
||||||
<property name="top_attach">1</property>
|
<property name="top_attach">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
@@ -448,9 +448,25 @@
|
|||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">1</property>
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">2</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkCheckButton" id="gpgencrypt">
|
||||||
|
<property name="label" translatable="yes">Encrypt with GPG key</property>
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="receives_default">False</property>
|
||||||
|
<property name="draw_indicator">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
<property name="top_attach">1</property>
|
<property name="top_attach">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<placeholder/>
|
||||||
|
</child>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">0</property>
|
<property name="left_attach">0</property>
|
||||||
|
@@ -49,6 +49,7 @@ published constants ExtendedFilePickerElementIds
|
|||||||
const short LISTBOX_TEMPLATE_LABEL = 208;
|
const short LISTBOX_TEMPLATE_LABEL = 208;
|
||||||
const short LISTBOX_IMAGE_TEMPLATE_LABEL = 209;
|
const short LISTBOX_IMAGE_TEMPLATE_LABEL = 209;
|
||||||
const short LISTBOX_FILTER_SELECTOR = 210;
|
const short LISTBOX_FILTER_SELECTOR = 210;
|
||||||
|
const short CHECKBOX_GPGENCRYPTION = 211;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user