sc/source/ui/app/inputhdl.cxx | 4
sd/uiconfig/simpress/ui/customanimationspanel.ui | 979 +++++++++++------------
2 files changed, 486 insertions(+), 497 deletions(-)
New commits:
commit 7bb8c3da46544227ca35413738c9a57238fff8a0
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Jun 24 14:04:03 2022 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Jun 27 13:43:39 2022 +0200
lok: formulabar: send correct caret position for numbers
It fixes the bug:
1. Open spreadsheet and type long numer in some cell (only numbers)
2. Move cell cursor to another cell, then using keyboard go back to the
previous cell
3. click in formulabar somewhere in the middle of a number
4. try to type one character
result: character was added in correct place but cursor was moved to the
start
expected: caret will stay at correct place
Change-Id: I514d868dce5478e65d57fd2f350da9777b615e0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136395
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Rashesh Padia <rashesh.pa...@collabora.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index e2343e052cfe..0fb604520ac2 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2786,6 +2786,10 @@ void ScInputHandler::DataChanged( bool bFromTopNotify,
bool bSetModified )
if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh && pInputWin)
{
+ UpdateActiveView();
+ if (pActiveView)
+ aSel = pActiveView->GetSelection();
+
ScInputHandler::LOKSendFormulabarUpdate(pActiveViewSh,
ScEditUtil::GetMultilineString(*mpEditEngine),
aSel);
commit 26ee145fd829d24c197f723efbb71809170e9e3b
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Jun 23 16:25:11 2022 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Jun 27 13:43:26 2022 +0200
Remove not necessary container in Animation Panel in Impress Sidebar
It was causing layouting issues in LOK.
Change-Id: Ic7520f46efa764d2d6b50b021b44e0a5dd07d837
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136343
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Rashesh Padia <rashesh.pa...@collabora.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui
b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index 2d8bd06d6118..8625fbe97cf0 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -75,625 +75,610 @@
<property name="border-width">6</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkPaned">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="wide-handle">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="hscrollbar-policy">never</property>
+ <property name="can-focus">False</property>
<child>
- <object class="GtkViewport">
+ <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>
<child>
- <object class="GtkBox" id="bxApplied">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
+ <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="GtkScrolledWindow">
+ <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="shadow-type">in</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="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>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn2">
+ <property name="spacing">6</property>
<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>
+ <object class="GtkCellRendererPixbuf"
id="cellrenderertext4"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
</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 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>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</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="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="GtkScrolledWindow"
id="custom_animation_label_parent">
+ <object class="GtkViewport">
<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>
+ <property name="can-focus">False</property>
<child>
- <object class="GtkViewport">
+ <object class="GtkLabel" id="custom_animation_label">
+ <property name="width-request">260</property>
<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>
+ <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>
- <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>
</child>
</object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <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="hscrollbar-policy">never</property>
+ <property name="can-focus">False</property>
<child>
- <object class="GtkViewport">
+ <!-- n-columns=3 n-rows=13 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
- <!-- n-columns=3 n-rows=13 -->
- <object class="GtkGrid">
+ <object class="GtkLabel" id="lbEffect">
<property name="visible">True</property>
<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="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>
- <property name="always-show-image">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>
- <property name="use-underline">True</property>
- <property name="always-show-image">True</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>
- <property name="use-underline">True</property>
- <property name="always-show-image">True</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>
- <property name="use-underline">True</property>
- <property name="always-show-image">True</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>
- <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>
+ <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="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="GtkComboBoxText" id="categorylb">
+ <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="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>
+ <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>
+ <property name="always-show-image">True</property>
<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 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="left-attach">1</property>
- <property name="top-attach">2</property>
- <property name="width">2</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="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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkButton" id="remove_effect">
<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>
- <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>
- <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="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>
<property name="use-underline">True</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">5</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>
+ <property name="always-show-image">True</property>
<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 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="left-attach">1</property>
- <property name="top-attach">5</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>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">6</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="more_properties">
+ <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|more_properties|tooltip_text">Options</property>
- <property name="image">image1</property>
+ <property name="tooltip-text" translatable="yes"
context="customanimationspanel|move_up|tooltip_text">Move Up</property>
+ <property name="image">image_up</property>
+ <property name="use-underline">True</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 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="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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="anim_duration">
+ <object class="GtkButton" id="move_down">
<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>
+ <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>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">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>
+ <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="left-attach">1</property>
- <property name="top-attach">7</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</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">1</property>
+ <property name="top-attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <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>
+ <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>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">8</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ <property name="width">2</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="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>
+ <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="GtkSpinButton" id="delay_value">
+ <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="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>
+ <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>
- </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>
+ <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>
- </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 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>
- <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">1</property>
+ <property name="top-attach">3</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <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>
+ <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>
+ <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>
- <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">1</property>
+ <property name="top-attach">5</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>
+ </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>
- <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">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>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">6</property>
- </packing>
</child>
- <child>
- <placeholder/>
+ </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>
- <child>
- <placeholder/>
+ </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>
- <child>
- <placeholder/>
+ </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>
</child>
</object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
<child internal-child="accessible">
