desktop/source/lib/init.cxx | 1 +
sd/source/ui/dlg/tpaction.cxx | 3 ++-
sd/source/ui/inc/tpaction.hxx | 1 +
sd/uiconfig/simpress/ui/interactiondialog.ui | 18 +++++++++++++++---
sfx2/source/control/unoctitm.cxx | 1 +
vcl/jsdialog/enabled.cxx | 2 ++
6 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit 74982577a52e03f3dfb2e388a30df1db43ec39be
Author: Hubert Figuière <h...@collabora.com>
AuthorDate: Thu Aug 15 06:28:26 2024 -0400
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Aug 16 21:07:24 2024 +0200
LOKit: Enable the "Interaction..." command for Impress.
Also enable the dialog for JSDialogs
Fix the layout of the dialog.
Signed-off-by: Hubert Figuière <h...@collabora.com>
Change-Id: I4581da34921eb355ce8f59d7bfdf2f7d5d7493f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171922
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 899d14bb7f62..54a2ce72b8ff 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4041,6 +4041,7 @@ static void doc_iniUnoCommands ()
u".uno:DistributeVertCenter"_ustr,
u".uno:DistributeVertDistance"_ustr,
u".uno:DistributeVertTop"_ustr,
+ u".uno:AnimationEffects"_ustr,
};
util::URL aCommandURL;
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index db92bd2a820e..8e048ae0f92e 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -72,8 +72,9 @@ constexpr OUStringLiteral pStarDrawXMLContent( u"content.xml"
);
SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr,
::sd::View const * pView)
: SfxSingleTabDialogController(pParent, pAttr,
"modules/simpress/ui/interactiondialog.ui",
"InteractionDialog")
+ , m_xContent( m_xBuilder->weld_container("content") )
{
- std::unique_ptr<SfxTabPage> xNewPage =
SdTPAction::Create(get_content_area(), this, *pAttr);
+ std::unique_ptr<SfxTabPage> xNewPage =
SdTPAction::Create(m_xContent.get(), this, *pAttr);
// formerly in PageCreated
static_cast<SdTPAction*>( xNewPage.get() )->SetView( pView );
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 893192d256f2..75447e254f31 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -38,6 +38,7 @@ class SdDrawDocument;
*/
class SdActionDlg final : public SfxSingleTabDialogController
{
+ std::unique_ptr<weld::Container> m_xContent;
public:
SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View
const * pView);
};
diff --git a/sd/uiconfig/simpress/ui/interactiondialog.ui
b/sd/uiconfig/simpress/ui/interactiondialog.ui
index 0214891c17a2..eb49c79fe437 100644
--- a/sd/uiconfig/simpress/ui/interactiondialog.ui
+++ b/sd/uiconfig/simpress/ui/interactiondialog.ui
@@ -18,6 +18,21 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="content">
+ <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">0</property>
+ </packing>
+ </child>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -75,9 +90,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<action-widgets>
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index dd528ce069c6..e8cc4f8dce7a 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1307,6 +1307,7 @@ constexpr auto handlers =
frozen::make_unordered_map<std::u16string_view, Payloa
{ u"DistributeVertCenter", EnabledPayload },
{ u"DistributeVertDistance", EnabledPayload },
{ u"DistributeVertTop", EnabledPayload },
+ { u"AnimationEffects", EnabledPayload },
{ u"ParaLeftToRight", ParaDirectionPayload },
{ u"ParaRightToLeft", ParaDirectionPayload },
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 902b73f9ab8b..89c2654d9445 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -177,6 +177,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/simpress/ui/customanimationtimingtab.ui"
|| rUIFile == u"modules/simpress/ui/headerfooterdialog.ui"
|| rUIFile == u"modules/simpress/ui/headerfootertab.ui"
+ || rUIFile == u"modules/simpress/ui/interactiondialog.ui"
+ || rUIFile == u"modules/simpress/ui/interactionpage.ui"
// swriter
|| rUIFile == u"modules/swriter/ui/bulletsandnumbering.ui"
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
