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

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |    3 +++
 sw/uiconfig/swriter/ui/autotext.ui             |   22 ++++------------------
 2 files changed, 7 insertions(+), 18 deletions(-)

New commits:
commit 1f0749777085a89e66244f988bd45034e48c8863
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon May 13 12:00:08 2013 +0100

    remove non-functional show preview checkbox
    
    in 9453d3d484c5410be81bae8ff89b492d7cf92052 I made the preview always on, but
    for some reason didn't remove the now non-functional button
    
    Change-Id: I9af3889a3753c919a897d37a96fe37974d83a272

diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui
index 1af3c64..81d335b 100644
--- a/sw/uiconfig/swriter/ui/autotext.ui
+++ b/sw/uiconfig/swriter/ui/autotext.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="AutoTextDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -191,24 +192,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="showpreview">
-                <property name="label" translatable="yes">Sho_w preview</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="valign">end</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkAlignment" id="alignment2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -393,6 +376,9 @@
                 <property name="height">1</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
commit fa26737fab95d0361d2968de07bb02358ebbfee0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon May 13 11:59:48 2013 +0100

    yet another custom widget stub
    
    Change-Id: Ifb216d9efc593e7ecbc9d47b09aed83ab7b2ec39

diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index d6980be..2b012b8 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -162,6 +162,9 @@
     <glade-widget-class title="Checked Tree List" name="svxlo-SvxCheckListBox"
                         generic-name="Checked Tree List" parent="GtkTreeView"
                         icon-name="widget-gtk-treeview"/>
+    <glade-widget-class title="Glossary Tree List" name="swuilo-SwGlTreeListBox"
+                        generic-name="Glossary Tree List" parent="GtkTreeView"
+                        icon-name="widget-gtk-treeview"/>
     <glade-widget-class title="Dial Control" name="svxlo-DialControl"
                         generic-name="Dial Control" parent="GtkSpinner"
                         icon-name="widget-gtk-spinner"/>