[Libreoffice-commits] core.git: extras/source sd/uiconfig

[Szymon Kłos]

 extras/source/glade/libreoffice-catalog.xml.in             |    3 
 sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui |   92 ++++++++-----
 2 files changed, 61 insertions(+), 34 deletions(-)

New commits:
commit b192a8714935294b8e68b71954837404b57fa60d
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Tue Feb 14 12:18:07 2017 +0100

    tdf#105962: added missing controls to avoid crash in impress
    
    Change-Id: I0df6da42b02188f417964afa607ec9ea2c23f8ea

diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index b842df2..2019ab2 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -853,5 +853,8 @@
     <glade-widget-class title="Managed Menu Button" name="svtlo-ManagedMenuButton"
                         generic-name="ManagedMenuButton" parent="GtkButton"
                         icon-name="widget-gtk-button"/>
+    <glade-widget-class title="Category ListBox" name="sdlo-CategoryListBox"
+                        generic-name="Category ListBox" parent="GtkTreeView"
+                        icon-name="widget-gtk-treeview"/>
   </glade-widget-classes>
 </glade-catalog>
diff --git a/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui
index 3baac1f..347c47a 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui
@@ -3,6 +3,40 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/sc_moveup.png</property>
+  </object>
+  <object class="GtkImage" id="image_add1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/sc_moveup.png</property>
+    <property name="icon_size">2</property>
+  </object>
+  <object class="GtkImage" id="image_down">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/sc_moveup.png</property>
+    <property name="icon_size">2</property>
+  </object>
+  <object class="GtkImage" id="image_play">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/sc_moveup.png</property>
+  </object>
+  <object class="GtkImage" id="image_remove1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/sc_moveup.png</property>
+    <property name="icon_size">2</property>
+  </object>
+  <object class="GtkImage" id="image_up">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/sc_moveup.png</property>
+    <property name="icon_size">2</property>
+  </object>
   <object class="GtkBox" id="CustomAnimationsPanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -257,6 +291,30 @@
                 <property name="top_attach">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel" id="delay_label">
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">_Delay:</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="GtkSpinButton" id="delay_value:0.0sec">
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="text" translatable="yes">0.0</property>
+                <property name="digits">1</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -371,38 +429,4 @@
       </packing>
     </child>
   </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">sfx2/res/symphony/sidebar-property-small.png</property>
-  </object>
-  <object class="GtkImage" id="image_add1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">svtools/res/list_add.png</property>
-    <property name="icon_size">2</property>
-  </object>
-  <object class="GtkImage" id="image_down">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_movedown.png</property>
-    <property name="icon_size">2</property>
-  </object>
-  <object class="GtkImage" id="image_play">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">sd/res/playblue_16.png</property>
-  </object>
-  <object class="GtkImage" id="image_remove1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">extensions/res/buttonminus.png</property>
-    <property name="icon_size">2</property>
-  </object>
-  <object class="GtkImage" id="image_up">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_moveup.png</property>
-    <property name="icon_size">2</property>
-  </object>
 </interface>