From 75f7e057039aaa49558e22d18cad651d11589da9 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 13 May 2022 13:35:23 +0200 Subject: sw content controls, dropdown: add an initial properties dialog - read the doc model: show if a content control is a placeholder or not - work with a shared pointer in the dialog, which avoids lifetime issues in case the content control we edit in one view gets deleted in an other view - write the doc model: set the placeholder mode of the content control based on the checkbox state and mark the doc as modified if any widget is touched when pressing OK - handle command state: allow this dialog only inside content controls Change-Id: Ie0b9075ccd3450dd403cc7f8bbf93fc04de3b234 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134278 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/uiconfig/swriter/menubar/menubar.xml | 1 + .../swriter/menubar/mscompatibleformsmenu.xml | 1 + sw/uiconfig/swriter/ui/contentcontroldlg.ui | 114 +++++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 sw/uiconfig/swriter/ui/contentcontroldlg.ui (limited to 'sw/uiconfig') diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 14c3705a3189..dda9338ce381 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -715,6 +715,7 @@ + diff --git a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml index 83b8cd35d98a..147b4dd03d6e 100644 --- a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml +++ b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml @@ -19,6 +19,7 @@ + diff --git a/sw/uiconfig/swriter/ui/contentcontroldlg.ui b/sw/uiconfig/swriter/ui/contentcontroldlg.ui new file mode 100644 index 000000000000..5ac95091d71c --- /dev/null +++ b/sw/uiconfig/swriter/ui/contentcontroldlg.ui @@ -0,0 +1,114 @@ + + + + + + False + 6 + Content Control Properties + True + 0 + 0 + dialog + + + False + True + True + vertical + 6 + + + False + + + _OK + True + True + True + True + True + True + + + False + True + 0 + + + + + _Cancel + True + True + True + True + + + False + True + 1 + + + + + _Help + True + True + True + True + + + False + True + 2 + True + + + + + False + False + 1 + + + + + + True + False + 6 + 6 + + + Content is placeholder text + True + True + False + start + start + True + True + + + 0 + 0 + + + + + False + False + 0 + + + + + + ok + cancel + help + + + + -- cgit