diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-02-06 17:48:51 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-03-07 10:57:15 +0100 |
commit | 2f5c5aa139268e040a511823288d9edc3c3e29c8 (patch) | |
tree | e1b8a825beed37a0749793a72fb1279d25351efb /vcl | |
parent | 559b60c7f2c236667bdc3f9dae67e25cb2a4bcc5 (diff) |
tdf#86739 Option to set image anchor type in image insert dialog
This adds the selectbox to (hopefully) all filepickers:
- LO native
- GTK/GTK3
- KDE4
- KDE5
- Windows
- macOS
Reviewed-on: https://gerrit.libreoffice.org/49311
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 38774ce79b4b24628c3a73f387489bf2498363f1)
Change-Id: I01bd42b1ca18e0f691b879647a6cb1b62177d3ce
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/svids.hrc | 1 | ||||
-rw-r--r-- | vcl/source/src/fpicker.src | 5 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 11 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 1 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/resourceprovider.cxx | 1 | ||||
-rw-r--r-- | vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx | 12 | ||||
-rw-r--r-- | vcl/unx/kde4/KDE4FilePicker.cxx | 12 |
7 files changed, 43 insertions, 0 deletions
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index dcbd8dd6ce61..ce3d3a79f76f 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -152,6 +152,7 @@ #define STR_FPICKER_OPEN 10316 #define STR_FPICKER_SAVE 10317 #define STR_FPICKER_TYPE 10318 +#define STR_FPICKER_IMAGE_ANCHOR 10319 #define SV_ACCESSERROR_NO_FONTS 10510 diff --git a/vcl/source/src/fpicker.src b/vcl/source/src/fpicker.src index 73e404c9e6c0..5fcf178ff3fd 100644 --- a/vcl/source/src/fpicker.src +++ b/vcl/source/src/fpicker.src @@ -69,6 +69,11 @@ String STR_FPICKER_IMAGE_TEMPLATE Text [ en-US ] = "Frame Style: "; }; +String STR_FPICKER_IMAGE_ANCHOR +{ + Text [ en-US ] = "A~nchor: "; +}; + String STR_FPICKER_SELECTION { Text [ en-US ] = "~Selection" ; diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 5156a7a9b642..5733f192082e 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -199,6 +199,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext LABEL_LIST( VERSION ); LABEL_LIST( TEMPLATE ); LABEL_LIST( IMAGE_TEMPLATE ); + LABEL_LIST( IMAGE_ANCHOR ); default: OSL_TRACE("Handle unknown control %d", i); break; @@ -1103,9 +1104,11 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) MAP_LIST( VERSION ); MAP_LIST( TEMPLATE ); MAP_LIST( IMAGE_TEMPLATE ); + MAP_LIST( IMAGE_ANCHOR ); MAP_LIST_LABEL( VERSION ); MAP_LIST_LABEL( TEMPLATE ); MAP_LIST_LABEL( IMAGE_TEMPLATE ); + MAP_LIST_LABEL( IMAGE_ANCHOR ); default: OSL_TRACE("Handle unknown control %d", nControlId); break; @@ -1663,6 +1666,14 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu mbListVisibility[IMAGE_TEMPLATE] = true; // TODO break; + case FILEOPEN_LINK_PREVIEW_IMAGE_ANCHOR: + eAction = GTK_FILE_CHOOSER_ACTION_OPEN; + first_button_text = GTK_STOCK_OPEN; + mbToggleVisibility[LINK] = true; + mbToggleVisibility[PREVIEW] = true; + mbListVisibility[IMAGE_ANCHOR] = true; + // TODO + break; case FILEOPEN_PLAY: eAction = GTK_FILE_CHOOSER_ACTION_OPEN; first_button_text = GTK_STOCK_OPEN; diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 49190eafedb7..a61344b140d3 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -212,6 +212,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base VERSION, TEMPLATE, IMAGE_TEMPLATE, + IMAGE_ANCHOR, LIST_LAST }; diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index c6b09452df91..f6a5be79c3b8 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -47,6 +47,7 @@ static const struct { LISTBOX_VERSION_LABEL, STR_FPICKER_VERSION }, { LISTBOX_TEMPLATE_LABEL, STR_FPICKER_TEMPLATES }, { LISTBOX_IMAGE_TEMPLATE_LABEL, STR_FPICKER_IMAGE_TEMPLATE }, + { LISTBOX_IMAGE_ANCHOR_LABEL, STR_FPICKER_IMAGE_ANCHOR }, { CHECKBOX_SELECTION, STR_FPICKER_SELECTION }, { FOLDERPICKER_TITLE, STR_FPICKER_FOLDER_DEFAULT_TITLE }, { FOLDER_PICKER_DEF_DESCRIPTION, STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION }, diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx index c23a35716779..66dab2918aae 100644 --- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx +++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx @@ -253,9 +253,13 @@ void Gtk3KDE5FilePicker::addCustomControl(sal_Int16 controlId) case LISTBOX_IMAGE_TEMPLATE: resId = STR_FPICKER_IMAGE_TEMPLATE; break; + case LISTBOX_IMAGE_ANCHOR: + resId = STR_FPICKER_IMAGE_ANCHOR; + break; case LISTBOX_VERSION_LABEL: case LISTBOX_TEMPLATE_LABEL: case LISTBOX_IMAGE_TEMPLATE_LABEL: + case LISTBOX_IMAGE_ANCHOR_LABEL: case LISTBOX_FILTER_SELECTOR: break; } @@ -282,9 +286,11 @@ void Gtk3KDE5FilePicker::addCustomControl(sal_Int16 controlId) case LISTBOX_VERSION: case LISTBOX_TEMPLATE: case LISTBOX_IMAGE_TEMPLATE: + case LISTBOX_IMAGE_ANCHOR: case LISTBOX_VERSION_LABEL: case LISTBOX_TEMPLATE_LABEL: case LISTBOX_IMAGE_TEMPLATE_LABEL: + case LISTBOX_IMAGE_ANCHOR_LABEL: case LISTBOX_FILTER_SELECTOR: break; } @@ -358,6 +364,12 @@ void SAL_CALL Gtk3KDE5FilePicker::initialize(const uno::Sequence<uno::Any>& args addCustomControl(LISTBOX_IMAGE_TEMPLATE); break; + case FILEOPEN_LINK_PREVIEW_IMAGE_ANCHOR: + addCustomControl(CHECKBOX_LINK); + addCustomControl(CHECKBOX_PREVIEW); + addCustomControl(LISTBOX_IMAGE_ANCHOR); + break; + case FILEOPEN_PLAY: addCustomControl(PUSHBUTTON_PLAY); break; diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 229aa020bb98..5456344d3f5e 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -585,9 +585,13 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId) case LISTBOX_IMAGE_TEMPLATE: resId = STR_FPICKER_IMAGE_TEMPLATE; break; + case LISTBOX_IMAGE_ANCHOR: + resId = STR_FPICKER_IMAGE_ANCHOR; + break; case LISTBOX_VERSION_LABEL: case LISTBOX_TEMPLATE_LABEL: case LISTBOX_IMAGE_TEMPLATE_LABEL: + case LISTBOX_IMAGE_ANCHOR_LABEL: case LISTBOX_FILTER_SELECTOR: break; } @@ -615,9 +619,11 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId) case LISTBOX_VERSION: case LISTBOX_TEMPLATE: case LISTBOX_IMAGE_TEMPLATE: + case LISTBOX_IMAGE_ANCHOR: case LISTBOX_VERSION_LABEL: case LISTBOX_TEMPLATE_LABEL: case LISTBOX_IMAGE_TEMPLATE_LABEL: + case LISTBOX_IMAGE_ANCHOR_LABEL: case LISTBOX_FILTER_SELECTOR: break; } @@ -711,6 +717,12 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) addCustomControl( LISTBOX_IMAGE_TEMPLATE ); break; + case FILEOPEN_LINK_PREVIEW_IMAGE_ANCHOR: + addCustomControl( CHECKBOX_LINK ); + addCustomControl( CHECKBOX_PREVIEW ); + addCustomControl( LISTBOX_IMAGE_ANCHOR ); + break; + case FILEOPEN_PLAY: addCustomControl( PUSHBUTTON_PLAY ); break; |