sd/source/ui/animations/CustomAnimation.src | 32 +++++++-------
sd/uiconfig/simpress/ui/customanimationspanel.ui | 51 +++++++++++++++++++++--
2 files changed, 63 insertions(+), 20 deletions(-)
New commits:
commit 798d55fcd8efc10fcef6b8ac3fa5abdbc82501ec
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sun Sep 11 20:58:49 2016 +0400
Adjust controls in animation deck and make it a11y accessible
Change-Id: I0a9bbfdc88f3432a80900aeee04c2de71c1c54fb
Reviewed-on: https://gerrit.libreoffice.org/28796
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/animations/CustomAnimation.src
b/sd/source/ui/animations/CustomAnimation.src
index daa5c65..632e7b6 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -216,82 +216,82 @@ String STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE
String STR_CUSTOMANIMATION_DIRECTION_PROPERTY
{
- Text [ en-US ] = "Direction";
+ Text [ en-US ] = "Direction:";
};
String STR_CUSTOMANIMATION_ZOOM_PROPERTY
{
- Text [ en-US ] = "Zoom";
+ Text [ en-US ] = "Zoom:";
};
String STR_CUSTOMANIMATION_SPOKES_PROPERTY
{
- Text [ en-US ] = "Spokes";
+ Text [ en-US ] = "Spokes:";
};
String STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY
{
- Text [ en-US ] = "First color";
+ Text [ en-US ] = "First color:";
};
String STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY
{
- Text [ en-US ] = "Second color";
+ Text [ en-US ] = "Second color:";
};
String STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY
{
- Text [ en-US ] = "Fill color";
+ Text [ en-US ] = "Fill color:";
};
String STR_CUSTOMANIMATION_STYLE_PROPERTY
{
- Text [ en-US ] = "Style";
+ Text [ en-US ] = "Style:";
};
String STR_CUSTOMANIMATION_FONT_PROPERTY
{
- Text [ en-US ] = "Font";
+ Text [ en-US ] = "Font:";
};
String STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY
{
- Text [ en-US ] = "Font color";
+ Text [ en-US ] = "Font color:";
};
String STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY
{
- Text [ en-US ] = "Style";
+ Text [ en-US ] = "Style:";
};
String STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY
{
- Text [ en-US ] = "Typeface";
+ Text [ en-US ] = "Typeface:";
};
String STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY
{
- Text [ en-US ] = "Line color";
+ Text [ en-US ] = "Line color:";
};
String STR_CUSTOMANIMATION_SIZE_PROPERTY
{
- Text [ en-US ] = "Font size";
+ Text [ en-US ] = "Font size:";
};
String STR_CUSTOMANIMATION_SCALE_PROPERTY
{
- Text [ en-US ] = "Size";
+ Text [ en-US ] = "Size:";
};
String STR_CUSTOMANIMATION_AMOUNT_PROPERTY
{
- Text [ en-US ] = "Amount";
+ Text [ en-US ] = "Amount:";
};
String STR_CUSTOMANIMATION_COLOR_PROPERTY
{
- Text [ en-US ] = "Color";
+ Text [ en-US ] = "Color:";
};
String STR_CUSTOMANIMATION_NO_SOUND
diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui
b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index 513a7d1..8f73654 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -47,11 +47,16 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">3</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">3</property>
<child>
<object class="sdlo-CustomAnimationList" id="custom_animation_list">
+ <property name="width_request">260</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
@@ -70,6 +75,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
+ <property name="margin_top">3</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkButton" id="add_effect">
<property name="visible">True</property>
@@ -141,6 +148,7 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_bottom">3</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
@@ -149,6 +157,8 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Category:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">categorylb</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -161,6 +171,8 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Effect:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">effect_list</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -224,6 +236,7 @@
<property name="halign">end</property>
<property name="label"
translatable="yes">_Start:</property>
<property name="use_underline">True</property>
+ <property
name="mnemonic_widget">start_effect_list</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -237,6 +250,7 @@
<property name="halign">end</property>
<property name="label"
translatable="yes">_Direction:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">placeholder</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -250,6 +264,7 @@
<property name="halign">end</property>
<property name="label"
translatable="yes">D_uration:</property>
<property name="use_underline">True</property>
+ <property
name="mnemonic_widget">anim_duration:0.00sec</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -301,6 +316,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Options</property>
<property name="image">image1</property>
<property name="always_show_image">True</property>
</object>
@@ -314,10 +330,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Select
the speed of Custom Animation.</property>
- <property name="tooltip_text" translatable="yes">Select
the speed of Custom Animation.</property>
<property name="hexpand">True</property>
- <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -357,8 +370,11 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkSeparator" id="separator1">
+ <property name="height_request">2</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
</object>
<packing>
<property name="expand">False</property>
@@ -372,6 +388,7 @@
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
+ <property name="margin_top">3</property>
<property name="spacing">18</property>
<child>
<object class="GtkCheckButton" id="auto_preview">
@@ -422,6 +439,32 @@
<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">Custom 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">Custom 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>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
