sd/source/ui/animations/SlideTransitionPane.cxx | 6 sd/source/ui/inc/SlideTransitionPane.hxx | 1 sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 202 +++++++++++------------ 3 files changed, 103 insertions(+), 106 deletions(-)
New commits: commit b9281609d22008f2df2512559484788493cd8816 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Feb 9 11:51:00 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Feb 9 20:02:55 2026 +0100 sd: Set IconView sensitive status instead of ScrolledWindow parent The IconView with ID "transitions_icons" is the only child of the ScrolledWindow with ID "transitions_icons_scrolled_window" Set the enabled/sensitive status directly for the IconView instead of its parent, which allows dropping the SlideTransitionPane::mxTransitionsScrollWindow member altogether. Change-Id: I01d866df75ea1095758b88b4c20da08cf30f99d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198983 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 39d2f7278313..d4729930205d 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -367,7 +367,6 @@ SlideTransitionPane::SlideTransitionPane( mrBase( rBase ), mpDrawDoc( rBase.GetDocShell() ? rBase.GetDocShell()->GetDoc() : nullptr ), mxTransitionsIconView(m_xBuilder->weld_icon_view("transitions_icons")), - mxTransitionsScrollWindow(m_xBuilder->weld_scrolled_window("transitions_icons_scrolled_window")), mxRepeatAutoFrame(m_xBuilder->weld_frame("repeat_after_frame")), mbHasSelection( false ), mbUpdatingControls( false ), @@ -453,7 +452,6 @@ SlideTransitionPane::~SlideTransitionPane() { maLateInitTimer.Stop(); removeListener(); - mxTransitionsScrollWindow.reset(); mxTransitionsIconView.reset(); mxRepeatAutoFrame.reset(); mxLB_VARIANT.reset(); @@ -645,8 +643,8 @@ void SlideTransitionPane::updateControls() void SlideTransitionPane::updateControlState() { - if (mxTransitionsScrollWindow) - mxTransitionsScrollWindow->set_sensitive(mbHasSelection); + if (mxTransitionsIconView) + mxTransitionsIconView->set_sensitive(mbHasSelection); mxLB_VARIANT->set_sensitive( mbHasSelection && mxLB_VARIANT->get_count() > 0 ); mxCBX_duration->set_sensitive( mbHasSelection ); mxLB_SOUND->set_sensitive( mbHasSelection ); diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index f76f402161a8..f595d169d248 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -113,7 +113,6 @@ private: std::shared_ptr<sdtools::EventMultiplexer> mpEventMultiplexer; std::unique_ptr<weld::IconView> mxTransitionsIconView; - std::unique_ptr<weld::ScrolledWindow> mxTransitionsScrollWindow; std::unique_ptr<weld::Frame> mxRepeatAutoFrame; std::unique_ptr<weld::ComboBox> mxLB_VARIANT; std::unique_ptr<weld::MetricSpinButton> mxCBX_duration; commit 968252661ee3342b95d5287d9dbd1dd80dd86e2d Author: Michael Weghorn <[email protected]> AuthorDate: Mon Feb 9 11:35:19 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Feb 9 20:02:45 2026 +0100 sd: Resave slidetransitionspanel.ui with glade 3.40 Resaving results in the GtkFrame with ID "repeat_after_frame" to move further down in the file, which also matches its logical/visual position better. However, manually restore GtkIconView properties that got lost on resave, as they are needed for the gtk3 VCL plugin. Change-Id: I9f476c97625a9ad9a95b49235acfd97b4b44245e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198982 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui index cacffbb818eb..fe0ab7fbc184 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sd"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustment1"> @@ -337,106 +337,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkFrame" id="repeat_after_frame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <!-- n-columns=2 n-rows=2 --> - <object class="GtkGrid" id="grid3"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">12</property> - <property name="margin-top">3</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> - <child> - <object class="GtkRadioButton" id="rb_disabled"> - <property name="label" translatable="yes" context="slidetransitionspanel|rb_disabled">Disabled</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rb_disabled-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="slidetransitionspanel|extended_tip|rb_disabled">Select to advance to the next slide on a mouse click.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="rb_auto_repeat"> - <property name="label" translatable="yes" context="slidetransitionspanel|rb_auto_repeat">After :</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - <property name="group">rb_disabled</property> - <accessibility> - <relation type="label-for" target="rb_auto_repeat_value"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="rb_auto_repeat-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="slidetransitionspanel|extended_tip|rb_auto_repeat">Select to advance to the next slide after a number of seconds. Enter the seconds in the numerical field next to the spin button, or click the spin button.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="rb_auto_repeat_value"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="truncate-multiline">True</property> - <property name="adjustment">adjustment3</property> - <property name="digits">2</property> - <accessibility> - <relation type="labelled-by" target="rb_auto_repeat"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="rb_auto_repeat_value-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="slidetransitionspanel|extended_tip|rb_auto_repeat_value">Select to advance to the next slide after a number of seconds. Enter the seconds in the numerical field next to the spin button, or click the spin button.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="slidetransitionspanel|rb_auto_repeat">Repeat Slideshow</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> @@ -547,6 +447,106 @@ <property name="position">3</property> </packing> </child> + <child> + <object class="GtkFrame" id="repeat_after_frame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <!-- n-columns=2 n-rows=2 --> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">3</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> + <child> + <object class="GtkRadioButton" id="rb_disabled"> + <property name="label" translatable="yes" context="slidetransitionspanel|rb_disabled">Disabled</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rb_disabled-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="slidetransitionspanel|extended_tip|rb_disabled">Select to advance to the next slide on a mouse click.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rb_auto_repeat"> + <property name="label" translatable="yes" context="slidetransitionspanel|rb_auto_repeat">After :</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + <property name="group">rb_disabled</property> + <accessibility> + <relation type="label-for" target="rb_auto_repeat_value"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="rb_auto_repeat-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="slidetransitionspanel|extended_tip|rb_auto_repeat">Select to advance to the next slide after a number of seconds. Enter the seconds in the numerical field next to the spin button, or click the spin button.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="rb_auto_repeat_value"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment3</property> + <property name="digits">2</property> + <accessibility> + <relation type="labelled-by" target="rb_auto_repeat"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="rb_auto_repeat_value-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="slidetransitionspanel|extended_tip|rb_auto_repeat_value">Select to advance to the next slide after a number of seconds. Enter the seconds in the numerical field next to the spin button, or click the spin button.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="slidetransitionspanel|rb_auto_repeat">Repeat Slideshow</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> </object> <packing> <property name="expand">False</property>
