Kaydet (Commit) 5198c983 authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

Add new open dialog type: Play and link

This is needed e.g. for the "Slide transition sound" files
where we want to play files and also give the choice whether to link or not

Change-Id: I5aaef7152be8e5c0a0f88c4d7234926f233c5d92
Reviewed-on: https://gerrit.libreoffice.org/26846Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 6373f9ec
...@@ -219,6 +219,8 @@ void ControlHelper::initialize( sal_Int16 nTemplateId ) ...@@ -219,6 +219,8 @@ void ControlHelper::initialize( sal_Int16 nTemplateId )
case FILEOPEN_PREVIEW: case FILEOPEN_PREVIEW:
m_bToggleVisibility[PREVIEW] = true; m_bToggleVisibility[PREVIEW] = true;
break; break;
case FILEOPEN_LINK_PLAY:
m_bToggleVisibility[LINK] = true;
} }
createControls(); createControls();
......
...@@ -474,6 +474,9 @@ throw( uno::Exception, uno::RuntimeException ) ...@@ -474,6 +474,9 @@ throw( uno::Exception, uno::RuntimeException )
case FILEOPEN_PLAY: case FILEOPEN_PLAY:
m_nDialogType = NAVIGATIONSERVICES_OPEN; m_nDialogType = NAVIGATIONSERVICES_OPEN;
break; break;
case FILEOPEN_LINK_PLAY:
m_nDialogType = NAVIGATIONSERVICES_OPEN;
break;
case FILEOPEN_READONLY_VERSION: case FILEOPEN_READONLY_VERSION:
m_nDialogType = NAVIGATIONSERVICES_OPEN; m_nDialogType = NAVIGATIONSERVICES_OPEN;
break; break;
......
...@@ -269,6 +269,10 @@ PickerFlags SvtFilePicker::getPickerFlags() ...@@ -269,6 +269,10 @@ PickerFlags SvtFilePicker::getPickerFlags()
{ {
nBits = PickerFlags::Open | PickerFlags::PlayButton; nBits = PickerFlags::Open | PickerFlags::PlayButton;
} }
else if ( m_nServiceType == TemplateDescription::FILEOPEN_LINK_PLAY )
{
nBits = PickerFlags::Open | PickerFlags::InsertAsLink | PickerFlags::PlayButton;
}
else if ( m_nServiceType == TemplateDescription::FILEOPEN_READONLY_VERSION ) else if ( m_nServiceType == TemplateDescription::FILEOPEN_READONLY_VERSION )
{ {
nBits = PickerFlags::Open | PickerFlags::ReadOnly | PickerFlags::ShowVersions; nBits = PickerFlags::Open | PickerFlags::ReadOnly | PickerFlags::ShowVersions;
......
...@@ -554,6 +554,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) ...@@ -554,6 +554,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
break; break;
case FILEOPEN_PLAY: case FILEOPEN_PLAY:
case FILEOPEN_LINK_PLAY: //FIXME: FILEOPEN_LINK_PLAY needs an own template, no idea how to create one
winResTemplateId = TMPL2000_PLAY_PUSHBUTTON; winResTemplateId = TMPL2000_PLAY_PUSHBUTTON;
break; break;
......
...@@ -501,6 +501,14 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An ...@@ -501,6 +501,14 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An
} }
break; break;
case css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PLAY :
{
bFileOpenDialog = sal_True;
nFeatures |= FEATURE_LINK;
nFeatures |= FEATURE_PLAY;
}
break;
case css::ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION : case css::ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION :
{ {
bFileOpenDialog = sal_True; bFileOpenDialog = sal_True;
......
...@@ -552,6 +552,7 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I ...@@ -552,6 +552,7 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
break; break;
case css::ui::dialogs::TemplateDescription::FILEOPEN_PLAY : case css::ui::dialogs::TemplateDescription::FILEOPEN_PLAY :
case css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PLAY :
aGUID = CLIENTID_FILEOPEN_PLAY; aGUID = CLIENTID_FILEOPEN_PLAY;
break; break;
......
...@@ -123,6 +123,16 @@ published constants TemplateDescription ...@@ -123,6 +123,16 @@ published constants TemplateDescription
@since LibreOffice 5.3 @since LibreOffice 5.3
*/ */
const short FILEOPEN_PREVIEW = 11; const short FILEOPEN_PREVIEW = 11;
/** A FileOpen dialog with additional controls.
<ul>
<li>A checkbox "Insert as link"</li>
<li>A push button "Play"</li>
</ul>
@since LibreOffice 5.3
*/
const short FILEOPEN_LINK_PLAY = 12;
}; };
......
...@@ -433,6 +433,7 @@ bool FileDialogHelper_Impl::isInOpenMode() const ...@@ -433,6 +433,7 @@ bool FileDialogHelper_Impl::isInOpenMode() const
case FILEOPEN_SIMPLE: case FILEOPEN_SIMPLE:
case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE: case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE:
case FILEOPEN_PLAY: case FILEOPEN_PLAY:
case FILEOPEN_LINK_PLAY:
case FILEOPEN_READONLY_VERSION: case FILEOPEN_READONLY_VERSION:
case FILEOPEN_LINK_PREVIEW: case FILEOPEN_LINK_PREVIEW:
case FILEOPEN_PREVIEW: case FILEOPEN_PREVIEW:
...@@ -827,6 +828,7 @@ static open_or_save_t lcl_OpenOrSave(sal_Int16 const nDialogType) ...@@ -827,6 +828,7 @@ static open_or_save_t lcl_OpenOrSave(sal_Int16 const nDialogType)
case FILEOPEN_SIMPLE: case FILEOPEN_SIMPLE:
case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE: case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE:
case FILEOPEN_PLAY: case FILEOPEN_PLAY:
case FILEOPEN_LINK_PLAY:
case FILEOPEN_READONLY_VERSION: case FILEOPEN_READONLY_VERSION:
case FILEOPEN_LINK_PREVIEW: case FILEOPEN_LINK_PREVIEW:
case FILEOPEN_PREVIEW: case FILEOPEN_PREVIEW:
...@@ -998,6 +1000,10 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( ...@@ -998,6 +1000,10 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
nTemplateDescription = TemplateDescription::FILEOPEN_PLAY; nTemplateDescription = TemplateDescription::FILEOPEN_PLAY;
break; break;
case FILEOPEN_LINK_PLAY:
nTemplateDescription = TemplateDescription::FILEOPEN_LINK_PLAY;
break;
case FILEOPEN_READONLY_VERSION: case FILEOPEN_READONLY_VERSION:
nTemplateDescription = TemplateDescription::FILEOPEN_READONLY_VERSION; nTemplateDescription = TemplateDescription::FILEOPEN_READONLY_VERSION;
mbHasVersions = true; mbHasVersions = true;
......
...@@ -1662,6 +1662,13 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu ...@@ -1662,6 +1662,13 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
mbButtonVisibility[PLAY] = true; mbButtonVisibility[PLAY] = true;
// TODO // TODO
break; break;
case FILEOPEN_LINK_PLAY:
eAction = GTK_FILE_CHOOSER_ACTION_OPEN;
first_button_text = GTK_STOCK_OPEN;
mbToggleVisibility[LINK] = true;
mbButtonVisibility[PLAY] = true;
// TODO
break;
case FILEOPEN_READONLY_VERSION: case FILEOPEN_READONLY_VERSION:
eAction = GTK_FILE_CHOOSER_ACTION_OPEN; eAction = GTK_FILE_CHOOSER_ACTION_OPEN;
first_button_text = GTK_STOCK_OPEN; first_button_text = GTK_STOCK_OPEN;
......
...@@ -704,6 +704,13 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen ...@@ -704,6 +704,13 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
sendAppendControlCommand( ExtendedFilePickerElementIds::PUSHBUTTON_PLAY ); sendAppendControlCommand( ExtendedFilePickerElementIds::PUSHBUTTON_PLAY );
break; break;
case FILEOPEN_LINK_PLAY:
sendCommand( aTypeOpen );
sendAppendControlCommand( ExtendedFilePickerElementIds::CHECKBOX_LINK );
sendAppendControlCommand( ExtendedFilePickerElementIds::PUSHBUTTON_PLAY );
break;
case FILEOPEN_READONLY_VERSION: case FILEOPEN_READONLY_VERSION:
sendCommand( aTypeOpen ); sendCommand( aTypeOpen );
......
...@@ -715,6 +715,11 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) ...@@ -715,6 +715,11 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
addCustomControl( PUSHBUTTON_PLAY ); addCustomControl( PUSHBUTTON_PLAY );
break; break;
case FILEOPEN_LINK_PLAY:
addCustomControl( CHECKBOX_LINK );
addCustomControl( PUSHBUTTON_PLAY );
break;
case FILEOPEN_READONLY_VERSION: case FILEOPEN_READONLY_VERSION:
addCustomControl( CHECKBOX_READONLY ); addCustomControl( CHECKBOX_READONLY );
addCustomControl( LISTBOX_VERSION ); addCustomControl( LISTBOX_VERSION );
......
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