extras/source/glade/libreoffice-catalog.xml.in | 6 ++
sw/uiconfig/swriter/ui/insertcaption.ui | 69 +++++++++++--------------
2 files changed, 38 insertions(+), 37 deletions(-)
New commits:
commit 4dfbd5d06f80813688af46a5c10ea641e320fc2b
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Mar 14 20:52:58 2013 +0000
add in custom category widgets
Change-Id: I68eea2cee58edc2e6ab164dcccf6a87b271a403a
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 435449c..40dc276 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -81,9 +81,15 @@
<glade-widget-class title="Table Preview" name="swuilo-AutoFmtPreview"
generic-name="Table Preview Window"
parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
+ <glade-widget-class title="Caption Preview" name="swuilo-SwCaptionPreview"
+ generic-name="Caption Preview Window"
parent="GtkDrawingArea"
+ icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Text Direction ListBox"
name="svxlo-FrameDirectionListBox"
generic-name="FrameDirectionListBox"
parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
+ <glade-widget-class title="Category ComboBox" name="swuilo-CategoryBox"
+ generic-name="CategoryComboBox" parent="GtkComboBox"
+ icon-name="widget-gtk-combobox"/>
<glade-widget-class title="Bookmark Combo" name="swuilo-BookmarkCombo"
generic-name="BookmarkComboBox" parent="GtkTreeView"
icon-name="widget-gtk-combobox"/>
commit 8f645360196182cbd62161c98422acd0560e8eef
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Mar 14 20:49:23 2013 +0000
various efforts to consistently apply HIG rules
Change-Id: Ia90000452551b57f644226f1ba4c5c9533b679a5
diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui
b/sw/uiconfig/swriter/ui/insertcaption.ui
index b71a2f7..22ef9b9 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -1,15 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">9999</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">[None]</col>
+ </row>
+ </data>
+ </object>
<object class="GtkDialog" id="InsertCaptionDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Insert Caption</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
@@ -30,7 +48,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkEntry" id="caption_edit">
@@ -71,6 +88,7 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
@@ -78,13 +96,15 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="numbering_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label"
translatable="yes">Numbering</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">numbering</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -98,8 +118,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_right">12</property>
<property name="label"
translatable="yes">Separator</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">separator_edit</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -113,8 +134,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_right">12</property>
<property name="label"
translatable="yes">Position</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">position</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -156,8 +178,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_right">12</property>
<property name="label"
translatable="yes">Numbering separator</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">num_seperator_edit</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -199,8 +222,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_right">12</property>
<property name="label"
translatable="yes">Category</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">category</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -256,7 +280,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="swuilo-SwCaptionPreview" id="preview">
@@ -300,13 +323,11 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -318,11 +339,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -334,11 +353,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -350,11 +367,9 @@
<child>
<object class="GtkButton" id="auto">
<property name="label" translatable="yes">Auto...</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -365,11 +380,9 @@
<child>
<object class="GtkButton" id="options">
<property name="label" translatable="yes">Options...</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -395,22 +408,4 @@
<action-widget response="0">options</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">1</property>
- <property name="upper">9999</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">[None]</col>
- </row>
- </data>
- </object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
