sd/source/ui/animations/CustomAnimationPane.cxx | 4
sd/uiconfig/simpress/ui/customanimationspanel.ui | 1124 +++++++++++------------
2 files changed, 566 insertions(+), 562 deletions(-)
New commits:
commit 279cc2aa9d8e5e53762352415c05c262fb1d906f
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Mon Oct 18 12:50:26 2021 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Wed Oct 20 07:12:28 2021 +0200
Related tdf#145037 and tdf#145028 - Animation sidebar usability
* Splitter to resize available vs. applied animations
* Label on the Add button
Change-Id: I0321d35a4c7e796c0732560b34a0bc18fb104e6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123741
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
Tested-by: Jenkins
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index a125838a07d5..73d4b581cfbd 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -167,10 +167,10 @@ void CustomAnimationPane::initialize()
mxLBAnimation->connect_changed(LINK(this, CustomAnimationPane,
AnimationSelectHdl));
mxCustomAnimationList->setController(
static_cast<ICustomAnimationListController*> ( this ) );
mxCustomAnimationList->set_size_request(mxCustomAnimationList->get_approximate_digit_width()
* 15,
-
mxCustomAnimationList->get_height_rows(8));
+
mxCustomAnimationList->get_height_rows(4));
mxLBAnimation->set_size_request(mxLBAnimation->get_approximate_digit_width() *
15,
- mxLBAnimation->get_height_rows(8));
+ mxLBAnimation->get_height_rows(4));
maStrProperty = mxFTProperty->get_label();
diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui
b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index c0d1ab91614f..35cc0d49ecb7 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -1,50 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="sd">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100000</property>
- <property name="step_increment">0.5</property>
- <property name="page_increment">5</property>
+ <property name="step-increment">0.5</property>
+ <property name="page-increment">5</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">100000</property>
- <property name="step_increment">0.5</property>
- <property name="page_increment">5</property>
+ <property name="step-increment">0.5</property>
+ <property name="page-increment">5</property>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="icon_name">sfx2/res/symphony/sidebar-property-small.png</property>
+ <property name="can-focus">False</property>
+ <property
name="icon-name">sfx2/res/symphony/sidebar-property-small.png</property>
</object>
<object class="GtkImage" id="image_add">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svtools/res/list_add.png</property>
- <property name="icon_size">2</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svtools/res/list_add.png</property>
</object>
<object class="GtkImage" id="image_down">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">cmd/sc_movedown.png</property>
- <property name="icon_size">2</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">cmd/sc_movedown.png</property>
</object>
<object class="GtkImage" id="image_play">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">sd/res/playblue_16.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">sd/res/playblue_16.png</property>
</object>
<object class="GtkImage" id="image_remove">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">extensions/res/buttonminus.png</property>
- <property name="icon_size">2</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">extensions/res/buttonminus.png</property>
</object>
<object class="GtkImage" id="image_up">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">cmd/sc_moveup.png</property>
- <property name="icon_size">2</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">cmd/sc_moveup.png</property>
</object>
<object class="GtkTreeStore" id="liststore1">
<columns>
@@ -74,615 +70,623 @@
</object>
<object class="GtkBox" id="CustomAnimationsPanel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="vexpand">True</property>
- <property name="border_width">6</property>
+ <property name="border-width">6</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkPaned">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="wide-handle">True</property>
<child>
- <object class="GtkBox">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="hscrollbar-policy">never</property>
<child>
- <object class="GtkScrolledWindow">
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <object class="GtkViewport">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
<child>
- <object class="GtkTreeView" id="custom_animation_list">
- <property name="width_request">260</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="no_show_all">True</property>
+ <object class="GtkBox" id="bxApplied">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="reorderable">True</property>
- <property name="search_column">1</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro Library
List-selection1"/>
- </child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn2">
- <property name="spacing">6</property>
- <child>
- <object class="GtkCellRendererPixbuf"
id="cellrenderertext4"/>
- <attributes>
- <attribute name="pixbuf">0</attribute>
- </attributes>
- </child>
+ <object class="GtkScrolledWindow">
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">in</property>
<child>
- <object class="GtkCellRendererText"
id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
+ <object class="GtkTreeView"
id="custom_animation_list">
+ <property name="width-request">260</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="no-show-all">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore1</property>
+ <property name="headers-visible">False</property>
+ <property name="reorderable">True</property>
+ <property name="search-column">1</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn2">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCellRendererPixbuf"
id="cellrenderertext4"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="custom_animation_list-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="customanimationspanel|extended_tip|custom_animation_list">The
animation list displays all animations for the current slide.</property>
+ </object>
+ </child>
+ </object>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child internal-child="accessible">
- <object class="AtkObject"
id="custom_animation_list-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|custom_animation_list">The
animation list displays all animations for the current slide.</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="custom_animation_label_parent">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkViewport">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkLabel" id="custom_animation_label">
- <property name="width_request">260</property>
+ <object class="GtkScrolledWindow"
id="custom_animation_label_parent">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="label" translatable="yes"
context="customanimationspanel|STR_CUSTOMANIMATION_LIST_HELPTEXT">First select
the slide element and then click 'Add...' to add an animation effect.</property>
- <property name="justify">center</property>
- <property name="wrap">True</property>
+ <property name="shadow-type">in</property>
+ <child>
+ <object class="GtkViewport">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="custom_animation_label">
+ <property name="width-request">260</property>
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|STR_CUSTOMANIMATION_LIST_HELPTEXT">First select
the slide element and then click 'Add' to add an animation effect.</property>
+ <property name="justify">center</property>
+ <property name="wrap">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkButton" id="add_effect">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes"
context="customanimationspanel|add_effect|tooltip_text">Add Effect</property>
- <property name="image">image_add</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="add_effect-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="customanimationspanel|extended_tip|add_effect">Adds
another animation effect for the selected object on the slide.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="remove_effect">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes"
context="customanimationspanel|remove_effect|tooltip_text">Remove
Effect</property>
- <property name="image">image_remove</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="remove_effect-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|remove_effect">Removes the selected
animation effects from the animation list.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="move_up">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes"
context="customanimationspanel|move_up|tooltip_text">Move Up</property>
- <property name="image">image_up</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="move_up-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="customanimationspanel|extended_tip|move_up">Click
one of the buttons to move the selected animation effect up or down in the
list.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="move_down">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes"
context="customanimationspanel|move_down|tooltip_text">Move Down</property>
- <property name="image">image_down</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="move_down-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="customanimationspanel|extended_tip|move_down">Click
one of the buttons to move the selected animation effect up or down in the
list.</property>
- </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>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid2">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkLabel" id="categorylabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="customanimationspanel|categorylabel">Category:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">categorylb</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="effectlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="customanimationspanel|effectlabel">Effect:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">effect_list</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="categorylb">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="popup_fixed_width">False</property>
- <items>
- <item translatable="yes"
context="customanimationspanel|categorylb">Entrance</item>
- <item translatable="yes"
context="customanimationspanel|categorylb">Emphasis</item>
- <item translatable="yes"
context="customanimationspanel|categorylb">Exit</item>
- <item translatable="yes"
context="customanimationspanel|categorylb">Motion Paths</item>
- <item translatable="yes"
context="customanimationspanel|categorylb">Misc Effects</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="categorylb-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|categorylb">Select an animation
effect category.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
+ <property name="can-focus">True</property>
+ <property name="hscrollbar-policy">never</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkViewport">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="no_show_all">True</property>
- <property name="hexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="can-focus">False</property>
<child>
- <object class="GtkTreeView" id="effect_list">
+ <!-- n-columns=3 n-rows=13 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="no_show_all">True</property>
- <property name="hexpand">True</property>
- <property name="model">liststore2</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro Library
List-selection11"/>
+ <property name="can-focus">False</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="lbEffect">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|lbEffect">Effects</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ <property name="width">3</property>
+ </packing>
</child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn21">
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-top">3</property>
+ <property name="margin-bottom">6</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkButton" id="add_effect">
+ <property name="label" translatable="yes"
context="customanimationspanel|add">_Add</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes"
context="customanimationspanel|add_effect|tooltip_text">Add Effect</property>
+ <property name="image">image_add</property>
+ <property name="use-underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="add_effect-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="customanimationspanel|extended_tip|add_effect">Adds another animation
effect for the selected object on the slide.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="remove_effect">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes"
context="customanimationspanel|remove_effect|tooltip_text">Remove
Effect</property>
+ <property name="image">image_remove</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="remove_effect-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="customanimationspanel|extended_tip|remove_effect">Removes the selected
animation effects from the animation list.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="move_up">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes"
context="customanimationspanel|move_up|tooltip_text">Move Up</property>
+ <property name="image">image_up</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="move_up-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="customanimationspanel|extended_tip|move_up">Click one of the buttons
to move the selected animation effect up or down in the list.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
<child>
- <object class="GtkCellRendererText"
id="cellrenderertext22"/>
- <attributes>
- <attribute name="xalign">5</attribute>
- <attribute name="text">0</attribute>
- <attribute name="weight">2</attribute>
- </attributes>
+ <object class="GtkButton" id="move_down">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes"
context="customanimationspanel|move_down|tooltip_text">Move Down</property>
+ <property name="image">image_down</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="move_down-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="customanimationspanel|extended_tip|move_down">Click one of the buttons
to move the selected animation effect up or down in the list.</property>
+ </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="left-attach">1</property>
+ <property name="top-attach">1</property>
+ <property name="width">2</property>
+ </packing>
</child>
- <child internal-child="accessible">
- <object class="AtkObject" id="effect_list-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|effect_list">Select an animation
effect.</property>
+ <child>
+ <object class="GtkLabel" id="categorylabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|categorylabel">Category:</property>
+ <property name="use-underline">True</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
</child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame2">
- <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=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkLabel" id="start_effect">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="customanimationspanel|start_effect">_Start:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">start_effect_list</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="effect_property">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="customanimationspanel|effect_property">_Direction:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">placeholder</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="effect_duration">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="customanimationspanel|effect_duration">D_uration:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">anim_duration</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="start_effect_list">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes"
context="customanimationspanel|start_effect_list">On click</item>
- <item translatable="yes"
context="customanimationspanel|start_effect_list">With previous</item>
- <item translatable="yes"
context="customanimationspanel|start_effect_list">After previous</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject"
id="start_effect_list-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|start_effect_list">Displays when
the selected animation effect should be started.</property>
+ <child>
+ <object class="GtkComboBoxText" id="categorylb">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="popup-fixed-width">False</property>
+ <items>
+ <item translatable="yes"
context="customanimationspanel|categorylb">Entrance</item>
+ <item translatable="yes"
context="customanimationspanel|categorylb">Emphasis</item>
+ <item translatable="yes"
context="customanimationspanel|categorylb">Exit</item>
+ <item translatable="yes"
context="customanimationspanel|categorylb">Motion Paths</item>
+ <item translatable="yes"
context="customanimationspanel|categorylb">Misc Effects</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="categorylb-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|categorylb">Select an animation
effect category.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ <property name="width">2</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="placeholder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="spacing">6</property>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="effectlabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="margin-top">3</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|effectlabel">Effect:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">effect_list</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="more_properties">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes"
context="customanimationspanel|more_properties|tooltip_text">Options</property>
- <property name="image">image1</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="more_properties-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|more_properties">Specifies
additional properties for the selected element in the Custom Animations
pane.</property>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="no-show-all">True</property>
+ <property name="margin-start">3</property>
+ <property name="margin-top">3</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">in</property>
+ <property name="min-content-width">1</property>
+ <child>
+ <object class="GtkTreeView" id="effect_list">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="no-show-all">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore2</property>
+ <property name="headers-visible">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn21">
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext22"/>
+ <attributes>
+ <attribute name="xalign">5</attribute>
+ <attribute name="text">0</attribute>
+ <attribute name="weight">2</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="effect_list-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="customanimationspanel|extended_tip|effect_list">Select an animation
effect.</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
+ <property name="width">2</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="anim_duration">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="adjustment">adjustment2</property>
- <property name="digits">2</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="anim_duration-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|anim_duration">Specifies the
duration of the selected animation effect.</property>
+ <child>
+ <object class="GtkLabel" id="effect_label">
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|effect_label">Options</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ <property name="width">3</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="delay_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="customanimationspanel|delay_label">_Delay:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">delay_value</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="delay_value">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="digits">1</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="delay_value-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="customanimationspanel|extended_tip|delay_value">The
animation starts delayed by this amount of time.</property>
+ <child>
+ <object class="GtkLabel" id="start_effect">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|start_effect">_Start:</property>
+ <property name="use-underline">True</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="effect_label">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes"
context="customanimationspanel|effect_label">Effect</property>
- <property name="xalign">0</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">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSeparator" id="separator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkCheckButton" id="auto_preview">
- <property name="label" translatable="yes"
context="customanimationspanel|auto_preview">Automatic Preview</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>
- <child internal-child="accessible">
- <object class="AtkObject" id="auto_preview-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|auto_preview">Select to preview new
or edited effects on the slide while you assign them.</property>
+ <child>
+ <object class="GtkComboBoxText" id="start_effect_list">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="customanimationspanel|start_effect_list">On click</item>
+ <item translatable="yes"
context="customanimationspanel|start_effect_list">With previous</item>
+ <item translatable="yes"
context="customanimationspanel|start_effect_list">After previous</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="start_effect_list-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|start_effect_list">Displays when
the selected animation effect should be started.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">5</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="play">
- <property name="label" translatable="yes"
context="customanimationspanel|play">Play</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes"
context="customanimationspanel|play|tooltip_text">Preview Effect</property>
- <property name="image">image_play</property>
- <property name="use_underline">True</property>
- <property name="image_position">right</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="play-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="customanimationspanel|extended_tip|play">Plays the
selected animation effect in the preview.</property>
+ <child>
+ <object class="GtkLabel" id="effect_property">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|effect_property">_Direction:</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="more_properties">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes"
context="customanimationspanel|more_properties|tooltip_text">Options</property>
+ <property name="image">image1</property>
+ <property name="always-show-image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="more_properties-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|more_properties">Specifies
additional properties for the selected element in the Custom Animations
pane.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">2</property>
+ <property name="top-attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="effect_duration">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|effect_duration">D_uration:</property>
+ <property name="use-underline">True</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="anim_duration">
+ <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">adjustment2</property>
+ <property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="anim_duration-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|anim_duration">Specifies the
duration of the selected animation effect.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="delay_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|delay_label">_Delay:</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="delay_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">adjustment1</property>
+ <property name="digits">1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="delay_value-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="customanimationspanel|extended_tip|delay_value">The
animation starts delayed by this amount of time.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator1">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">9</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="auto_preview">
+ <property name="label" translatable="yes"
context="customanimationspanel|auto_preview">Automatic Preview</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>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="auto_preview-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="customanimationspanel|extended_tip|auto_preview">Select to preview new
or edited effects on the slide while you assign them.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">10</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="play">
+ <property name="label" translatable="yes"
context="customanimationspanel|play">Play</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes"
context="customanimationspanel|play|tooltip_text">Preview Effect</property>
+ <property name="image">image_play</property>
+ <property name="use-underline">True</property>
+ <property name="image-position">right</property>
+ <property name="always-show-image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="play-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="customanimationspanel|extended_tip|play">Plays the
selected animation effect in the preview.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">2</property>
+ <property name="top-attach">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="box1_label">
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|box1_label">Animation Deck</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">11</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="custom_animation_list_label">
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="customanimationspanel|custom_animation_list_label">Animation
List</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">custom_animation_list</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">12</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="placeholder">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="box1_label">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="customanimationspanel|box1_label">Animation Deck</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">box1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="custom_animation_list_label">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="customanimationspanel|custom_animation_list_label">Animation
List</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_animation_list</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">6</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child internal-child="accessible">
