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

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |    6 ++++++
 sw/uiconfig/swriter/ui/outlinenumberingpage.ui |    2 +-
 sw/uiconfig/swriter/ui/outlinepositionpage.ui  |    2 +-
 vcl/source/control/morebtn.cxx                 |    1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 7d6f4391deb85012c4ede0bb5f35b1d6f347bc0f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 1 16:44:00 2013 +0100

    Resoves: fdo#31849 ensure more button text remains vertically centered
    
    Is seems very bizarre that in Button::ImplDrawAlignedImage if
    there is no image, that we still add padding for the image
    separator to the text position. Why we have the concept of an
    Image *and* a Symbol escapes me.
    
    Anyway, setting the "Image" align to the right to match the
    "Symbol" align stops the button text getting displaced downwards.
    
    Change-Id: I67b80b2ff5cc960f5394cb7d69cab7a4c14513bf

diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 0debd4c..5d61292 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -50,6 +50,7 @@ void MoreButton::ImplInit( Window* pParent, WinBits nStyle )
     ShowState();
 
     SetSymbolAlign(SYMBOLALIGN_RIGHT);
+    SetImageAlign(IMAGEALIGN_RIGHT); //Resoves: fdo#31849 ensure button remains vertically centered
     SetSmallSymbol(true);
 
     if ( ! ( nStyle & ( WB_RIGHT | WB_LEFT ) ) )
commit 1bdf1122a9860a460ba6275d747d8baeedcfe1d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 1 15:19:03 2013 +0100

    put a border around the numbering level listbox
    
    Change-Id: Ie45cc82af0e232b7b523d30552cc14317fc479b5

diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index d16f8f7..9447f27 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -32,7 +32,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="GtkTreeView" id="level">
+              <object class="GtkTreeView" id="level:border">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="headers_visible">False</property>
diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
index de97b4b..74e4388 100644
--- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
@@ -33,7 +33,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="GtkTreeView" id="levellb">
+              <object class="GtkTreeView" id="levellb:border">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="headers_visible">False</property>
commit b0461fbde8476c879183d9a6600a3d3567888f64
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 1 15:18:49 2013 +0100

    stubs for more custom widgets
    
    Change-Id: I27d96030aed3866c0d384a28598e292cb4ab3a04

diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index ca81047..d6980be 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -63,6 +63,9 @@
     <glade-widget-class title="Number Preview" name="cuilo-SvxNumberPreview"
                         generic-name="Number Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
+    <glade-widget-class title="Writer Number Preview" name="swuilo-NumberingPreview"
+                        generic-name="Writer Number Preview Window" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Background Preview" name="cuilo-BackgroundPreview"
                         generic-name="Background Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
@@ -120,6 +123,9 @@
     <glade-widget-class title="Text Direction ListBox" name="svxlo-FrameDirectionListBox"
                         generic-name="FrameDirectionListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>
+    <glade-widget-class title="Numbering Type ListBox" name="swlo-SwNumberingTypeListBox"
+                        generic-name="NumberingTypeListBox" parent="GtkComboBox"
+                        icon-name="widget-gtk-combobox"/>
     <glade-widget-class title="Gradiant ListBox" name="svxlo-GradientLB"
                         generic-name="GradiantListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>