diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-01-01 20:16:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-02 21:43:30 +0100 |
| commit | ed7d6dd9e222daef5a0d0147e0311b951f9a29ce (patch) | |
| tree | bccbe8a22d18983b5babb14d6bc8361d4290dcfb | |
| parent | 17a6597ab00e9b1e8337ae7254b26672caf09690 (diff) | |
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 <caolanm@redhat.com>
30 files changed, 9190 insertions, 9936 deletions
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> - <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="fldvarpage|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="fldvarpage|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> @@ -256,111 +242,103 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box5"> <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="box5"> + <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="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">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="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">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="numformat-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="fldvarpage|extended_tip|numformat">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="numformat-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="fldvarpage|extended_tip|numformat">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="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">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="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">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="format-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="fldvarpage|extended_tip|format">In the Format list, define if the value is inserted as text or a number.</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="format-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="fldvarpage|extended_tip|format">In the Format list, define if the value is inserted as text or a number.</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> @@ -412,83 +390,77 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="label5"> <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="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="fldvarpage|label5">_Level</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="separatorft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="fldvarpage|separatorft">Se_parator</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">separator</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="level"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="fldvarpage|level">None</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="level-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="fldvarpage|extended_tip|level">Choose the heading or chapter level at which to restart numbering in the document.</property> - </object> - </child> + <property name="label" translatable="yes" context="fldvarpage|label5">_Level</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="separatorft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="fldvarpage|separatorft">Se_parator</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">separator</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="level"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="fldvarpage|level">None</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="level-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="fldvarpage|extended_tip|level">Choose the heading or chapter level at which to restart numbering in the document.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkEntry" id="separator"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">1</property> - <property name="width_chars">2</property> - <property name="text" translatable="yes" context="fldvarpage|separator">.</property> - <child internal-child="accessible"> - <object class="AtkObject" id="separator-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="fldvarpage|extended_tip|separator">Type the character that you want to use as a separator between the heading or chapter levels.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="separator"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="max_length">1</property> + <property name="width_chars">2</property> + <property name="text" translatable="yes" context="fldvarpage|separator">.</property> + <child internal-child="accessible"> + <object class="AtkObject" id="separator-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="fldvarpage|extended_tip|separator">Type the character that you want to use as a separator between the heading or chapter levels.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">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/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui index d0f6eb01f615..2e8b43dbdea0 100644 --- a/sw/uiconfig/swriter/ui/footnotepage.ui +++ b/sw/uiconfig/swriter/ui/footnotepage.ui @@ -23,226 +23,220 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="label6"> <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="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|label6">Numbering</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|label7">Counting</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|label8">Before</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="pos"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|pos">Position</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="offset"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|offset">Start at</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|label11">After</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="pospagecb"> - <property name="label" translatable="yes" context="footnotepage|pospagecb">End of page</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">posdoccb</property> - <accessibility> - <relation type="member-of" target="pos"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="pospagecb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|pospagecb">Displays footnotes at the bottom of the page.</property> - </object> - </child> + <property name="label" translatable="yes" context="footnotepage|label6">Numbering</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|label7">Counting</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|label8">Before</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="pos"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|pos">Position</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="offset"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|offset">Start at</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|label11">After</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="pospagecb"> + <property name="label" translatable="yes" context="footnotepage|pospagecb">End of page</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">posdoccb</property> + <accessibility> + <relation type="member-of" target="pos"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="pospagecb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|pospagecb">Displays footnotes at the bottom of the page.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="posdoccb"> - <property name="label" translatable="yes" context="footnotepage|posdoccb">End of document</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">pospagecb</property> - <accessibility> - <relation type="member-of" target="pos"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="posdoccb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|posdoccb">Displays footnotes at the end of the document as endnotes.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="posdoccb"> + <property name="label" translatable="yes" context="footnotepage|posdoccb">End of document</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">pospagecb</property> + <accessibility> + <relation type="member-of" target="pos"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="posdoccb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|posdoccb">Displays footnotes at the end of the document as endnotes.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="offsetnf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="offsetnf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|offsetnf">Enter the number for the first footnote in the document. This option is only available if you selected "Per Document" in the Counting box.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="offsetnf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="offsetnf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|offsetnf">Enter the number for the first footnote in the document. This option is only available if you selected "Per Document" in the Counting box.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="countinglb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="footnotepage|liststore1">Per page</item> - <item translatable="yes" context="footnotepage|liststore1">Per chapter</item> - <item translatable="yes" context="footnotepage|liststore1">Per document</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="countinglb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|countinglb">Select the numbering option for the footnotes.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="countinglb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="footnotepage|liststore1">Per page</item> + <item translatable="yes" context="footnotepage|liststore1">Per chapter</item> + <item translatable="yes" context="footnotepage|liststore1">Per document</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="countinglb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|countinglb">Select the numbering option for the footnotes.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkEntry" id="prefix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="prefix-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|prefix">Enter the text that you want to display in front of the footnote number in the note text.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="prefix"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="prefix-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|prefix">Enter the text that you want to display in front of the footnote number in the note text.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkEntry" id="suffix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="suffix-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|suffix">Enter the text that you want to display after the footnote number in the note text.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="suffix"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="suffix-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|suffix">Enter the text that you want to display after the footnote number in the note text.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="numberinglb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="numberinglb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|numberinglb">Select the numbering style that you want to use.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="numberinglb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="numberinglb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|numberinglb">Select the numbering style that you want to use.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -270,80 +264,74 @@ <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="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|label17">End of footnote</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|label18">Start of next page</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="contfromed"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|label17">End of footnote</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label18"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|label18">Start of next page</property> - <property name="xalign">0</property> + <property name="max_length">30</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="contfromed-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|contfromed">Enter the text that you want to display on the page where the footnotes are continued, for example, "Continued from Page ". %PRODUCTNAME Writer automatically inserts the number of the previous page.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="contfromed"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="max_length">30</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="contfromed-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|contfromed">Enter the text that you want to display on the page where the footnotes are continued, for example, "Continued from Page ". %PRODUCTNAME Writer automatically inserts the number of the previous page.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="conted"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="max_length">30</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="conted-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|conted">Enter the text that you want to display when the footnotes are continued on the next page, for example, "Continued on Page ". %PRODUCTNAME Writer automatically inserts the number of the following page.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="conted"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="max_length">30</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="conted-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|conted">Enter the text that you want to display when the footnotes are continued on the next page, for example, "Continued on Page ". %PRODUCTNAME Writer automatically inserts the number of the following page.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -370,131 +358,125 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="label4"> <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="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|label4">Paragraph</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="pagestyleft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|pagestyleft">Page</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="parastylelb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="parastylelb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|parastylelb">Select the paragraph style for the footnote text. Only special styles can be selected.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="pagestylelb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="pagestylelb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|pagestylelb">Select the page style that you want to use for footnotes.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="charanchorstylelb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="charanchorstylelb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|charanchorstylelb">Select the character style that you want to use for footnote anchors in the text area of your document.</property> - </object> - </child> + <property name="label" translatable="yes" context="footnotepage|label4">Paragraph</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="pagestyleft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|pagestyleft">Page</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="parastylelb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="parastylelb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|parastylelb">Select the paragraph style for the footnote text. Only special styles can be selected.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="charstylelb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="charstylelb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|charstylelb">Select the character style that you want to use for the footnote numbers in the footnote area.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="pagestylelb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="pagestylelb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|pagestylelb">Select the page style that you want to use for footnotes.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|label15">Text area</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="charanchorstylelb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="charanchorstylelb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|charanchorstylelb">Select the character style that you want to use for footnote anchors in the text area of your document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label16"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotepage|label16">Footnote area</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="charstylelb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="charstylelb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|charstylelb">Select the character style that you want to use for the footnote numbers in the footnote area.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|label15">Text area</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotepage|label16">Footnote area</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/formattablepage.ui b/sw/uiconfig/swriter/ui/formattablepage.ui index 30aa539de260..c851a422fc04 100644 --- a/sw/uiconfig/swriter/ui/formattablepage.ui +++ b/sw/uiconfig/swriter/ui/formattablepage.ui @@ -59,222 +59,79 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment12"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid28"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid28"> + <object class="GtkLabel" id="nameft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="formattablepage|nameft">_Name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">name</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="widthft"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="formattablepage|widthft">W_idth</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">widthmf</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="name"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="nameft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formattablepage|nameft">_Name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">name</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="widthft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formattablepage|widthft">W_idth</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">widthmf</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="name"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="name-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|name">Enter an internal name for the table. You can use this name to quickly locate the table in the Navigator.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid29"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="relwidth"> - <property name="label" translatable="yes" context="formattablepage|relwidth">Relati_ve</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="relwidth-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|relwidth">Displays the width of the table as a percentage of the page width.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="widthmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="widthmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|widthmf">Enter the width of the table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="name-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|name">Enter an internal name for the table. You can use this name to quickly locate the table in the Navigator.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label45"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formattablepage|label45">Properties</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid31"> + <object class="GtkGrid" id="grid29"> <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="GtkLabel" id="leftft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formattablepage|leftft">Lef_t</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">leftmf</property> - <property name="xalign">0</property> - <property name="yalign">0.5099999904632568</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="rightft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formattablepage|rightft">Ri_ght</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">rightmf</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="aboveft"> + <object class="GtkCheckButton" id="relwidth"> + <property name="label" translatable="yes" context="formattablepage|relwidth">Relati_ve</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formattablepage|aboveft">_Above</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">abovemf</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="belowft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formattablepage|belowft">_Below</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">belowmf</property> <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="leftmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <property name="digits">2</property> + <property name="draw_indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="leftmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|leftmf">Enter the amount of space that you want to leave between the left page margin and the edge of the table.</property> + <object class="AtkObject" id="relwidth-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|relwidth">Displays the width of the table as a percentage of the page width.</property> </object> </child> </object> @@ -284,68 +141,36 @@ </packing> </child> <child> - <object class="GtkSpinButton" id="rightmf"> + <object class="GtkSpinButton" id="widthmf"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> - <property name="adjustment">adjustment3</property> + <property name="adjustment">adjustment1</property> <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="rightmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|rightmf">Enter the amount of space that you want to leave between the right page margin and the edge of the table.</property> + <object class="AtkObject" id="widthmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|widthmf">Enter the width of the table.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="abovemf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment4</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="abovemf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|abovemf">Enter the amount of space that you want to leave between the top edge of the table and the text above the table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="belowmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment5</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="belowmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|belowmf">Enter the amount of space that you want to leave between the bottom edge of the table and the text below the table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label46"> + <object class="GtkLabel" id="label45"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formattablepage|label46">Spacing</property> + <property name="label" translatable="yes" context="formattablepage|label45">Properties</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -354,49 +179,33 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment10"> + <object class="GtkFrame" id="frame13"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid30"> + <object class="GtkGrid" id="grid31"> <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="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkRadioButton" id="full"> - <property name="label" translatable="yes" context="formattablepage|full">A_utomatic</property> + <object class="GtkLabel" id="leftft"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="formattablepage|leftft">Lef_t</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">leftmf</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="full-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|full">Extends the table horizontally to the left and to the right page margins.</property> - </object> - </child> + <property name="yalign">0.5099999904632568</property> </object> <packing> <property name="left_attach">0</property> @@ -404,20 +213,13 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="left"> - <property name="label" translatable="yes" context="formattablepage|left">_Left</property> + <object class="GtkLabel" id="rightft"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="formattablepage|rightft">Ri_ght</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">rightmf</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">full</property> - <child internal-child="accessible"> - <object class="AtkObject" id="left-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|left">Aligns the left edge of the table to the left page margin.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> @@ -425,20 +227,13 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="fromleft"> - <property name="label" translatable="yes" context="formattablepage|fromleft">_From left</property> + <object class="GtkLabel" id="aboveft"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="formattablepage|aboveft">_Above</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">abovemf</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">full</property> - <child internal-child="accessible"> - <object class="AtkObject" id="fromleft-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|fromleft">Aligns the left edge of the table to the indent that you enter in the Left box in the Spacing area.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> @@ -446,69 +241,254 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="right"> - <property name="label" translatable="yes" context="formattablepage|right">R_ight</property> + <object class="GtkLabel" id="belowft"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="formattablepage|belowft">_Below</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">belowmf</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">full</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="leftmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="right-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|right">Aligns the right edge of the table to the right page margin.</property> + <object class="AtkObject" id="leftmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|leftmf">Enter the amount of space that you want to leave between the left page margin and the edge of the table.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkRadioButton" id="center"> - <property name="label" translatable="yes" context="formattablepage|center">_Center</property> + <object class="GtkSpinButton" id="rightmf"> <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">full</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment3</property> + <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="center-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|center">Centers the table horizontally on the page.</property> + <object class="AtkObject" id="rightmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|rightmf">Enter the amount of space that you want to leave between the right page margin and the edge of the table.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkRadioButton" id="free"> - <property name="label" translatable="yes" context="formattablepage|free">_Manual</property> + <object class="GtkSpinButton" id="abovemf"> <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">full</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment4</property> + <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="free-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|free">Horizontally aligns the table based on the values that you enter in the Left and Right boxes in the Spacing area.</property> + <object class="AtkObject" id="abovemf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|abovemf">Enter the amount of space that you want to leave between the top edge of the table and the text above the table.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> + <child> + <object class="GtkSpinButton" id="belowmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment5</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="belowmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|belowmf">Enter the amount of space that you want to leave between the bottom edge of the table and the text below the table.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label46"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="formattablepage|label46">Spacing</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid30"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkRadioButton" id="full"> + <property name="label" translatable="yes" context="formattablepage|full">A_utomatic</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="full-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|full">Extends the table horizontally to the left and to the right page margins.</property> + </object> + </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="left"> + <property name="label" translatable="yes" context="formattablepage|left">_Left</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">full</property> + <child internal-child="accessible"> + <object class="AtkObject" id="left-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|left">Aligns the left edge of the table to the left page margin.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="fromleft"> + <property name="label" translatable="yes" context="formattablepage|fromleft">_From left</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">full</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fromleft-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|fromleft">Aligns the left edge of the table to the indent that you enter in the Left box in the Spacing area.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="right"> + <property name="label" translatable="yes" context="formattablepage|right">R_ight</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">full</property> + <child internal-child="accessible"> + <object class="AtkObject" id="right-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|right">Aligns the right edge of the table to the right page margin.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="center"> + <property name="label" translatable="yes" context="formattablepage|center">_Center</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">full</property> + <child internal-child="accessible"> + <object class="AtkObject" id="center-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|center">Centers the table horizontally on the page.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="free"> + <property name="label" translatable="yes" context="formattablepage|free">_Manual</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">full</property> + <child internal-child="accessible"> + <object class="AtkObject" id="free-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="formattablepage|extended_tip|free">Horizontally aligns the table based on the values that you enter in the Left and Right boxes in the Spacing area.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> </child> </object> </child> @@ -541,42 +521,36 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment11"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid32"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid32"> + <object class="GtkLabel" id="label53"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label53"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formattablepage|label53">Text _direction</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">textdirection</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="textdirection"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="formattablepage|label53">Text _direction</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">textdirection</property> + <property name="xalign">0</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="textdirection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui index 406ceccd141b..a6876295f836 100644 --- a/sw/uiconfig/swriter/ui/frmaddpage.ui +++ b/sw/uiconfig/swriter/ui/frmaddpage.ui @@ -26,190 +26,182 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <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="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkEntry" id="name"> <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="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="name"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">50</property> - <child internal-child="accessible"> - <object class="AtkObject" id="name-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|name">Enter a name for the selected item.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="altname"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">50</property> - <child internal-child="accessible"> - <object class="AtkObject" id="altname-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|altname">Enter the text to display in a web browser when the selected item is unavailable. Alternate text is also used to assist people with disabilities.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="name_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmaddpage|name_label">_Name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">name</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="altname_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmaddpage|altname_label">_Alternative (Text only):</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">altname</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="prev"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="frmaddpage|prev"><None></item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="prev-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|prev">Displays the item (object, graphic, or frame) that comes before the current item in a linked sequence. To add or change the previous link, select a name from the list. If you are linking frames, the current frame and the target frame must be empty.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="next"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="frmaddpage|next"><None></item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="next-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|next">Displays the item (object, graphic, or frame) that comes after the current item in a linked sequence. To add or change the next link, select a name from the list. If you are a linking frames, the target frame must be empty.</property> - </object> - </child> + <property name="activates_default">True</property> + <property name="width_chars">50</property> + <child internal-child="accessible"> + <object class="AtkObject" id="name-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|name">Enter a name for the selected item.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkLabel" id="prev_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmaddpage|prev_label">_Previous link:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">prev</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="altname"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">50</property> + <child internal-child="accessible"> + <object class="AtkObject" id="altname-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|altname">Enter the text to display in a web browser when the selected item is unavailable. Alternate text is also used to assist people with disabilities.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkLabel" id="next_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmaddpage|next_label">_Next link:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">next</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="name_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmaddpage|name_label">_Name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">name</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="altname_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmaddpage|altname_label">_Alternative (Text only):</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">altname</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="prev"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="frmaddpage|prev"><None></item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="prev-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|prev">Displays the item (object, graphic, or frame) that comes before the current item in a linked sequence. To add or change the previous link, select a name from the list. If you are linking frames, the current frame and the target frame must be empty.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkLabel" id="description_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmaddpage|description_label">_Description:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">description</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="next"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="frmaddpage|next"><None></item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="next-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|next">Displays the item (object, graphic, or frame) that comes after the current item in a linked sequence. To add or change the next link, select a name from the list. If you are a linking frames, the target frame must be empty.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="prev_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmaddpage|prev_label">_Previous link:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">prev</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="next_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmaddpage|next_label">_Next link:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">next</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="description_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmaddpage|description_label">_Description:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">description</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <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" id="scrolledwindow1"> + <object class="GtkTextView" id="description"> <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="GtkTextView" id="description"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="wrap_mode">word</property> - <property name="buffer">textbuffer1</property> - </object> - </child> + <property name="wrap_mode">word</property> + <property name="buffer">textbuffer1</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -237,78 +229,72 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment6"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> + <object class="GtkCheckButton" id="protectcontent"> + <property name="label" translatable="yes" context="frmaddpage|protectcontent">_Contents</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <child> - <object class="GtkCheckButton" id="protectcontent"> - <property name="label" translatable="yes" context="frmaddpage|protectcontent">_Contents</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="protectcontent-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|protectcontent">Prevents changes to the contents of the selected item.</property> - </object> - </child> + <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="protectcontent-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|protectcontent">Prevents changes to the contents of the selected item.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="protectframe"> - <property name="label" translatable="yes" context="frmaddpage|protectframe">P_osition</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="protectframe-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|protectframe">Locks the position of the selected item in the current document.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="protectframe"> + <property name="label" translatable="yes" context="frmaddpage|protectframe">P_osition</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="protectframe-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|protectframe">Locks the position of the selected item in the current document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="protectsize"> - <property name="label" translatable="yes" context="frmaddpage|protectsize">_Size</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="protectsize-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|protectsize">Locks the size of the selected item.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="protectsize"> + <property name="label" translatable="yes" context="frmaddpage|protectsize">_Size</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="protectsize-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|protectsize">Locks the size of the selected item.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -335,50 +321,44 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmaddpage|label2">_Vertical alignment</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="vertalign"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item id="0" translatable="yes" context="frmaddpage|liststore">Top</item> - <item id="1" translatable="yes" context="frmaddpage|liststore">Centered</item> - <item id="2" translatable="yes" context="frmaddpage|liststore">Bottom</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="vertalign-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|vertalign">Specifies the vertical alignment of the frame's content. Mainly it means text content, but it also affects tables and other objects anchored to the text area (anchored as character, to character or to paragraph), for example frames, graphics or drawings.</property> - </object> - </child> + <property name="label" translatable="yes" context="frmaddpage|label2">_Vertical alignment</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="vertalign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item id="0" translatable="yes" context="frmaddpage|liststore">Top</item> + <item id="1" translatable="yes" context="frmaddpage|liststore">Centered</item> + <item id="2" translatable="yes" context="frmaddpage|liststore">Bottom</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="vertalign-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|vertalign">Specifies the vertical alignment of the frame's content. Mainly it means text content, but it also affects tables and other objects anchored to the text area (anchored as character, to character or to paragraph), for example frames, graphics or drawings.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -405,95 +385,87 @@ <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="grid3"> <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="left_padding">12</property> + <property name="row_spacing">3</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkCheckButton" id="editinreadonly"> + <property name="label" translatable="yes" context="frmaddpage|editinreadonly">_Editable in read-only document</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">3</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="editinreadonly"> - <property name="label" translatable="yes" context="frmaddpage|editinreadonly">_Editable in read-only document</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="editinreadonly-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|editinreadonly">Allows you to edit the contents of a frame in a document that is read-only (write-protected).</property> - </object> - </child> + <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="editinreadonly-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|editinreadonly">Allows you to edit the contents of a frame in a document that is read-only (write-protected).</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="printframe"> - <property name="label" translatable="yes" context="frmaddpage|printframe">Prin_t</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="printframe-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|printframe">Includes the selected item when you print the document.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="textflow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="textflow-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|textflow">Specifies the preferred text flow direction in a frame. To use the default text flow settings for the page, select Use superordinate object settings from the list.</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="GtkCheckButton" id="printframe"> + <property name="label" translatable="yes" context="frmaddpage|printframe">Prin_t</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="printframe-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|printframe">Includes the selected item when you print the document.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="textflow_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="frmaddpage|textflow_label">_Text direction:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">textflow</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="textflow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="textflow-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|textflow">Specifies the preferred text flow direction in a frame. To use the default text flow settings for the page, select Use superordinate object settings from the list.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="textflow_label"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="frmaddpage|textflow_label">_Text direction:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">textflow</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui b/sw/uiconfig/swriter/ui/frmtypepage.ui index 98ccd70b80cc..f8632f9e3386 100644 --- a/sw/uiconfig/swriter/ui/frmtypepage.ui +++ b/sw/uiconfig/swriter/ui/frmtypepage.ui @@ -52,352 +52,346 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkSpinButton" id="width"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="width-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|width">Enter the width that you want for the selected object.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="autowidth"> + <property name="label" translatable="yes" context="frmtypepage|autowidth">AutoSize</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="autowidth-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|autowidth">Automatically adjusts the width or height of a frame to match the contents of the frame. If you want, you can specify a minimum width or minimum height for the frame.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkGrid" id="grid8"> <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="valign">center</property> <child> - <object class="GtkSpinButton" id="width"> + <object class="GtkLabel" id="autowidthft"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="width-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|width">Enter the width that you want for the selected object.</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|autowidthft">_Width (at least)</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">width</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="autowidth"> - <property name="label" translatable="yes" context="frmtypepage|autowidth">AutoSize</property> + <object class="GtkLabel" id="widthft"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|widthft">_Width</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">width</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="autowidth-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|autowidth">Automatically adjusts the width or height of a frame to match the contents of the frame. If you want, you can specify a minimum width or minimum height for the frame.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkCheckButton" id="relwidth"> + <property name="label" translatable="yes" context="frmtypepage|relwidth">Relat_ive to</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="GtkLabel" id="autowidthft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|autowidthft">_Width (at least)</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="widthft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|widthft">_Width</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="relwidthrelation"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="relwidth-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|relwidth">Calculates the width of the selected object as a percentage of the width of the page text area.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="box1"> + <object class="GtkComboBoxText" id="relwidthrelation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="relwidth"> - <property name="label" translatable="yes" context="frmtypepage|relwidth">Relat_ive to</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <accessibility> - <relation type="label-for" target="relwidthrelation"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="relwidth-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|relwidth">Calculates the width of the selected object as a percentage of the width of the page text area.</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="relwidthrelation"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="relwidthrelation-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|relwidthrelation">Decides what 100% width means: either text area (excluding margins) or the entire page (including margins).</property> - </object> - </child> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="relwidthrelation-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|relwidthrelation">Decides what 100% width means: either text area (excluding margins) or the entire page (including margins).</property> </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">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> + <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="GtkSpinButton" id="height"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment3</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="height-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|height">Enter the height that you want for the selected object.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> <property name="top_attach">0</property> </packing> </child> <child> + <object class="GtkCheckButton" id="autoheight"> + <property name="label" translatable="yes" context="frmtypepage|autoheight">AutoSize</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="autoheight-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|autoheight">Automatically adjusts the width or height of a frame to match the contents of the frame. If you want, you can specify a minimum width or minimum height for the frame.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <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="valign">center</property> <child> - <object class="GtkSpinButton" id="height"> + <object class="GtkLabel" id="autoheightft"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment3</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="height-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|height">Enter the height that you want for the selected object.</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|autoheightft">H_eight (at least)</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">height</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="autoheight"> - <property name="label" translatable="yes" context="frmtypepage|autoheight">AutoSize</property> + <object class="GtkLabel" id="heightft"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|heightft">H_eight</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">height</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="autoheight-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|autoheight">Automatically adjusts the width or height of a frame to match the contents of the frame. If you want, you can specify a minimum width or minimum height for the frame.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkCheckButton" id="relheight"> + <property name="label" translatable="yes" context="frmtypepage|relheight">Re_lative to</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="GtkLabel" id="autoheightft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|autoheightft">H_eight (at least)</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">height</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="heightft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|heightft">H_eight</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">height</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="relheightrelation"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="relheight-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|relheight">Calculates the height of the selected object as a percentage of the height of the page text area.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkComboBoxText" id="relheightrelation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="relheight"> - <property name="label" translatable="yes" context="frmtypepage|relheight">Re_lative to</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <accessibility> - <relation type="label-for" target="relheightrelation"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="relheight-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|relheight">Calculates the height of the selected object as a percentage of the height of the page text area.</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="relheightrelation"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="relheightrelation-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|relheightrelation">Decides what 100% height means: either text area (excluding margins) or the entire page (including margins).</property> - </object> - </child> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="relheightrelation-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|relheightrelation">Decides what 100% height means: either text area (excluding margins) or the entire page (including margins).</property> </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">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> + <property name="width">2</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="ratio"> - <property name="label" translatable="yes" context="frmtypepage|ratio">_Keep ratio</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="ratio-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|ratio">Maintains the height and width ratio when you change the width or the height setting.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ratio"> + <property name="label" translatable="yes" context="frmtypepage|ratio">_Keep ratio</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="ratio-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|ratio">Maintains the height and width ratio when you change the width or the height setting.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="origsize"> - <property name="label" translatable="yes" context="frmtypepage|origsize">_Original Size</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="halign">end</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="origsize-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|origsize">Resets the size settings of the selected object to the original values.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="origsize"> + <property name="label" translatable="yes" context="frmtypepage|origsize">_Original Size</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="origsize-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|origsize">Resets the size settings of the selected object to the original values.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> @@ -449,389 +443,377 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="topage"> - <property name="label" translatable="yes" context="frmtypepage|topage">To _page</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="topage-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|topage">Anchors the selection to the current page.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="topara"> - <property name="label" translatable="yes" context="frmtypepage|topara">To paragrap_h</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">topage</property> - <child internal-child="accessible"> - <object class="AtkObject" id="topara-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|topara">Anchors the selection to the current paragraph.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="tochar"> - <property name="label" translatable="yes" context="frmtypepage|tochar">To cha_racter</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">topage</property> - <child internal-child="accessible"> - <object class="AtkObject" id="tochar-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|tochar">Anchors the selection to a character.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="aschar"> - <property name="label" translatable="yes" context="frmtypepage|aschar">_As character</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">topage</property> - <child internal-child="accessible"> - <object class="AtkObject" id="aschar-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|aschar">Anchors the selection as character. The height of the current line is resized to match the height of the selection.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="toframe"> - <property name="label" translatable="yes" context="frmtypepage|toframe">To _frame</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">topage</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|label1">Anchor</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid10"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="horiposft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|horiposft">Hori_zontal</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">horipos</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkLabel" id="horibyft"> + <object class="GtkRadioButton" id="topage"> + <property name="label" translatable="yes" context="frmtypepage|topage">To _page</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|horibyft">b_y</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">byhori</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="vertbyft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|vertbyft">by</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">byvert</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="horitoft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|horitoft">_to</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">horianchor</property> <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="byhori"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="byhori-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|byhori">Enter the amount of space to leave between the left edge of the selected object and the reference point that you select in the To box.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="horianchor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="horianchor-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|horianchor">Select the reference point for the selected horizontal alignment option.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="horipos"> - <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="horipos-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|horipos">Select the horizontal alignment option for the object.</property> + <object class="AtkObject" id="topage-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|topage">Anchors the selection to the current page.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="vertposft"> + <object class="GtkRadioButton" id="topara"> + <property name="label" translatable="yes" context="frmtypepage|topara">To paragrap_h</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|vertposft">_Vertical</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">vertpos</property> <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="vertpos"> - <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="draw_indicator">True</property> + <property name="group">topage</property> <child internal-child="accessible"> - <object class="AtkObject" id="vertpos-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|vertpos">Select the vertical alignment option for the object.</property> + <object class="AtkObject" id="topara-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|topara">Anchors the selection to the current paragraph.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkSpinButton" id="byvert"> + <object class="GtkRadioButton" id="tochar"> + <property name="label" translatable="yes" context="frmtypepage|tochar">To cha_racter</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment4</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="byvert-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|byvert">Enter the amount of space to leave between the top edge of the selected object and the reference point that you select in the To box.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="verttoft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmtypepage|verttoft">t_o</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">vertanchor</property> <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="vertanchor"> - <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="draw_indicator">True</property> + <property name="group">topage</property> <child internal-child="accessible"> - <object class="AtkObject" id="vertanchor-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|vertanchor">Select the reference point for the selected vertical alignment option.</property> + <object class="AtkObject" id="tochar-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|tochar">Anchors the selection to a character.</property> </object> </child> </object> <packing> - <property name="left_attach">5</property> + <property name="left_attach">0</property> <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkCheckButton" id="mirror"> - <property name="label" translatable="yes" context="frmtypepage|mirror">_Mirror on even pages</property> + <object class="GtkRadioButton" id="aschar"> + <property name="label" translatable="yes" context="frmtypepage|aschar">_As character</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="margin-start">12</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> + <property name="group">topage</property> <child internal-child="accessible"> - <object class="AtkObject" id="mirror-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|mirror">Reverses the current horizontal alignment settings on even pages.</property> + <object class="AtkObject" id="aschar-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|aschar">Anchors the selection as character. The height of the current line is resized to match the height of the selection.</property> </object> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">6</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkCheckButton" id="followtextflow"> - <property name="label" translatable="yes" context="frmtypepage|followtextflow">Keep inside text boundaries</property> + <object class="GtkRadioButton" id="toframe"> + <property name="label" translatable="yes" context="frmtypepage|toframe">To _frame</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="margin-start">12</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="followtextflow-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|followtextflow">Keeps the selected object within the layout boundaries of the text that the object is anchored to. To place the selected object anywhere in your document, do not select this option.</property> - </object> - </child> + <property name="group">topage</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">6</property> + <property name="top_attach">4</property> </packing> </child> </object> </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|label1">Anchor</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid10"> + <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="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkLabel" id="horiposft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|horiposft">Hori_zontal</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">horipos</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="horibyft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|horibyft">b_y</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">byhori</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="vertbyft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|vertbyft">by</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">byvert</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="horitoft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|horitoft">_to</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">horianchor</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="byhori"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="byhori-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|byhori">Enter the amount of space to leave between the left edge of the selected object and the reference point that you select in the To box.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="horianchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="horianchor-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|horianchor">Select the reference point for the selected horizontal alignment option.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="horipos"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="horipos-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|horipos">Select the horizontal alignment option for the object.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="vertposft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|vertposft">_Vertical</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">vertpos</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="vertpos"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="vertpos-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|vertpos">Select the vertical alignment option for the object.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="byvert"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment4</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="byvert-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|byvert">Enter the amount of space to leave between the top edge of the selected object and the reference point that you select in the To box.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="verttoft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmtypepage|verttoft">t_o</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">vertanchor</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="vertanchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="vertanchor-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|vertanchor">Select the reference point for the selected vertical alignment option.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="mirror"> + <property name="label" translatable="yes" context="frmtypepage|mirror">_Mirror on even pages</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="mirror-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|mirror">Reverses the current horizontal alignment settings on even pages.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">6</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="followtextflow"> + <property name="label" translatable="yes" context="frmtypepage|followtextflow">Keep inside text boundaries</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="followtextflow-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmtypepage|extended_tip|followtextflow">Keeps the selected object within the layout boundaries of the text that the object is anchored to. To place the selected object anywhere in your document, do not select this option.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">6</property> + </packing> + </child> </object> </child> <child type="label"> diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui b/sw/uiconfig/swriter/ui/mailmerge.ui index 7c42c2060d55..6418e78c1012 100644 --- a/sw/uiconfig/swriter/ui/mailmerge.ui +++ b/sw/uiconfig/swriter/ui/mailmerge.ui @@ -118,31 +118,76 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="valign">start</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkRadioButton" id="all"> + <property name="label" translatable="yes" context="mailmerge|all">_All</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="all-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|all">Processes all the records from the database.</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="GtkRadioButton" id="selected"> + <property name="label" translatable="yes" context="mailmerge|selected">_Selected records</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">all</property> + <child internal-child="accessible"> + <object class="AtkObject" id="selected-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|selected">Processes only the marked records from the database. This option is only available when you have previously marked the necessary records in the database.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkRadioButton" id="all"> - <property name="label" translatable="yes" context="mailmerge|all">_All</property> + <object class="GtkRadioButton" id="rbfrom"> + <property name="label" translatable="yes" context="mailmerge|rbfrom">_From:</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> + <property name="group">all</property> <child internal-child="accessible"> - <object class="AtkObject" id="all-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|all">Processes all the records from the database.</property> + <object class="AtkObject" id="rbfrom-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|rbfrom">Specify the number of the first record to be printed.</property> </object> </child> </object> @@ -153,18 +198,15 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="selected"> - <property name="label" translatable="yes" context="mailmerge|selected">_Selected records</property> + <object class="GtkSpinButton" id="from"> <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">all</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <property name="numeric">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="selected-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|selected">Processes only the marked records from the database. This option is only available when you have previously marked the necessary records in the database.</property> + <object class="AtkObject" id="from-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|from">Specify the number of the first record to be printed.</property> </object> </child> </object> @@ -175,92 +217,44 @@ </packing> </child> <child> - <object class="GtkBox" id="box4"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkRadioButton" id="rbfrom"> - <property name="label" translatable="yes" context="mailmerge|rbfrom">_From:</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">all</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rbfrom-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|rbfrom">Specify the number of the first record to be printed.</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="GtkSpinButton" id="from"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <property name="numeric">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="from-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|from">Specify the number of the first record to be printed.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mailmerge|label3">_To:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">to</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="to"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <property name="numeric">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="to-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|to">Specify the number of the last record to be printed.</property> - </object> - </child> + <property name="label" translatable="yes" context="mailmerge|label3">_To:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">to</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="to"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <property name="numeric">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="to-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|to">Specify the number of the last record to be printed.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> @@ -290,82 +284,32 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box5"> + <object class="GtkBox" id="box6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="box6"> + <object class="GtkRadioButton" id="printer"> + <property name="label" translatable="yes" context="mailmerge|printer">_Printer</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="printer"> - <property name="label" translatable="yes" context="mailmerge|printer">_Printer</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="printer-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|printer">Prints the form letters.</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="GtkRadioButton" id="electronic"> - <property name="label" translatable="yes" context="mailmerge|electronic">_Electronic</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">printer</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="file"> - <property name="label" translatable="yes" context="mailmerge|file">File</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">printer</property> - <child internal-child="accessible"> - <object class="AtkObject" id="file-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|file">Saves the form letters in files.</property> - </object> - </child> + <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="printer-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|printer">Prints the form letters.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> </object> <packing> @@ -375,14 +319,15 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="singlejobs"> - <property name="label" translatable="yes" context="mailmerge|singlejobs">_Single print jobs</property> + <object class="GtkRadioButton" id="electronic"> + <property name="label" translatable="yes" context="mailmerge|electronic">_Electronic</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">printer</property> </object> <packing> <property name="expand">False</property> @@ -391,457 +336,488 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkRadioButton" id="file"> + <property name="label" translatable="yes" context="mailmerge|file">File</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">printer</property> + <child internal-child="accessible"> + <object class="AtkObject" id="file-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|file">Saves the form letters in files.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</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="singlejobs"> + <property name="label" translatable="yes" context="mailmerge|singlejobs">_Single print jobs</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkFrame" id="frame4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkAlignment" id="alignment3"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkFrame" id="frame4"> + <object class="GtkCheckButton" id="generate"> + <property name="label" translatable="yes" context="mailmerge|generate">Generate file name 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="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="generate-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|generate">Generate each file name from data contained in a database.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="fieldlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="mailmerge|fieldlabel">Field:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="pathlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkCheckButton" id="generate"> - <property name="label" translatable="yes" context="mailmerge|generate">Generate file name 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="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="generate-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|generate">Generate each file name from data contained in a database.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="fieldlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="mailmerge|fieldlabel">Field:</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="pathlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="mailmerge|pathlabel">_Path:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">path</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="fileformatlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="mailmerge|fileformatlabel">F_ile format:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fileformat</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="field"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="field-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|field">Uses the content of the selected database field as the file name for the form letter.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="fileformat"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="fileformat-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|fileformat">Select the file format to store the resulting document.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="pathpb"> - <property name="label">_...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="pathpb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|pathpb">Opens the Select Path dialog.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="path"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="path-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|path">Specifies the path to store the form letters.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="subjectlabel"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="mailmerge|subjectlabel">_Subject:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">subject</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="subject"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="attachmentslabel"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="mailmerge|attachmentslabel">Attachments:</property> - <property name="mnemonic_widget">attachments</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="attachments"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkButton" id="attach"> - <property name="label">_...</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="mailformatlabel"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="mailmerge|mailformatlabel">Mail format:</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="address"> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="html"> - <property name="label" translatable="yes" context="mailmerge|html">HTM_L</property> - <property name="visible">True</property> - <property name="sensitive">False</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> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">9</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="rtf"> - <property name="label" translatable="yes" context="mailmerge|rtf">RT_F</property> - <property name="visible">True</property> - <property name="sensitive">False</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> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">10</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="swriter"> - <property name="label" translatable="yes" context="mailmerge|swriter">%PRODUCTNAME Writer</property> - <property name="visible">True</property> - <property name="sensitive">False</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> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">11</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="passwd-check"> - <property name="label" translatable="yes" context="mailmerge|passwd-check">Save with password</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="passwd-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="mailmerge|passwd-label">Password field:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">passwd-combobox</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="passwd-combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes" context="mailmerge|pathlabel">_Path:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">path</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="fileformatlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="mailmerge|fileformatlabel">F_ile format:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fileformat</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="field-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|field">Uses the content of the selected database field as the file name for the form letter.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="fileformat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fileformat-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|fileformat">Select the file format to store the resulting document.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="pathpb"> + <property name="label">_...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="pathpb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|pathpb">Opens the Select Path dialog.</property> </object> </child> - <child type="label"> - <object class="GtkBox" id="box7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="singledocument"> - <property name="label" translatable="yes" context="mailmerge|singledocument">S_ave as single document</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="singledocument-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|singledocument">Create one big document containing all data records.</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="GtkRadioButton" id="individualdocuments"> - <property name="label" translatable="yes" context="mailmerge|individualdocuments">Sa_ve as individual documents</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">singledocument</property> - <child internal-child="accessible"> - <object class="AtkObject" id="individualdocuments-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|individualdocuments">Create one document for every one data record.</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">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="path"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="path-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|path">Specifies the path to store the form letters.</property> </object> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="subjectlabel"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="mailmerge|subjectlabel">_Subject:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">subject</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="subject"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="attachmentslabel"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="mailmerge|attachmentslabel">Attachments:</property> + <property name="mnemonic_widget">attachments</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="attachments"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkButton" id="attach"> + <property name="label">_...</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="mailformatlabel"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="mailmerge|mailformatlabel">Mail format:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="address"> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="html"> + <property name="label" translatable="yes" context="mailmerge|html">HTM_L</property> + <property name="visible">True</property> + <property name="sensitive">False</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> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="rtf"> + <property name="label" translatable="yes" context="mailmerge|rtf">RT_F</property> + <property name="visible">True</property> + <property name="sensitive">False</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> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="swriter"> + <property name="label" translatable="yes" context="mailmerge|swriter">%PRODUCTNAME Writer</property> + <property name="visible">True</property> + <property name="sensitive">False</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> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">11</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="passwd-check"> + <property name="label" translatable="yes" context="mailmerge|passwd-check">Save with password</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="passwd-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="mailmerge|passwd-label">Password field:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">passwd-combobox</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="passwd-combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="savemergeddoclabel"> + <object class="GtkBox" id="box7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mailmerge|savemergeddoclabel">Save Merged Document</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="singledocument"> + <property name="label" translatable="yes" context="mailmerge|singledocument">S_ave as single document</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="singledocument-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|singledocument">Create one big document containing all data records.</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="GtkRadioButton" id="individualdocuments"> + <property name="label" translatable="yes" context="mailmerge|individualdocuments">Sa_ve as individual documents</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">singledocument</property> + <child internal-child="accessible"> + <object class="AtkObject" id="individualdocuments-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mailmerge|extended_tip|individualdocuments">Create one document for every one data record.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel" id="savemergeddoclabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mailmerge|savemergeddoclabel">Save Merged Document</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui index 2ab4c9bcf9af..9c71a7a07d21 100644 --- a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui +++ b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui @@ -31,153 +31,96 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <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="left_padding">12</property> + <property name="row_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="step1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">12</property> + <property name="column_spacing">12</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="step1"> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkButton" id="addresslist"> + <property name="label" translatable="yes" context="mmaddressblockpage|addresslist">Select A_ddress List...</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkButton" id="addresslist"> - <property name="label" translatable="yes" context="mmaddressblockpage|addresslist">Select A_ddress List...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="addresslist-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|addresslist">Opens the Select Address List dialog, where you can choose a data source for the addresses, add new addresses, or type in a new address list.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="differentlist"> - <property name="label" translatable="yes" context="mmaddressblockpage|differentlist">Select Different A_ddress List...</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="addresslist-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|addresslist">Opens the Select Address List dialog, where you can choose a data source for the addresses, add new addresses, or type in a new address list.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="currentaddress"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmaddressblockpage|currentaddress">Current address list: %1</property> - <property name="xalign">1</property> + <object class="GtkButton" id="differentlist"> + <property name="label" translatable="yes" context="mmaddressblockpage|differentlist">Select Different A_ddress List...</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="mmaddressblockpage|label2">Select the address list containing the address data you want to use. This data is needed to create the address block.</property> - <property name="wrap">True</property> - <property name="width_chars">40</property> - <property name="max_width_chars">40</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmaddressblockpage|label3">1.</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">0</property> </packing> </child> <child> + <object class="GtkLabel" id="currentaddress"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmaddressblockpage|currentaddress">Current address list: %1</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="step3"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="column_spacing">12</property> <child> - <object class="GtkButton" id="assign"> - <property name="label" translatable="yes" context="mmaddressblockpage|assign">Match _Fields...</property> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">end</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="assign-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|assign">Opens the Match Fields dialog.</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="mmaddressblockpage|label2">Select the address list containing the address data you want to use. This data is needed to create the address block.</property> + <property name="wrap">True</property> + <property name="width_chars">40</property> + <property name="max_width_chars">40</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -185,42 +128,12 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="mmaddressblockpage|label4">Match the field name used in the mail merge to the column headers in your data source.</property> - <property name="wrap">True</property> - <property name="width_chars">40</property> - <property name="max_width_chars">40</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="settingsft1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmaddressblockpage|settingsft1">3.</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="mmaddressblockpage|label3">1.</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -230,309 +143,308 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="step3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkButton" id="assign"> + <property name="label" translatable="yes" context="mmaddressblockpage|assign">Match _Fields...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="assign-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|assign">Opens the Match Fields dialog.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="step2"> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="settingsft"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmaddressblockpage|settingsft">2.</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="mmaddressblockpage|label4">Match the field name used in the mail merge to the column headers in your data source.</property> + <property name="wrap">True</property> + <property name="width_chars">40</property> + <property name="max_width_chars">40</property> <property name="xalign">0</property> <property name="yalign">0</property> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="height">2</property> </packing> </child> <child> - <object class="GtkCheckButton" id="address"> - <property name="label" translatable="yes" context="mmaddressblockpage|address">_This document shall contain an address block</property> + <object class="GtkLabel" id="settingsft1"> <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="can_focus">False</property> + <property name="label" translatable="yes" context="mmaddressblockpage|settingsft1">3.</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="address-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|address">Adds an address block to the mail merge document.</property> - </object> - </child> + <property name="yalign">0</property> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="step2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="settingsft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmaddressblockpage|settingsft">2.</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="address"> + <property name="label" translatable="yes" context="mmaddressblockpage|address">_This document shall contain an address block</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="address-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|address">Adds an address block to the mail merge document.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="left_padding">12</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkButton" id="settings"> + <property name="label" translatable="yes" context="mmaddressblockpage|settings">_More...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="settings-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|settings">Opens the Select Address Block dialog.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="settingspreviewwin"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="column_spacing">12</property> <child> - <object class="GtkButton" id="settings"> - <property name="label" translatable="yes" context="mmaddressblockpage|settings">_More...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">end</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="settings-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|settings">Opens the Select Address Block dialog.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="settingspreviewwin"> + <object class="GtkDrawingArea" id="settingspreview"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="settingspreview"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="settingspreview-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|settingspreview">Select the address block layout that you want to use.</property> - </object> - </child> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="settingspreview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|settingspreview">Select the address block layout that you want to use.</property> </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="hideempty"> - <property name="label" translatable="yes" context="mmaddressblockpage|hideempty">_Suppress lines with just empty fields</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="hideempty-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|hideempty">Enable to leave empty lines out of the address.</property> - </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="hideempty"> + <property name="label" translatable="yes" context="mmaddressblockpage|hideempty">_Suppress lines with just empty fields</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="hideempty-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|hideempty">Enable to leave empty lines out of the address.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> <property name="top_attach">1</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">1</property> </packing> </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="step4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="step4"> + <object class="GtkGrid" id="grid9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="row_spacing">6</property> + <property name="margin-start">12</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkScrolledWindow" id="addresspreviewwin"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="left_padding">12</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> <child> - <object class="GtkScrolledWindow" id="addresspreviewwin"> + <object class="GtkDrawingArea" id="addresspreview"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="addresspreview"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="addresspreview-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|addresspreview">Shows a preview of the address block template filled with data.</property> - </object> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkButton" id="prev"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="mmaddressblockpage|prev|tooltip_text">Preview Previous Address Block</property> - <property name="image">image1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="prev-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|prev">Use the browse buttons to preview the information from the previous or next data record.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="next"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="mmaddressblockpage|next|tooltip_text">Preview Next Address Block</property> - <property name="image">image2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="next-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|next">Use the browse buttons to preview the information from the previous or next data record.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="documentindex"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="mmaddressblockpage|documentindex">Document: %1</property> - <property name="xalign">1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="addresspreview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|addresspreview">Shows a preview of the address block template filled with data.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkGrid" id="grid10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="column_spacing">12</property> + <property name="column_spacing">6</property> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkButton" id="prev"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="mmaddressblockpage|label6">Check if the address data matches correctly.</property> - <property name="wrap">True</property> - <property name="max_width_chars">56</property> - <property name="xalign">0</property> - <property name="yalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="mmaddressblockpage|prev|tooltip_text">Preview Previous Address Block</property> + <property name="image">image1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="prev-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|prev">Use the browse buttons to preview the information from the previous or next data record.</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> @@ -540,12 +452,30 @@ </packing> </child> <child> - <object class="GtkLabel" id="settingsft2"> + <object class="GtkButton" id="next"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="mmaddressblockpage|next|tooltip_text">Preview Next Address Block</property> + <property name="image">image2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="next-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmaddressblockpage|extended_tip|next">Use the browse buttons to preview the information from the previous or next data record.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="documentindex"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmaddressblockpage|settingsft2">4.</property> - <property name="xalign">0</property> - <property name="yalign">0</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="mmaddressblockpage|documentindex">Document: %1</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -555,16 +485,62 @@ </object> <packing> <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </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="grid6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="mmaddressblockpage|label6">Check if the address data matches correctly.</property> + <property name="wrap">True</property> + <property name="max_width_chars">56</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="settingsft2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmaddressblockpage|settingsft2">4.</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> <property name="top_attach">0</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/mmlayoutpage.ui b/sw/uiconfig/swriter/ui/mmlayoutpage.ui index 447fc6b0dd4d..1458022557de 100644 --- a/sw/uiconfig/swriter/ui/mmlayoutpage.ui +++ b/sw/uiconfig/swriter/ui/mmlayoutpage.ui @@ -30,259 +30,125 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <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="left_padding">12</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="column_spacing">12</property> + <property name="row_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkFrame" id="addresspos"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="addresspos"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmlayoutpage|label6">_From top</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">top</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="top"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text" translatable="yes" context="mmlayoutpage|top">2.00</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> - <property name="value">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="top-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|top">Enter the amount of space to leave between the top edge of the page and the top edge of the address block.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="mmlayoutpage|label6">_From top</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">top</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="top"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text" translatable="yes" context="mmlayoutpage|top">2.00</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + <property name="value">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="top-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|top">Enter the amount of space to leave between the top edge of the page and the top edge of the address block.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkCheckButton" id="align"> - <property name="label" translatable="yes" context="mmlayoutpage|align">Align to text body</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="align-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|align">Aligns the frame that contains the address block to the left page margin.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkSpinButton" id="left"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text">2.00</property> - <property name="adjustment">adjustment2</property> - <property name="digits">2</property> - <property name="value">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="left-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|left">Enter the amount of space to leave between the left edge of the page and the left edge of the address block.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="leftft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="mmlayoutpage|leftft">From _left</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">left</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmlayoutpage|label2">Address Block Position</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="greetingspos"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <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="grid9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="align"> + <property name="label" translatable="yes" context="mmlayoutpage|align">Align to text body</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="align-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|align">Aligns the frame that contains the address block to the left page margin.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkGrid" id="grid10"> <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="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmlayoutpage|label4">Move</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">up</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmlayoutpage|label5">Move</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">down</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="up"> - <property name="label" translatable="yes" context="mmlayoutpage|up">_Up</property> + <object class="GtkSpinButton" id="left"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="activates_default">True</property> + <property name="text">2.00</property> + <property name="adjustment">adjustment2</property> + <property name="digits">2</property> + <property name="value">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="up-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|up">Moves the salutation up.</property> + <object class="AtkObject" id="left-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|left">Enter the amount of space to leave between the left edge of the page and the left edge of the address block.</property> </object> </child> </object> @@ -292,42 +158,55 @@ </packing> </child> <child> - <object class="GtkButton" id="down"> - <property name="label" translatable="yes" context="mmlayoutpage|down">_Down</property> + <object class="GtkBox" id="box1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="down-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|down">Moves the salutation down.</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="leftft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="mmlayoutpage|leftft">From _left</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">left</property> + <property name="xalign">0</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmlayoutpage|label3">Salutation Position</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmlayoutpage|label2">Address Block Position</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> </child> </object> <packing> @@ -336,27 +215,27 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkFrame" id="greetingspos"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> + <property name="row_spacing">6</property> <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkLabel" id="label7"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmlayoutpage|label7">_Zoom</property> + <property name="label" translatable="yes" context="mmlayoutpage|label4">Move</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">zoom</property> + <property name="mnemonic_widget">up</property> <property name="xalign">0</property> </object> <packing> @@ -365,15 +244,29 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="zoom"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <items> - <item translatable="yes" context="mmlayoutpage|zoom">Entire page</item> - </items> + <property name="label" translatable="yes" context="mmlayoutpage|label5">Move</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">down</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="up"> + <property name="label" translatable="yes" context="mmlayoutpage|up">_Up</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="zoom-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|zoom">Select a magnification for the print preview.</property> + <object class="AtkObject" id="up-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|up">Moves the salutation up.</property> </object> </child> </object> @@ -382,56 +275,143 @@ <property name="top_attach">0</property> </packing> </child> + <child> + <object class="GtkButton" id="down"> + <property name="label" translatable="yes" context="mmlayoutpage|down">_Down</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="down-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|down">Moves the salutation down.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmlayoutpage|label3">Salutation Position</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmlayoutpage|label7">_Zoom</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">zoom</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkScrolledWindow"> + <object class="GtkComboBoxText" id="zoom"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="mmlayoutpage|zoom">Entire page</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="zoom-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|zoom">Select a magnification for the print preview.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</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="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="example"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="example"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="no_show_all">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="example-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="mmlayoutpage|example-atkobject">Preview</property> - <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|example">Provides a preview of the salutation positioning on the page.</property> - </object> - </child> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="no_show_all">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="example-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="mmlayoutpage|example-atkobject">Preview</property> + <property name="AtkObject::accessible-description" translatable="yes" context="mmlayoutpage|extended_tip|example">Provides a preview of the salutation positioning on the page.</property> </object> </child> </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/mmresultemaildialog.ui b/sw/uiconfig/swriter/ui/mmresultemaildialog.ui index 69d09238201e..dc01beb3bbad 100644 --- a/sw/uiconfig/swriter/ui/mmresultemaildialog.ui +++ b/sw/uiconfig/swriter/ui/mmresultemaildialog.ui @@ -94,260 +94,247 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <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="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="mailtoft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmresultemaildialog|mailtoft">T_o</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mailto</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="mailto"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="mailtoft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmresultemaildialog|mailtoft">T_o</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mailto</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="mailto"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="mailto-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|mailto">Select the database field that contains the email address of the recipient.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="copyto"> - <property name="label" translatable="yes" context="mmresultemaildialog|copyto">_Copy to...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="copyto-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|copyto">Opens the Copy To dialog where you can specify one or more CC or BCC addresses.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="subjectft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmresultemaildialog|subjectft">S_ubject</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">subject</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="subject"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="subject-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|subject">Enter the subject line for the email messages.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="sendasft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmresultemaildialog|sendasft">Sen_d as</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">sendas</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="sendas"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item id="1" translatable="yes" context="mmresultemaildialog|liststore1">OpenDocument Text</item> - <item id="2" translatable="yes" context="mmresultemaildialog|liststore1">Adobe PDF-Document</item> - <item id="3" translatable="yes" context="mmresultemaildialog|liststore1">Microsoft Word Document</item> - <item id="4" translatable="yes" context="mmresultemaildialog|liststore1">HTML Message</item> - <item id="5" translatable="yes" context="mmresultemaildialog|liststore1">Plain Text</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="sendas-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|sendas">Select the mail format for the email messages.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="sendassettings"> - <property name="label" translatable="yes" context="mmresultemaildialog|sendassettings">Pr_operties...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">False</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="sendassettings-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|sendassettings">Opens the E-Mail Message dialog where you can enter the email message for the mail merge files that are sent as attachments.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="passwordft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmresultemaildialog|passwordft">Password</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">password</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="mailto-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|mailto">Select the database field that contains the email address of the recipient.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="password"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="copyto"> + <property name="label" translatable="yes" context="mmresultemaildialog|copyto">_Copy to...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="copyto-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|copyto">Opens the Copy To dialog where you can specify one or more CC or BCC addresses.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="passwordcb"> - <property name="label" translatable="yes" context="mmresultemaildialog|passwordcb">Save with password</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="subjectft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmresultemaildialog|subjectft">S_ubject</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">subject</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="subject"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="subject-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|subject">Enter the subject line for the email messages.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> </object> <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="sendasft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmresultemaildialog|sendasft">Sen_d as</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">sendas</property> + <property name="xalign">0</property> + </object> + <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkFrame" id="attachgroup"> + <object class="GtkComboBoxText" id="sendas"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkEntry" id="attach"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="attach-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|attach">Shows the name of the attachment.</property> - </object> - </child> - </object> - </child> + <property name="hexpand">True</property> + <items> + <item id="1" translatable="yes" context="mmresultemaildialog|liststore1">OpenDocument Text</item> + <item id="2" translatable="yes" context="mmresultemaildialog|liststore1">Adobe PDF-Document</item> + <item id="3" translatable="yes" context="mmresultemaildialog|liststore1">Microsoft Word Document</item> + <item id="4" translatable="yes" context="mmresultemaildialog|liststore1">HTML Message</item> + <item id="5" translatable="yes" context="mmresultemaildialog|liststore1">Plain Text</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="sendas-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|sendas">Select the mail format for the email messages.</property> </object> </child> - <child type="label"> - <object class="GtkLabel" id="attachft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmresultemaildialog|attachft">Name of the a_ttachment</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">attach</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="sendassettings"> + <property name="label" translatable="yes" context="mmresultemaildialog|sendassettings">Pr_operties...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">False</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="sendassettings-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|sendassettings">Opens the E-Mail Message dialog where you can enter the email message for the mail merge files that are sent as attachments.</property> </object> </child> </object> <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="passwordft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmresultemaildialog|passwordft">Password</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">password</property> + <property name="xalign">0</property> + </object> + <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="password"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="passwordcb"> + <property name="label" translatable="yes" context="mmresultemaildialog|passwordcb">Save with password</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="attachgroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkEntry" id="attach"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="margin-start">12</property> + <child internal-child="accessible"> + <object class="AtkObject" id="attach-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|attach">Shows the name of the attachment.</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="attachft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmresultemaildialog|attachft">Name of the a_ttachment</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">attach</property> + <property name="xalign">0</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -375,128 +362,122 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkRadioButton" id="sendallrb"> + <property name="label" translatable="yes" context="mmresultemaildialog|sendallrb">S_end all documents</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="sendallrb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|sendallrb">Select to send emails to all recipients.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkRadioButton" id="sendallrb"> - <property name="label" translatable="yes" context="mmresultemaildialog|sendallrb">S_end all documents</property> + <object class="GtkRadioButton" id="fromrb"> + <property name="label" translatable="yes" context="mmresultemaildialog|fromrb">_From</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> + <property name="group">sendallrb</property> + <accessibility> + <relation type="label-for" target="from"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="sendallrb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|sendallrb">Select to send emails to all recipients.</property> + <object class="AtkObject" id="fromrb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|fromrb">Selects a range of records starting at the record number in the From box and ending at the record number in the To box.</property> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="toft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="fromrb"> - <property name="label" translatable="yes" context="mmresultemaildialog|fromrb">_From</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">sendallrb</property> - <accessibility> - <relation type="label-for" target="from"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="fromrb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|fromrb">Selects a range of records starting at the record number in the From box and ending at the record number in the To box.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="toft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmresultemaildialog|toft">_To</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">to</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="from"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text">1</property> - <property name="adjustment">adjustment2</property> - <accessibility> - <relation type="labelled-by" target="fromrb"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="from-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|from">Enter the number of the first record to include in the mail merge.</property> - </object> - </child> + <property name="label" translatable="yes" context="mmresultemaildialog|toft">_To</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">to</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="from"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text">1</property> + <property name="adjustment">adjustment2</property> + <accessibility> + <relation type="labelled-by" target="fromrb"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="from-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|from">Enter the number of the first record to include in the mail merge.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="to"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text">1</property> - <property name="adjustment">adjustment1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="to-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|to">Enter the number of the last record to include in the mail merge.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="to"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text">1</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="to-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultemaildialog|extended_tip|to">Enter the number of the last record to include in the mail merge.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">3</property> + <property name="top_attach">0</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/mmresultprintdialog.ui b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui index 2c68807be88e..bff800b3ff63 100644 --- a/sw/uiconfig/swriter/ui/mmresultprintdialog.ui +++ b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui @@ -96,70 +96,63 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> <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="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="printerft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmresultprintdialog|printerft">_Printer</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">printers</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="printers"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="printerft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmresultprintdialog|printerft">_Printer</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">printers</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="printers"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="printers-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printers">Select the printer.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="printers-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printers">Select the printer.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="printersettings"> - <property name="label" translatable="yes" context="mmresultprintdialog|printersettings">P_roperties...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="printersettings-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printersettings">Changes the printer properties.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="printersettings"> + <property name="label" translatable="yes" context="mmresultprintdialog|printersettings">P_roperties...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="printersettings-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printersettings">Changes the printer properties.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -187,135 +180,123 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkRadioButton" id="printallrb"> + <property name="label" translatable="yes" context="mmresultprintdialog|printallrb">Print _all documents</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> + <property name="group">fromrb</property> + <child internal-child="accessible"> + <object class="AtkObject" id="printallrb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printallrb">Prints documents for all recipients.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkRadioButton" id="fromrb"> + <property name="label" translatable="yes" context="mmresultprintdialog|fromrb">_From</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkRadioButton" id="printallrb"> - <property name="label" translatable="yes" context="mmresultprintdialog|printallrb">Print _all documents</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> - <property name="group">fromrb</property> - <child internal-child="accessible"> - <object class="AtkObject" id="printallrb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printallrb">Prints documents for all recipients.</property> - </object> - </child> + <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">printallrb</property> + <accessibility> + <relation type="label-for" target="from"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="fromrb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|fromrb">Selects a range of records starting at the record number in the From box and ending at the record number in the To box.</property> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="toft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="fromrb"> - <property name="label" translatable="yes" context="mmresultprintdialog|fromrb">_From</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">printallrb</property> - <accessibility> - <relation type="label-for" target="from"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="fromrb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|fromrb">Selects a range of records starting at the record number in the From box and ending at the record number in the To box.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="toft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmresultprintdialog|toft">_To</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">to</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="from"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text">1</property> - <property name="adjustment">adjustment1</property> - <property name="value">1</property> - <accessibility> - <relation type="labelled-by" target="fromrb"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="from-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|from">Enter the number of the first record to include in the mail merge.</property> - </object> - </child> + <property name="label" translatable="yes" context="mmresultprintdialog|toft">_To</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">to</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="from"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text">1</property> + <property name="adjustment">adjustment1</property> + <property name="value">1</property> + <accessibility> + <relation type="labelled-by" target="fromrb"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="from-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|from">Enter the number of the first record to include in the mail merge.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="to"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text">1</property> - <property name="adjustment">adjustment2</property> - <property name="value">1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="to-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|to">Enter the number of the last record to include in the mail merge.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="to"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text">1</property> + <property name="adjustment">adjustment2</property> + <property name="value">1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="to-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|to">Enter the number of the last record to include in the mail merge.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">3</property> + <property name="top_attach">0</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/mmsalutationpage.ui b/sw/uiconfig/swriter/ui/mmsalutationpage.ui index 6d6cd9a6f8dc..be3d0fd32613 100644 --- a/sw/uiconfig/swriter/ui/mmsalutationpage.ui +++ b/sw/uiconfig/swriter/ui/mmsalutationpage.ui @@ -31,164 +31,152 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <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="left_padding">12</property> + <property name="row_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="previewft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmsalutationpage|previewft">Preview</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">preview</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="previewft"> + <object class="GtkButton" id="assign"> + <property name="label" translatable="yes" context="mmsalutationpage|assign">_Match fields...</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmsalutationpage|previewft">Preview</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">preview</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="assign-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|assign">Opens the Match Fields dialog.</property> + </object> + </child> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">0</property> + <property name="height">2</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkScrolledWindow" id="previewwin"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkButton" id="assign"> - <property name="label" translatable="yes" context="mmsalutationpage|assign">_Match fields...</property> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="preview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|preview">Displays a preview of the salutation.</property> + </object> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkButton" id="prev"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="valign">start</property> - <property name="use_underline">True</property> + <property name="tooltip_text" translatable="yes" context="mmsalutationpage|prev|tooltip_text">Preview Previous Address Block</property> + <property name="image">image1</property> <child internal-child="accessible"> - <object class="AtkObject" id="assign-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|assign">Opens the Match Fields dialog.</property> + <object class="AtkObject" id="prev-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|prev">Use the browse buttons to preview the information from the previous or next data record.</property> </object> </child> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="height">2</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="previewwin"> + <object class="GtkButton" id="next"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="preview"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="preview-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|preview">Displays a preview of the salutation.</property> - </object> - </child> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="mmsalutationpage|next|tooltip_text">Preview Next Address Block</property> + <property name="image">image2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="next-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|next">Use the browse buttons to preview the information from the previous or next data record.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">2</property> <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid10"> + <object class="GtkLabel" id="documentindex"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkButton" id="prev"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="mmsalutationpage|prev|tooltip_text">Preview Previous Address Block</property> - <property name="image">image1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="prev-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|prev">Use the browse buttons to preview the information from the previous or next data record.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="next"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="mmsalutationpage|next|tooltip_text">Preview Next Address Block</property> - <property name="image">image2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="next-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|next">Use the browse buttons to preview the information from the previous or next data record.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="documentindex"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="mmsalutationpage|documentindex">Document: %1</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="mmsalutationpage|documentindex">Document: %1</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> @@ -203,53 +191,134 @@ <property name="top_attach">1</property> </packing> </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="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="greeting"> + <property name="label" translatable="yes" context="mmsalutationpage|greeting">This document should contain a salutation</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="greeting-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|greeting">Adds a salutation.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> + <property name="margin-start">12</property> <child> - <object class="GtkCheckButton" id="greeting"> - <property name="label" translatable="yes" context="mmsalutationpage|greeting">This document should contain a salutation</property> + <object class="GtkLabel" id="generalft"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmsalutationpage|generalft">General salutation</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">general</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="general"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">True</property> + </object> + </child> <child internal-child="accessible"> - <object class="AtkObject" id="greeting-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|greeting">Adds a salutation.</property> + <object class="AtkObject" id="general-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|general">Select the default salutation that is used when you do not specify a personalized salutation.</property> </object> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkGrid" id="grid8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="row_homogeneous">True</property> + <property name="margin-start">12</property> <child> - <object class="GtkLabel" id="generalft"> + <object class="GtkLabel" id="femalefi"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmsalutationpage|generalft">General salutation</property> + <property name="label" translatable="yes" context="mmsalutationpage|femalefi">Address list field indicating a female recipient</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="femaleft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmsalutationpage|femaleft">_Female</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">general</property> + <property name="mnemonic_widget">female</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="maleft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmsalutationpage|maleft">_Male</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">male</property> <property name="xalign">0</property> </object> <packing> @@ -258,285 +327,194 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="general"> + <object class="GtkLabel" id="femalecolft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> + <property name="label" translatable="yes" context="mmsalutationpage|femalecolft">Field name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">femalecol</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="femalefieldft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmsalutationpage|femalefieldft">Field value</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">femalefield</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="newfemale"> + <property name="label" translatable="yes" context="mmsalutationpage|newfemale">_New...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="newfemale-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|newfemale">Opens the Custom Salutation (Female recipient) dialog.</property> </object> </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="newmale"> + <property name="label" translatable="yes" context="mmsalutationpage|newmale">N_ew...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="use_underline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="general-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|general">Select the default salutation that is used when you do not specify a personalized salutation.</property> + <object class="AtkObject" id="newmale-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|newmale">Opens the Custom Salutation (Male recipient) dialog.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkComboBoxText" id="female"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="left_padding">12</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="row_homogeneous">True</property> - <child> - <object class="GtkLabel" id="femalefi"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmsalutationpage|femalefi">Address list field indicating a female recipient</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="femaleft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmsalutationpage|femaleft">_Female</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">female</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="maleft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmsalutationpage|maleft">_Male</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">male</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="femalecolft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmsalutationpage|femalecolft">Field name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">femalecol</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="femalefieldft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmsalutationpage|femalefieldft">Field value</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">femalefield</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkButton" id="newfemale"> - <property name="label" translatable="yes" context="mmsalutationpage|newfemale">_New...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="newfemale-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|newfemale">Opens the Custom Salutation (Female recipient) dialog.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="newmale"> - <property name="label" translatable="yes" context="mmsalutationpage|newmale">N_ew...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="newmale-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|newmale">Opens the Custom Salutation (Male recipient) dialog.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="female"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="female-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|female">Select the personalized greeting for a female recipient.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="male"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="male-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|male">Select the personalized greeting for a male recipient.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="femalecol"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="femalecol-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|femalecol">Select the field name of the address database field that contains the gender information.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="femalefield"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry2"> - <property name="can_focus">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="femalefield-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|femalefield">Select the field value that indicates the gender of the recipient.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="female-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|female">Select the personalized greeting for a female recipient.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="personalized"> - <property name="label" translatable="yes" context="mmsalutationpage|personalized">Insert personalized salutation</property> - <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="male"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="male-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|male">Select the personalized greeting for a male recipient.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="femalecol"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="femalecol-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|femalecol">Select the field name of the address database field that contains the gender information.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="femalefield"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry2"> <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="personalized-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|personalized">Adds a personalized salutation to the mail merge document. To use the default salutation, clear this check box.</property> - </object> - </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="femalefield-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|femalefield">Select the field value that indicates the gender of the recipient.</property> + </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left_attach">1</property> + <property name="top_attach">4</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="personalized"> + <property name="label" translatable="yes" context="mmsalutationpage|personalized">Insert personalized salutation</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="personalized-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmsalutationpage|extended_tip|personalized">Adds a personalized salutation to the mail merge document. To use the default salutation, clear this check box.</property> + </object> + </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">1</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui b/sw/uiconfig/swriter/ui/optcaptionpage.ui index cbb85c77867f..1aa746a56baf 100644 --- a/sw/uiconfig/swriter/ui/optcaptionpage.ui +++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui @@ -44,181 +44,174 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optcaptionpage|label7">Category:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">category</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="numberingft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optcaptionpage|numberingft">_Numbering:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numbering</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="numseparatorft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optcaptionpage|numseparatorft">Numbering separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numseparator</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="separatorft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optcaptionpage|separatorft">Separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">separator</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optcaptionpage|label18">Position:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">position</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="position"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcaptionpage|label7">Category:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">category</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="numberingft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcaptionpage|numberingft">_Numbering:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numbering</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="numseparatorft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcaptionpage|numseparatorft">Numbering separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numseparator</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="separatorft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcaptionpage|separatorft">Separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">separator</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label18"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcaptionpage|label18">Position:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">position</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="position-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|position">Determines the position of the caption with respect to the object.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="position"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="position-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|position">Determines the position of the caption with respect to the object.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="separator"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="separator-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|separator">Defines the character to be displayed after the number of the heading or chapter level.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkEntry" id="separator"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="separator-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|separator">Defines the character to be displayed after the number of the heading or chapter level.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="numseparator"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="text" translatable="yes" context="optcaptionpage|numseparator">. </property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="numbering"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="numbering-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numbering">Specifies the type of numbering required.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkEntry" id="numseparator"> - <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="category"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> <property name="activates_default">True</property> - <property name="text" translatable="yes" context="optcaptionpage|numseparator">. </property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="numbering"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="numbering-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numbering">Specifies the type of numbering required.</property> - </object> - </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="category"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="category-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|category">Specifies the category of the selected object.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="category-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|category">Specifies the category of the selected object.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -246,87 +239,80 @@ <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="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optcaptionpage|label4">Level:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">level</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optcaptionpage|label6">Separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">chapseparator</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="chapseparator"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcaptionpage|label4">Level:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">level</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcaptionpage|label6">Separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">chapseparator</property> - <property name="xalign">0</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="chapseparator-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|chapseparator">Defines the character to be displayed after the number of the heading or chapter level.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="chapseparator"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="chapseparator-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|chapseparator">Defines the character to be displayed after the number of the heading or chapter level.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="level"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="optcaptionpage|level">None</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="level-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|level">Specifies the headings or chapter levels where you want the numbering to start.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="level"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="optcaptionpage|level">None</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="level-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|level">Specifies the headings or chapter levels where you want the numbering to start.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -354,75 +340,68 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optcaptionpage|label3">Character style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">charstyle</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkComboBoxText" id="charstyle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcaptionpage|label3">Character style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">charstyle</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="charstyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="optcaptionpage|charstyle">None</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="charstyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|charstyle">Specifies the character style of the caption paragraph.</property> - </object> - </child> + <items> + <item translatable="yes" context="optcaptionpage|charstyle">None</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="charstyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|charstyle">Specifies the character style of the caption paragraph.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="applyborder"> - <property name="label" translatable="yes" context="optcaptionpage|applyborder">Apply border and shadow</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="applyborder-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|applyborder">Applies the border and shadow of the object to the caption frame.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="applyborder"> + <property name="label" translatable="yes" context="optcaptionpage|applyborder">Apply border and shadow</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="applyborder-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|applyborder">Applies the border and shadow of the object to the caption frame.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> </child> </object> </child> @@ -462,68 +441,62 @@ <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="top_padding">6</property> - <property name="left_padding">12</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="objects"> <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="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</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-selection1"/> + </child> <child> - <object class="GtkTreeView" id="objects"> - <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-selection1"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer2"/> - <attributes> - <attribute name="active">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererToggle" id="cellrenderer2"/> + <attributes> + <attribute name="active">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">0</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">0</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer1"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="objects-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|objects">Select the object type for which the AutoCaption settings are to be valid.</property> - </object> + <object class="GtkCellRendererText" id="cellrenderer1"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="objects-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|objects">Select the object type for which the AutoCaption settings are to be valid.</property> + </object> + </child> </object> </child> </object> @@ -584,22 +557,16 @@ when inserting:</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkComboBoxText" id="captionorder"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkComboBoxText" id="captionorder"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="optcaptionpage|captionorder">Category first</item> - <item translatable="yes" context="optcaptionpage|captionorder">Numbering first</item> - </items> - </object> - </child> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <items> + <item translatable="yes" context="optcaptionpage|captionorder">Category first</item> + <item translatable="yes" context="optcaptionpage|captionorder">Numbering first</item> + </items> </object> </child> <child type="label"> diff --git a/sw/uiconfig/swriter/ui/optcomparison.ui b/sw/uiconfig/swriter/ui/optcomparison.ui index a992373e1b38..2d207dbc7c9c 100644 --- a/sw/uiconfig/swriter/ui/optcomparison.ui +++ b/sw/uiconfig/swriter/ui/optcomparison.ui @@ -22,66 +22,60 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">5</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkRadioButton" id="auto"> + <property name="label" translatable="yes" context="optcomparison|auto">A_uto</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="auto"> - <property name="label" translatable="yes" context="optcomparison|auto">A_uto</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> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="byword"> - <property name="label" translatable="yes" context="optcomparison|byword">By w_ord</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">auto</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="bycharacter"> - <property name="label" translatable="yes" context="optcomparison|bycharacter">By _character</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">auto</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> + <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> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="byword"> + <property name="label" translatable="yes" context="optcomparison|byword">By w_ord</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">auto</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="bycharacter"> + <property name="label" translatable="yes" context="optcomparison|bycharacter">By _character</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">auto</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -109,84 +103,78 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="ignore"> + <property name="label" translatable="yes" context="optcomparison|ignore">Ignore _pieces of length</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> + </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="grid2"> + <object class="GtkCheckButton" id="useRSID"> + <property name="label" translatable="yes" context="optcomparison|useRSID">Take it into account when comparing</property> <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="GtkCheckButton" id="ignore"> - <property name="label" translatable="yes" context="optcomparison|ignore">Ignore _pieces of length</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> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="useRSID"> - <property name="label" translatable="yes" context="optcomparison|useRSID">Take it into account when comparing</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="image_position">right</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="ignorelen"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="storeRSID"> - <property name="label" translatable="yes" context="optcomparison|storeRSID">Store it when changing the document</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="image_position">right</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <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="image_position">right</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="ignorelen"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="storeRSID"> + <property name="label" translatable="yes" context="optcomparison|storeRSID">Store it when changing the document</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="image_position">right</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui index 0416eab4a2c6..dc38c88800e3 100644 --- a/sw/uiconfig/swriter/ui/optcompatpage.ui +++ b/sw/uiconfig/swriter/ui/optcompatpage.ui @@ -47,88 +47,82 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="row_spacing">5</property> <property name="hexpand">True</property> <property name="vexpand">False</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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkScrolledWindow" id="globaloptioncheckboxscroll"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">5</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" id="globaloptioncheckboxscroll"> + <object class="GtkTreeView" id="globaloptioncheckbox"> <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">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection1"/> + </child> <child> - <object class="GtkTreeView" id="globaloptioncheckbox"> - <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">0</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Macro Library List-selection1"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn6"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn6"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer7"/> - <attributes> - <attribute name="visible">3</attribute> - <attribute name="active">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererToggle" id="cellrenderer7"/> + <attributes> + <attribute name="visible">3</attribute> + <attribute name="active">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn8"> + <property name="resizable">True</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn8"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer9"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderer9"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="globaloptions"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <items> - <item translatable="yes" context="optcompatpage|globalcompatoptions">Reorganize Form menu to have it MS compatible</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="globaloptions"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <items> + <item translatable="yes" context="optcompatpage|globalcompatoptions">Reorganize Form menu to have it MS compatible</item> + </items> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -158,123 +152,117 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="row_spacing">5</property> <property name="hexpand">True</property> <property name="vexpand">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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkScrolledWindow" id="optionsscroll"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">5</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" id="optionsscroll"> + <object class="GtkTreeView" id="options"> <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="options"> - <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="treeviewcolumn4"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn4"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer5"/> - <attributes> - <attribute name="visible">3</attribute> - <attribute name="active">0</attribute> - <attribute name="inconsistent">4</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererToggle" id="cellrenderer5"/> + <attributes> + <attribute name="visible">3</attribute> + <attribute name="active">0</attribute> + <attribute name="inconsistent">4</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn5"> + <property name="resizable">True</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn5"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer4"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderer4"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="format"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <items> - <item translatable="yes" context="optcompatpage|format">Use printer metrics for document formatting</item> - <item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables</item> - <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at tops of pages</item> - <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 tabstop formatting</item> - <item translatable="yes" context="optcompatpage|format">Do not add leading (extra space) between lines of text</item> - <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 line spacing</item> - <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at bottom of table cells</item> - <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 object positioning</item> - <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 text wrapping around objects</item> - <item translatable="yes" context="optcompatpage|format">Consider wrapping style when positioning objects</item> - <item translatable="yes" context="optcompatpage|format">Expand word space on lines with manual line breaks in justified paragraphs</item> - <item translatable="yes" context="optcompatpage|format">Protect form (no longer protects whole document. Insert write protected section instead)</item> - <item translatable="yes" context="optcompatpage|format">Word-compatible trailing blanks</item> - <item translatable="yes" context="optcompatpage|format">Tolerate white lines of PDF page backgrounds for compatibility with old documents</item> - <item translatable="yes" context="optcompatpage|format">Hide paragraphs of database fields (e.g., mail merge) with an empty value</item> - <item translatable="yes" context="optcompatpage|format"><User settings></item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkButton" id="default"> - <property name="label" translatable="yes" context="optcompatpage|default">Use as _Default</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="default-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|default">Click to use the current settings on this tab page as the default for further sessions with %PRODUCTNAME.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="format"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <items> + <item translatable="yes" context="optcompatpage|format">Use printer metrics for document formatting</item> + <item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables</item> + <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at tops of pages</item> + <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 tabstop formatting</item> + <item translatable="yes" context="optcompatpage|format">Do not add leading (extra space) between lines of text</item> + <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 line spacing</item> + <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at bottom of table cells</item> + <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 object positioning</item> + <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 text wrapping around objects</item> + <item translatable="yes" context="optcompatpage|format">Consider wrapping style when positioning objects</item> + <item translatable="yes" context="optcompatpage|format">Expand word space on lines with manual line breaks in justified paragraphs</item> + <item translatable="yes" context="optcompatpage|format">Protect form (no longer protects whole document. Insert write protected section instead)</item> + <item translatable="yes" context="optcompatpage|format">Word-compatible trailing blanks</item> + <item translatable="yes" context="optcompatpage|format">Tolerate white lines of PDF page backgrounds for compatibility with old documents</item> + <item translatable="yes" context="optcompatpage|format">Hide paragraphs of database fields (e.g., mail merge) with an empty value</item> + <item translatable="yes" context="optcompatpage|format"><User settings></item> + </items> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="default"> + <property name="label" translatable="yes" context="optcompatpage|default">Use as _Default</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="default-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|default">Click to use the current settings on this tab page as the default for further sessions with %PRODUCTNAME.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui b/sw/uiconfig/swriter/ui/optformataidspage.ui index 66ac14988f87..6a1aa150d68f 100644 --- a/sw/uiconfig/swriter/ui/optformataidspage.ui +++ b/sw/uiconfig/swriter/ui/optformataidspage.ui @@ -21,248 +21,242 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=2 n-rows=8 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">6</property> - <property name="left-padding">12</property> + <property name="row-spacing">6</property> + <property name="column-spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=2 n-rows=8 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkCheckButton" id="paragraph"> + <property name="label" translatable="yes" context="optformataidspage|paragraph">Pa_ragraph end</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-spacing">6</property> - <property name="column-spacing">6</property> - <child> - <object class="GtkCheckButton" id="paragraph"> - <property name="label" translatable="yes" context="optformataidspage|paragraph">Pa_ragraph end</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="paragraph-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|paragraph">Specifies whether paragraph delimiters are displayed. The paragraph delimiters also contain paragraph format information.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="hyphens"> - <property name="label" translatable="yes" context="optformataidspage|hyphens">Soft h_yphens</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="hyphens-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hyphens">Specifies whether soft hyphens (called also as optional or discretionary hyphens) are displayed. These are hidden user-defined delimiters that you enter within a word by pressing Ctrl+Hyphen(-). Words with soft hyphens are only separated at the end of a line at the point where a soft hyphen has been inserted, irrespective of whether the automatic hyphenation is activated or deactivated.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="spaces"> - <property name="label" translatable="yes" context="optformataidspage|spaces">Spac_es</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="spaces-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|spaces">Specifies whether to represent every space in the text with a dot.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="nonbreak"> - <property name="label" translatable="yes" context="optformataidspage|nonbreak">Non-breaking s_paces</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="nonbreak-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|nonbreak">Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the Ctrl+Shift+Spacebar shortcut keys.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="tabs"> - <property name="label" translatable="yes" context="optformataidspage|tabs">Tabs</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="tabs-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tabs">Specifies that tab stops are displayed as small arrows.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="break"> - <property name="label" translatable="yes" context="optformataidspage|break">Brea_ks</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="break-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|break">Displays all line breaks inserted with the Shift+Enter shortcut. These breaks create a new line, but do not start a new paragraph.</property> - </object> - </child> + <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="paragraph-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|paragraph">Specifies whether paragraph delimiters are displayed. The paragraph delimiters also contain paragraph format information.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">5</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="hiddentext"> - <property name="label" translatable="yes" context="optformataidspage|hiddentext">Hidden characters</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="hiddentext-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hiddentext">Displays text that uses the character format "hidden", when View - Formatting Marks is enabled.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="hyphens"> + <property name="label" translatable="yes" context="optformataidspage|hyphens">Soft h_yphens</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="hyphens-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hyphens">Specifies whether soft hyphens (called also as optional or discretionary hyphens) are displayed. These are hidden user-defined delimiters that you enter within a word by pressing Ctrl+Hyphen(-). Words with soft hyphens are only separated at the end of a line at the point where a soft hyphen has been inserted, irrespective of whether the automatic hyphenation is activated or deactivated.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">6</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="bookmarks"> - <property name="label" translatable="yes" context="optformataidspage|bookmarks">Bookmarks</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> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="spaces"> + <property name="label" translatable="yes" context="optformataidspage|spaces">Spac_es</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="spaces-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|spaces">Specifies whether to represent every space in the text with a dot.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">7</property> - </packing> </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label">¶</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="nonbreak"> + <property name="label" translatable="yes" context="optformataidspage|nonbreak">Non-breaking s_paces</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="nonbreak-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|nonbreak">Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the Ctrl+Shift+Spacebar shortcut keys.</property> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label">-</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="tabs"> + <property name="label" translatable="yes" context="optformataidspage|tabs">Tabs</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="tabs-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tabs">Specifies that tab stops are displayed as small arrows.</property> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label">·</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="break"> + <property name="label" translatable="yes" context="optformataidspage|break">Brea_ks</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="break-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|break">Displays all line breaks inserted with the Shift+Enter shortcut. These breaks create a new line, but do not start a new paragraph.</property> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="tabs_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label">→</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label">↵</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">5</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="hiddentext"> + <property name="label" translatable="yes" context="optformataidspage|hiddentext">Hidden characters</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="hiddentext-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hiddentext">Displays text that uses the character format "hidden", when View - Formatting Marks is enabled.</property> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">5</property> - </packing> </child> - <child> - <object class="GtkLabel" id="bookmarks_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes" context="optformataidspage|bookmarks_label|tooltip_text">| indicates a point bookmark + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">6</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="bookmarks"> + <property name="label" translatable="yes" context="optformataidspage|bookmarks">Bookmarks</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> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">¶</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">-</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">·</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="tabs_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">→</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">↵</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="bookmarks_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes" context="optformataidspage|bookmarks_label|tooltip_text">| indicates a point bookmark [ ] indicate the start and end of a bookmark on a text range</property> - <property name="label">| [ ]</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">7</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="label">| [ ]</property> </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">7</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -289,33 +283,27 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">6</property> - <property name="left-padding">12</property> + <property name="row-spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkCheckButton" id="mathbaseline"> + <property name="label" translatable="yes" context="optformataidspage|mathbaseline">Math baseline alignment</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-spacing">6</property> - <child> - <object class="GtkCheckButton" id="mathbaseline"> - <property name="label" translatable="yes" context="optformataidspage|mathbaseline">Math baseline alignment</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> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> + <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> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> </child> </object> </child> @@ -343,38 +331,32 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">6</property> - <property name="left-padding">12</property> + <property name="row-spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkCheckButton" id="cursorinprot"> + <property name="label" translatable="yes" context="optformataidspage|cursorinprot">Enable cursor</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-spacing">6</property> - <child> - <object class="GtkCheckButton" id="cursorinprot"> - <property name="label" translatable="yes" context="optformataidspage|cursorinprot">Enable cursor</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="cursorinprot-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|cursorinprot">Specifies that you can set the cursor in a protected area, but cannot make any changes.</property> - </object> - </child> + <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="cursorinprot-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|cursorinprot">Specifies that you can set the cursor in a protected area, but cannot make any changes.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> </child> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> </child> </object> </child> @@ -406,83 +388,77 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=2 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">6</property> - <property name="left-padding">12</property> + <property name="row-spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=2 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkCheckButton" id="cursoronoff"> + <property name="label" translatable="yes" context="optformataidspage|cursoronoff">_Direct cursor</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="cursoronoff-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|cursoronoff">Activates the direct cursor.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="bxFillMode"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="row-spacing">6</property> + <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="cursoronoff"> - <property name="label" translatable="yes" context="optformataidspage|cursoronoff">_Direct cursor</property> + <object class="GtkLabel" id="fillmode"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="optformataidspage|fillmode">Insert:</property> <property name="use-underline">True</property> + <property name="mnemonic-widget">cxDirectCursorFillMode</property> <property name="xalign">0</property> - <property name="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="cursoronoff-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|cursoronoff">Activates the direct cursor.</property> - </object> - </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="bxFillMode"> + <object class="GtkComboBoxText" id="cxDirectCursorFillMode"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="fillmode"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="optformataidspage|fillmode">Insert:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">cxDirectCursorFillMode</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="cxDirectCursorFillMode"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="active-id">2</property> - <items> - <item id="0" translatable="yes" context="optformataidspage|filltab">Tabs</item> - <item id="1" translatable="yes" context="optformataidspage|filltabandspace">Tabs and spaces</item> - <item id="2" translatable="yes" context="optformataidspage|fillspace">Spaces</item> - <item id="3" translatable="yes" context="optformataidspage|fillindent">Left paragraph margin</item> - <item id="4" translatable="yes" context="optformataidspage|fillmargin">Paragraph alignment</item> - </items> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="active-id">2</property> + <items> + <item id="0" translatable="yes" context="optformataidspage|filltab">Tabs</item> + <item id="1" translatable="yes" context="optformataidspage|filltabandspace">Tabs and spaces</item> + <item id="2" translatable="yes" context="optformataidspage|fillspace">Spaces</item> + <item id="3" translatable="yes" context="optformataidspage|fillindent">Left paragraph margin</item> + <item id="4" translatable="yes" context="optformataidspage|fillmargin">Paragraph alignment</item> + </items> </object> <packing> - <property name="left-attach">0</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">0</property> + <property name="top-attach">1</property> + </packing> </child> </object> </child> @@ -511,49 +487,43 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">6</property> - <property name="left-padding">12</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox"> + <object class="GtkLabel" id="lbDefaultAnchor"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="lbDefaultAnchor"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="optformataidspage|anchor">_Anchor:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">cxDefaultAnchor</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="cxDefaultAnchor"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="active-id">1</property> - <items> - <item id="0" translatable="yes" context="optformataidspage|cxDefaultAnchor1">To Paragraph</item> - <item id="1" translatable="yes" context="optformataidspage|cxDefaultAnchor2">To Character</item> - <item id="2" translatable="yes" context="optformataidspage|cxDefaultAnchor3">As Character</item> - </items> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="optformataidspage|anchor">_Anchor:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">cxDefaultAnchor</property> + <property name="xalign">0</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cxDefaultAnchor"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="active-id">1</property> + <items> + <item id="0" translatable="yes" context="optformataidspage|cxDefaultAnchor1">To Paragraph</item> + <item id="1" translatable="yes" context="optformataidspage|cxDefaultAnchor2">To Character</item> + <item id="2" translatable="yes" context="optformataidspage|cxDefaultAnchor3">As Character</item> + </items> + </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/optgeneralpage.ui b/sw/uiconfig/swriter/ui/optgeneralpage.ui index 29056b133c5e..be12b1d09dfc 100644 --- a/sw/uiconfig/swriter/ui/optgeneralpage.ui +++ b/sw/uiconfig/swriter/ui/optgeneralpage.ui @@ -31,58 +31,52 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkCheckButton" id="updatefields"> + <property name="label" translatable="yes" context="optgeneralpage|updatefields">_Fields</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkCheckButton" id="updatefields"> - <property name="label" translatable="yes" context="optgeneralpage|updatefields">_Fields</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="updatefields-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|updatefields">The contents of all fields are updated automatically whenever the screen contents are displayed as new. Even with this box unchecked, some fields are updated each time a special condition takes place.</property> - </object> - </child> + <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="updatefields-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|updatefields">The contents of all fields are updated automatically whenever the screen contents are displayed as new. Even with this box unchecked, some fields are updated each time a special condition takes place.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="updatecharts"> - <property name="label" translatable="yes" context="optgeneralpage|updatecharts">_Charts</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="updatecharts-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|updatecharts">Specifies whether to automatically update charts. Whenever a Writer table cell value changes and the cursor leaves that cell, the chart that displays the cell value is updated automatically.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="updatecharts"> + <property name="label" translatable="yes" context="optgeneralpage|updatecharts">_Charts</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="updatecharts-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|updatecharts">Specifies whether to automatically update charts. Whenever a Writer table cell value changes and the cursor leaves that cell, the chart that displays the cell value is updated automatically.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -111,81 +105,75 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkRadioButton" id="always"> + <property name="label" translatable="yes" context="optgeneralpage|always">_Always</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="always"> - <property name="label" translatable="yes" context="optgeneralpage|always">_Always</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="always-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|always">Always updates links while loading a document, and only if the document is in a trusted file location or the global security level is Low (Not recommended).</property> - </object> - </child> + <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="always-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|always">Always updates links while loading a document, and only if the document is in a trusted file location or the global security level is Low (Not recommended).</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="onrequest"> - <property name="label" translatable="yes" context="optgeneralpage|onrequest">_On request</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">always</property> - <child internal-child="accessible"> - <object class="AtkObject" id="onrequest-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|onrequest">Updates links only on request while loading a document.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="onrequest"> + <property name="label" translatable="yes" context="optgeneralpage|onrequest">_On request</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">always</property> + <child internal-child="accessible"> + <object class="AtkObject" id="onrequest-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|onrequest">Updates links only on request while loading a document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="never"> - <property name="label" translatable="yes" context="optgeneralpage|never">_Never</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">always</property> - <child internal-child="accessible"> - <object class="AtkObject" id="never-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|never">Links are never updated while loading a document.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="never"> + <property name="label" translatable="yes" context="optgeneralpage|never">_Never</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">always</property> + <child internal-child="accessible"> + <object class="AtkObject" id="never-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|never">Links are never updated while loading a document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -213,89 +201,112 @@ <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="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <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> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkLabel" id="label5"> <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="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optgeneralpage|label5">_Measurement unit:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">metric</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="metric"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="metric-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|metric">Specifies the unit of measurement for text documents.</property> - </object> - </child> + <property name="label" translatable="yes" context="optgeneralpage|label5">_Measurement unit:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">metric</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="metric"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="metric-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|metric">Specifies the unit of measurement for text documents.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="tablabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optgeneralpage|tablabel">_Tab stops:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">tab</property> - <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="tablabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optgeneralpage|tablabel">_Tab stops:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">tab</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="tab"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> + <property name="text">1.25</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + <property name="value">1.25</property> + <child internal-child="accessible"> + <object class="AtkObject" id="tab-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tab">Specifies the spacing between the individual tab stops.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="tab"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="activates_default">True</property> - <property name="text">1.25</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> - <property name="value">1.25</property> - <child internal-child="accessible"> - <object class="AtkObject" id="tab-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tab">Specifies the spacing between the individual tab stops.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkCheckButton" id="usecharunit"> + <property name="label" translatable="yes" context="optgeneralpage|usecharunit">_Enable char unit</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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="usecharunit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|usecharunit">When this setting is enabled, the measurement units of indents and spacing on Format - Paragraph - Indents & Spacing tab will be character (ch) and line.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> </object> <packing> @@ -304,60 +315,31 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkCheckButton" id="squaremode"> + <property name="label" translatable="yes" context="optgeneralpage|squaremode">_Use square page mode for text grid</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="usecharunit"> - <property name="label" translatable="yes" context="optgeneralpage|usecharunit">_Enable char unit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="hexpand">True</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="usecharunit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|usecharunit">When this setting is enabled, the measurement units of indents and spacing on Format - Paragraph - Indents & Spacing tab will be character (ch) and line.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="squaremode"> - <property name="label" translatable="yes" context="optgeneralpage|squaremode">_Use square page mode for text grid</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="hexpand">True</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="squaremode-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|squaremode">When this setting is enabled, the text grid will look like square page.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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="squaremode-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|squaremode">When this setting is enabled, the text grid will look like square page.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -386,51 +368,68 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkGrid" id="grid9"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optgeneralpage|label7">_Additional separators:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">wordcount</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="wordcount"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="optgeneralpage|label7">_Additional separators:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">wordcount</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="wordcount"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="standardizedpageshow"> + <property name="label" translatable="yes" context="optgeneralpage|standardizedpageshow">Show standardized page count</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> </object> <packing> <property name="left_attach">0</property> @@ -439,19 +438,19 @@ </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid10"> + <object class="GtkGrid" id="grid11"> <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="margin-start">12</property> <child> - <object class="GtkCheckButton" id="standardizedpageshow"> - <property name="label" translatable="yes" context="optgeneralpage|standardizedpageshow">Show standardized page count</property> + <object class="GtkLabel" id="labelstandardpages"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optgeneralpage|labelstandardpages">Characters per standardized page:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="mnemonic_widget">standardpagesize</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -459,51 +458,18 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkSpinButton" id="standardpagesize"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="labelstandardpages"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optgeneralpage|labelstandardpages">Characters per standardized page:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">standardpagesize</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="standardpagesize"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="activates_default">True</property> - <property name="text">1800</property> - <property name="adjustment">adjustment-sps</property> - <property name="value">1800</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - </child> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> + <property name="text">1800</property> + <property name="adjustment">adjustment-sps</property> + <property name="value">1800</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> @@ -513,6 +479,10 @@ </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/optredlinepage.ui b/sw/uiconfig/swriter/ui/optredlinepage.ui index 19a8139e6e6f..9a5c786c2107 100644 --- a/sw/uiconfig/swriter/ui/optredlinepage.ui +++ b/sw/uiconfig/swriter/ui/optredlinepage.ui @@ -18,130 +18,123 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="insert_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="insert_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optredlinepage|insert_label">_Attributes:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">insert</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="insertcolor_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optredlinepage|insertcolor_label">Co_lor:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">insertcolor</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="optredlinepage|insert_label">_Attributes:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">insert</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="insertcolor_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optredlinepage|insertcolor_label">Co_lor:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">insertcolor</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="insert"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <items> + <item translatable="yes" context="optredlinepage|insert">[None]</item> + <item translatable="yes" context="optredlinepage|insert">Bold</item> + <item translatable="yes" context="optredlinepage|insert">Italic</item> + <item translatable="yes" context="optredlinepage|insert">Underlined</item> + <item translatable="yes" context="optredlinepage|insert">Underlined: double</item> + <item translatable="yes" context="optredlinepage|insert">Strikethrough</item> + <item translatable="yes" context="optredlinepage|insert">Uppercase</item> + <item translatable="yes" context="optredlinepage|insert">Lowercase</item> + <item translatable="yes" context="optredlinepage|insert">Small caps</item> + <item translatable="yes" context="optredlinepage|insert">Title font</item> + <item translatable="yes" context="optredlinepage|insert">Background color</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="insert-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|insert">Specifies how changes in the document are displayed when text is inserted.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="insertcolor"> + <property name="label" translatable="no"></property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child> - <object class="GtkComboBoxText" id="insert"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <items> - <item translatable="yes" context="optredlinepage|insert">[None]</item> - <item translatable="yes" context="optredlinepage|insert">Bold</item> - <item translatable="yes" context="optredlinepage|insert">Italic</item> - <item translatable="yes" context="optredlinepage|insert">Underlined</item> - <item translatable="yes" context="optredlinepage|insert">Underlined: double</item> - <item translatable="yes" context="optredlinepage|insert">Strikethrough</item> - <item translatable="yes" context="optredlinepage|insert">Uppercase</item> - <item translatable="yes" context="optredlinepage|insert">Lowercase</item> - <item translatable="yes" context="optredlinepage|insert">Small caps</item> - <item translatable="yes" context="optredlinepage|insert">Title font</item> - <item translatable="yes" context="optredlinepage|insert">Background color</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="insert-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|insert">Specifies how changes in the document are displayed when text is inserted.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkMenuButton" id="insertcolor"> - <property name="label" translatable="no"></property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="insertcolor-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|insertcolor-atkobject">Color of Insertions</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|insertcolor">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by %PRODUCTNAME, then modified to match to the author of each change.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="insertcolor-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|insertcolor-atkobject">Color of Insertions</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|insertcolor">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by %PRODUCTNAME, then modified to match to the author of each change.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="insertedpreview"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="insertedpreview"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - </child> + <property name="hexpand">True</property> </object> </child> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> </child> </object> </child> @@ -170,117 +163,110 @@ <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="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="deleted_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="deleted_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optredlinepage|deleted_label">Attri_butes:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">deleted</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="deletedcolor_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optredlinepage|deletedcolor_label">Col_or:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">deletedcolor</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="optredlinepage|deleted_label">Attri_butes:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">deleted</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="deletedcolor_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optredlinepage|deletedcolor_label">Col_or:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">deletedcolor</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="deleted"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child internal-child="accessible"> + <object class="AtkObject" id="deleted-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|deleted">Specifies how changes in the document are displayed when text is deleted. If you record text deletions, the text is displayed with the selected attribute (for example, strikethrough) and is not deleted.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="deletedcolor"> + <property name="label" translatable="no"></property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child> - <object class="GtkComboBoxText" id="deleted"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child internal-child="accessible"> - <object class="AtkObject" id="deleted-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|deleted">Specifies how changes in the document are displayed when text is deleted. If you record text deletions, the text is displayed with the selected attribute (for example, strikethrough) and is not deleted.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkMenuButton" id="deletedcolor"> - <property name="label" translatable="no"></property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="deletedcolor-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|deletedcolor-atkobject">Color of Deletions</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|deletedcolor">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by %PRODUCTNAME, then modified to match to the author of each change.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="deletedcolor-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|deletedcolor-atkobject">Color of Deletions</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|deletedcolor">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by %PRODUCTNAME, then modified to match to the author of each change.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="deletedpreview"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="deletedpreview"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - </child> + <property name="hexpand">True</property> </object> </child> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> </child> </object> </child> @@ -309,117 +295,110 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="changed_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="changed_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optredlinepage|changed_label">Attrib_utes:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">changed</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="changedcolor_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optredlinepage|changedcolor_label">Colo_r:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">changedcolor</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="optredlinepage|changed_label">Attrib_utes:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">changed</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="changedcolor_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optredlinepage|changedcolor_label">Colo_r:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">changedcolor</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="changed"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child internal-child="accessible"> + <object class="AtkObject" id="changed-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|changed">Defines how changes to text attributes are displayed in the document. These changes affect attributes such as bold, italic or underline.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="changedcolor"> + <property name="label" translatable="no"></property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child> - <object class="GtkComboBoxText" id="changed"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child internal-child="accessible"> - <object class="AtkObject" id="changed-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|changed">Defines how changes to text attributes are displayed in the document. These changes affect attributes such as bold, italic or underline.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkMenuButton" id="changedcolor"> - <property name="label" translatable="no"></property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="changedcolor-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|changedcolor-atkobject">Color of Changed Attributes</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|changedcolor">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by %PRODUCTNAME, then modified to match to the author of each change.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="changedcolor-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|changedcolor-atkobject">Color of Changed Attributes</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|changedcolor">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by %PRODUCTNAME, then modified to match to the author of each change.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="changedpreview"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="changedpreview"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - </child> + <property name="hexpand">True</property> </object> </child> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> </child> </object> </child> @@ -448,124 +427,117 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkMenuButton" id="markcolor"> + <property name="label" translatable="no"></property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child> - <object class="GtkMenuButton" id="markcolor"> - <property name="label" translatable="no"></property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="markcolor-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|markcolor-atkobject">Color of Mark</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|markcolor">Specifies the color for highlighting the changed lines in the text.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkLabel" id="markpos_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optredlinepage|markpos_label">Mar_k:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">markpos</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="markcolor-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|markcolor-atkobject">Color of Mark</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|markcolor">Specifies the color for highlighting the changed lines in the text.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="markcolor_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optredlinepage|markcolor_label">_Color:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">markcolor</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="markpos_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optredlinepage|markpos_label">Mar_k:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">markpos</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="markcolor_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optredlinepage|markcolor_label">_Color:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">markcolor</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="markpreview"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="markpreview"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - </child> + <property name="hexpand">True</property> </object> </child> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="markpos"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <items> - <item translatable="yes" context="optredlinepage|markpos">[None]</item> - <item translatable="yes" context="optredlinepage|markpos">Left margin</item> - <item translatable="yes" context="optredlinepage|markpos">Right margin</item> - <item translatable="yes" context="optredlinepage|markpos">Outer margin</item> - <item translatable="yes" context="optredlinepage|markpos">Inner margin</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="markpos-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|markpos">Defines if and where changed lines in the document are marked.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="markpos"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <items> + <item translatable="yes" context="optredlinepage|markpos">[None]</item> + <item translatable="yes" context="optredlinepage|markpos">Left margin</item> + <item translatable="yes" context="optredlinepage|markpos">Right margin</item> + <item translatable="yes" context="optredlinepage|markpos">Outer margin</item> + <item translatable="yes" context="optredlinepage|markpos">Inner margin</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="markpos-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|markpos">Defines if and where changed lines in the document are marked.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui b/sw/uiconfig/swriter/ui/opttablepage.ui index 34d16cc8e935..da40114ed4ad 100644 --- a/sw/uiconfig/swriter/ui/opttablepage.ui +++ b/sw/uiconfig/swriter/ui/opttablepage.ui @@ -46,102 +46,95 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkCheckButton" id="header"> + <property name="label" translatable="yes" context="opttablepage|header">H_eading</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="header"> - <property name="label" translatable="yes" context="opttablepage|header">H_eading</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="header-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|header">Specifies that the first row of the table is formatted with the "Table heading" Paragraph Style.</property> - </object> - </child> + <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="header-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|header">Specifies that the first row of the table is formatted with the "Table heading" Paragraph Style.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="repeatheader"> - <property name="label" translatable="yes" context="opttablepage|repeatheader">Re_peat on each page</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</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="repeatheader-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|repeatheader">Specifies whether the table heading is carried over onto the new page after a page break.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="repeatheader"> + <property name="label" translatable="yes" context="opttablepage|repeatheader">Re_peat on each page</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="repeatheader-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|repeatheader">Specifies whether the table heading is carried over onto the new page after a page break.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="dontsplit"> - <property name="label" translatable="yes" context="opttablepage|dontsplit">_Do not split</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="dontsplit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|dontsplit">Specifies that tables are not split by any type of text flow break.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="dontsplit"> + <property name="label" translatable="yes" context="opttablepage|dontsplit">_Do not split</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="dontsplit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|dontsplit">Specifies that tables are not split by any type of text flow break.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="border"> - <property name="label" translatable="yes" context="opttablepage|border">B_order</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="border-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|border">Specifies that table cells have a border by default.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="border"> + <property name="label" translatable="yes" context="opttablepage|border">B_order</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="border-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|border">Specifies that table cells have a border by default.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> @@ -170,83 +163,76 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkCheckButton" id="numformatting"> + <property name="label" translatable="yes" context="opttablepage|numformatting">_Number recognition</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="numformatting"> - <property name="label" translatable="yes" context="opttablepage|numformatting">_Number recognition</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="numformatting-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numformatting">Specifies that numbers in a text table are recognized and formatted as numbers.</property> - </object> - </child> + <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="numformatting-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numformatting">Specifies that numbers in a text table are recognized and formatted as numbers.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="numfmtformatting"> - <property name="label" translatable="yes" context="opttablepage|numfmtformatting">N_umber format recognition</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</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="numfmtformatting-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numfmtformatting">If Number format recognition is not marked, only input in the format that has been set at the cell is accepted. Any other input resets the format to Text.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="numfmtformatting"> + <property name="label" translatable="yes" context="opttablepage|numfmtformatting">N_umber format recognition</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="numfmtformatting-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numfmtformatting">If Number format recognition is not marked, only input in the format that has been set at the cell is accepted. Any other input resets the format to Text.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="numalignment"> - <property name="label" translatable="yes" context="opttablepage|numalignment">_Alignment</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</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="numalignment-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numalignment">Specifies that numbers are always bottom right aligned in the cell.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="numalignment"> + <property name="label" translatable="yes" context="opttablepage|numalignment">_Alignment</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="numalignment-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numalignment">Specifies that numbers are always bottom right aligned in the cell.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -283,33 +269,181 @@ <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="grid3"> <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="left_padding">12</property> + <property name="row_spacing">12</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkGrid" id="grid5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">18</property> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="opttablepage|label10">Behavior of rows/columns</property> + <property name="xalign">0</property> + </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="fix"> + <property name="label" translatable="yes" context="opttablepage|fix">_Fixed</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="fix-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fix">Specifies that changes to a row or column only affect the corresponding adjacent area.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="fixprop"> + <property name="label" translatable="yes" context="opttablepage|fixprop">Fi_xed, proportional</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="group">fix</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fixprop-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fixprop">Specifies that changes to a row or column have an effect on the entire table.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="var"> + <property name="label" translatable="yes" context="opttablepage|var">_Variable</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="group">fix</property> + <child internal-child="accessible"> + <object class="AtkObject" id="var-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|var">Specifies that changes to a row or column affect the table size.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="opttablepage|label11">Changes affect the adjacent area only</property> + <property name="wrap">True</property> + <property name="wrap_mode">char</property> + <property name="width_chars">50</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="opttablepage|label12">Changes affect the entire table</property> + <property name="wrap">True</property> + <property name="width_chars">50</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="opttablepage|label13">Changes affect the table size</property> + <property name="wrap">True</property> + <property name="width_chars">50</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">12</property> - <property name="column_spacing">12</property> + <property name="spacing">12</property> + <property name="homogeneous">True</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> <property name="row_spacing">6</property> - <property name="column_spacing">18</property> + <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label10"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="opttablepage|label10">Behavior of rows/columns</property> + <property name="label" translatable="yes" context="opttablepage|label4">Move cells</property> <property name="xalign">0</property> </object> <packing> @@ -319,100 +453,118 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="fix"> - <property name="label" translatable="yes" context="opttablepage|fix">_Fixed</property> + <object class="GtkSpinButton" id="rowmove"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</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="halign">start</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="fix-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fix">Specifies that changes to a row or column only affect the corresponding adjacent area.</property> + <object class="AtkObject" id="rowmove-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowmove">Specifies the value to be used for moving a row.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkRadioButton" id="fixprop"> - <property name="label" translatable="yes" context="opttablepage|fixprop">Fi_xed, proportional</property> + <object class="GtkSpinButton" id="colmove"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</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="group">fix</property> + <property name="halign">start</property> + <property name="adjustment">adjustment2</property> + <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="fixprop-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fixprop">Specifies that changes to a row or column have an effect on the entire table.</property> + <object class="AtkObject" id="colmove-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|colmove">Specifies the value to be used for moving a column.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkRadioButton" id="var"> - <property name="label" translatable="yes" context="opttablepage|var">_Variable</property> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> <property name="margin-start">12</property> + <property name="label" translatable="yes" context="opttablepage|label5">_Row:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">rowmove</property> <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">fix</property> - <child internal-child="accessible"> - <object class="AtkObject" id="var-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|var">Specifies that changes to a row or column affect the table size.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label11"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="opttablepage|label11">Changes affect the adjacent area only</property> - <property name="wrap">True</property> - <property name="wrap_mode">char</property> - <property name="width_chars">50</property> - <property name="max_width_chars">50</property> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="opttablepage|label6">_Column:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">colmove</property> <property name="xalign">0</property> </object> <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkSpinButton" id="rowinsert"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="adjustment">adjustment3</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rowinsert-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowinsert">Specifies the default value for inserting rows.</property> + </object> + </child> + </object> + <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label12"> + <object class="GtkSpinButton" id="colinsert"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="opttablepage|label12">Changes affect the entire table</property> - <property name="wrap">True</property> - <property name="width_chars">50</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="adjustment">adjustment4</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="colinsert-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|colinsert">Specifies the default value for inserting columns.</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> @@ -420,233 +572,60 @@ </packing> </child> <child> - <object class="GtkLabel" id="label13"> + <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="opttablepage|label13">Changes affect the table size</property> - <property name="wrap">True</property> - <property name="width_chars">50</property> - <property name="max_width_chars">50</property> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="opttablepage|label15">Ro_w:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">rowinsert</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">12</property> - <property name="homogeneous">True</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="opttablepage|label4">Move cells</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="rowmove"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rowmove-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowmove">Specifies the value to be used for moving a row.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="colmove"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="adjustment">adjustment2</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="colmove-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|colmove">Specifies the value to be used for moving a column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="opttablepage|label5">_Row:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">rowmove</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="opttablepage|label6">_Column:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">colmove</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="opttablepage|label16">Colu_mn:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">colinsert</property> + <property name="xalign">0</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkSpinButton" id="rowinsert"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="adjustment">adjustment3</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rowinsert-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowinsert">Specifies the default value for inserting rows.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="colinsert"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="adjustment">adjustment4</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="colinsert-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|colinsert">Specifies the default value for inserting columns.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="opttablepage|label15">Ro_w:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">rowinsert</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label16"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="opttablepage|label16">Colu_mn:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">colinsert</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="opttablepage|label14">Insert cell</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="opttablepage|label14">Insert cell</property> + <property name="xalign">0</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui index 5b0b231dae28..141d0718198e 100644 --- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui +++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui @@ -36,46 +36,40 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkScrolledWindow"> + <property name="width_request">50</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow"> - <property name="width_request">50</property> + <object class="GtkTreeView" id="level"> <property name="visible">True</property> <property name="can_focus">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="level"> - <property name="visible">True</property> - <property name="can_focus">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="level-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|level">Click the chapter and outline level that you want to modify, and then specify the numbering options for the level.</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="level-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|level">Click the chapter and outline level that you want to modify, and then specify the numbering options for the level.</property> + </object> + </child> </object> </child> </object> @@ -105,175 +99,169 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="label3"> <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="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label3">Paragraph style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">style</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="style"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="style-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|style">Select the paragraph style that you want to assign to the selected chapter and outline level.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label4">Number:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numbering</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label5">Character style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">charstyle</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="sublevelsft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|sublevelsft">Show sublevels:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">sublevelsnf</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="numbering"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="numbering-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|numbering">Select the numbering style that you want to apply to the selected outline level.</property> - </object> - </child> + <property name="label" translatable="yes" context="outlinenumberingpage|label3">Paragraph style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">style</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="style"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="style-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|style">Select the paragraph style that you want to assign to the selected chapter and outline level.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="charstyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="charstyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|charstyle">Select the format of the numbering character.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinenumberingpage|label4">Number:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numbering</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinenumberingpage|label5">Character style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">charstyle</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="sublevelsft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinenumberingpage|sublevelsft">Show sublevels:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">sublevelsnf</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="numbering"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="numbering-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|numbering">Select the numbering style that you want to apply to the selected outline level.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="sublevelsnf"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <property name="value">1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="sublevelsnf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|sublevelsnf">Select the number of outline levels to include in the chapter numbering. For example, select "3" to display three levels of chapter numbering: 1.1.1</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="charstyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="charstyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|charstyle">Select the format of the numbering character.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label10">Start at:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">startat</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="sublevelsnf"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <property name="value">1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="sublevelsnf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|sublevelsnf">Select the number of outline levels to include in the chapter numbering. For example, select "3" to display three levels of chapter numbering: 1.1.1</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="startat"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="startat-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|startat">Enter the number that you want to restart the chapter numbering at.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinenumberingpage|label10">Start at:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">startat</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="startat"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="startat-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|startat">Enter the number that you want to restart the chapter numbering at.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -302,32 +290,26 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <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="left_padding">12</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkDrawingArea" id="preview"> + <property name="width_request">150</property> + <property name="height_request">260</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkDrawingArea" id="preview"> - <property name="width_request">150</property> - <property name="height_request">260</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> </object> </child> @@ -355,81 +337,75 @@ <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="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkEntry" id="prefix"> <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="GtkEntry" id="prefix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="prefix-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|prefix">Enter the text that you want to display before the chapter number.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="suffix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="suffix-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|suffix">Enter the text that you want to display after the chapter number.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label8">Before:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">prefix</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="prefix-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|prefix">Enter the text that you want to display before the chapter number.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label9">After:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">suffix</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="suffix"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="suffix-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|suffix">Enter the text that you want to display after the chapter number.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinenumberingpage|label8">Before:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">prefix</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinenumberingpage|label9">After:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">suffix</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui index 63487356b360..80cfe3e56db0 100644 --- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui +++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui @@ -55,46 +55,40 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkScrolledWindow"> + <property name="width_request">50</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow"> - <property name="width_request">50</property> + <object class="GtkTreeView" id="levellb"> <property name="visible">True</property> <property name="can_focus">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="levellb"> - <property name="visible">True</property> - <property name="can_focus">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="levellb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|levellb">Select the level(s) that you want to modify.</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="levellb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|levellb">Select the level(s) that you want to modify.</property> + </object> + </child> </object> </child> </object> @@ -125,368 +119,362 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment6"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <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="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="numalign"> <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="GtkLabel" id="numalign"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|numalign">Numbering alignment:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numalignlb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="numalignlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="outlinepositionpage|liststore1">Left</item> - <item translatable="yes" context="outlinepositionpage|liststore1">Centered</item> - <item translatable="yes" context="outlinepositionpage|liststore1">Right</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="numalignlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numalignlb">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">9</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="numdist"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|numdist">Minimum space between -numbering and text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numdistmf</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="numdistmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment3</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="numdistmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numdistmf">The alignment of the numbering symbol is adjusted to get the desired minimum space. If it is not possible because the numbering area is not wide enough, then the start of the text is adjusted.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="numberingwidth"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|numberingwidth">Width of numbering:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numberingwidthmf</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="numberingwidthmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="numberingwidthmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numberingwidthmf">Enter the width of the numbering area. The numbering symbol can be left, center or right in this area.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="relative"> - <property name="label" translatable="yes" context="outlinepositionpage|relative">Relative</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="relative-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|relative">Indents the current level relative to the previous level in the list hierarchy.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="indent"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|indent">Indent:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">indentmf</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="indentmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="indentmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|indentmf">Enter the amount of space to leave between the left page margin (or the left edge of the text object) and the left edge of the numbering area. If the current paragraph style uses an indent, the amount you enter here is added to the indent.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="indentat"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|indentat">Indent at:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">indentatmf</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="outlinepositionpage|numalign">Numbering alignment:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numalignlb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="numalignlb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="outlinepositionpage|liststore1">Left</item> + <item translatable="yes" context="outlinepositionpage|liststore1">Centered</item> + <item translatable="yes" context="outlinepositionpage|liststore1">Right</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="numalignlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numalignlb">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="indentatmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment6</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="indentatmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|indentatmf">Enter the distance from the left page margin to the start of all lines in the numbered paragraph that follow the first line.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="numdist"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinepositionpage|numdist">Minimum space between +numberind text:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numdistmf</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="numdistmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment3</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="numdistmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numdistmf">The alignment of the numbering symbol is adjusted to get the desired minimum space. If it is not possible because the numbering area is not wide enough, then the start of the text is adjusted.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkLabel" id="num2align"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|num2align">Numbering alignment:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">num2alignlb</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="numberingwidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinepositionpage|numberingwidth">Width of numbering:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numberingwidthmf</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="numberingwidthmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="numberingwidthmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numberingwidthmf">Enter the width of the numbering area. The numbering symbol can be left, center or right in this area.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="num2alignlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="num2alignlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|num2alignlb">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="relative"> + <property name="label" translatable="yes" context="outlinepositionpage|relative">Relative</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="relative-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|relative">Indents the current level relative to the previous level in the list hierarchy.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="alignedat"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|alignedat">Aligned at:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">alignedatmf</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="indent"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinepositionpage|indent">Indent:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">indentmf</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="indentmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="indentmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|indentmf">Enter the amount of space to leave between the left page margin (or the left edge of the text object) and the left edge of the numbering area. If the current paragraph style uses an indent, the amount you enter here is added to the indent.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="alignedatmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment4</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="alignedatmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|alignedatmf">Enter the distance from the left page margin at which the numbering symbol will be aligned.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="indentat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinepositionpage|indentat">Indent at:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">indentatmf</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="indentatmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment6</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="indentatmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|indentatmf">Enter the distance from the left page margin to the start of all lines in the numbered paragraph that follow the first line.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel" id="at"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|at">Tab stop at:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">atmf</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="num2align"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinepositionpage|num2align">Numbering alignment:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">num2alignlb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="num2alignlb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="num2alignlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|num2alignlb">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="atmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment5</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="atmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|atmf">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="alignedat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinepositionpage|alignedat">Aligned at:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">alignedatmf</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="alignedatmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment4</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="alignedatmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|alignedatmf">Enter the distance from the left page margin at which the numbering symbol will be aligned.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="numfollowedbylb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="outlinepositionpage|liststore2">Tab stop</item> - <item translatable="yes" context="outlinepositionpage|liststore2">Space</item> - <item translatable="yes" context="outlinepositionpage|liststore2">Nothing</item> - <item translatable="yes" context="outlinepositionpage|liststore2">New Line</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="numfollowedbylb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numfollowedbylb">Enter the distance from the left page margin at which the numbering symbol will be aligned.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="at"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinepositionpage|at">Tab stop at:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">atmf</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="atmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment5</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="atmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|atmf">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="numfollowedby"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|numfollowedby">Numbering followed by:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numfollowedbylb</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="numfollowedbylb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="outlinepositionpage|liststore2">Tab stop</item> + <item translatable="yes" context="outlinepositionpage|liststore2">Space</item> + <item translatable="yes" context="outlinepositionpage|liststore2">Nothing</item> + <item translatable="yes" context="outlinepositionpage|liststore2">New Line</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="numfollowedbylb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numfollowedbylb">Enter the distance from the left page margin at which the numbering symbol will be aligned.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="standard"> - <property name="label" translatable="yes" context="outlinepositionpage|standard">Default</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> - <accessibility> - <relation type="member-of" target="label10"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="standard-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|standard">Resets the indent and the spacing values to the default values.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="numfollowedby"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="outlinepositionpage|numfollowedby">Numbering followed by:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numfollowedbylb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="standard"> + <property name="label" translatable="yes" context="outlinepositionpage|standard">Default</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <accessibility> + <relation type="member-of" target="label10"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="standard-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|standard">Resets the indent and the spacing values to the default values.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">10</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -514,29 +502,23 @@ numbering and text:</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="box2"> <property name="visible">True</property> <property name="can_focus">False</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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="box2"> + <object class="GtkDrawingArea" id="preview"> + <property name="width_request">150</property> + <property name="height_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="preview"> - <property name="width_request">150</property> - <property name="height_request">130</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/sectionpage.ui b/sw/uiconfig/swriter/ui/sectionpage.ui index fd89795bb5c3..f44550c229bc 100644 --- a/sw/uiconfig/swriter/ui/sectionpage.ui +++ b/sw/uiconfig/swriter/ui/sectionpage.ui @@ -27,73 +27,65 @@ <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="sectionnames"> <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="left_padding">12</property> + <property name="row_spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="sectionnames"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">3</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="sectionnames-list"> <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="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="sectionnames-list"> - <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> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="sectionnames-entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="sectionnames-entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -133,203 +125,190 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="link"> + <property name="label" translatable="yes" context="sectionpage|link">_Link</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="link-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|link">Inserts the contents of another document or section from another document in the current section.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="dde"> + <property name="label" translatable="yes" context="sectionpage|dde">DD_E</property> + <property name="visible">True</property> + <property name="sensitive">False</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="dde-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|dde">Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected.</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="grid2"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkCheckButton" id="link"> - <property name="label" translatable="yes" context="sectionpage|link">_Link</property> + <object class="GtkBox" id="box1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="filelabel"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sectionpage|filelabel">_File name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">filename</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="ddelabel"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="sectionpage|ddelabel">DDE _command</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">filename</property> + <property name="xalign">0</property> + </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">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="sectionlabel"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sectionpage|sectionlabel">_Section</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">sectionname</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="selectfile"> + <property name="label" translatable="yes" context="sectionpage|selectfile">Browse...</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="link-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|link">Inserts the contents of another document or section from another document in the current section.</property> + <object class="AtkObject" id="selectfile-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|selectfile">Locate the file that you want to insert as a link, and then click Insert.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">2</property> <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="dde"> - <property name="label" translatable="yes" context="sectionpage|dde">DD_E</property> + <object class="GtkEntry" id="filename"> <property name="visible">True</property> <property name="sensitive">False</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="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">18</property> <child internal-child="accessible"> - <object class="AtkObject" id="dde-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|dde">Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected.</property> + <object class="AtkObject" id="filename-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|filename">Enter the path and the filename for the file that you want to insert, or click the Browse button to locate the file.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkAlignment"> + <object class="GtkComboBoxText" id="sectionname"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry"> <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="GtkBox" id="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="filelabel"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sectionpage|filelabel">_File name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">filename</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="ddelabel"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="sectionpage|ddelabel">DDE _command</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">filename</property> - <property name="xalign">0</property> - </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">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="sectionlabel"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sectionpage|sectionlabel">_Section</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">sectionname</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="selectfile"> - <property name="label" translatable="yes" context="sectionpage|selectfile">Browse...</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="selectfile-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|selectfile">Locate the file that you want to insert as a link, and then click Insert.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="filename"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">18</property> - <child internal-child="accessible"> - <object class="AtkObject" id="filename-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|filename">Enter the path and the filename for the file that you want to insert, or click the Browse button to locate the file.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="sectionname"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="sectionname-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|sectionname">Type a name for the new section.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="sectionname-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|sectionname">Type a name for the new section.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">2</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -357,23 +336,46 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="protect"> + <property name="label" translatable="yes" context="sectionpage|protect">_Protect</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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="protect-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|protect">Prevents the selected section from being edited.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> <property name="column_spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkCheckButton" id="protect"> - <property name="label" translatable="yes" context="sectionpage|protect">_Protect</property> + <object class="GtkCheckButton" id="withpassword"> + <property name="label" translatable="yes" context="sectionpage|withpassword">Wit_h password</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -381,9 +383,12 @@ <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="selectpassword"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="protect-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|protect">Prevents the selected section from being edited.</property> + <object class="AtkObject" id="withpassword-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|withpassword">Protects the selected section with a password. The password must have a minimum of 5 characters.</property> </object> </child> </object> @@ -393,71 +398,31 @@ </packing> </child> <child> - <object class="GtkAlignment"> + <object class="GtkButton" id="selectpassword"> + <property name="label" translatable="yes" context="sectionpage|selectpassword">Password...</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="withpassword"> - <property name="label" translatable="yes" context="sectionpage|withpassword">Wit_h password</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</property> - <property name="hexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <accessibility> - <relation type="label-for" target="selectpassword"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="withpassword-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|withpassword">Protects the selected section with a password. The password must have a minimum of 5 characters.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="selectpassword"> - <property name="label" translatable="yes" context="sectionpage|selectpassword">Password...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <accessibility> - <relation type="labelled-by" target="withpassword"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="selectpassword-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|selectpassword">Opens a dialog where you can change the current password.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <accessibility> + <relation type="labelled-by" target="withpassword"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="selectpassword-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|selectpassword">Opens a dialog where you can change the current password.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -485,35 +450,53 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="hide"> + <property name="label" translatable="yes" context="sectionpage|hide">H_ide</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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="hide-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|hide">Hides and prevents the selected section from being printed.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> <property name="column_spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkCheckButton" id="hide"> - <property name="label" translatable="yes" context="sectionpage|hide">H_ide</property> + <object class="GtkLabel" id="condlabel"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sectionpage|condlabel">_With Condition</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">withcond</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="hide-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|hide">Hides and prevents the selected section from being printed.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> @@ -521,60 +504,29 @@ </packing> </child> <child> - <object class="GtkAlignment"> + <object class="GtkEntry" id="withcond"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="condlabel"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sectionpage|condlabel">_With Condition</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">withcond</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="withcond"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">18</property> - <child internal-child="accessible"> - <object class="AtkObject" id="withcond-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|withcond">Enter the condition that must be met to hide the section.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">18</property> + <child internal-child="accessible"> + <object class="AtkObject" id="withcond-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sectionpage|extended_tip|withcond">Enter the condition that must be met to hide the section.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -602,23 +554,17 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkCheckButton" id="editable"> + <property name="label" translatable="yes" context="sectionpage|editable">E_ditable in read-only document</property> <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="left_padding">12</property> - <child> - <object class="GtkCheckButton" id="editable"> - <property name="label" translatable="yes" context="sectionpage|editable">E_ditable in read-only document</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> - </object> - </child> + <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="margin-start">12</property> + <property name="margin-top">6</property> </object> </child> <child type="label"> diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui index aa153b1fb668..99b431140055 100644 --- a/sw/uiconfig/swriter/ui/sortdialog.ui +++ b/sw/uiconfig/swriter/ui/sortdialog.ui @@ -107,447 +107,440 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkLabel" id="column"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sortdialog|column">Column</property> + <accessibility> + <relation type="label-for" target="colsb1"/> + <relation type="label-for" target="colsb2"/> + <relation type="label-for" target="colsb3"/> + </accessibility> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="keytype"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sortdialog|keytype">Key type</property> + <accessibility> + <relation type="label-for" target="typelb1"/> + <relation type="label-for" target="typelb2"/> + <relation type="label-for" target="typelb3"/> + </accessibility> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="order"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sortdialog|order">Order</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkGrid" id="grid8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="column"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sortdialog|column">Column</property> - <accessibility> - <relation type="label-for" target="colsb1"/> - <relation type="label-for" target="colsb2"/> - <relation type="label-for" target="colsb3"/> - </accessibility> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="keytype"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sortdialog|keytype">Key type</property> - <accessibility> - <relation type="label-for" target="typelb1"/> - <relation type="label-for" target="typelb2"/> - <relation type="label-for" target="typelb3"/> - </accessibility> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="order"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sortdialog|order">Order</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="up1"> - <property name="label" translatable="yes" context="sortdialog|up1">Ascending</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> - <accessibility> - <relation type="member-of" target="key1"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="up1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|up1">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="down1"> - <property name="label" translatable="yes" context="sortdialog|down1">Descending</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> - <property name="group">up1</property> - <accessibility> - <relation type="member-of" target="key1"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="down1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|down1">Sorts in descending order (for example, 9, 8, 7 or z, y, x).</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> - </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="up2"> - <property name="label" translatable="yes" context="sortdialog|up2">Ascending</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> - <accessibility> - <relation type="member-of" target="key2"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="up2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|up2">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="down2"> - <property name="label" translatable="yes" context="sortdialog|down2">Descending</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> - <property name="group">up2</property> - <accessibility> - <relation type="member-of" target="key2"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="down2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|down2">Sorts in descending order (for example, 9, 8, 7 or z, y, x).</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="up3"> - <property name="label" translatable="yes" context="sortdialog|up3">Ascending</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> - <accessibility> - <relation type="member-of" target="key3"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="up3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|up3">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="down3"> - <property name="label" translatable="yes" context="sortdialog|down3">Descending</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> - <property name="group">up3</property> - <accessibility> - <relation type="member-of" target="key3"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="down3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|down3">Sorts in descending order (for example, 9, 8, 7 or z, y, x).</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="key1"> - <property name="label" translatable="yes" context="sortdialog|key1">Key 1</property> + <object class="GtkRadioButton" id="up1"> + <property name="label" translatable="yes" context="sortdialog|up1">Ascending</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">center</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> + <accessibility> + <relation type="member-of" target="key1"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="key1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|key1">Specifies additional sorting criteria. You can also combine sort keys.</property> + <object class="AtkObject" id="up1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|up1">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</property> </object> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="key2"> - <property name="label" translatable="yes" context="sortdialog|key2">Key 2</property> + <object class="GtkRadioButton" id="down1"> + <property name="label" translatable="yes" context="sortdialog|down1">Descending</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">center</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="group">up1</property> + <accessibility> + <relation type="member-of" target="key1"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="key2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|key2">Specifies additional sorting criteria. You can also combine sort keys.</property> + <object class="AtkObject" id="down1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|down1">Sorts in descending order (for example, 9, 8, 7 or z, y, x).</property> </object> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> </packing> </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> <child> - <object class="GtkCheckButton" id="key3"> - <property name="label" translatable="yes" context="sortdialog|key3">Key 3</property> + <object class="GtkRadioButton" id="up2"> + <property name="label" translatable="yes" context="sortdialog|up2">Ascending</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">center</property> <property name="use_underline">True</property> - <property name="xalign">0.009999999776482582</property> + <property name="xalign">0</property> + <property name="active">True</property> <property name="draw_indicator">True</property> + <accessibility> + <relation type="member-of" target="key2"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="key3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|key3">Specifies additional sorting criteria. You can also combine sort keys.</property> + <object class="AtkObject" id="up2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|up2">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</property> </object> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkSpinButton" id="colsb1"> + <object class="GtkRadioButton" id="down2"> + <property name="label" translatable="yes" context="sortdialog|down2">Descending</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</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="group">up2</property> <accessibility> - <relation type="labelled-by" target="column"/> - <relation type="member-of" target="key1"/> + <relation type="member-of" target="key2"/> </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="colsb1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|colsb1">Enter the number of the table column that you want to use as a basis for sorting.</property> + <object class="AtkObject" id="down2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|down2">Sorts in descending order (for example, 9, 8, 7 or z, y, x).</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">1</property> </packing> </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> <child> - <object class="GtkSpinButton" id="colsb2"> + <object class="GtkRadioButton" id="up3"> + <property name="label" translatable="yes" context="sortdialog|up3">Ascending</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</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> <accessibility> - <relation type="labelled-by" target="column"/> - <relation type="member-of" target="key2"/> + <relation type="member-of" target="key3"/> </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="colsb2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|colsb2">Enter the number of the table column that you want to use as a basis for sorting.</property> + <object class="AtkObject" id="up3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|up3">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkSpinButton" id="colsb3"> + <object class="GtkRadioButton" id="down3"> + <property name="label" translatable="yes" context="sortdialog|down3">Descending</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment3</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="group">up3</property> <accessibility> - <relation type="labelled-by" target="column"/> <relation type="member-of" target="key3"/> </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="colsb3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|colsb3">Enter the number of the table column that you want to use as a basis for sorting.</property> + <object class="AtkObject" id="down3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|down3">Sorts in descending order (for example, 9, 8, 7 or z, y, x).</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> - <child> - <object class="GtkComboBoxText" id="typelb1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <accessibility> - <relation type="labelled-by" target="keytype"/> - <relation type="member-of" target="key1"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="typelb1-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb1-atkobject">Key type</property> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|typelb1">Select the sorting option that you want to use.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="key1"> + <property name="label" translatable="yes" context="sortdialog|key1">Key 1</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="valign">center</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="key1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|key1">Specifies additional sorting criteria. You can also combine sort keys.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="typelb2"> - <property name="width_request">130</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <accessibility> - <relation type="labelled-by" target="keytype"/> - <relation type="member-of" target="key2"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="typelb2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb2-atkobject">Key type</property> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|typelb2">Select the sorting option that you want to use.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="key2"> + <property name="label" translatable="yes" context="sortdialog|key2">Key 2</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="valign">center</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="key2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|key2">Specifies additional sorting criteria. You can also combine sort keys.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="typelb3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <accessibility> - <relation type="labelled-by" target="keytype"/> - <relation type="member-of" target="key3"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="typelb3-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb3-atkobject">Key type</property> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|typelb3">Select the sorting option that you want to use.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="key3"> + <property name="label" translatable="yes" context="sortdialog|key3">Key 3</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="valign">center</property> + <property name="use_underline">True</property> + <property name="xalign">0.009999999776482582</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="key3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|key3">Specifies additional sorting criteria. You can also combine sort keys.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <placeholder/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="colsb1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <accessibility> + <relation type="labelled-by" target="column"/> + <relation type="member-of" target="key1"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="colsb1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|colsb1">Enter the number of the table column that you want to use as a basis for sorting.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="colsb2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <accessibility> + <relation type="labelled-by" target="column"/> + <relation type="member-of" target="key2"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="colsb2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|colsb2">Enter the number of the table column that you want to use as a basis for sorting.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="colsb3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment3</property> + <accessibility> + <relation type="labelled-by" target="column"/> + <relation type="member-of" target="key3"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="colsb3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|colsb3">Enter the number of the table column that you want to use as a basis for sorting.</property> + </object> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="typelb1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <accessibility> + <relation type="labelled-by" target="keytype"/> + <relation type="member-of" target="key1"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="typelb1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb1-atkobject">Key type</property> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|typelb1">Select the sorting option that you want to use.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="typelb2"> + <property name="width_request">130</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <accessibility> + <relation type="labelled-by" target="keytype"/> + <relation type="member-of" target="key2"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="typelb2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb2-atkobject">Key type</property> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|typelb2">Select the sorting option that you want to use.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="typelb3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <accessibility> + <relation type="labelled-by" target="keytype"/> + <relation type="member-of" target="key3"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="typelb3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb3-atkobject">Key type</property> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|typelb3">Select the sorting option that you want to use.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -584,60 +577,54 @@ <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="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">10</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkRadioButton" id="columns"> + <property name="label" translatable="yes" context="sortdialog|columns">Columns</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">10</property> - <child> - <object class="GtkRadioButton" id="columns"> - <property name="label" translatable="yes" context="sortdialog|columns">Columns</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="columns-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|columns">Sorts the columns in the table according to the current sort options.</property> - </object> - </child> + <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="columns-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|columns">Sorts the columns in the table according to the current sort options.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="rows"> - <property name="label" translatable="yes" context="sortdialog|rows">Rows</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">columns</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rows-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|rows">Sorts the rows in the table or the paragraphs in the selection according to the current sort options.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rows"> + <property name="label" translatable="yes" context="sortdialog|rows">Rows</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">columns</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rows-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|rows">Sorts the rows in the table or the paragraphs in the selection according to the current sort options.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -664,123 +651,117 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="row_spacing">10</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <property name="valign">end</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <child> + <object class="GtkRadioButton" id="tabs"> + <property name="label" translatable="yes" context="sortdialog|tabs">Tabs</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="tabs-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|tabs">If the selected paragraphs correspond to a list separated by tabs, select this option.</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="character"> + <property name="label" translatable="yes" context="sortdialog|character">Character </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">tabs</property> + <accessibility> + <relation type="label-for" target="separator"/> + <relation type="label-for" target="delimpb"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="character-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|character">Enter the character that you want to use as a separator in the selected area.</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="grid4"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="row_spacing">10</property> + <property name="column_spacing">6</property> + <property name="column_homogeneous">True</property> <child> - <object class="GtkRadioButton" id="tabs"> - <property name="label" translatable="yes" context="sortdialog|tabs">Tabs</property> + <object class="GtkEntry" id="separator"> <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> + <property name="max_length">1</property> + <property name="activates_default">True</property> + <property name="width_chars">1</property> + <property name="max_width_chars">1</property> + <accessibility> + <relation type="labelled-by" target="character"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="tabs-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|tabs">If the selected paragraphs correspond to a list separated by tabs, select this option.</property> + <object class="AtkObject" id="separator-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|separator">Enter the character that you want to use as a separator in the selected area.</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="character"> - <property name="label" translatable="yes" context="sortdialog|character">Character </property> + <object class="GtkButton" id="delimpb"> + <property name="label" translatable="yes" context="sortdialog|delimpb">Select...</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">tabs</property> + <property name="receives_default">True</property> <accessibility> - <relation type="label-for" target="separator"/> - <relation type="label-for" target="delimpb"/> + <relation type="labelled-by" target="character"/> + <relation type="member-of" target="character"/> </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="character-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|character">Enter the character that you want to use as a separator in the selected area.</property> + <object class="AtkObject" id="delimpb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|delimpb">Opens the Special Characters dialog, where you can select the character that you want to use as a separator.</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="grid5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">6</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkEntry" id="separator"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">1</property> - <property name="activates_default">True</property> - <property name="width_chars">1</property> - <property name="max_width_chars">1</property> - <accessibility> - <relation type="labelled-by" target="character"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="separator-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|separator">Enter the character that you want to use as a separator in the selected area.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="delimpb"> - <property name="label" translatable="yes" context="sortdialog|delimpb">Select...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <accessibility> - <relation type="labelled-by" target="character"/> - <relation type="member-of" target="character"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="delimpb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|delimpb">Opens the Special Characters dialog, where you can select the character that you want to use as a separator.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -822,26 +803,20 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkComboBoxText" id="langlb"> <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="GtkComboBoxText" id="langlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry"> - <property name="can_focus">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="langlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|langlb">Select the language that defines the sorting rules.</property> - </object> - </child> + <property name="has_entry">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child internal-child="entry"> + <object class="GtkEntry"> + <property name="can_focus">True</property> + </object> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="langlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|langlb">Select the language that defines the sorting rules.</property> </object> </child> </object> @@ -869,25 +844,19 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkCheckButton" id="matchcase"> + <property name="label" translatable="yes" context="sortdialog|matchcase">Match case</property> <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="GtkCheckButton" id="matchcase"> - <property name="label" translatable="yes" context="sortdialog|matchcase">Match case</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="matchcase-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|matchcase">Distinguishes between uppercase and lowercase letters when you sort a table. For Asian languages special handling applies.</property> - </object> - </child> + <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="margin-start">12</property> + <property name="margin-top">6</property> + <child internal-child="accessible"> + <object class="AtkObject" id="matchcase-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortdialog|extended_tip|matchcase">Distinguishes between uppercase and lowercase letters when you sort a table. For Asian languages special handling applies.</property> </object> </child> </object> diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui index e1371f1e535d..3fcec160b373 100644 --- a/sw/uiconfig/swriter/ui/titlepage.ui +++ b/sw/uiconfig/swriter/ui/titlepage.ui @@ -111,167 +111,161 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="label6"> <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="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="titlepage|label6">Number of title pages:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">NF_PAGE_COUNT</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="titlepage|label7">Place title pages at:</property> - <property name="xalign">0</property> - <accessibility> - <relation type="label-for" target="RB_DOCUMENT_START"/> - <relation type="label-for" target="RB_PAGE_START"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="NF_PAGE_COUNT"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="NF_PAGE_START"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <property name="numeric">True</property> - <accessibility> - <relation type="labelled-by" target="RB_PAGE_START"/> - </accessibility> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="RB_USE_EXISTING_PAGES"> - <property name="label" translatable="yes" context="titlepage|RB_USE_EXISTING_PAGES">Converting existing pages to title pages</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</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="group">RB_INSERT_NEW_PAGES</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="RB_INSERT_NEW_PAGES"> - <property name="label" translatable="yes" context="titlepage|RB_INSERT_NEW_PAGES">Insert new title pages</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</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="group">RB_USE_EXISTING_PAGES</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="RB_DOCUMENT_START"> - <property name="label" translatable="yes" context="titlepage|RB_DOCUMENT_START">Document start</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> - <accessibility> - <relation type="labelled-by" target="label7"/> - </accessibility> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="RB_PAGE_START"> - <property name="label" translatable="yes" context="titlepage|RB_PAGE_START">Page</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">RB_DOCUMENT_START</property> - <accessibility> - <relation type="labelled-by" target="label7"/> - </accessibility> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes" context="titlepage|label6">Number of title pages:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">NF_PAGE_COUNT</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="titlepage|label7">Place title pages at:</property> + <property name="xalign">0</property> + <accessibility> + <relation type="label-for" target="RB_DOCUMENT_START"/> + <relation type="label-for" target="RB_PAGE_START"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="NF_PAGE_COUNT"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="NF_PAGE_START"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <property name="numeric">True</property> + <accessibility> + <relation type="labelled-by" target="RB_PAGE_START"/> + </accessibility> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="RB_USE_EXISTING_PAGES"> + <property name="label" translatable="yes" context="titlepage|RB_USE_EXISTING_PAGES">Converting existing pages to title pages</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</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="group">RB_INSERT_NEW_PAGES</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="RB_INSERT_NEW_PAGES"> + <property name="label" translatable="yes" context="titlepage|RB_INSERT_NEW_PAGES">Insert new title pages</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</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="group">RB_USE_EXISTING_PAGES</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="RB_DOCUMENT_START"> + <property name="label" translatable="yes" context="titlepage|RB_DOCUMENT_START">Document start</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> + <accessibility> + <relation type="labelled-by" target="label7"/> + </accessibility> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="RB_PAGE_START"> + <property name="label" translatable="yes" context="titlepage|RB_PAGE_START">Page</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">RB_DOCUMENT_START</property> + <accessibility> + <relation type="labelled-by" target="label7"/> + </accessibility> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -299,26 +293,42 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkCheckButton" id="CB_RESTART_NUMBERING"> + <property name="label" translatable="yes" context="titlepage|CB_RESTART_NUMBERING">Reset page numbering after title pages</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkCheckButton" id="CB_RESTART_NUMBERING"> - <property name="label" translatable="yes" context="titlepage|CB_RESTART_NUMBERING">Reset page numbering after title pages</property> + <object class="GtkLabel" id="FT_PAGE_COUNT"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="titlepage|FT_PAGE_COUNT">Page number:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="mnemonic_widget">NF_RESTART_NUMBERING</property> </object> <packing> <property name="expand">False</property> @@ -327,47 +337,14 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkSpinButton" id="NF_RESTART_NUMBERING"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkBox" id="box4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="FT_PAGE_COUNT"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="titlepage|FT_PAGE_COUNT">Page number:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">NF_RESTART_NUMBERING</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="NF_RESTART_NUMBERING"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment3</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment3</property> + <property name="numeric">True</property> </object> <packing> <property name="expand">False</property> @@ -375,72 +352,71 @@ <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> + <child> + <object class="GtkCheckButton" id="CB_SET_PAGE_NUMBER"> + <property name="label" translatable="yes" context="titlepage|CB_SET_PAGE_NUMBER">Set page number for first title page</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkCheckButton" id="CB_SET_PAGE_NUMBER"> - <property name="label" translatable="yes" context="titlepage|CB_SET_PAGE_NUMBER">Set page number for first title page</property> + <object class="GtkLabel" id="FT_PAGE_PAGES"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="titlepage|FT_PAGE_PAGES">Page number:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="mnemonic_widget">NF_SET_PAGE_NUMBER</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkSpinButton" id="NF_SET_PAGE_NUMBER"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkBox" id="box5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="FT_PAGE_PAGES"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="titlepage|FT_PAGE_PAGES">Page number:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">NF_SET_PAGE_NUMBER</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="NF_SET_PAGE_NUMBER"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment4</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment4</property> + <property name="numeric">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child> @@ -468,55 +444,49 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="titlepage|label4">_Style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">LB_PAGE_PROPERTIES</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="LB_PAGE_PROPERTIES"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="PB_PAGE_PROPERTIES"> - <property name="label" translatable="yes" context="titlepage|PB_PAGE_PROPERTIES">Edit...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="titlepage|label4">_Style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">LB_PAGE_PROPERTIES</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="LB_PAGE_PROPERTIES"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="PB_PAGE_PROPERTIES"> + <property name="label" translatable="yes" context="titlepage|PB_PAGE_PROPERTIES">Edit...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui b/sw/uiconfig/swriter/ui/tocentriespage.ui index 412772930eda..50ce7018f8f7 100644 --- a/sw/uiconfig/swriter/ui/tocentriespage.ui +++ b/sw/uiconfig/swriter/ui/tocentriespage.ui @@ -74,39 +74,33 @@ <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="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <property name="vexpand">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="GtkScrolledWindow"> + <object class="GtkTreeView" id="level"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</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="level"> - <property name="visible">True</property> - <property name="can_focus">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> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> </child> @@ -175,546 +169,539 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <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="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocentriespage|label4">_Structure:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">token</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="all"> + <property name="label" translatable="yes" context="tocentriespage|all">_All</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="all-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|all">Applies the current settings to all levels without closing the dialog.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="token"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="token-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|token">Displays the remainder of the Structure line.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|label4">_Structure:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">token</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="tocentriespage|label5">Character style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">charstyle</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="edit"> + <property name="label" translatable="yes" context="tocentriespage|edit">_Edit...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="edit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|edit">Opens a dialog where you can edit the selected character style.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="all"> - <property name="label" translatable="yes" context="tocentriespage|all">_All</property> - <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="charstyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="charstyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|charstyle">Specify the formatting style for the selected part on the Structure line.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="fillcharft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocentriespage|fillcharft">Fill character:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fillchar</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="fillchar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="all-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|all">Applies the current settings to all levels without closing the dialog.</property> - </object> - </child> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkBox" id="token"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="token-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|token">Displays the remainder of the Structure line.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="fillchar-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|fillchar">Select the tab leader that you want use.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="tabstopposft"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocentriespage|tabstopposft">Tab stop position:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">tabstoppos</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="tabstoppos"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|label5">Character style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">charstyle</property> - <property name="xalign">0</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="tabstoppos-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|tabstoppos">Enter the distance to leave between the left page margin and the tab stop.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="edit"> - <property name="label" translatable="yes" context="tocentriespage|edit">_Edit...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="edit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|edit">Opens a dialog where you can edit the selected character style.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="alignright"> + <property name="label" translatable="yes" context="tocentriespage|alignright">Align right</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="alignright-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|alignright">Aligns the tab stop to the right page margin.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="charstyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="charstyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|charstyle">Specify the formatting style for the selected part on the Structure line.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="chapterentryft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocentriespage|chapterentryft">Chapter entry:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">chapterentry</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="chapterentry"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="tocentriespage|chapterentry">Number range only</item> + <item translatable="yes" context="tocentriespage|chapterentry">Description only</item> + <item translatable="yes" context="tocentriespage|chapterentry">Number range and description</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="chapterentry-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|chapterentry">Select the chapter information that you want to include in the index entry.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="fillcharft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|fillcharft">Fill character:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fillchar</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="entryoutlinelevelft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocentriespage|entryoutlinelevelft">Evaluate up to level:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entryoutlinelevel</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="entryoutlinelevel"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="entryoutlinelevel-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|entryoutlinelevel">Enter the maximum hierarchy level down to which objects are shown in the generated index.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="fillchar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="fillchar-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|fillchar">Select the tab leader that you want use.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="numberformatft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocentriespage|numberformatft">Format:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numberformat</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="numberformat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="tocentriespage|numberformat">Number</item> + <item translatable="yes" context="tocentriespage|numberformat">Number without separator</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="numberformat-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|numberformat">Only visible when you click the E# button in the Structure line. Select to show the chapter number with or without separator.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="tabstopposft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|tabstopposft">Tab stop position:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">tabstoppos</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="hexpand">True</property> + <child> + <object class="GtkComboBoxText" id="authfield"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="authfield-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|authfield">To add an entry to the Structure line, click the entry, click in an empty box on the Structure line, and then click Insert.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</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="GtkButtonBox" id="buttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="spacing">12</property> + <property name="layout_style">spread</property> <child> - <object class="GtkSpinButton" id="tabstoppos"> - <property name="visible">True</property> + <object class="GtkButton" id="insert"> + <property name="label" translatable="yes" context="tocentriespage|insert">_Insert</property> <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="tabstoppos-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|tabstoppos">Enter the distance to leave between the left page margin and the tab stop.</property> + <object class="AtkObject" id="insert-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|insert">Adds the reference code for the selected bibliography entry to the Structure line. Select an entry in the list, click in an empty box, and then click this button.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="alignright"> - <property name="label" translatable="yes" context="tocentriespage|alignright">Align right</property> - <property name="visible">True</property> + <object class="GtkButton" id="remove"> + <property name="label" translatable="yes" context="tocentriespage|remove">_Remove</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</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="alignright-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|alignright">Aligns the tab stop to the right page margin.</property> + <object class="AtkObject" id="remove-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|remove">Removes the selected reference code from the Structure line.</property> </object> </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkLabel" id="chapterentryft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|chapterentryft">Chapter entry:</property> + <object class="GtkButton" id="chapterno"> + <property name="label" translatable="yes" context="tocentriespage|chapterno">Chapter No.</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">chapterentry</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="chapterentry"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="tocentriespage|chapterentry">Number range only</item> - <item translatable="yes" context="tocentriespage|chapterentry">Description only</item> - <item translatable="yes" context="tocentriespage|chapterentry">Number range and description</item> - </items> <child internal-child="accessible"> - <object class="AtkObject" id="chapterentry-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|chapterentry">Select the chapter information that you want to include in the index entry.</property> + <object class="AtkObject" id="chapterno-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|chapterno">Inserts the chapter number. To assign chapter numbering to a heading style, choose Tools - Chapter Numbering.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="entryoutlinelevelft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|entryoutlinelevelft">Evaluate up to level:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entryoutlinelevel</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkSpinButton" id="entryoutlinelevel"> + <object class="GtkButton" id="entrytext"> + <property name="label" translatable="yes" context="tocentriespage|entrytext">Entry Text</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> + <property name="receives_default">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="entryoutlinelevel-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|entryoutlinelevel">Enter the maximum hierarchy level down to which objects are shown in the generated index.</property> + <object class="AtkObject" id="entrytext-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|entrytext">Inserts the text of the chapter heading.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkLabel" id="numberformatft"> + <object class="GtkButton" id="tabstop"> + <property name="label" translatable="yes" context="tocentriespage|tabstop">Tab Stop</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|numberformatft">Format:</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">numberformat</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="tabstop-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|tabstop">Inserts a tab stop. To add leader dots to the tab stop, select a character in the Fill character box. To change the position of the tab stop, enter a value in the Tab stop position box, or select the Align right check box.</property> + </object> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="numberformat"> + <object class="GtkButton" id="chapterinfo"> + <property name="label" translatable="yes" context="tocentriespage|chapterinfo">_Chapter Info</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="tocentriespage|numberformat">Number</item> - <item translatable="yes" context="tocentriespage|numberformat">Number without separator</item> - </items> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="numberformat-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|numberformat">Only visible when you click the E# button in the Structure line. Select to show the chapter number with or without separator.</property> + <object class="AtkObject" id="chapterinfo-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|chapterinfo">Inserts chapter information, such as the chapter heading and number. Select the information that you want to display in the Chapter entry box.</property> </object> </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">5</property> </packing> </child> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">6</property> - <property name="hexpand">True</property> - <child> - <object class="GtkComboBoxText" id="authfield"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <object class="GtkButton" id="pageno"> + <property name="label" translatable="yes" context="tocentriespage|pageno">Page No.</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="authfield-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|authfield">To add an entry to the Structure line, click the entry, click in an empty box on the Structure line, and then click Insert.</property> + <object class="AtkObject" id="pageno-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|pageno">Inserts the page number of the entry.</property> </object> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">6</property> </packing> </child> <child> - <object class="GtkButtonBox" id="buttonbox1"> + <object class="GtkButton" id="hyperlink"> + <property name="label" translatable="yes" context="tocentriespage|hyperlink">H_yperlink</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">12</property> - <property name="layout_style">spread</property> - <child> - <object class="GtkButton" id="insert"> - <property name="label" translatable="yes" context="tocentriespage|insert">_Insert</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="insert-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|insert">Adds the reference code for the selected bibliography entry to the Structure line. Select an entry in the list, click in an empty box, and then click this button.</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="GtkButton" id="remove"> - <property name="label" translatable="yes" context="tocentriespage|remove">_Remove</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="remove-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|remove">Removes the selected reference code from the Structure line.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="chapterno"> - <property name="label" translatable="yes" context="tocentriespage|chapterno">Chapter No.</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="chapterno-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|chapterno">Inserts the chapter number. To assign chapter numbering to a heading style, choose Tools - Chapter Numbering.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="entrytext"> - <property name="label" translatable="yes" context="tocentriespage|entrytext">Entry Text</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="entrytext-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|entrytext">Inserts the text of the chapter heading.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="tabstop"> - <property name="label" translatable="yes" context="tocentriespage|tabstop">Tab Stop</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="tabstop-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|tabstop">Inserts a tab stop. To add leader dots to the tab stop, select a character in the Fill character box. To change the position of the tab stop, enter a value in the Tab stop position box, or select the Align right check box.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkButton" id="chapterinfo"> - <property name="label" translatable="yes" context="tocentriespage|chapterinfo">_Chapter Info</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="chapterinfo-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|chapterinfo">Inserts chapter information, such as the chapter heading and number. Select the information that you want to display in the Chapter entry box.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkButton" id="pageno"> - <property name="label" translatable="yes" context="tocentriespage|pageno">Page No.</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="pageno-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|pageno">Inserts the page number of the entry.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="GtkButton" id="hyperlink"> - <property name="label" translatable="yes" context="tocentriespage|hyperlink">H_yperlink</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="hyperlink-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|hyperlink">Creates a hyperlink for the part of the entry that you enclose by the opening (LS) and the closing (LE) hyperlink tags. On the Structure line, click in the empty box in front of the part that you want to create a hyperlink for, and then click this button. Click in the empty box after the part that you want to hyperlink, and then click this button again. All hyperlinks must be unique. Available only for a table of contents.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="hyperlink-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|hyperlink">Creates a hyperlink for the part of the entry that you enclose by the opening (LS) and the closing (LE) hyperlink tags. On the Structure line, click in the empty box in front of the part that you want to create a hyperlink for, and then click this button. Click in the empty box after the part that you want to hyperlink, and then click this button again. All hyperlinks must be unique. Available only for a table of contents.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> - </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">7</property> </packing> </child> </object> <packing> - <property name="left_attach">0</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">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -742,113 +729,107 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> <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="vexpand">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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkCheckButton" id="reltostyle"> + <property name="label" translatable="yes" context="tocentriespage|reltostyle">Tab position relati_ve to paragraph style indent</property> <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="GtkCheckButton" id="reltostyle"> - <property name="label" translatable="yes" context="tocentriespage|reltostyle">Tab position relati_ve to paragraph style indent</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="reltostyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|reltostyle">Positions the tab stop relative to the "indent from left" value defined in the paragraph style selected on the Styles tab. Otherwise the tab stop is positioned relative to the left text margin.</property> - </object> - </child> + <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="reltostyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|reltostyle">Positions the tab stop relative to the "indent from left" value defined in the paragraph style selected on the Styles tab. Otherwise the tab stop is positioned relative to the left text margin.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="commasep"> - <property name="label" translatable="yes" context="tocentriespage|commasep">Key separated by commas</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="commasep-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|commasep">Arranges the index entries on the same line, separated by commas.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="commasep"> + <property name="label" translatable="yes" context="tocentriespage|commasep">Key separated by commas</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="commasep-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|commasep">Arranges the index entries on the same line, separated by commas.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="alphadelim"> - <property name="label" translatable="yes" context="tocentriespage|alphadelim">Alphabetical delimiter</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="alphadelim-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|alphadelim">Uses the initial letters of the alphabetically arranged index entries as section headings.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="alphadelim"> + <property name="label" translatable="yes" context="tocentriespage|alphadelim">Alphabetical delimiter</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="alphadelim-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|alphadelim">Uses the initial letters of the alphabetically arranged index entries as section headings.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="mainstyleft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|mainstyleft">Character style for main entries:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mainstyle</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="mainstyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="mainstyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|mainstyle">Specify the formatting style for the main entries in the alphabetical index. To convert an index entry into a main entry, click in front of the index field in the document and then choose Edit - Index Entry.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="mainstyleft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocentriespage|mainstyleft">Character style for main entries:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mainstyle</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="mainstyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="mainstyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|mainstyle">Specify the formatting style for the main entries in the alphabetical index. To convert an index entry into a main entry, click in front of the index field in the document and then choose Edit - Index Entry.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -876,63 +857,57 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid7"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="column_spacing">18</property> <property name="hexpand">True</property> <property name="vexpand">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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkRadioButton" id="sortpos"> + <property name="label" translatable="yes" context="tocentriespage|sortpos">Document _position</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">18</property> - <child> - <object class="GtkRadioButton" id="sortpos"> - <property name="label" translatable="yes" context="tocentriespage|sortpos">Document _position</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> - <property name="group">sortcontents</property> - <child internal-child="accessible"> - <object class="AtkObject" id="sortpos-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|sortpos">Sorts the bibliography entries according to the position of their references in the document.</property> - </object> - </child> + <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="group">sortcontents</property> + <child internal-child="accessible"> + <object class="AtkObject" id="sortpos-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|sortpos">Sorts the bibliography entries according to the position of their references in the document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="sortcontents"> - <property name="label" translatable="yes" context="tocentriespage|sortcontents">_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> - <property name="group">sortpos</property> - <child internal-child="accessible"> - <object class="AtkObject" id="sortcontents-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|sortcontents">Sorts the bibliography entries by the Sort keys that you specify, for example, by author or by year of publication.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="sortcontents"> + <property name="label" translatable="yes" context="tocentriespage|sortcontents">_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> + <property name="group">sortpos</property> + <child internal-child="accessible"> + <object class="AtkObject" id="sortcontents-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|sortcontents">Sorts the bibliography entries by the Sort keys that you specify, for example, by author or by year of publication.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -960,240 +935,234 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid8"> <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="vexpand">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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkLabel" id="label15"> <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="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|label15">_1:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="key1lb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="key1lb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|key1lb">Select the entry by which to sort the bibliography entries. This option is only available if you select the Content radio button in the Sort by area.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label16"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|label16">_2:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocentriespage|label17">_3:</property> - <property name="use_underline">True</property> + <property name="label" translatable="yes" context="tocentriespage|label15">_1:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="key1lb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="key1lb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|key1lb">Select the entry by which to sort the bibliography entries. This option is only available if you select the Content radio button in the Sort by area.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="key2lb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="key2lb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|key2lb">Select the entry by which to sort the bibliography entries. This option is only available if you select the Content radio button in the Sort by area.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocentriespage|label16">_2:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocentriespage|label17">_3:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="key2lb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="key2lb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|key2lb">Select the entry by which to sort the bibliography entries. This option is only available if you select the Content radio button in the Sort by area.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="key3lb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="key3lb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|key3lb">Select the entry by which to sort the bibliography entries. This option is only available if you select the Content radio button in the Sort by area.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="key3lb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="key3lb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|key3lb">Select the entry by which to sort the bibliography entries. This option is only available if you select the Content radio button in the Sort by area.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="up1cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="tocentriespage|up1cb|tooltip_text">Ascending</property> - <property name="image">image1</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="up1cb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|up1cb">Sorts the bibliography entries in ascending alphanumerical order.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="up1cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="tocentriespage|up1cb|tooltip_text">Ascending</property> + <property name="image">image1</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="up1cb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|up1cb">Sorts the bibliography entries in ascending alphanumerical order.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="down1cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="tocentriespage|down1cb|tooltip_text">Descending</property> - <property name="image">image2</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">up1cb</property> - <child internal-child="accessible"> - <object class="AtkObject" id="down1cb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|down1cb">Sorts the bibliography entries in a descending alphanumerical order.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="down1cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="tocentriespage|down1cb|tooltip_text">Descending</property> + <property name="image">image2</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">up1cb</property> + <child internal-child="accessible"> + <object class="AtkObject" id="down1cb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|down1cb">Sorts the bibliography entries in a descending alphanumerical order.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="up2cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="tocentriespage|up2cb|tooltip_text">Ascending</property> - <property name="image">image3</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="up2cb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|up2cb">Sorts the bibliography entries in ascending alphanumerical order.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="up2cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="tocentriespage|up2cb|tooltip_text">Ascending</property> + <property name="image">image3</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="up2cb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|up2cb">Sorts the bibliography entries in ascending alphanumerical order.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="up3cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="tocentriespage|up3cb|tooltip_text">Ascending</property> - <property name="image">image4</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="up3cb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|up3cb">Sorts the bibliography entries in ascending alphanumerical order.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="up3cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="tocentriespage|up3cb|tooltip_text">Ascending</property> + <property name="image">image4</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="up3cb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|up3cb">Sorts the bibliography entries in ascending alphanumerical order.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="down2cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="tocentriespage|down2cb|tooltip_text">Descending</property> - <property name="image">image5</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">up2cb</property> - <child internal-child="accessible"> - <object class="AtkObject" id="down2cb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|down2cb">Sorts the bibliography entries in a descending alphanumerical order.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="down2cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="tocentriespage|down2cb|tooltip_text">Descending</property> + <property name="image">image5</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">up2cb</property> + <child internal-child="accessible"> + <object class="AtkObject" id="down2cb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|down2cb">Sorts the bibliography entries in a descending alphanumerical order.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="down3cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="tocentriespage|down3cb|tooltip_text">Descending</property> - <property name="image">image6</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">up3cb</property> - <child internal-child="accessible"> - <object class="AtkObject" id="down3cb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|down3cb">Sorts the bibliography entries in a descending alphanumerical order.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="down3cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="tocentriespage|down3cb|tooltip_text">Descending</property> + <property name="image">image6</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">up3cb</property> + <child internal-child="accessible"> + <object class="AtkObject" id="down3cb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocentriespage|extended_tip|down3cb">Sorts the bibliography entries in a descending alphanumerical order.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui index 4920dd9839a1..6221a10c1ed6 100644 --- a/sw/uiconfig/swriter/ui/tocindexpage.ui +++ b/sw/uiconfig/swriter/ui/tocindexpage.ui @@ -76,113 +76,107 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> <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="vexpand">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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkLabel" id="mainstyleft"> <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="GtkLabel" id="mainstyleft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocindexpage|mainstyleft">_Title:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">title</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="title"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="title-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|title">Enter a title for the selected index.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="typeft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocindexpage|typeft">Type:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">type</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="tocindexpage|mainstyleft">_Title:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">title</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="title"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="title-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|title">Enter a title for the selected index.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="type"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <items> - <item id="1" translatable="yes" context="tocindexpage|liststore1">Table of Contents</item> - <item id="2" translatable="yes" context="tocindexpage|liststore1">Alphabetical Index</item> - <item id="4" translatable="yes" context="tocindexpage|liststore1">Table of Figures</item> - <item id="8" translatable="yes" context="tocindexpage|liststore1">Index of Tables</item> - <item id="16" translatable="yes" context="tocindexpage|liststore1">User-Defined</item> - <item id="32" translatable="yes" context="tocindexpage|liststore1">Table of Objects</item> - <item id="64" translatable="yes" context="tocindexpage|liststore1">Bibliography</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="type-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|type">Select the type of index that you want to insert or edit.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="typeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocindexpage|typeft">Type:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">type</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="type"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <items> + <item id="1" translatable="yes" context="tocindexpage|liststore1">Table of Contents</item> + <item id="2" translatable="yes" context="tocindexpage|liststore1">Alphabetical Index</item> + <item id="4" translatable="yes" context="tocindexpage|liststore1">Table of Figures</item> + <item id="8" translatable="yes" context="tocindexpage|liststore1">Index of Tables</item> + <item id="16" translatable="yes" context="tocindexpage|liststore1">User-Defined</item> + <item id="32" translatable="yes" context="tocindexpage|liststore1">Table of Objects</item> + <item id="64" translatable="yes" context="tocindexpage|liststore1">Bibliography</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="type-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|type">Select the type of index that you want to insert or edit.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="readonly"> - <property name="label" translatable="yes" context="tocindexpage|readonly">Protected against manual changes</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="readonly-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|readonly">Prevents the contents of the index from being changed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="readonly"> + <property name="label" translatable="yes" context="tocindexpage|readonly">Protected against manual changes</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="readonly-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|readonly">Prevents the contents of the index from being changed.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> </child> </object> </child> @@ -210,58 +204,29 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="column_spacing">18</property> <property name="hexpand">True</property> <property name="vexpand">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> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">18</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="mainstyleft2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="mainstyleft2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocindexpage|mainstyleft2">For:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">scope</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="scope"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="tocindexpage|scope">Entire document</item> - <item translatable="yes" context="tocindexpage|scope">Chapter</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="scope-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|scope">Select whether to create the index for the document or for the current chapter.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="tocindexpage|mainstyleft2">For:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">scope</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -269,41 +234,60 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkComboBoxText" id="scope"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="levelft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocindexpage|levelft">Evaluate up to level:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">level</property> - <property name="xalign">0</property> + <items> + <item translatable="yes" context="tocindexpage|scope">Entire document</item> + <item translatable="yes" context="tocindexpage|scope">Chapter</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="scope-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|scope">Select whether to create the index for the document or for the current chapter.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="level"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="level-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|level">Enter the number of heading levels to include in the index.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="levelft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocindexpage|levelft">Evaluate up to level:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">level</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="level"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="level-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|level">Enter the number of heading levels to include in the index.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> @@ -312,6 +296,10 @@ </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -339,218 +327,191 @@ <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="grid2"> <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="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkGrid" id="grid10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid10"> - <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="GtkCheckButton" id="fromheadings"> - <property name="label" translatable="yes" context="tocindexpage|fromheadings">Outline</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</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="fromheadings-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromheadings">Creates the index using outline levels. Paragraphs formatted with one of the predefined heading styles (Heading 1-10) are added to the index.</property> - </object> - </child> + <object class="GtkCheckButton" id="fromheadings"> + <property name="label" translatable="yes" context="tocindexpage|fromheadings">Outline</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</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="fromheadings-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromheadings">Creates the index using outline levels. Paragraphs formatted with one of the predefined heading styles (Heading 1-10) are added to the index.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="indexmarks"> - <property name="label" translatable="yes" context="tocindexpage|indexmarks">Inde_x marks</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="indexmarks-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|indexmarks">Includes the index entries that you inserted by choosing Insert - Table of Contents and Index - Index Entry in the index.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="indexmarks"> + <property name="label" translatable="yes" context="tocindexpage|indexmarks">Inde_x marks</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="indexmarks-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|indexmarks">Includes the index entries that you inserted by choosing Insert - Table of Contents and Index - Index Entry in the index.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="fromtables"> - <property name="label" translatable="yes" context="tocindexpage|fromtables">Tables</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="fromtables-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromtables">Includes tables in the index.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fromtables"> + <property name="label" translatable="yes" context="tocindexpage|fromtables">Tables</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="fromtables-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromtables">Includes tables in the index.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="fromframes"> - <property name="label" translatable="yes" context="tocindexpage|fromframes">Te_xt frames</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="fromframes-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromframes">Includes frames in the index.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fromframes"> + <property name="label" translatable="yes" context="tocindexpage|fromframes">Te_xt frames</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="fromframes-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromframes">Includes frames in the index.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="fromgraphics"> - <property name="label" translatable="yes" context="tocindexpage|fromgraphics">Graphics</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="fromgraphics-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromgraphics">Includes graphics in the index.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fromgraphics"> + <property name="label" translatable="yes" context="tocindexpage|fromgraphics">Graphics</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="fromgraphics-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromgraphics">Includes graphics in the index.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="fromoles"> - <property name="label" translatable="yes" context="tocindexpage|fromoles">OLE objects</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="fromoles-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromoles">Includes OLE objects in the index.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fromoles"> + <property name="label" translatable="yes" context="tocindexpage|fromoles">OLE objects</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="fromoles-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromoles">Includes OLE objects in the index.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="uselevel"> - <property name="label" translatable="yes" context="tocindexpage|uselevel">Use level from source chapter</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</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="uselevel-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|uselevel">Indents table, graphic, frame, and OLE object index entries according their place in the chapter heading hierarchy.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="uselevel"> + <property name="label" translatable="yes" context="tocindexpage|uselevel">Use level from source chapter</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="uselevel-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|uselevel">Indents table, graphic, frame, and OLE object index entries according their place in the chapter heading hierarchy.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkCheckButton" id="addstylescb"> + <property name="label" translatable="yes" context="tocindexpage|addstylescb">_Additional styles</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkCheckButton" id="addstylescb"> - <property name="label" translatable="yes" context="tocindexpage|addstylescb">_Additional styles</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="addstylescb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|addstylescb">Includes the paragraph styles that you specify in the Assign Styles dialog as index entries. To select the paragraph styles that you want to include in the index, click the Assign Styles (...) button to the right of this box.</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="GtkCheckButton" id="stylescb"> - <property name="label" translatable="yes" context="tocindexpage|stylescb">Styl_es</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">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="addstylescb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|addstylescb">Includes the paragraph styles that you specify in the Assign Styles dialog as index entries. To select the paragraph styles that you want to include in the index, click the Assign Styles (...) button to the right of this box.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -560,21 +521,14 @@ </packing> </child> <child> - <object class="GtkButton" id="styles"> - <property name="label" translatable="yes" context="tocindexpage|styles">Assign styles...</property> - <property name="visible">True</property> + <object class="GtkCheckButton" id="stylescb"> + <property name="label" translatable="yes" context="tocindexpage|stylescb">Styl_es</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">start</property> - <property name="valign">center</property> - <accessibility> - <relation type="labelled-by" target="addstylescb"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="styles-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|styles">Opens the Assign Styles dialog, where you can select the paragraph styles to include in the index. Choose the proper heading level on which the style will be included in the index.</property> - </object> - </child> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -584,18 +538,77 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <placeholder/> - </child> - <child> - <placeholder/> + <object class="GtkButton" id="styles"> + <property name="label" translatable="yes" context="tocindexpage|styles">Assign styles...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">center</property> + <accessibility> + <relation type="labelled-by" target="addstylescb"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="styles-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|styles">Opens the Assign Styles dialog, where you can select the paragraph styles to include in the index. Choose the proper heading level on which the style will be included in the index.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - <child> - <placeholder/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkRadioButton" id="captions"> + <property name="label" translatable="yes" context="tocindexpage|captions">Captions</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">objnames</property> + <child internal-child="accessible"> + <object class="AtkObject" id="captions-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|captions">Creates index entries from object captions.</property> + </object> </child> </object> <packing> @@ -604,28 +617,41 @@ </packing> </child> <child> + <object class="GtkRadioButton" id="objnames"> + <property name="label" translatable="yes" context="tocindexpage|objnames">Object names</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</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="objnames-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|objnames">Creates index entries from object names.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid13"> + <object class="GtkGrid" id="grid12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkRadioButton" id="captions"> - <property name="label" translatable="yes" context="tocindexpage|captions">Captions</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <object class="GtkLabel" id="categoryft"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="tocindexpage|categoryft">Category:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">category</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">objnames</property> - <child internal-child="accessible"> - <object class="AtkObject" id="captions-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|captions">Creates index entries from object captions.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> @@ -633,18 +659,12 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="objnames"> - <property name="label" translatable="yes" context="tocindexpage|objnames">Object names</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <object class="GtkComboBoxText" id="category"> + <property name="can_focus">False</property> <property name="no_show_all">True</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="objnames-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|objnames">Creates index entries from object names.</property> + <object class="AtkObject" id="category-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|category">Select the caption category that you want to use for the index entries.</property> </object> </child> </object> @@ -654,89 +674,51 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid12"> - <property name="visible">True</property> + <object class="GtkLabel" id="displayft"> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="categoryft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="tocindexpage|categoryft">Category:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">category</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="category"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="category-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|category">Select the caption category that you want to use for the index entries.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="displayft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="tocindexpage|displayft">Display:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">display</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="display"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <items> - <item translatable="yes" context="tocindexpage|display">References</item> - <item translatable="yes" context="tocindexpage|display">Category and Number</item> - <item translatable="yes" context="tocindexpage|display">Caption Text</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="display-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|display">Select the part of the caption that you want to use for index entries.</property> - </object> - </child> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="tocindexpage|displayft">Display:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">display</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="display"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <items> + <item translatable="yes" context="tocindexpage|display">References</item> + <item translatable="yes" context="tocindexpage|display">Category and Number</item> + <item translatable="yes" context="tocindexpage|display">Caption Text</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="display-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|display">Select the part of the caption that you want to use for index entries.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">2</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> + <property name="width">2</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -765,68 +747,62 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment6"> + <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="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="objects"> <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-selection1"/> + </child> <child> - <object class="GtkTreeView" id="objects"> - <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-selection1"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer2"/> - <attributes> - <attribute name="active">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererToggle" id="cellrenderer2"/> + <attributes> + <attribute name="active">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">0</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">0</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer1"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="objects-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|objects">Select the object types that you want to include in a table of objects.</property> - </object> + <object class="GtkCellRendererText" id="cellrenderer1"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="objects-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|objects">Select the object types that you want to include in a table of objects.</property> + </object> + </child> </object> </child> </object> @@ -855,79 +831,73 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment7"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid11"> <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="vexpand">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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid11"> + <object class="GtkLabel" id="mainstyleft9"> <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="GtkLabel" id="mainstyleft9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocindexpage|mainstyleft9">_Brackets:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">brackets</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="numberentries"> - <property name="label" translatable="yes" context="tocindexpage|numberentries">_Number entries</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="numberentries-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|numberentries">Automatically numbers the bibliography entries.</property> - </object> - </child> + <property name="label" translatable="yes" context="tocindexpage|mainstyleft9">_Brackets:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">brackets</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="numberentries"> + <property name="label" translatable="yes" context="tocindexpage|numberentries">_Number entries</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="numberentries-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|numberentries">Automatically numbers the bibliography entries.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="brackets"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <items> - <item translatable="yes" context="tocindexpage|brackets">[none]</item> - <item translatable="yes" context="tocindexpage|brackets">[]</item> - <item translatable="yes" context="tocindexpage|brackets">()</item> - <item translatable="yes" context="tocindexpage|brackets">{}</item> - <item translatable="yes" context="tocindexpage|brackets"><></item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="brackets-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|brackets">Select the brackets that you want to enclose bibliography entries.</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="GtkComboBoxText" id="brackets"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <items> + <item translatable="yes" context="tocindexpage|brackets">[none]</item> + <item translatable="yes" context="tocindexpage|brackets">[]</item> + <item translatable="yes" context="tocindexpage|brackets">()</item> + <item translatable="yes" context="tocindexpage|brackets">{}</item> + <item translatable="yes" context="tocindexpage|brackets"><></item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="brackets-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|brackets">Select the brackets that you want to enclose bibliography entries.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -961,190 +931,184 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid9"> <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="vexpand">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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> + <object class="GtkCheckButton" id="combinesame"> + <property name="label" translatable="yes" context="tocindexpage|combinesame">Combine identical entries</property> <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="GtkCheckButton" id="combinesame"> - <property name="label" translatable="yes" context="tocindexpage|combinesame">Combine identical entries</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="combinesame-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|combinesame">Replaces identical index entries with a single entry that lists the page numbers where the entry occurs in the document. For example, the entries "View 10, View 43" are combined as "View 10, 43".</property> - </object> - </child> + <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="combinesame-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|combinesame">Replaces identical index entries with a single entry that lists the page numbers where the entry occurs in the document. For example, the entries "View 10, View 43" are combined as "View 10, 43".</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="useff"> - <property name="label" translatable="yes" context="tocindexpage|useff">Combine identical entries with f. or _ff.</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</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="useff-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|useff">Replaces identical index entries that occur on the directly following page(s), with a single entry that lists the first page number and a "f" or "ff". For example, the entries "View 10, View 11" are combined as "View 10f", and "View 10, View 11, View 12" as "View 10ff". Actual appearance depends on the locale setting, but can be overridden with Sort - Language.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="useff"> + <property name="label" translatable="yes" context="tocindexpage|useff">Combine identical entries with f. or _ff.</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="useff-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|useff">Replaces identical index entries that occur on the directly following page(s), with a single entry that lists the first page number and a "f" or "ff". For example, the entries "View 10, View 11" are combined as "View 10f", and "View 10, View 11, View 12" as "View 10ff". Actual appearance depends on the locale setting, but can be overridden with Sort - Language.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="usedash"> - <property name="label" translatable="yes" context="tocindexpage|usedash">Combine with -</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</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="usedash-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|usedash">Replaces identical index entries that occur on consecutive pages with a single entry and the page range where the entry occurs. For example, the entries "View 10, View 11, View 12" are combined as "View 10-12".</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="usedash"> + <property name="label" translatable="yes" context="tocindexpage|usedash">Combine with -</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="usedash-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|usedash">Replaces identical index entries that occur on consecutive pages with a single entry and the page range where the entry occurs. For example, the entries "View 10, View 11, View 12" are combined as "View 10-12".</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="casesens"> - <property name="label" translatable="yes" context="tocindexpage|casesens">Case sensitive</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">12</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="casesens-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|casesens">Distinguishes between uppercase and lowercase letters in identical index entries. For Asian languages special handling applies.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="casesens"> + <property name="label" translatable="yes" context="tocindexpage|casesens">Case sensitive</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">12</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="casesens-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|casesens">Distinguishes between uppercase and lowercase letters in identical index entries. For Asian languages special handling applies.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="initcaps"> - <property name="label" translatable="yes" context="tocindexpage|initcaps">AutoCapitalize entries</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="initcaps-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|initcaps">Automatically capitalizes the first letter of an index entry.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="initcaps"> + <property name="label" translatable="yes" context="tocindexpage|initcaps">AutoCapitalize entries</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="initcaps-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|initcaps">Automatically capitalizes the first letter of an index entry.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="keyasentry"> - <property name="label" translatable="yes" context="tocindexpage|keyasentry">Keys as separate entries</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="keyasentry-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|keyasentry">Inserts index keys as separate index entries.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="keyasentry"> + <property name="label" translatable="yes" context="tocindexpage|keyasentry">Keys as separate entries</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="keyasentry-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|keyasentry">Inserts index keys as separate index entries.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="fromfile"> - <property name="label" translatable="yes" context="tocindexpage|fromfile">_Concordance file</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="fromfile-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromfile">Automatically marks index entries using a concordance file - a list of words to include in an index.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fromfile"> + <property name="label" translatable="yes" context="tocindexpage|fromfile">_Concordance file</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="fromfile-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|fromfile">Automatically marks index entries using a concordance file - a list of words to include in an index.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="file"> + <property name="label" translatable="yes" context="tocindexpage|file">_File</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="margin-start">12</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="popup">filemenu</property> + <property name="use_popover">False</property> <child> - <object class="GtkMenuButton" id="file"> - <property name="label" translatable="yes" context="tocindexpage|file">_File</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">start</property> - <property name="margin-start">12</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="popup">filemenu</property> - <property name="use_popover">False</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="file-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|file">Select, create, or edit a concordance file.</property> - </object> - </child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="file-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|file">Select, create, or edit a concordance file.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> @@ -1173,54 +1137,29 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="column_spacing">18</property> <property name="hexpand">True</property> <property name="vexpand">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> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkGrid" id="grid7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">18</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkLabel" id="mainstyleft3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="mainstyleft3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocindexpage|mainstyleft3">Language:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">lang</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="lang"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="lang-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|lang">Select the language rules to use for sorting the index entries.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="tocindexpage|mainstyleft3">Language:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">lang</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -1228,39 +1167,54 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkComboBoxText" id="lang"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="mainstyleft5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocindexpage|mainstyleft5">Key type:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">keytype</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="lang-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|lang">Select the language rules to use for sorting the index entries.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="keytype"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="keytype-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|keytype">Select numeric when you want to sort numbers by value, such as in 1, 2, 12. Select alphanumeric, when you want to sort the numbers by character code, such as in 1, 12, 2.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="mainstyleft5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocindexpage|mainstyleft5">Key type:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">keytype</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="keytype"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="keytype-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocindexpage|extended_tip|keytype">Select numeric when you want to sort numbers by value, such as in 1, 2, 12. Select alphanumeric, when you want to sort the numbers by character code, such as in 1, 12, 2.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> @@ -1269,6 +1223,10 @@ </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> |