cui/uiconfig/ui/fmsearchdialog.ui | 70 ++++++++++++++++++++++++--------------
1 file changed, 46 insertions(+), 24 deletions(-)
New commits:
commit 9b1b0c82eefaa2e3ede563556ac46dd69e06ae0f
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Mar 23 21:12:54 2014 +0000
presumably this label and combobox should be in the search frame
Change-Id: I1153aeca7d2b9b99da7b4fbca955133c1dfae289
diff --git a/cui/uiconfig/ui/fmsearchdialog.ui
b/cui/uiconfig/ui/fmsearchdialog.ui
index d982ba6..e4f431d 100644
--- a/cui/uiconfig/ui/fmsearchdialog.ui
+++ b/cui/uiconfig/ui/fmsearchdialog.ui
@@ -307,7 +307,7 @@
</object>
<packing>
<property
name="left_attach">0</property>
- <property
name="top_attach">1</property>
+ <property
name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -327,6 +327,48 @@
</object>
<packing>
<property
name="left_attach">0</property>
+ <property
name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="ftForm">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="xalign">0</property>
+ <property name="label"
translatable="yes">Form</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">lbForm</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">0</property>
+ <property name="width">1</property>
+ <property
name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox"
id="lbForm">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">0</property>
+ <property name="width">1</property>
+ <property
name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
<property
name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -438,6 +480,7 @@
<property name="xalign">0</property>
<property name="label"
translatable="yes">_Position</property>
<property name="use_underline">True</property>
+ <property
name="mnemonic_widget">lbPosition</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -802,29 +845,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkComboBox" id="lbForm">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="ftForm">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -840,12 +860,14 @@
<widget name="rbSearchForText"/>
<widget name="rbSingleField"/>
<widget name="rbAllFields"/>
+ <widget name="ftForm"/>
<widget name="ftPosition"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
<widgets>
<widget name="lbField"/>
+ <widget name="lbForm"/>
<widget name="lbPosition"/>
</widgets>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
