sd/uiconfig/simpress/ui/customanimationeffecttab.ui | 54 ++-
sd/uiconfig/simpress/ui/customanimationtimingtab.ui | 337 +++++++++++---------
2 files changed, 226 insertions(+), 165 deletions(-)
New commits:
commit 79d31b8dc8d934d9f9c897eced06271e7e08f04c
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Tue Nov 5 13:39:23 2019 +0100
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Tue Nov 5 15:00:04 2019 +0100
Impress Effects Dialog update
Change-Id: Ifa9a4c60038cd86e286e7bc1cf9fe97b0eceb5cb
Reviewed-on: https://gerrit.libreoffice.org/82064
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
index d30efbd25339..b1632f9287be 100644
--- a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
@@ -45,7 +45,9 @@
<object class="GtkLabel" id="prop_label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes"
context="customanimationeffecttab|prop_label1">_Direction:</property>
+ <property name="xalign">0</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -164,10 +166,10 @@
<object class="GtkLabel" id="aeffect_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes"
context="customanimationeffecttab|aeffect_label">A_fter animation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">aeffect_list</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -178,10 +180,10 @@
<object class="GtkLabel" id="sound_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes"
context="customanimationeffecttab|sound_label">_Sound:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">sound_list</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -192,10 +194,10 @@
<object class="GtkLabel" id="text_animation_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes"
context="customanimationeffecttab|text_animation_label">_Text
animation:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">text_animation_list</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -206,10 +208,10 @@
<object class="GtkLabel" id="dim_color_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes"
context="customanimationeffecttab|dim_color_label">Di_m color:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">dim_color_list</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -226,6 +228,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -238,6 +241,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="valign">center</property>
<property name="image">image1</property>
</object>
<packing>
@@ -257,6 +261,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
@@ -275,12 +281,12 @@
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
- <object class="GtkSpinButton" id="text_delay">
+ <object class="GtkLabel" id="text_delay_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="digits">1</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="customanimationeffecttab|text_delay_label">delay between
characters</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">text_delay</property>
</object>
<packing>
<property name="expand">False</property>
@@ -289,12 +295,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="text_delay_label">
+ <object class="GtkSpinButton" id="text_delay">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="customanimationeffecttab|text_delay_label">delay between
characters</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">text_delay</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -304,14 +311,17 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="aeffect_list">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<items>
<item translatable="yes"
context="customanimationeffecttab|aeffect_list">Don't dim</item>
<item translatable="yes"
context="customanimationeffecttab|aeffect_list">Dim with color</item>
@@ -328,6 +338,8 @@
<object class="GtkComboBoxText" id="text_animation_list">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<items>
<item translatable="yes"
context="customanimationeffecttab|text_animation_list">All at once</item>
<item translatable="yes"
context="customanimationeffecttab|text_animation_list">Word by word</item>
@@ -339,9 +351,6 @@
<property name="top_attach">3</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -364,4 +373,13 @@
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroupLabel">
+ <widgets>
+ <widget name="prop_label1"/>
+ <widget name="aeffect_label"/>
+ <widget name="sound_label"/>
+ <widget name="text_animation_label"/>
+ <widget name="dim_color_label"/>
+ </widgets>
+ </object>
</interface>
diff --git a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
index 979b8ddaa13b..05334e8477ff 100644
--- a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
@@ -3,12 +3,12 @@
<interface domain="sd">
<requires lib="gtk+" version="3.18"/>
<object class="GtkAdjustment" id="adjustment1">
- <property name="upper">999.99000000000001</property>
+ <property name="upper">1000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
- <property name="upper">999.99000000000001</property>
+ <property name="upper">1000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -21,141 +21,171 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="start_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="customanimationtimingtab|start_label">_Start:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">start_list</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</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="customanimationtimingtab|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">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="duration_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="customanimationtimingtab|duration_label">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="GtkLabel" id="repeat_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="customanimationtimingtab|repeat_label">_Repeat:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">repeat_list</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkComboBoxText" id="start_list">
+ <object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes"
context="customanimationtimingtab|start_list">On click</item>
- <item translatable="yes"
context="customanimationtimingtab|start_list">With previous</item>
- <item translatable="yes"
context="customanimationtimingtab|start_list">After previous</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</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="activates_default">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="digits">1</property>
- </object>
- <packing>
- <property name="left_attach">1</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="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes"
context="customanimationtimingtab|anim_duration|tooltip_text">Select the speed
of the Animation.</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment2</property>
- <property name="digits">2</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="start_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="customanimationtimingtab|start_label">_Start:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">start_list</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="delay_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="customanimationtimingtab|delay_label">_Delay:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">delay_value</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="duration_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="customanimationtimingtab|duration_label">D_uration:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">anim_duration</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="repeat_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="customanimationtimingtab|repeat_label">_Repeat:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">repeat_list</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="start_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="customanimationtimingtab|start_list">On click</item>
+ <item translatable="yes"
context="customanimationtimingtab|start_list">With previous</item>
+ <item translatable="yes"
context="customanimationtimingtab|start_list">After previous</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="delay_value">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</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="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes"
context="customanimationtimingtab|anim_duration|tooltip_text">Select the speed
of the Animation.</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="repeat_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="rewind">
+ <property name="label" translatable="yes"
context="customanimationtimingtab|rewind">Rewind _when done playing</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkComboBoxText" id="repeat_list">
+ <child type="label">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="rewind">
- <property name="label" translatable="yes"
context="customanimationtimingtab|rewind">Rewind _when done playing</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="label" translatable="yes"
context="customanimationtimingtab|label11">Timing</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">2</property>
- </packing>
</child>
</object>
<packing>
@@ -200,32 +230,45 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="rb_interactive">
- <property name="label" translatable="yes"
context="customanimationtimingtab|rb_interactive">Start _effect on click
of:</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">rb_click_sequence</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="trigger_list">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkRadioButton" id="rb_interactive">
+ <property name="label" translatable="yes"
context="customanimationtimingtab|rb_interactive">Start _effect on click
of:</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">rb_click_sequence</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="trigger_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ </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">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
