cui/uiconfig/ui/numberingformatpage.ui | 23 +++++++++++++---------- extras/source/glade/libreoffice-catalog.xml.in | 6 ++++++ svx/source/dialog/fontlb.cxx | 8 ++++++-- 3 files changed, 25 insertions(+), 12 deletions(-)
New commits: commit 6f906d9c26e90f507299bc117dac8c9859e6b182 Author: Caolán McNamara <[email protected]> Date: Thu Apr 25 20:56:56 2013 +0100 add borders to category and format listboxes Change-Id: Ic53084ded75f9c9000d5768de12953e3b339908e diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui index 4633547..338afb7 100644 --- a/cui/uiconfig/ui/numberingformatpage.ui +++ b/cui/uiconfig/ui/numberingformatpage.ui @@ -2,6 +2,11 @@ <interface> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">20</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkGrid" id="NumberingFormatPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -309,7 +314,7 @@ <property name="vscrollbar_policy">always</property> <property name="shadow_type">in</property> <child> - <object class="GtkTreeView" id="categorylb"> + <object class="GtkTreeView" id="categorylb:border"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="model">liststore1</property> @@ -329,7 +334,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">C_ategory</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">categorylb</property> + <property name="mnemonic_widget">categorylb:border</property> <attributes> <attribute name="weight" value="semibold"/> </attributes> @@ -367,11 +372,14 @@ <property name="vexpand">True</property> <property name="row_spacing">6</property> <child> - <object class="svxlo-SvxFontListBox" id="formatlb"> + <object class="svxlo-SvxFontListBox" id="formatlb:border"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Font List-selection1"/> + </child> </object> <packing> <property name="left_attach">0</property> @@ -405,7 +413,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">Fo_rmat</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">formatlb</property> + <property name="mnemonic_widget">formatlb:border</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -456,8 +464,8 @@ <object class="cuilo-SvxNumberPreview" id="preview"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="valign">end</property> + <property name="hexpand">True</property> <property name="vexpand">True</property> </object> <packing> @@ -517,11 +525,6 @@ </packing> </child> </object> - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">20</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 131ca43..f5a4d32 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -97,9 +97,13 @@ SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle) maEntryFont = maStdFont; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pParent, VclBuilder::stringmap &rMap) { - return new SvxFontListBox(pParent, WB_TABSTOP); + WinBits nWinStyle = WB_TABSTOP; + OString sBorder = VclBuilder::extractCustomProperty(rMap); + if (!sBorder.isEmpty()) + nWinStyle |= WB_BORDER; + return new SvxFontListBox(pParent, nWinStyle); } void SvxFontListBox::InsertFontEntry( const String& rString, const Font& rFont, const Color* pColor ) commit 99aa9f1decf991d05bd03e079565670f3bcc8b06 Author: Caolán McNamara <[email protected]> Date: Thu Apr 25 20:49:37 2013 +0100 add glade stubs for some more custom widgets Change-Id: Iffefd61167bf46aef4791aa3c09d4a78ae79dd92 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 9275f78..aa26a10 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -57,6 +57,9 @@ <glade-widget-class title="Font Preview" name="svxlo-SvxFontPrevWindow" generic-name="Font Preview Window" parent="GtkDrawingArea" icon-name="widget-gtk-drawingarea"/> + <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="Frame Selector" name="svxlo-SvxFrameSelector" generic-name="Frame Border Preview Window" parent="GtkDrawingArea" icon-name="widget-gtk-drawingarea"/> @@ -123,6 +126,9 @@ <glade-widget-class title="Glossary List" name="swuilo-SwGlossaryGroupTLB" generic-name="Glossary List" parent="GtkTreeView" icon-name="widget-gtk-treeview"/> + <glade-widget-class title="Font List" name="svxlo-SvxFontListBox" + generic-name="Font List" parent="GtkTreeView" + icon-name="widget-gtk-treeview"/> <glade-widget-class title="Macro Library" name="basctllo-TreeListBox" generic-name="Macro Library List" parent="GtkTreeView" icon-name="widget-gtk-treeview"/>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
