strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Related: tdf#150706 add OK and CANCEL to known controls

Browse source 
which results that we can rename "Save" to "Export" in pdf export dialog

Change-Id: I8186a9ea3d18bfb383b07ba54f2fd7a5cd71e7b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141004
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2022-10-06 09:59:44 +01:00
parent 81051d1fcc
commit 1da3406a8e
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
View file

@ -1099,6 +1099,10 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
pWidget = m_pToggles[elem]; tType = GTK_TYPE_CHECK_BUTTON; \
break
#define MAP_BUTTON( elem ) \
case CommonFilePickerElementIds::PUSHBUTTON_##elem: \
pWidget = m_pButtons[elem]; tType = GTK_TYPE_BUTTON; \
break
#define MAP_EXT_BUTTON( elem ) \
case ExtendedFilePickerElementIds::PUSHBUTTON_##elem: \
pWidget = m_pButtons[elem]; tType = GTK_TYPE_BUTTON; \
break
@ -1121,7 +1125,9 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
MAP_TOGGLE( LINK );
MAP_TOGGLE( PREVIEW );
MAP_TOGGLE( SELECTION );
MAP_BUTTON( PLAY );
MAP_BUTTON( OK );
MAP_BUTTON( CANCEL );
MAP_EXT_BUTTON( PLAY );
MAP_LIST( VERSION );
MAP_LIST( TEMPLATE );
MAP_LIST( IMAGE_TEMPLATE );
@ -1383,7 +1389,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
if( !( pWidget = getWidget( nControlId, &tType ) ) )
{
SAL_WARN( "vcl.gtk", "Set label on unknown control " << nControlId);
SAL_WARN( "vcl.gtk", "Set label '" << rLabel << "' on unknown control " << nControlId);
return;
}
@ -1775,18 +1781,17 @@ void SalGtkFilePicker::impl_initialize(GtkWidget* pParentWidget, sal_Int16 templ
}
gtk_file_chooser_set_action( GTK_FILE_CHOOSER( m_pDialog ), eAction);
gtk_dialog_add_button(GTK_DIALOG( m_pDialog ),
getCancelText().getStr(),
GTK_RESPONSE_CANCEL);
for( int nTVIndex = 0; nTVIndex < BUTTON_LAST; nTVIndex++ )
m_pButtons[CANCEL] = gtk_dialog_add_button(GTK_DIALOG(m_pDialog), getCancelText().getStr(), GTK_RESPONSE_CANCEL);
mbButtonVisibility[CANCEL] = true;
if (mbButtonVisibility[PLAY])
{
if( mbButtonVisibility[nTVIndex] )
{
OString aPlay = OUStringToOString( getResString( PUSHBUTTON_PLAY ), RTL_TEXTENCODING_UTF8 );
m_pButtons[ nTVIndex ] = gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), aPlay.getStr(), 1 );
}
OString aPlay = OUStringToOString(getResString(PUSHBUTTON_PLAY), RTL_TEXTENCODING_UTF8);
m_pButtons[PLAY] = gtk_dialog_add_button(GTK_DIALOG(m_pDialog), aPlay.getStr(), 1);
}
gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), first_button_text, GTK_RESPONSE_ACCEPT );
m_pButtons[OK] = gtk_dialog_add_button(GTK_DIALOG(m_pDialog), first_button_text, GTK_RESPONSE_ACCEPT);
mbButtonVisibility[OK] = true;
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );

2
vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
View file

@ -170,6 +170,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
bool mbToggleVisibility[TOGGLE_LAST];
enum {
OK,
CANCEL,
PLAY,
BUTTON_LAST };