summaryrefslogtreecommitdiff
path: root/sd/uiconfig
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-12-20 17:02:25 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-12-21 15:38:34 +0100
commit12c72066c2a0b4cf0ab6c936c4b1bda81a0a1b6a (patch)
tree4445d0443d0f477a75dc35ceeab1a1f2829e86c1 /sd/uiconfig
parent76e7360c1982d041ff99ead9fcf3cbd01d43c473 (diff)
weld SlideTransitionPane
Change-Id: I92fdc6b75f6c1c10ea47dd95f73db2bff04a4ba3 Reviewed-on: https://gerrit.libreoffice.org/85651 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/uiconfig')
-rw-r--r--sd/uiconfig/simpress/ui/slidetransitionspanel.ui63
1 files changed, 53 insertions, 10 deletions
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index 3d1f291d718c..3bc5eec9ebde 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -1,15 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sd">
<requires lib="gtk+" version="3.18"/>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">1000</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">1000</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">1</property>
+ </object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">sd/res/playblue_16.png</property>
+ <property name="icon_name">sd/res/playblue_16.png</property>
</object>
<object class="GtkBox" id="SlideTransitionsPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<child>
@@ -25,7 +36,7 @@
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkAlignment" id="transitions_icons">
+ <object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -34,7 +45,29 @@
<property name="left_padding">6</property>
<property name="right_padding">6</property>
<child>
- <placeholder/>
+ <object class="GtkScrolledWindow" id="transitions_iconswin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="hscrollbar_policy">never</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="GtkDrawingArea" id="transitions_icons">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
<packing>
@@ -75,7 +108,7 @@
<property name="halign">end</property>
<property name="label" translatable="yes" context="slidetransitionspanel|duration_label">Duration:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">transition_duration:0.00sec</property>
+ <property name="mnemonic_widget">transition_duration</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -84,12 +117,14 @@
</packing>
</child>
<child>
- <object class="VclComboBoxNumeric" id="transition_duration:0.00sec">
+ <object class="GtkSpinButton" id="transition_duration">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes" context="slidetransitionspanel|transition_duration|tooltip_text">Select the speed of Slide Transition.</property>
<property name="hexpand">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -156,7 +191,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="variant_list">
+ <object class="GtkComboBoxText" id="variant_list">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -215,8 +250,8 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">rb_mouse_click</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -234,6 +269,9 @@
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">rb_mouse_click</property>
+ <accessibility>
+ <relation type="label-for" target="auto_after_value"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -241,10 +279,14 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="auto_after_value:0sec">
+ <object class="GtkSpinButton" id="auto_after_value">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="adjustment">adjustment1</property>
<property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="rb_auto_after"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -277,6 +319,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>