sw/uiconfig/swriter/ui/flddbpage.ui | 278 +---
sw/uiconfig/swriter/ui/flddocinfopage.ui | 217 +--
sw/uiconfig/swriter/ui/flddocumentpage.ui | 236 +--
sw/uiconfig/swriter/ui/fldfuncpage.ui | 155 +-
sw/uiconfig/swriter/ui/fldrefpage.ui | 246 +--
sw/uiconfig/swriter/ui/fldvarpage.ui | 372 ++---
sw/uiconfig/swriter/ui/footnotepage.ui | 730 +++++-----
sw/uiconfig/swriter/ui/formattablepage.ui | 678 ++++------
sw/uiconfig/swriter/ui/frmaddpage.ui | 640 ++++-----
sw/uiconfig/swriter/ui/frmtypepage.ui | 1110 ++++++++--------
sw/uiconfig/swriter/ui/mailmerge.ui | 1156 ++++++++---------
sw/uiconfig/swriter/ui/mmaddressblockpage.ui | 672 ++++------
sw/uiconfig/swriter/ui/mmlayoutpage.ui | 546 +++-----
sw/uiconfig/swriter/ui/mmresultemaildialog.ui | 595 ++++----
sw/uiconfig/swriter/ui/mmresultprintdialog.ui | 291 ++--
sw/uiconfig/swriter/ui/mmsalutationpage.ui | 692 +++++-----
sw/uiconfig/swriter/ui/optcaptionpage.ui | 653 ++++-----
sw/uiconfig/swriter/ui/optcomparison.ui | 244 +--
sw/uiconfig/swriter/ui/optcompatpage.ui | 298 ++--
sw/uiconfig/swriter/ui/optformataidspage.ui | 694 ++++------
sw/uiconfig/swriter/ui/optgeneralpage.ui | 580 ++++----
sw/uiconfig/swriter/ui/optredlinepage.ui | 714 +++++-----
sw/uiconfig/swriter/ui/opttablepage.ui | 797 +++++------
sw/uiconfig/swriter/ui/outlinenumberingpage.ui | 512 +++----
sw/uiconfig/swriter/ui/outlinepositionpage.ui | 742 +++++------
sw/uiconfig/swriter/ui/sectionpage.ui | 634 ++++-----
sw/uiconfig/swriter/ui/sortdialog.ui | 983 +++++++-------
sw/uiconfig/swriter/ui/titlepage.ui | 566 ++++----
sw/uiconfig/swriter/ui/tocentriespage.ui | 1663 ++++++++++++-------------
sw/uiconfig/swriter/ui/tocindexpage.ui | 1542 +++++++++++------------
30 files changed, 9245 insertions(+), 9991 deletions(-)
New commits:
commit ed7d6dd9e222daef5a0d0147e0311b951f9a29ce
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jan 1 20:16:33 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 2 21:43:30 2021 +0100
drop deprecated GtkAlignment, move left/top-padding into child
margin-start/top
for sw part b
Change-Id: Iebd29eb907e47fbaf1d80c9201dd6cbd32c06c44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108597
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui
b/sw/uiconfig/swriter/ui/flddbpage.ui
index 645b78b3bf0d..a9fe9a79d4c1 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -52,50 +52,43 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="type">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro Library
List-selection2"/>
+ </child>
<child>
- <object class="GtkTreeView" id="type">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro
Library List-selection2"/>
- </child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn3">
+ <property name="spacing">6</property>
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn3">
- <property name="spacing">6</property>
- <child>
- <object class="GtkCellRendererText"
id="cellrenderer4"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="type-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="flddbpage|extended_tip|type">Lists the available field types. To add a
field to your document, click a field type, click a field in the Select list,
and then click Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderer4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="type-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddbpage|extended_tip|type">Lists the available
field types. To add a field to your document, click a field type, click a field
in the Select list, and then click Insert.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -238,57 +231,50 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="select">
+ <property name="width_request">-1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore2</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">1</property>
+ <property name="enable_tree_lines">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro Library
List-selection1"/>
+ </child>
<child>
- <object class="GtkTreeView" id="select">
- <property name="width_request">-1</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore2</property>
- <property name="headers_visible">False</property>
- <property name="search_column">1</property>
- <property name="enable_tree_lines">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro
Library List-selection1"/>
- </child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn8">
+ <property name="spacing">6</property>
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn8">
- <property name="spacing">6</property>
- <child>
- <object class="GtkCellRendererPixbuf"
id="cellrenderertext5"/>
- <attributes>
- <attribute name="pixbuf">0</attribute>
- </attributes>
- </child>
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext6"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererPixbuf"
id="cellrenderertext5"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
</child>
- <child internal-child="accessible">
- <object class="AtkObject" id="select-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="flddbpage|extended_tip|select">Select the database table or the
database query that you want the field to refer to.</property>
- </object>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext6"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="select-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddbpage|extended_tip|select">Select the database
table or the database query that you want the field to refer to.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -365,113 +351,107 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid7">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <child>
+ <object class="GtkRadioButton" id="fromdatabasecb">
+ <property name="label" translatable="yes"
context="flddbpage|fromdatabasecb">From database</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="fromdatabasecb-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddbpage|extended_tip|fromdatabasecb">Uses the
format defined in the selected database.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="userdefinedcb">
+ <property name="label" translatable="yes"
context="flddbpage|userdefinedcb">User-defined</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">fromdatabasecb</property>
+ <accessibility>
+ <relation type="label-for" target="numformat"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="userdefinedcb-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddbpage|extended_tip|userdefinedcb">Applies the
format that you select in the List of user-defined formats.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid7">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
<child>
- <object class="GtkRadioButton" id="fromdatabasecb">
- <property name="label" translatable="yes"
context="flddbpage|fromdatabasecb">From database</property>
- <property name="visible">True</property>
+ <object class="GtkComboBoxText" id="format">
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
<child internal-child="accessible">
- <object class="AtkObject"
id="fromdatabasecb-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="flddbpage|extended_tip|fromdatabasecb">Uses the format defined in the
selected database.</property>
+ <object class="AtkObject" id="format-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="flddbpage|extended_tip|format">Lists the available user-defined
formats.</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="userdefinedcb">
- <property name="label" translatable="yes"
context="flddbpage|userdefinedcb">User-defined</property>
+ <object class="GtkComboBoxText" id="numformat">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">fromdatabasecb</property>
+ <property name="hexpand">True</property>
<accessibility>
- <relation type="label-for" target="numformat"/>
+ <relation type="labelled-by"
target="userdefinedcb"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject"
id="userdefinedcb-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="flddbpage|extended_tip|userdefinedcb">Applies the format that you
select in the List of user-defined formats.</property>
+ <object class="AtkObject"
id="numformat-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="flddbpage|extended_tip|numformat">Lists the available user-defined
formats.</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkComboBoxText" id="format">
- <property name="can_focus">True</property>
- <property name="no_show_all">True</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="format-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="flddbpage|extended_tip|format">Lists the available user-defined
formats.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="numformat">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <accessibility>
- <relation type="labelled-by"
target="userdefinedcb"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject"
id="numformat-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="flddbpage|extended_tip|numformat">Lists the available user-defined
formats.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/flddocinfopage.ui
b/sw/uiconfig/swriter/ui/flddocinfopage.ui
index 13054b693681..4e09f721eb20 100644
--- a/sw/uiconfig/swriter/ui/flddocinfopage.ui
+++ b/sw/uiconfig/swriter/ui/flddocinfopage.ui
@@ -42,49 +42,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="type">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
- <object class="GtkTreeView" id="type">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection1"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="type-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|type">Lists the
available field types. To add a field to your document, click a field type,
click a field in the Select list, and then click Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="type-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|type">Lists the
available field types. To add a field to your document, click a field type,
click a field in the Select list, and then click Insert.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -116,49 +109,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="select">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore2</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
<child>
- <object class="GtkTreeView" id="select">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore2</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection2"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn2">
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn2">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="select-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|select">Lists the
available fields for the field type selected in the Type list. To insert a
field, click the field, and then click Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="select-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|select">Lists the
available fields for the field type selected in the Type list. To insert a
field, click the field, and then click Insert.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -190,85 +176,78 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="format">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore3</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection3"/>
+ </child>
<child>
- <object class="GtkTreeView" id="format">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore3</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection3"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn3">
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn3">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="format-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|format">Click the
format that you want to apply to the selected field, or click "Additional
formats" to define a custom format.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="fixed">
- <property name="label" translatable="yes"
context="flddocinfopage|fixed">Fi_xed content</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="fixed-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|fixed">Inserts the
field as static content, that is, the field cannot be updated.</property>
+ <object class="AtkObject" id="format-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|format">Click the
format that you want to apply to the selected field, or click "Additional
formats" to define a custom format.</property>
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="fixed">
+ <property name="label" translatable="yes"
context="flddocinfopage|fixed">Fi_xed content</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="fixed-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|fixed">Inserts the
field as static content, that is, the field cannot be updated.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui
b/sw/uiconfig/swriter/ui/flddocumentpage.ui
index 4686fd863284..b2fc046a9ad5 100644
--- a/sw/uiconfig/swriter/ui/flddocumentpage.ui
+++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui
@@ -62,49 +62,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="type">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
- <object class="GtkTreeView" id="type">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection1"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="type-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="flddocumentpage|extended_tip|type">Lists the
available field types. To add a field to your document, click a field type,
click a field in the Select list, and then click Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="type-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddocumentpage|extended_tip|type">Lists the
available field types. To add a field to your document, click a field type,
click a field in the Select list, and then click Insert.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -136,49 +129,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="select">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore2</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
<child>
- <object class="GtkTreeView" id="select">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore2</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection2"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn2">
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn2">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="select-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="flddocumentpage|extended_tip|select">Lists the
available fields for the field type selected in the Type list. To insert a
field, click the field, and then click Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="select-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddocumentpage|extended_tip|select">Lists the
available fields for the field type selected in the Type list. To insert a
field, click the field, and then click Insert.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -217,106 +203,98 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="format">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore3</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection3"/>
+ </child>
<child>
- <object class="GtkTreeView" id="format">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore3</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection3"/>
- </child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn3">
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn3">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="format-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="flddocumentpage|extended_tip|format">Click the format that you want to
apply to the selected field, or click "Additional formats" to define a custom
format.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="format-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddocumentpage|extended_tip|format">Click the
format that you want to apply to the selected field, or click "Additional
formats" to define a custom format.</property>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="numformat">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore4</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection4"/>
+ </child>
<child>
- <object class="GtkTreeView" id="numformat">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore4</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection4"/>
- </child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn4">
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn4">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext4"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui
b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 3ea10ee3b6dd..4f9880cdf41c 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -43,49 +43,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="type">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
- <object class="GtkTreeView" id="type">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection1"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="type-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="fldfuncpage|extended_tip|type">Lists the available
field types. To add a field to your document, click a field type, click a field
in the Select list, and then click Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="type-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fldfuncpage|extended_tip|type">Lists the available
field types. To add a field to your document, click a field type, click a field
in the Select list, and then click Insert.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -118,41 +111,34 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="select">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore2</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
<child>
- <object class="GtkTreeView" id="select">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore2</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection2"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn2">
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn2">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
@@ -188,49 +174,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="format">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore3</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
+ </child>
<child>
- <object class="GtkTreeView" id="format">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore3</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection3"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn3">
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn3">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="format-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="fldfuncpage|extended_tip|format">Click the format
that you want to apply to the selected field, or click "Additional formats" to
define a custom format.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="format-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fldfuncpage|extended_tip|format">Click the format
that you want to apply to the selected field, or click "Additional formats" to
define a custom format.</property>
+ </object>
+ </child>
</object>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui
b/sw/uiconfig/swriter/ui/fldrefpage.ui
index e906238ae91f..e32f614f8d19 100644
--- a/sw/uiconfig/swriter/ui/fldrefpage.ui
+++ b/sw/uiconfig/swriter/ui/fldrefpage.ui
@@ -66,49 +66,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="type">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
- <object class="GtkTreeView" id="type">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection1"/>
- </child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn1">
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn1">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="type-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fldrefpage|extended_tip|type">Lists the available field types. To add
a field to your document, click a field type, click a field in the Selection
list, and then click Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="type-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fldrefpage|extended_tip|type">Lists the available
field types. To add a field to your document, click a field type, click a field
in the Selection list, and then click Insert.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -140,49 +133,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="format">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore2</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection2"/>
+ </child>
<child>
- <object class="GtkTreeView" id="format">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore2</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection2"/>
- </child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn2">
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn2">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="format-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fldrefpage|extended_tip|format">Select the format that you want to use
for the selected reference field.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="format-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fldrefpage|extended_tip|format">Select the format
that you want to use for the selected reference field.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -282,107 +268,101 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="orientation">vertical</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="selecttip">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore3</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection3"/>
+ </child>
<child>
- <object class="GtkTreeView" id="selecttip">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore3</property>
- <property
name="headers_visible">False</property>
- <property
name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property
name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection3"/>
- </child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn3">
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn3">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject"
id="selecttip-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fldrefpage|extended_tip|selecttip">Lists the available fields for the
field type selected in the Type list. To insert a field, click the field,
select a format in the "Insert reference to" list, and then click
Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="selecttip-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="fldrefpage|extended_tip|selecttip">Lists the available fields for the
field type selected in the Type list. To insert a field, click the field,
select a format in the "Insert reference to" list, and then click
Insert.</property>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="select">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore4</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection4"/>
+ </child>
<child>
- <object class="GtkTreeView" id="select">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore4</property>
- <property
name="headers_visible">False</property>
- <property
name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property
name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection4"/>
- </child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn4">
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn4">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext4"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject"
id="select-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fldrefpage|extended_tip|select">Lists the available fields for the
field type selected in the Type list. To insert a field, click the field,
select a format in the "Insert reference to" list, and then click
Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="select-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="fldrefpage|extended_tip|select">Lists the available fields for the
field type selected in the Type list. To insert a field, click the field,
select a format in the "Insert reference to" list, and then click
Insert.</property>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui
b/sw/uiconfig/swriter/ui/fldvarpage.ui
index ad7235971f64..31a834c2bd90 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -71,49 +71,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="type">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
- <object class="GtkTreeView" id="type">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection1"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn1">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="type-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="fldvarpage|extended_tip|type">Lists the available
field types. To add a field to your document, click a field type, click a field
in the Select list, and then click Insert.</property>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="type-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fldvarpage|extended_tip|type">Lists the available
field types. To add a field to your document, click a field type, click a field
in the Select list, and then click Insert.</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -160,49 +153,42 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="select">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore2</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection2"/>
+ </child>
<child>
- <object class="GtkTreeView" id="select">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore2</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
