svx/uiconfig/ui/acceptrejectchangesdialog.ui | 14 +++++++++++++- sw/source/ui/misc/titlepage.cxx | 1 + sw/source/uibase/inc/titlepage.hxx | 1 + sw/source/uibase/misc/redlndlg.cxx | 2 +- vcl/jsdialog/enabled.cxx | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-)
New commits: commit 1102e01bc9ef0fa65121b7d4154efaeede45193c Author: Szymon Kłos <[email protected]> AuthorDate: Fri Jun 16 18:53:46 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Fri Jun 23 18:43:09 2023 +0200 jsdialog: enable Manage Changes dialog Change-Id: Ibc501dc595eba93adde7b635a5de1122b22c9651 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153190 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/svx/uiconfig/ui/acceptrejectchangesdialog.ui b/svx/uiconfig/ui/acceptrejectchangesdialog.ui index 58d1e10bdfcb..a2d4f4e2741f 100644 --- a/svx/uiconfig/ui/acceptrejectchangesdialog.ui +++ b/svx/uiconfig/ui/acceptrejectchangesdialog.ui @@ -58,7 +58,19 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkBox" id="container"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 502eea81dea8..de5310de0311 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -82,7 +82,7 @@ SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg( SfxBindings* _pBindings, SwChildWinWrapper* pChild, weld::Window *pParent) : SfxModelessDialogController(_pBindings, pChild, pParent, "svx/ui/acceptrejectchangesdialog.ui", "AcceptRejectChangesDialog") - , m_xContentArea(m_xDialog->weld_content_area()) + , m_xContentArea(m_xBuilder->weld_container("container")) , m_pChildWin(pChild) { m_xImplDlg.reset(new SwRedlineAcceptDlg(m_xDialog, m_xBuilder.get(), m_xContentArea.get())); diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index e4e09487bb87..d2d304ce2014 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -222,12 +222,16 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"sfx/ui/managestylepage.ui" || rUIFile == u"sfx/ui/password.ui" // svx + || rUIFile == u"svx/ui/acceptrejectchangesdialog.ui" || rUIFile == u"svx/ui/accessibilitycheckdialog.ui" || rUIFile == u"svx/ui/accessibilitycheckentry.ui" || rUIFile == u"svx/ui/compressgraphicdialog.ui" || rUIFile == u"svx/ui/findreplacedialog.ui" || rUIFile == u"svx/ui/fontworkgallerydialog.ui" || rUIFile == u"svx/ui/headfootformatpage.ui" + || rUIFile == u"svx/ui/redlinecontrol.ui" + || rUIFile == u"svx/ui/redlinefilterpage.ui" + || rUIFile == u"svx/ui/redlineviewpage.ui" || rUIFile == u"svx/ui/themecoloreditdialog.ui" || rUIFile == u"svx/ui/themedialog.ui" // uui commit a3d479abf247d5f3379131302532c8f0e8da6667 Author: Szymon Kłos <[email protected]> AuthorDate: Fri Jun 16 18:30:35 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Fri Jun 23 18:42:59 2023 +0200 jsdialog: enable Insert Title Page dialog we need to weld also RB_INSERT_NEW_PAGES so when we check it - JSDialog executor will make it active and RB_USE_EXISTING_PAGES inactive Change-Id: I0abc5b6610e301abb1d24ecea680f63358dc5584 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153189 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 4308c8db246d..0d8c776cce64 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -150,6 +150,7 @@ SwTitlePageDlg::SwTitlePageDlg(weld::Window *pParent) , mpIndexDesc(nullptr) , mpNormalDesc(nullptr) , m_xUseExistingPagesRB(m_xBuilder->weld_radio_button("RB_USE_EXISTING_PAGES")) + , m_xInsertNewPagesRB(m_xBuilder->weld_radio_button("RB_INSERT_NEW_PAGES")) , m_xPageCountNF(m_xBuilder->weld_spin_button("NF_PAGE_COUNT")) , m_xDocumentStartRB(m_xBuilder->weld_radio_button("RB_DOCUMENT_START")) , m_xPageStartRB(m_xBuilder->weld_radio_button("RB_PAGE_START")) diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index 9e8c58984652..13f167786339 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -31,6 +31,7 @@ private: const SwPageDesc* mpNormalDesc; std::unique_ptr<weld::RadioButton> m_xUseExistingPagesRB; + std::unique_ptr<weld::RadioButton> m_xInsertNewPagesRB; // required by LOK JSDialogs std::unique_ptr<weld::SpinButton> m_xPageCountNF; std::unique_ptr<weld::RadioButton> m_xDocumentStartRB; std::unique_ptr<weld::RadioButton> m_xPageStartRB; diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index cd2cd4d2a5eb..e4e09487bb87 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -201,6 +201,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui" + || rUIFile == u"modules/swriter/ui/titlepage.ui" || rUIFile == u"modules/swriter/ui/tocdialog.ui" || rUIFile == u"modules/swriter/ui/tocentriespage.ui" || rUIFile == u"modules/swriter/ui/tocindexpage.ui"
