diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-31 20:21:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-02 12:49:26 +0100 |
| commit | 83de497ae90f69118c35121bc228f15fbb5c5623 (patch) | |
| tree | 8d51d9f5591121e6a744ebd68cb7c659a7cb50cd /sw/uiconfig | |
| parent | 6e3424ca1131fe371f63e456267de476b5eb0eae (diff) | |
drop deprecated GtkAlignment, move left/top-padding into child margin-start/top
for sw part a
Change-Id: I27a3bbd46ba87e67c4a0d109fb661e2228f38ce5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108564
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/uiconfig')
74 files changed, 12881 insertions, 13772 deletions
diff --git a/sw/uiconfig/swriter/ui/abstractdialog.ui b/sw/uiconfig/swriter/ui/abstractdialog.ui index e6e1e57fee89..f1f412167dd5 100644 --- a/sw/uiconfig/swriter/ui/abstractdialog.ui +++ b/sw/uiconfig/swriter/ui/abstractdialog.ui @@ -95,105 +95,97 @@ <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="GtkLabel" id="label2"> <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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="abstractdialog|label2">Included outline levels</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">outlines</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="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="abstractdialog|label3">Paragraphs per level</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">paras</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="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="abstractdialog|label4">The abstract contains the selected number of paragraphs from the included outline levels.</property> - <property name="use_underline">True</property> - <property name="wrap">True</property> - <property name="width_chars">52</property> - <property name="max_width_chars">52</property> - <property name="xalign">0</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="GtkSpinButton" id="outlines"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <property name="adjustment">adjustment1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="outlines-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="abstractdialog|extended_tip|outlines">Enter the extent of the outline levels to be copied to the new document.</property> - </object> - </child> + <property name="label" translatable="yes" context="abstractdialog|label2">Included outline levels</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">outlines</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="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="abstractdialog|label3">Paragraphs per level</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">paras</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="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="abstractdialog|label4">The abstract contains the selected number of paragraphs from the included outline levels.</property> + <property name="use_underline">True</property> + <property name="wrap">True</property> + <property name="width_chars">52</property> + <property name="max_width_chars">52</property> + <property name="xalign">0</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="GtkSpinButton" id="outlines"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="outlines-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="abstractdialog|extended_tip|outlines">Enter the extent of the outline levels to be copied to the new document.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="paras"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <property name="adjustment">adjustment2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="paras-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="abstractdialog|extended_tip|paras">Specify the maximum number of consecutive paragraphs to be included in the AutoAbstract document after each heading.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="paras"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="adjustment">adjustment2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="paras-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="abstractdialog|extended_tip|paras">Specify the maximum number of consecutive paragraphs to be included in the AutoAbstract document after each heading.</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/addentrydialog.ui b/sw/uiconfig/swriter/ui/addentrydialog.ui index cbf9d5b33ca0..083e01db9fa8 100644 --- a/sw/uiconfig/swriter/ui/addentrydialog.ui +++ b/sw/uiconfig/swriter/ui/addentrydialog.ui @@ -83,19 +83,13 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkEntry" id="entry"> <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="GtkEntry" id="entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">start</property> - <property name="activates_default">True</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">start</property> + <property name="activates_default">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/asciifilterdialog.ui b/sw/uiconfig/swriter/ui/asciifilterdialog.ui index 77a3cbd8445f..1160b68e75b6 100644 --- a/sw/uiconfig/swriter/ui/asciifilterdialog.ui +++ b/sw/uiconfig/swriter/ui/asciifilterdialog.ui @@ -81,227 +81,221 @@ <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="valign">start</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="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="row_spacing">6</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="halign">end</property> - <property name="label" translatable="yes" context="asciifilterdialog|label2">_Character set:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">charset</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="fontft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="asciifilterdialog|fontft">Default fonts:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">font</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="asciifilterdialog|label2">_Character set:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">charset</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="fontft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="asciifilterdialog|fontft">Default fonts:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">font</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="languageft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="asciifilterdialog|languageft">Lan_guage:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">language</property> + </object> + <packing> + <property name="left_attach">0</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="halign">end</property> + <property name="label" translatable="yes" context="asciifilterdialog|label5">_Paragraph break:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="charset"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="charset-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|charset">Specifies the character set of the file for export or import.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel" id="languageft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="asciifilterdialog|languageft">Lan_guage:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">language</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="font"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="font-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|font">By setting a default font, you specify that the text should be displayed in a specific font. The default fonts can only be selected when importing.</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">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> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkRadioButton" id="crlf"> + <property name="label" translatable="yes" context="asciifilterdialog|crlf">_CR & LF</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="asciifilterdialog|label5">_Paragraph break:</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="charset"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">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="charset-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|charset">Specifies the character set of the file for export or import.</property> + <object class="AtkObject" id="crlf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|crlf">Produces a "Carriage Return" and a "Linefeed". This option is the default.</property> </object> </child> </object> <packing> - <property name="left_attach">1</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="GtkComboBoxText" id="font"> + <object class="GtkRadioButton" id="cr"> + <property name="label" translatable="yes" context="asciifilterdialog|cr">C_R</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">crlf</property> <child internal-child="accessible"> - <object class="AtkObject" id="font-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|font">By setting a default font, you specify that the text should be displayed in a specific font. The default fonts can only be selected when importing.</property> + <object class="AtkObject" id="cr-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|cr">Produces a "Carriage Return" as the paragraph break.</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">1</property> </packing> </child> <child> - <object class="GtkBox" id="box1"> + <object class="GtkRadioButton" id="lf"> + <property name="label" translatable="yes" context="asciifilterdialog|lf">_LF</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkRadioButton" id="crlf"> - <property name="label" translatable="yes" context="asciifilterdialog|crlf">_CR & LF</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="crlf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|crlf">Produces a "Carriage Return" and a "Linefeed". This option is the default.</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="cr"> - <property name="label" translatable="yes" context="asciifilterdialog|cr">C_R</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">crlf</property> - <child internal-child="accessible"> - <object class="AtkObject" id="cr-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|cr">Produces a "Carriage Return" as the paragraph break.</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="GtkRadioButton" id="lf"> - <property name="label" translatable="yes" context="asciifilterdialog|lf">_LF</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">end</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">crlf</property> - <child internal-child="accessible"> - <object class="AtkObject" id="lf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|lf">Produces a "Linefeed" as the paragraph break.</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="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="language"> - <property name="visible">True</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="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">crlf</property> <child internal-child="accessible"> - <object class="AtkObject" id="language-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|language">Specifies the language of the text, if this has not already been defined. This setting is only available when importing.</property> + <object class="AtkObject" id="lf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|lf">Produces a "Linefeed" as the paragraph break.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="includebom"> - <property name="label" translatable="yes" context="asciifilterdialog|includebom">Include byte-order mark</property> - <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="language"> + <property name="visible">True</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="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <placeholder/> + <child internal-child="accessible"> + <object class="AtkObject" id="language-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="asciifilterdialog|extended_tip|language">Specifies the language of the text, if this has not already been defined. This setting is only available when importing.</property> + </object> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="includebom"> + <property name="label" translatable="yes" context="asciifilterdialog|includebom">Include byte-order mark</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="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/assignstylesdialog.ui b/sw/uiconfig/swriter/ui/assignstylesdialog.ui index 33902bf15a0e..ddda661d5373 100644 --- a/sw/uiconfig/swriter/ui/assignstylesdialog.ui +++ b/sw/uiconfig/swriter/ui/assignstylesdialog.ui @@ -165,296 +165,288 @@ <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="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="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">6</property> + <property name="halign">start</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkButtonBox" id="buttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="column_spacing">12</property> + <property name="spacing">12</property> + <property name="layout_style">start</property> <child> - <object class="GtkButtonBox" id="buttonbox1"> + <object class="GtkButton" id="left"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="spacing">12</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="left"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="assignstylesdialog|left|tooltip_text">Promote level</property> - <property name="image">image1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="left-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="assignstylesdialog|left-atkobject">Left</property> - <property name="AtkObject::accessible-description" translatable="yes" context="assignstylesdialog|extended_tip|left">Moves the selected paragraph style up one level in the index hierarchy.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="assignstylesdialog|left|tooltip_text">Promote level</property> + <property name="image">image1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="left-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="assignstylesdialog|left-atkobject">Left</property> + <property name="AtkObject::accessible-description" translatable="yes" context="assignstylesdialog|extended_tip|left">Moves the selected paragraph style up one level in the index hierarchy.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="right"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="assignstylesdialog|right|tooltip_text">Demote level</property> - <property name="image">image2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="right-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="assignstylesdialog|right-atkobject">Right</property> - <property name="AtkObject::accessible-description" translatable="yes" context="assignstylesdialog|extended_tip|right">Moves the selected paragraph style down one level in the index hierarchy.</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="right"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="assignstylesdialog|right|tooltip_text">Demote level</property> + <property name="image">image2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="right-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="assignstylesdialog|right-atkobject">Right</property> + <property name="AtkObject::accessible-description" translatable="yes" context="assignstylesdialog|extended_tip|right">Moves the selected paragraph style down one level in the index hierarchy.</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> + <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="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="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="styles"> <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="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="styles"> - <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="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="treeviewcolumn1"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="title" translatable="yes" context="assignstylesdialog|stylecolumn">Style</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="title" translatable="yes" context="assignstylesdialog|stylecolumn">Style</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">0</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderer1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> + </object> + </child> + <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"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">1</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer2"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">1</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn3"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn3"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer3"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">2</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer3"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">2</attribute> + </attributes> </child> + </object> + </child> + <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="cellrenderer4"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">3</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer4"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">3</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn5"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn5"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer5"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">4</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer5"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">4</attribute> + </attributes> </child> + </object> + </child> + <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="cellrenderer6"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">5</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer6"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">5</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn7"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn7"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer7"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">6</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer7"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">6</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn8"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn8"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer8"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">7</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer8"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">7</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn9"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn9"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer9"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">8</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer9"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">8</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn10"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn10"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer10"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">9</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer10"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">9</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn11"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn11"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer11"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">10</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer11"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">10</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn12"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn12"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer12"> - <property name="radio">True</property> - </object> - <attributes> - <attribute name="active">11</attribute> - </attributes> - </child> + <object class="GtkCellRendererToggle" id="cellrenderer12"> + <property name="radio">True</property> </object> + <attributes> + <attribute name="active">11</attribute> + </attributes> </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">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui index ad483615d150..bcb12d32f121 100644 --- a/sw/uiconfig/swriter/ui/autoformattable.ui +++ b/sw/uiconfig/swriter/ui/autoformattable.ui @@ -103,87 +103,77 @@ <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"> <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"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <property name="column_homogeneous">True</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <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> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <property name="column_homogeneous">True</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="autoformattable|extended_tip|preview">Displays a preview of the current selection.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|preview">Displays a preview of the current selection.</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> + <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="formatlb"> <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="formatlb"> - <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="formatlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|formatlb">Lists the available formatting styles for tables. Click the format that you want to apply, and then click OK.</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="formatlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|formatlb">Lists the available formatting styles for tables. Click the format that you want to apply, and then click OK.</property> + </object> + </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> @@ -191,71 +181,75 @@ <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="GtkButtonBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> <child> - <object class="GtkButtonBox"> + <object class="GtkButton" id="add"> + <property name="label">gtk-add</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="add"> - <property name="label">gtk-add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="add-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|add">Adds a new table style to the list.</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">gtk-delete</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="remove-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|remove">Deletes the selected element or elements after confirmation.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="add-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|add">Adds a new table style to the list.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> - <child> - <object class="GtkButton" id="rename"> - <property name="label" translatable="yes" context="autoformattable|rename">Rename</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + </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">gtk-delete</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="remove-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|remove">Deletes the selected element or elements after confirmation.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="rename"> + <property name="label" translatable="yes" context="autoformattable|rename">Rename</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -283,122 +277,116 @@ <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="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="GtkCheckButton" id="numformatcb"> + <property name="label" translatable="yes" context="autoformattable|numformatcb">Number format</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="numformatcb"> - <property name="label" translatable="yes" context="autoformattable|numformatcb">Number format</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="numformatcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|numformatcb">Includes numbering formats in the selected table 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="numformatcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|numformatcb">Includes numbering formats in the selected table style.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="bordercb"> - <property name="label" translatable="yes" context="autoformattable|bordercb">Borders</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="bordercb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|bordercb">Includes border styles in the selected table style.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="bordercb"> + <property name="label" translatable="yes" context="autoformattable|bordercb">Borders</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="bordercb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|bordercb">Includes border styles in the selected table style.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="fontcb"> - <property name="label" translatable="yes" context="autoformattable|fontcb">Font</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="fontcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|fontcb">Includes font formatting in the selected table style.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fontcb"> + <property name="label" translatable="yes" context="autoformattable|fontcb">Font</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="fontcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|fontcb">Includes font formatting in the selected table style.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="patterncb"> - <property name="label" translatable="yes" context="autoformattable|patterncb">Pattern</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="patterncb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|patterncb">Includes background styles in the selected table style.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="patterncb"> + <property name="label" translatable="yes" context="autoformattable|patterncb">Pattern</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="patterncb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|patterncb">Includes background styles in the selected table style.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="alignmentcb"> - <property name="label" translatable="yes" context="autoformattable|alignmentcb">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> - <child internal-child="accessible"> - <object class="AtkObject" id="alignmentcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|alignmentcb">Includes alignment settings in the selected table style.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="alignmentcb"> + <property name="label" translatable="yes" context="autoformattable|alignmentcb">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> + <child internal-child="accessible"> + <object class="AtkObject" id="alignmentcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|alignmentcb">Includes alignment settings in the selected table style.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui index b3583e2559b3..ca7531e16f8b 100644 --- a/sw/uiconfig/swriter/ui/autotext.ui +++ b/sw/uiconfig/swriter/ui/autotext.ui @@ -300,58 +300,52 @@ <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="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="column_spacing">18</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="relfile"> + <property name="label" translatable="yes" context="autotext|relfile">_File system</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">18</property> - <child> - <object class="GtkCheckButton" id="relfile"> - <property name="label" translatable="yes" context="autotext|relfile">_File system</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="relfile-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autotext|extended_tip|relfile">Links to AutoText directories on your computer are relative.</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="relfile-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autotext|extended_tip|relfile">Links to AutoText directories on your computer are relative.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="relnet"> - <property name="label" translatable="yes" context="autotext|relnet">Inter_net</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="relnet-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autotext|extended_tip|relnet">Links to files on the Internet are relative.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="relnet"> + <property name="label" translatable="yes" context="autotext|relnet">Inter_net</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="relnet-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autotext|extended_tip|relnet">Links to files on the Internet are relative.</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> @@ -373,31 +367,46 @@ </packing> </child> <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="row_spacing">6</property> + <property name="column_spacing">12</property> <property name="margin-start">12</property> <child> + <object class="GtkCheckButton" id="inserttip"> + <property name="label" translatable="yes" context="autotext|inserttip">_Display remainder of name as suggestion while typing</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> + <accessibility> + <relation type="label-for" target="category"/> + </accessibility> + </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="GtkCheckButton" id="inserttip"> - <property name="label" translatable="yes" context="autotext|inserttip">_Display remainder of name as suggestion while typing</property> + <object class="GtkLabel" id="nameft"> <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="autotext|nameft">Name:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <accessibility> - <relation type="label-for" target="category"/> - </accessibility> + <property name="mnemonic_widget">name</property> </object> <packing> <property name="left_attach">0</property> @@ -405,127 +414,106 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="shortnameft"> <property name="visible">True</property> <property name="can_focus">False</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="autotext|nameft">Name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">name</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="shortnameft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="autotext|shortnameft">Shortcut:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">shortname</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</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="max_length">60</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="autotext|extended_tip|name">Displays the name of the selected AutoText category. To change the name of the category, type a new name, and then click Rename. To create a new category, type a name, and then click New.</property> - </object> - </child> + <property name="label" translatable="yes" context="autotext|shortnameft">Shortcut:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">shortname</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</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="max_length">60</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="autotext|extended_tip|name">Displays the name of the selected AutoText category. To change the name of the category, type a new name, and then click Rename. To create a new category, type a name, and then click New.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkEntry" id="shortname"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <property name="max_length">30</property> - <property name="activates_default">True</property> - <property name="width_chars">6</property> - <child internal-child="accessible"> - <object class="AtkObject" id="shortname-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autotext|extended_tip|shortname">Displays the shortcut for the selected AutoText entry. If you are creating a new AutoText entry, type the shortcut that you want to use for the entry.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="shortname"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="max_length">30</property> + <property name="activates_default">True</property> + <property name="width_chars">6</property> + <child internal-child="accessible"> + <object class="AtkObject" id="shortname-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autotext|extended_tip|shortname">Displays the shortcut for the selected AutoText entry. If you are creating a new AutoText entry, type the shortcut that you want to use for the entry.</property> </object> - <packing> - <property name="left_attach">3</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">3</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="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="category"> <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> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> <child> - <object class="GtkTreeView" id="category"> - <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> - <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> - <accessibility> - <relation type="labelled-by" target="inserttip"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="category-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="autotext|category-atkobject">Category</property> - </object> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> </child> + <accessibility> + <relation type="labelled-by" target="inserttip"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="category-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="autotext|category-atkobject">Category</property> + </object> + </child> </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> <packing> diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui b/sw/uiconfig/swriter/ui/bibliographyentry.ui index b87fbe6af5a4..46fdd0d401ca 100644 --- a/sw/uiconfig/swriter/ui/bibliographyentry.ui +++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui @@ -137,60 +137,54 @@ <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="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="frombibliography"> + <property name="label" translatable="yes" context="bibliographyentry|frombibliography">Bibliography Database</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="frombibliography"> - <property name="label" translatable="yes" context="bibliographyentry|frombibliography">Bibliography 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="frombibliography-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="bibliographyentry|extended_tip|frombibliography">Inserts a reference from the bibliography database.</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="frombibliography-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="bibliographyentry|extended_tip|frombibliography">Inserts a reference from the bibliography database.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="fromdocument"> - <property name="label" translatable="yes" context="bibliographyentry|fromdocument">Document 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">frombibliography</property> - <child internal-child="accessible"> - <object class="AtkObject" id="fromdocument-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="bibliographyentry|extended_tip|fromdocument">Inserts a reference from the bibliography records that are stored 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="GtkRadioButton" id="fromdocument"> + <property name="label" translatable="yes" context="bibliographyentry|fromdocument">Document 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">frombibliography</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fromdocument-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="bibliographyentry|extended_tip|fromdocument">Inserts a reference from the bibliography records that are stored in the current document.</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> @@ -218,114 +212,108 @@ <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="label2"> <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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bibliographyentry|label2">Author</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</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="bibliographyentry|label3">Title</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="author"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="width_chars">60</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="title"> - <property name="visible">True</property> - <property name="can_focus">False</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="entrylb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="entrylb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="bibliographyentry|extended_tip|entrylb">Select the short name of the bibliography record that you want to insert.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entryed"> - <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="entryed-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="bibliographyentry|extended_tip|entryed">Select the short name of the bibliography record that you want to insert.</property> - </object> - </child> + <property name="label" translatable="yes" context="bibliographyentry|label2">Author</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</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="bibliographyentry|label3">Title</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="author"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="width_chars">60</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="title"> + <property name="visible">True</property> + <property name="can_focus">False</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="entrylb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="entrylb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="bibliographyentry|extended_tip|entrylb">Select the short name of the bibliography record that you want to insert.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</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="bibliographyentry|label5">Short name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entrylb</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="GtkEntry" id="entryed"> + <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="entryed-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="bibliographyentry|extended_tip|entryed">Select the short name of the bibliography record that you want to insert.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </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="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="bibliographyentry|label5">Short name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entrylb</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/businessdatapage.ui b/sw/uiconfig/swriter/ui/businessdatapage.ui index 15e84cd44323..fbed332e77fc 100644 --- a/sw/uiconfig/swriter/ui/businessdatapage.ui +++ b/sw/uiconfig/swriter/ui/businessdatapage.ui @@ -11,537 +11,531 @@ <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> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="businessdatapage|label5">Company:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">company</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="GtkLabel" id="streetft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="businessdatapage|streetft">Slogan:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">slogan</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="countryft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="businessdatapage|countryft">Co_untry/state:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">country</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</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="businessdatapage|label8">Position:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">position</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="phoneft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="businessdatapage|phoneft">Fa_x:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fax</property> + <property name="xalign">1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="phoneft-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="businessdatapage|phoneft-atkobject">Home telephone number</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="faxft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="businessdatapage|faxft">Homepage/email:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">url</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + </packing> + </child> <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="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkEntry" id="company"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="businessdatapage|label5">Company:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">company</property> - <property name="xalign">1</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="company-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|company-atkobject">First name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | company">Type the name of your company in this field.</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">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="column_spacing">12</property> <child> - <object class="GtkLabel" id="streetft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="businessdatapage|streetft">Slogan:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">slogan</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="countryft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="businessdatapage|countryft">Co_untry/state:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">country</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</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="businessdatapage|label8">Position:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">position</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="phoneft"> + <object class="GtkEntry" id="position"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="businessdatapage|phoneft">Fa_x:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fax</property> - <property name="xalign">1</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="phoneft-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="businessdatapage|phoneft-atkobject">Home telephone number</property> + <object class="AtkObject" id="position-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|position-atkobject">Title</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | position">Type your position in the company in this field.</property> </object> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</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="column_spacing">12</property> <child> - <object class="GtkLabel" id="faxft"> + <object class="GtkEntry" id="fax"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="businessdatapage|faxft">Homepage/email:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">url</property> - <property name="xalign">1</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fax-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|fax-atkobject">Home telephone number</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | fax">Type company fax number in this field.</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">9</property> + <property name="top_attach">0</property> + <property name="width">2</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <!-- 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="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkEntry" id="url"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="company"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="company-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|company-atkobject">First name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | company">Type the name of your company in this field.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="url-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|url-atkobject">Fax number</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | url">Company homepage</property> </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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkEntry" id="email"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="position"> - <property name="visible">True</property> - <property name="can_focus">True</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-name" translatable="yes" context="businessdatapage|position-atkobject">Title</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | position">Type your position in the company in this field.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="email-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|email-atkobject">email address</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | email">Type your company email address.</property> </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="top_attach">6</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="eastnameft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="businessdatapage|eastnameft">Company 2nd line:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">company2</property> + <property name="xalign">1</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="grid9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkEntry" id="company2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="fax"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="fax-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|fax-atkobject">Home telephone number</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | fax">Type company fax number in this field.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="company2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|company2-atkobject">Last name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | company2">Company second line</property> </object> - <packing> - <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">1</property> - <property name="top_attach">8</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> + <child> + <object class="GtkLabel" id="icityft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="businessdatapage|icityft">_Zip/city:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">izip</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkEntry" id="icity"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="url"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="url-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|url-atkobject">Fax number</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | url">Company homepage</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="email"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="email-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|email-atkobject">email address</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | email">Type your company email address.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="icity-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|icity-atkobject">City</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | icity">Type the company city</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">9</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="eastnameft"> + <object class="GtkEntry" id="izip"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="businessdatapage|eastnameft">Company 2nd line:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">company2</property> - <property name="xalign">1</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="izip-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|izip-atkobject">Zip code</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | izip">Type company ZIP in this field.</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> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</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> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> + <object class="GtkEntry" id="slogan"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="company2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="company2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|company2-atkobject">Last name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | company2">Company second line</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="slogan-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | slogan">Company slogan</property> </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="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="icityft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="businessdatapage|icityft">_Zip/city:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">izip</property> - <property name="xalign">1</property> - </object> - <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <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="grid12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid11"> + <object class="GtkEntry" id="country"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="icity"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="icity-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|icity-atkobject">City</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | icity">Type the company city</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="izip"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="width_chars">15</property> - <child internal-child="accessible"> - <object class="AtkObject" id="izip-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|izip-atkobject">Zip code</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | izip">Type company ZIP in this field.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="country-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | country">Company country</property> </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="top_attach">4</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="grid4"> + <object class="GtkEntry" id="state"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <child> - <object class="GtkEntry" id="slogan"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="slogan-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | slogan">Company slogan</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="state-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | state">Type company state.</property> </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="top_attach">2</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="titleft1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="businessdatapage|titleft1">Phone/mobile:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">phone</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</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="hexpand">True</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid12"> + <object class="GtkEntry" id="phone"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="country"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="country-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | country">Company country</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="state"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="state-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | state">Type company state.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="phone-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|phone-atkobject">Title</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | phone">Type business phone</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">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="titleft1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="businessdatapage|titleft1">Phone/mobile:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">phone</property> - <property name="xalign">1</property> - </object> - <packing> <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkEntry" id="mobile"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="phone"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="phone-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|phone-atkobject">Title</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | phone">Type business phone</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="mobile"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="mobile-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|mobile-atkobject">Position</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | mobile">Type company mobile</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="mobile-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|mobile-atkobject">Position</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | mobile">Type company mobile</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">7</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="streetft1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="businessdatapage|streetft1">Street:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">street</property> - <property name="xalign">1</property> - </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">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="streetft1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="businessdatapage|streetft1">Street:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">street</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</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="hexpand">True</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkEntry" id="street"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <child> - <object class="GtkEntry" id="street"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="street-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | street">Type the name of company street in this field.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="street-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | street">Type the name of company street in this field.</property> </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="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">3</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/captionoptions.ui b/sw/uiconfig/swriter/ui/captionoptions.ui index d07f4686a371..9a266ff7df85 100644 --- a/sw/uiconfig/swriter/ui/captionoptions.ui +++ b/sw/uiconfig/swriter/ui/captionoptions.ui @@ -88,81 +88,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="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="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="grid2"> + <object class="GtkComboBoxText" id="level"> <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="GtkComboBoxText" id="level"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="level-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="captionoptions|extended_tip|level">Select the number of outline levels from the top of the chapter hierarchy down to include in the caption label.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="level-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="captionoptions|extended_tip|level">Select the number of outline levels from the top of the chapter hierarchy down to include in the caption label.</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="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="captionoptions|extended_tip|separator">Enter the character that you want to insert between the chapter number and the caption 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="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="captionoptions|label5">_Level:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">level</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="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="captionoptions|label6">_Separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">separator</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="GtkEntry" id="separator"> + <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="separator-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="captionoptions|extended_tip|separator">Enter the character that you want to insert between the chapter number and the caption 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="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="captionoptions|label5">_Level:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">level</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="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="captionoptions|label6">_Separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">separator</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -191,72 +185,66 @@ <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="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="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="grid1"> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="captionoptions|label4">Character style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">style</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="style"> <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="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="captionoptions|label4">Character style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">style</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="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="captionoptions|extended_tip|style">Specifies the character style.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="style-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="captionoptions|extended_tip|style">Specifies the character style.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="border_and_shadow"> - <property name="label" translatable="yes" context="captionoptions|border_and_shadow">_Apply border and shadow</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="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="border_and_shadow-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="captionoptions|extended_tip|border_and_shadow">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="border_and_shadow"> + <property name="label" translatable="yes" context="captionoptions|border_and_shadow">_Apply border and shadow</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="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="border_and_shadow-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="captionoptions|extended_tip|border_and_shadow">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> @@ -285,49 +273,43 @@ <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="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="grid3"> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="captionoptions|label7">Caption order:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">caption_order</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="caption_order"> <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="captionoptions|label7">Caption order:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">caption_order</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="caption_order"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="captionoptions|liststore1">Category first</item> - <item translatable="yes" context="captionoptions|liststore1">Numbering first</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <items> + <item translatable="yes" context="captionoptions|liststore1">Category first</item> + <item translatable="yes" context="captionoptions|liststore1">Numbering first</item> + </items> </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/cardmediumpage.ui b/sw/uiconfig/swriter/ui/cardmediumpage.ui index 14f79fdf7978..a8b16bbb614d 100644 --- a/sw/uiconfig/swriter/ui/cardmediumpage.ui +++ b/sw/uiconfig/swriter/ui/cardmediumpage.ui @@ -31,154 +31,126 @@ <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="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="column_spacing">18</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="grid4"> <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">18</property> + <property name="row_spacing">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="hexpand">True</property> - <property name="vexpand">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="GtkCheckButton" id="address"> + <property name="label" translatable="yes" context="cardmediumpage|address">Address</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="address"> - <property name="label" translatable="yes" context="cardmediumpage|address">Address</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">end</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="cardmediumpage|extended_tip|address">Creates a label with your return address. Text that is currently in the Label text box is overwritten.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <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="cardmediumpage|label2">Label text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">textview</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">end</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="cardmediumpage|extended_tip|address">Creates a label with your return address. Text that is currently in the Label text box is overwritten.</property> </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="top_attach">0</property> + </packing> + </child> + <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="cardmediumpage|label2">Label text:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">textview</property> + <property name="xalign">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> + <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="textview"> <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="textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="textview-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|textview">Enter the text that you want to appear on the label. You can also insert a database field.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="textview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|textview">Enter the text that you want to appear on the label. You can also insert a database field.</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> + <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="grid6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">12</property> + <property name="row_homogeneous">True</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkGrid" id="grid8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">12</property> - <property name="row_homogeneous">True</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="hexpand">True</property> - <property name="row_spacing">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="cardmediumpage|label4">Database:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">database</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="database"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="database-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|database">Select the database that you want to use as the data source for your label.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="cardmediumpage|label4">Database:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">database</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -186,42 +158,14 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> + <object class="GtkComboBoxText" id="database"> <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="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="cardmediumpage|label7">Table:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">table</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="table"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="table-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|table">Select the database table containing the field(s) that you want to use in your label.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="database-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|database">Select the database that you want to use as the data source for your label.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> <packing> @@ -229,77 +173,125 @@ <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="grid9"> + <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="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="cardmediumpage|label7">Table:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">table</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="grid10"> + <object class="GtkComboBoxText" id="table"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="cardmediumpage|label8">Database field:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">field</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="field"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="field-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|field">Select the database field that you want, and then click the arrow to the left of this box to insert the field into the Label text box.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="table-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|table">Select the database table containing the field(s) that you want to use in your label.</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">2</property> + <property name="top_attach">1</property> </packing> </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkButton" id="insert"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid10"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="cardmediumpage|insert|tooltip_text">Insert</property> - <property name="valign">center</property> - <property name="image">image1</property> - <property name="always_show_image">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="insert-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|insert">Select the database field that you want, and then click the arrow to the left of this box to insert the field into the Label text box.</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="cardmediumpage|label8">Database field:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">field</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="field"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="field-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|field">Select the database field that you want, and then click the arrow to the left of this box to insert the field into the Label text box.</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">1</property> - <property name="top_attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="insert"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="cardmediumpage|insert|tooltip_text">Insert</property> + <property name="valign">center</property> + <property name="image">image1</property> + <property name="always_show_image">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="insert-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|insert">Select the database field that you want, and then click the arrow to the left of this box to insert the field into the Label text box.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -328,70 +320,43 @@ <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="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="row_spacing">6</property> + <property name="hexpand">True</property> + <property name="row_spacing">12</property> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkGrid" id="grid7"> <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="column_homogeneous">True</property> + <property name="row_spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkRadioButton" id="continuous"> + <property name="label" translatable="yes" context="cardmediumpage|continuous">_Continuous</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="continuous"> - <property name="label" translatable="yes" context="cardmediumpage|continuous">_Continuous</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="continuous-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|continuous">Prints labels on continuous paper.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="sheet"> - <property name="label" translatable="yes" context="cardmediumpage|sheet">_Sheet</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> - <property name="group">continuous</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="continuous-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|continuous">Prints labels on continuous paper.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> <packing> @@ -400,79 +365,20 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid11"> + <object class="GtkRadioButton" id="sheet"> + <property name="label" translatable="yes" context="cardmediumpage|sheet">_Sheet</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</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="cardmediumpage|label5">Brand:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">brand</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="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="cardmediumpage|label3">_Type:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">type</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="GtkComboBoxText" id="brand"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="popup_fixed_width">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="brand-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|brand">Select the brand of paper that you want to use.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="type"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="popup_fixed_width">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="type-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|type">Select the size format that you want to use. The available formats depend on the brand on what you selected in the Brand list. If you want to use a custom label format, select [User], and then click the Format tab to define the format.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">continuous</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> </object> @@ -482,32 +388,112 @@ </packing> </child> <child> - <object class="GtkLabel" id="formatinfo"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <child internal-child="accessible"> - <object class="AtkObject" id="formatinfo-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|formatinfo">The paper type and the dimensions of the business card are displayed at the bottom of the Format area.</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="cardmediumpage|label5">Brand:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">brand</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="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="cardmediumpage|label3">_Type:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">type</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="GtkComboBoxText" id="brand"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="popup_fixed_width">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="brand-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|brand">Select the brand of paper that you want to use.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="type"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="popup_fixed_width">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="type-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|type">Select the size format that you want to use. The available formats depend on the brand on what you selected in the Brand list. If you want to use a custom label format, select [User], and then click the Format tab to define the format.</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">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> - <child> - <object class="GtkComboBoxText" id="hiddentype"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="formatinfo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="formatinfo-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|formatinfo">The paper type and the dimensions of the business card are displayed at the bottom of the Format area.</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">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="hiddentype"> + <property name="can_focus">False</property> + <property name="no_show_all">True</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/ccdialog.ui b/sw/uiconfig/swriter/ui/ccdialog.ui index 9d44f52db28f..40f34bab5bb6 100644 --- a/sw/uiconfig/swriter/ui/ccdialog.ui +++ b/sw/uiconfig/swriter/ui/ccdialog.ui @@ -81,98 +81,91 @@ <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="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ccdialog|label2">_Cc:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">cc</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="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ccdialog|label3">_Bcc:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">bcc</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="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ccdialog|label4">Note: Separate email addresses with a semicolon (;).</property> + <property name="use_underline">True</property> + <property name="xalign">0</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="GtkEntry" id="cc"> + <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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ccdialog|label2">_Cc:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">cc</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="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ccdialog|label3">_Bcc:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">bcc</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="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ccdialog|label4">Note: Separate email addresses with a semicolon (;).</property> - <property name="use_underline">True</property> - <property name="xalign">0</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="GtkEntry" id="cc"> - <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="cc-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="ccdialog|extended_tip|cc">Enter the recipients of email copies, separated by a semicolon (;).</property> - </object> - </child> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="cc-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="ccdialog|extended_tip|cc">Enter the recipients of email copies, separated by a semicolon (;).</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkEntry" id="bcc"> - <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="bcc-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="ccdialog|extended_tip|bcc">Enter the recipients of email blind copies, separated by a semicolon (;).</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="bcc"> + <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="bcc-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="ccdialog|extended_tip|bcc">Enter the recipients of email blind copies, separated by a semicolon (;).</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/charurlpage.ui b/sw/uiconfig/swriter/ui/charurlpage.ui index 0209175c4372..006ee980b570 100644 --- a/sw/uiconfig/swriter/ui/charurlpage.ui +++ b/sw/uiconfig/swriter/ui/charurlpage.ui @@ -15,199 +15,193 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment10"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid7"> <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="grid7"> + <object class="GtkLabel" id="label36"> <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="label36"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label36">URL:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">urled</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="label37"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label37">Name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nameed</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="textft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|textft">Text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">texted</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="charurlpage|label36">URL:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">urled</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="label37"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="charurlpage|label37">Name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nameed</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="textft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="charurlpage|textft">Text:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">texted</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="label39"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="charurlpage|label39">Target frame:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">targetfrmlb</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="GtkButton" id="eventpb"> + <property name="label" translatable="yes" context="charurlpage|eventpb">Events...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <child internal-child="accessible"> + <object class="AtkObject" id="eventpb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|eventpb">Specify an event that triggers when you click the hyperlink.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label39"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label39">Target frame:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">targetfrmlb</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="urled"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">32</property> + <child internal-child="accessible"> + <object class="AtkObject" id="urled-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|urled">Enter a URL for the file that you want to open when you click the hyperlink.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkButton" id="eventpb"> - <property name="label" translatable="yes" context="charurlpage|eventpb">Events...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <child internal-child="accessible"> - <object class="AtkObject" id="eventpb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|eventpb">Specify an event that triggers when you click the hyperlink.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="nameed"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">32</property> + <child internal-child="accessible"> + <object class="AtkObject" id="nameed-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|nameed">Enter a name for the hyperlink.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkEntry" id="urled"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="width_chars">32</property> - <child internal-child="accessible"> - <object class="AtkObject" id="urled-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|urled">Enter a URL for the file that you want to open when you click the hyperlink.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="texted"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">32</property> + <child internal-child="accessible"> + <object class="AtkObject" id="texted-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|texted">Enter the text that you want to display for the hyperlink.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkEntry" id="nameed"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="width_chars">32</property> - <child internal-child="accessible"> - <object class="AtkObject" id="nameed-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|nameed">Enter a name for the hyperlink.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="urlpb"> + <property name="label" translatable="yes" context="charurlpage|urlpb">Browse...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <child internal-child="accessible"> + <object class="AtkObject" id="urlpb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|urlpb">Locate the file that you want to link to, and then click Open.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkEntry" id="texted"> - <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="targetfrmlb"> + <property name="visible">True</property> + <property name="can_focus">False</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> - <property name="width_chars">32</property> - <child internal-child="accessible"> - <object class="AtkObject" id="texted-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|texted">Enter the text that you want to display for the hyperlink.</property> - </object> - </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkButton" id="urlpb"> - <property name="label" translatable="yes" context="charurlpage|urlpb">Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <child internal-child="accessible"> - <object class="AtkObject" id="urlpb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|urlpb">Locate the file that you want to link to, and then click Open.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="targetfrmlb"> - <property name="visible">True</property> - <property name="can_focus">False</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="targetfrmlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|targetfrmlb">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="targetfrmlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|targetfrmlb">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -235,77 +229,71 @@ <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="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="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="grid6"> + <object class="GtkLabel" id="label34"> <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="label34"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label34">Visited links:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">visitedlb</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="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label10">Unvisited links:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">unvisitedlb</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="visitedlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="visitedlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|visitedlb">Select a formatting style to use for visited links from the list. To add or modify a style in this list, close this dialog, and click the Styles icon on the Formatting toolbar.</property> - </object> - </child> + <property name="label" translatable="yes" context="charurlpage|label34">Visited links:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">visitedlb</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="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="charurlpage|label10">Unvisited links:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">unvisitedlb</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="visitedlb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="visitedlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|visitedlb">Select a formatting style to use for visited links from the list. To add or modify a style in this list, close this dialog, and click the Styles icon on the Formatting toolbar.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="unvisitedlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="unvisitedlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|unvisitedlb">Select a formatting style to use for unvisited links from the list. To add or modify a style in this list, close this dialog, and click the Styles icon on the Formatting toolbar.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="unvisitedlb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="unvisitedlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|unvisitedlb">Select a formatting style to use for unvisited links from the list. To add or modify a style in this list, close this dialog, and click the Styles icon on the Formatting toolbar.</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/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui index d3b4ab387995..4f951df34a29 100644 --- a/sw/uiconfig/swriter/ui/columnpage.ui +++ b/sw/uiconfig/swriter/ui/columnpage.ui @@ -106,496 +106,272 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment3"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid8"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</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="grid8"> + <object class="GtkLabel" id="columnft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="columnft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnpage|columnft">Column:</property> - <property name="xalign">0</property> - <accessibility> - <relation type="label-for" target="back"/> - <relation type="label-for" target="next"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">_1</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width1mf</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">_2</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width2mf</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">_3</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width3mf</property> - </object> - <packing> - <property name="left_attach">4</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="columnpage|widthft">Width:</property> - <property name="xalign">0</property> - <accessibility> - <relation type="label-for" target="width3mf"/> - <relation type="label-for" target="width2mf"/> - <relation type="label-for" target="width1mf"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="width3mf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment7</property> - <property name="digits">2</property> - <accessibility> - <relation type="labelled-by" target="widthft"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="width3mf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|width3mf">Enter the width of the column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="width2mf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment6</property> - <property name="digits">2</property> - <accessibility> - <relation type="labelled-by" target="widthft"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="width2mf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|width2mf">Enter the width of the column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="width1mf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <property name="digits">2</property> - <accessibility> - <relation type="labelled-by" target="widthft"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="width1mf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|width1mf">Enter the width of the column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="distft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnpage|distft">Spacing:</property> - <property name="xalign">0</property> - <accessibility> - <relation type="label-for" target="spacing1mf"/> - <relation type="label-for" target="spacing2mf"/> - </accessibility> - </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="grid15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="column_spacing">24</property> - <child> - <object class="GtkSpinButton" id="spacing1mf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">center</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment3</property> - <property name="digits">2</property> - <accessibility> - <relation type="labelled-by" target="distft"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="spacing1mf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|spacing1mf">Enter the amount of space that you want to leave between the columns.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spacing2mf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">center</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment8</property> - <property name="digits">2</property> - <accessibility> - <relation type="labelled-by" target="distft"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="spacing2mf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|spacing2mf">Enter the amount of space that you want to leave between the columns.</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">2</property> - <property name="top_attach">2</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="back"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image7</property> - <accessibility> - <relation type="labelled-by" target="columnft"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="back-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|back">Moves the column display one column to the left.</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="image">image8</property> - <accessibility> - <relation type="labelled-by" target="columnft"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="next-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|next">Moves the column display one column to the right.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="label" translatable="yes" context="columnpage|columnft">Column:</property> + <property name="xalign">0</property> + <accessibility> + <relation type="label-for" target="back"/> + <relation type="label-for" target="next"/> + </accessibility> </object> + <packing> + <property name="left_attach">0</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> - <child type="label"> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnpage|label4">Width and Spacing</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - <accessibility> - <relation type="member-of" target="label4"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</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"> - <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="linestyleft"> + <object class="GtkLabel" id="1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnpage|linestyleft">St_yle:</property> + <property name="hexpand">True</property> + <property name="label">_1</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">linestylelb</property> - <property name="xalign">0</property> + <property name="mnemonic_widget">width1mf</property> </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="GtkLabel" id="linewidthft"> + <object class="GtkLabel" id="2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnpage|linewidthft">_Width:</property> + <property name="hexpand">True</property> + <property name="label">_2</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">linewidthmf</property> - <property name="xalign">0</property> + <property name="mnemonic_widget">width2mf</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">3</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="lineheightft"> + <object class="GtkLabel" id="3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnpage|lineheightft">H_eight:</property> + <property name="hexpand">True</property> + <property name="label">_3</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">lineheightmf</property> - <property name="xalign">0</property> + <property name="mnemonic_widget">width3mf</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left_attach">4</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="lineposft"> + <object class="GtkLabel" id="widthft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnpage|lineposft">_Position:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">lineposlb</property> + <property name="label" translatable="yes" context="columnpage|widthft">Width:</property> <property name="xalign">0</property> + <accessibility> + <relation type="label-for" target="width3mf"/> + <relation type="label-for" target="width2mf"/> + <relation type="label-for" target="width1mf"/> + </accessibility> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkMenuButton" id="linestylelb"> + <object class="GtkSpinButton" id="width3mf"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - <child> - <placeholder/> - </child> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment7</property> + <property name="digits">2</property> + <accessibility> + <relation type="labelled-by" target="widthft"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="linestylelb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|linestylelb">Select the formatting style for the column separator line. If you do not want a separator line, choose "None".</property> + <object class="AtkObject" id="width3mf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|width3mf">Enter the width of the column.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left_attach">4</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="lineposlb"> + <object class="GtkSpinButton" id="width2mf"> <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="columnpage|lineposlb">Top</item> - <item translatable="yes" context="columnpage|lineposlb">Centered</item> - <item translatable="yes" context="columnpage|lineposlb">Bottom</item> - </items> + <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment6</property> + <property name="digits">2</property> + <accessibility> + <relation type="labelled-by" target="widthft"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="lineposlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|lineposlb">Select the vertical alignment of the separator line. This option is only available if Height value of the line is less than 100%.</property> + <object class="AtkObject" id="width2mf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|width2mf">Enter the width of the column.</property> </object> </child> </object> <packing> <property name="left_attach">3</property> - <property name="top_attach">3</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkSpinButton" id="lineheightmf"> + <object class="GtkSpinButton" id="width1mf"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="hexpand">True</property> <property name="activates_default">True</property> - <property name="adjustment">adjustment5</property> + <property name="adjustment">adjustment2</property> + <property name="digits">2</property> + <accessibility> + <relation type="labelled-by" target="widthft"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="lineheightmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|lineheightmf">Enter the length of the separator line as a percentage of the height of the column area.</property> + <object class="AtkObject" id="width1mf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|width1mf">Enter the width of the column.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkSpinButton" id="linewidthmf"> + <object class="GtkLabel" id="distft"> <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> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="columnpage|distft">Spacing:</property> + <property name="xalign">0</property> + <accessibility> + <relation type="label-for" target="spacing1mf"/> + <relation type="label-for" target="spacing2mf"/> + </accessibility> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkMenuButton" id="colorlb"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid15"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="column_spacing">24</property> <child> - <placeholder/> + <object class="GtkSpinButton" id="spacing1mf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment3</property> + <property name="digits">2</property> + <accessibility> + <relation type="labelled-by" target="distft"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="spacing1mf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|spacing1mf">Enter the amount of space that you want to leave between the columns.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spacing2mf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment8</property> + <property name="digits">2</property> + <accessibility> + <relation type="labelled-by" target="distft"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="spacing2mf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|spacing2mf">Enter the amount of space that you want to leave between the columns.</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="left_attach">2</property> <property name="top_attach">2</property> + <property name="width">3</property> </packing> </child> <child> - <object class="GtkLabel" id="linecolorft"> + <object class="GtkButton" id="back"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnpage|linecolorft">_Color:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">colorlb</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image7</property> + <accessibility> + <relation type="labelled-by" target="columnft"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="back-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|back">Moves the column display one column to the left.</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">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="image">image8</property> + <accessibility> + <relation type="labelled-by" target="columnft"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="next-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|next">Moves the column display one column to the right.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">0</property> </packing> </child> <child> @@ -610,13 +386,225 @@ <child> <placeholder/> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="columnpage|label4">Width and Spacing</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + <accessibility> + <relation type="member-of" target="label4"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</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="linestyleft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="columnpage|linestyleft">St_yle:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">linestylelb</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="linewidthft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="columnpage|linewidthft">_Width:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">linewidthmf</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="lineheightft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="columnpage|lineheightft">H_eight:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">lineheightmf</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="lineposft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="columnpage|lineposft">_Position:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">lineposlb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="linestylelb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="linestylelb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|linestylelb">Select the formatting style for the column separator line. If you do not want a separator line, choose "None".</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="lineposlb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="columnpage|lineposlb">Top</item> + <item translatable="yes" context="columnpage|lineposlb">Centered</item> + <item translatable="yes" context="columnpage|lineposlb">Bottom</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="lineposlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|lineposlb">Select the vertical alignment of the separator line. This option is only available if Height value of the line is less than 100%.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="lineheightmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment5</property> + <child internal-child="accessible"> + <object class="AtkObject" id="lineheightmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|lineheightmf">Enter the length of the separator line as a percentage of the height of the column area.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="linewidthmf"> + <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> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="colorlb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="linecolorft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="columnpage|linecolorft">_Color:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">colorlb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -652,56 +640,125 @@ <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="halign">start</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">24</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="valign">center</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="columnpage|label3">Columns:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">colsnf</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="colsnf"> + <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="colsnf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|colsnf">Enter the number of columns that you want in the page, frame, or section.</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="grid6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">24</property> + <child> + <object class="GtkCheckButton" id="balance"> + <property name="label" translatable="yes" context="columnpage|balance">Evenly distribute contents _to all columns</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> + <child internal-child="accessible"> + <object class="AtkObject" id="balance-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|balance">Distributes the text in multi-column sections. The text flows into all columns to the same height. The height of the section adjusts automatically.</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"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> + <object class="GtkComboBoxText" id="applytolb"> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnpage|label3">Columns:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">colsnf</property> - <property name="xalign">0</property> + <property name="no_show_all">True</property> + <items> + <item id="0" translatable="yes" context="columnpage|liststore2">Selection</item> + <item id="1" translatable="yes" context="columnpage|liststore2">Current Section</item> + <item id="2" translatable="yes" context="columnpage|liststore2">Selected section</item> + <item id="4" translatable="yes" context="columnpage|liststore2">Frame</item> + <item id="3" translatable="yes" context="columnpage|liststore2">Page Style: </item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="applytolb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|applytolb">Select the item that you want to apply the column layout to.</property> + </object> + </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="GtkSpinButton" id="colsnf"> - <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="colsnf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|colsnf">Enter the number of columns that you want in the page, frame, or section.</property> - </object> - </child> + <object class="GtkLabel" id="applytoft"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="columnpage|applytoft">_Apply to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">applytolb</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> </packing> </child> @@ -713,72 +770,19 @@ </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> <child> - <object class="GtkCheckButton" id="balance"> - <property name="label" translatable="yes" context="columnpage|balance">Evenly distribute contents _to all columns</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <object class="GtkLabel" id="textdirectionft"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="columnpage|textdirectionft">Text _direction:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">textdirectionlb</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="balance-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|balance">Distributes the text in multi-column sections. The text flows into all columns to the same height. The height of the section adjusts automatically.</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"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkComboBoxText" id="applytolb"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <items> - <item id="0" translatable="yes" context="columnpage|liststore2">Selection</item> - <item id="1" translatable="yes" context="columnpage|liststore2">Current Section</item> - <item id="2" translatable="yes" context="columnpage|liststore2">Selected section</item> - <item id="4" translatable="yes" context="columnpage|liststore2">Frame</item> - <item id="3" translatable="yes" context="columnpage|liststore2">Page Style: </item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="applytolb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|applytolb">Select the item that you want to apply the column layout to.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="applytoft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="columnpage|applytoft">_Apply to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">applytolb</property> - <property name="xalign">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> @@ -786,70 +790,47 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> - <property name="visible">True</property> + <object class="GtkComboBoxText" id="textdirectionlb"> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="textdirectionft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="columnpage|textdirectionft">Text _direction:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">textdirectionlb</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="textdirectionlb"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="no_show_all">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</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> - <property name="width">2</property> + <property name="top_attach">2</property> </packing> </child> - <child> - <object class="GtkDrawingArea" id="valueset"> - <property name="width_request">160</property> - <property name="height_request">35</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="valueset-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|valueset">Enter the number of columns that you want in the page, frame, or section.</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="GtkDrawingArea" id="valueset"> + <property name="width_request">160</property> + <property name="height_request">35</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="valueset-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnpage|extended_tip|valueset">Enter the number of columns that you want in the page, frame, or section.</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/columnwidth.ui b/sw/uiconfig/swriter/ui/columnwidth.ui index 068d54edf84d..965a4473b7e1 100644 --- a/sw/uiconfig/swriter/ui/columnwidth.ui +++ b/sw/uiconfig/swriter/ui/columnwidth.ui @@ -87,81 +87,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="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="label2"> <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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnwidth|label2">Column:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">column</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="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="columnwidth|label3">Width:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width</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="column"> - <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="column-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnwidth|extended_tip|column">Enter the column number of the column you want to change the width of.</property> - </object> - </child> + <property name="label" translatable="yes" context="columnwidth|label2">Column:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">column</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="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="columnwidth|label3">Width:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">width</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="column"> + <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="column-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnwidth|extended_tip|column">Enter the column number of the column you want to change the width of.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <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="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="width-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="columnwidth|extended_tip|width">Enter the width that you want for the selected column(s).</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <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="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="width-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="columnwidth|extended_tip|width">Enter the width that you want for the selected column(s).</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/conditionpage.ui b/sw/uiconfig/swriter/ui/conditionpage.ui index 8b298c5d8f0c..de0163346bd5 100644 --- a/sw/uiconfig/swriter/ui/conditionpage.ui +++ b/sw/uiconfig/swriter/ui/conditionpage.ui @@ -37,240 +37,232 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=3 n-rows=2 --> + <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="column-homogeneous">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=3 n-rows=2 --> - <object class="GtkGrid" id="grid1"> + <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="row-spacing">6</property> - <property name="column-spacing">12</property> - <property name="column-homogeneous">True</property> + <property name="shadow-type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="links"> <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="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="links"> - <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="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="treeviewcolumn1"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="title" translatable="yes" context="conditionpage|contextft">Context</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="title" translatable="yes" context="conditionpage|contextft">Context</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderer1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="title" translatable="yes" context="conditionpage|usedft">Applied Styles</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="title" translatable="yes" context="conditionpage|usedft">Applied Styles</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer2"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="links-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="conditionpage|extended_tip|links">Here you can see the %PRODUCTNAME predefined contexts, including outline levels 1 to 10, numbering/bullets levels 1 to 10, table header, table contents, section, border, footnote, header and footer.</property> - </object> + <object class="GtkCellRendererText" id="cellrenderer2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="links-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="conditionpage|extended_tip|links">Here you can see the %PRODUCTNAME predefined contexts, including outline levels 1 to 10, numbering/bullets levels 1 to 10, table header, table contents, section, border, footnote, header and footer.</property> + </object> + </child> </object> - <packing> - <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="width">2</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="spacing">12</property> + <property name="layout-style">start</property> <child> - <object class="GtkButtonBox" id="buttonbox1"> + <object class="GtkButton" id="remove"> + <property name="label">gtk-remove</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="spacing">12</property> - <property name="layout-style">start</property> - <child> - <object class="GtkButton" id="remove"> - <property name="label">gtk-remove</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-stock">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="remove-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="conditionpage|extended_tip|remove">Click here to remove the current context assigned to the selected style.</property> - </object> - </child> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-stock">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="remove-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="conditionpage|extended_tip|remove">Click here to remove the current context assigned to the selected style.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="apply"> - <property name="label">gtk-apply</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-stock">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="apply-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="conditionpage|extended_tip|apply">Click Apply to apply the selected Paragraph Style to the defined context.</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="apply"> + <property name="label">gtk-apply</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-stock">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="apply-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="conditionpage|extended_tip|apply">Click Apply to apply the selected Paragraph Style to the defined context.</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">3</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">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">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="styles"> <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="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="styles"> - <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="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> + <property name="title" translatable="yes" context="conditionpage|styleft">Paragraph Styles</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn3"> - <property name="spacing">6</property> - <property name="title" translatable="yes" context="conditionpage|styleft">Paragraph Styles</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="styles-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="conditionpage|extended_tip|styles">A list of all Paragraph Styles which can be assigned to a context is contained in the list box.</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="styles-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="conditionpage|extended_tip|styles">A list of all Paragraph Styles which can be assigned to a context is contained in the list box.</property> + </object> + </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="filter"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">False</property> - <items> - <item translatable="yes" context="conditionpage|filter">Table Header</item> - <item translatable="yes" context="conditionpage|filter">Table</item> - <item translatable="yes" context="conditionpage|filter">Frame</item> - <item translatable="yes" context="conditionpage|filter">Section</item> - <item translatable="yes" context="conditionpage|filter">Footnote</item> - <item translatable="yes" context="conditionpage|filter">Endnote</item> - <item translatable="yes" context="conditionpage|filter">Header</item> - <item translatable="yes" context="conditionpage|filter">Footer</item> - <item translatable="yes" context="conditionpage|filter"> 1st Outline Level</item> - <item translatable="yes" context="conditionpage|filter"> 2nd Outline Level</item> - <item translatable="yes" context="conditionpage|filter"> 3rd Outline Level</item> - <item translatable="yes" context="conditionpage|filter"> 4th Outline Level</item> - <item translatable="yes" context="conditionpage|filter"> 5th Outline Level</item> - <item translatable="yes" context="conditionpage|filter"> 6th Outline Level</item> - <item translatable="yes" context="conditionpage|filter"> 7th Outline Level</item> - <item translatable="yes" context="conditionpage|filter"> 8th Outline Level</item> - <item translatable="yes" context="conditionpage|filter"> 9th Outline Level</item> - <item translatable="yes" context="conditionpage|filter">10th Outline Level</item> - <item translatable="yes" context="conditionpage|filter"> 1st Numbering Level</item> - <item translatable="yes" context="conditionpage|filter"> 2nd Numbering Level</item> - <item translatable="yes" context="conditionpage|filter"> 3rd Numbering Level</item> - <item translatable="yes" context="conditionpage|filter"> 4th Numbering Level</item> - <item translatable="yes" context="conditionpage|filter"> 5th Numbering Level</item> - <item translatable="yes" context="conditionpage|filter"> 6th Numbering Level</item> - <item translatable="yes" context="conditionpage|filter"> 7th Numbering Level</item> - <item translatable="yes" context="conditionpage|filter"> 8th Numbering Level</item> - <item translatable="yes" context="conditionpage|filter"> 9th Numbering Level</item> - <item translatable="yes" context="conditionpage|filter">10th Numbering Level</item> - </items> - </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">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="filter"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">False</property> + <items> + <item translatable="yes" context="conditionpage|filter">Table Header</item> + <item translatable="yes" context="conditionpage|filter">Table</item> + <item translatable="yes" context="conditionpage|filter">Frame</item> + <item translatable="yes" context="conditionpage|filter">Section</item> + <item translatable="yes" context="conditionpage|filter">Footnote</item> + <item translatable="yes" context="conditionpage|filter">Endnote</item> + <item translatable="yes" context="conditionpage|filter">Header</item> + <item translatable="yes" context="conditionpage|filter">Footer</item> + <item translatable="yes" context="conditionpage|filter"> 1st Outline Level</item> + <item translatable="yes" context="conditionpage|filter"> 2nd Outline Level</item> + <item translatable="yes" context="conditionpage|filter"> 3rd Outline Level</item> + <item translatable="yes" context="conditionpage|filter"> 4th Outline Level</item> + <item translatable="yes" context="conditionpage|filter"> 5th Outline Level</item> + <item translatable="yes" context="conditionpage|filter"> 6th Outline Level</item> + <item translatable="yes" context="conditionpage|filter"> 7th Outline Level</item> + <item translatable="yes" context="conditionpage|filter"> 8th Outline Level</item> + <item translatable="yes" context="conditionpage|filter"> 9th Outline Level</item> + <item translatable="yes" context="conditionpage|filter">10th Outline Level</item> + <item translatable="yes" context="conditionpage|filter"> 1st Numbering Level</item> + <item translatable="yes" context="conditionpage|filter"> 2nd Numbering Level</item> + <item translatable="yes" context="conditionpage|filter"> 3rd Numbering Level</item> + <item translatable="yes" context="conditionpage|filter"> 4th Numbering Level</item> + <item translatable="yes" context="conditionpage|filter"> 5th Numbering Level</item> + <item translatable="yes" context="conditionpage|filter"> 6th Numbering Level</item> + <item translatable="yes" context="conditionpage|filter"> 7th Numbering Level</item> + <item translatable="yes" context="conditionpage|filter"> 8th Numbering Level</item> + <item translatable="yes" context="conditionpage|filter"> 9th Numbering Level</item> + <item translatable="yes" context="conditionpage|filter">10th Numbering Level</item> + </items> + </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">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui index f0cb763f6232..fce67ad717ad 100644 --- a/sw/uiconfig/swriter/ui/converttexttable.ui +++ b/sw/uiconfig/swriter/ui/converttexttable.ui @@ -92,157 +92,149 @@ <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="halign">start</property> <property name="valign">start</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="GtkRadioButton" id="tabs"> + <property name="label" translatable="yes" context="converttexttable|tabs">Tabs</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="tabs"> - <property name="label" translatable="yes" context="converttexttable|tabs">Tabs</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="relief">half</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="converttexttable|extended_tip|tabs">Converts the text to a table using tabs as column markers.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="relief">half</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="converttexttable|extended_tip|tabs">Converts the text to a table using tabs as column markers.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="semicolons"> - <property name="label" translatable="yes" context="converttexttable|semicolons">Semicolons</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> - <child internal-child="accessible"> - <object class="AtkObject" id="semicolons-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|semicolons">Converts the text to a table using semi-colons (;) as column markers.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="semicolons"> + <property name="label" translatable="yes" context="converttexttable|semicolons">Semicolons</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> + <child internal-child="accessible"> + <object class="AtkObject" id="semicolons-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|semicolons">Converts the text to a table using semi-colons (;) as column markers.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="paragraph"> - <property name="label" translatable="yes" context="converttexttable|paragraph">Paragraph</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> - <child internal-child="accessible"> - <object class="AtkObject" id="paragraph-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|paragraph">Converts the text to a table using paragraphs as column markers.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="paragraph"> + <property name="label" translatable="yes" context="converttexttable|paragraph">Paragraph</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> + <child internal-child="accessible"> + <object class="AtkObject" id="paragraph-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|paragraph">Converts the text to a table using paragraphs as column markers.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="other"> - <property name="label" translatable="yes" context="converttexttable|other">Other:</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="othered"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="other-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|other">Converts the text to a table using the character that you type in the box as a column marker.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="other"> + <property name="label" translatable="yes" context="converttexttable|other">Other:</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="othered"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="other-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|other">Converts the text to a table using the character that you type in the box as a column marker.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="othered"> - <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> - <property name="text" translatable="yes" context="converttexttable|othered">,</property> - <accessibility> - <relation type="labelled-by" target="other"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="othered-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="converttexttable|othered-atkobject">Symbol</property> - <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|othered">Type the character that you want to use as a column marker.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="othered"> + <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> + <property name="text" translatable="yes" context="converttexttable|othered">,</property> + <accessibility> + <relation type="labelled-by" target="other"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="othered-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="converttexttable|othered-atkobject">Symbol</property> + <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|othered">Type the character that you want to use as a column marker.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="keepcolumn"> - <property name="label" translatable="yes" context="converttexttable|keepcolumn">Equal width for all columns</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="keepcolumn-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|keepcolumn">Creates columns of equal width, regardless of the position of the column marker.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="keepcolumn"> + <property name="label" translatable="yes" context="converttexttable|keepcolumn">Equal width for all columns</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="keepcolumn-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|keepcolumn">Creates columns of equal width, regardless of the position of the column marker.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">3</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">3</property> + </packing> </child> </object> </child> @@ -270,32 +262,91 @@ <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="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="headingcb"> + <property name="label" translatable="yes" context="converttexttable|headingcb">Heading</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="headingcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|headingcb">Formats the first row of the new table as a heading.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="repeatheading"> + <property name="label" translatable="yes" context="converttexttable|repeatheading">Repeat heading</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="repeatheading-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|repeatheading">Repeats the table header on each page that the table spans.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="dontsplitcb"> + <property name="label" translatable="yes" context="converttexttable|dontsplitcb">Don't split table</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="dontsplitcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|dontsplitcb">Does not divide the table across pages.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkGrid" id="repeatrows"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> + <property name="halign">start</property> + <property name="margin-start">24</property> <property name="column_spacing">12</property> <child> - <object class="GtkCheckButton" id="headingcb"> - <property name="label" translatable="yes" context="converttexttable|headingcb">Heading</property> + <object class="GtkLabel" id="label3"> <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="converttexttable|label3">The first </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="headingcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|headingcb">Formats the first row of the new table as a heading.</property> - </object> - </child> + <property name="mnemonic_widget">repeatheadersb</property> </object> <packing> <property name="left_attach">0</property> @@ -303,114 +354,49 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="repeatheading"> - <property name="label" translatable="yes" context="converttexttable|repeatheading">Repeat heading</property> + <object class="GtkLabel" id="label4"> <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="repeatheading-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|repeatheading">Repeats the table header on each page that the table spans.</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="converttexttable|label4">rows</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="dontsplitcb"> - <property name="label" translatable="yes" context="converttexttable|dontsplitcb">Don't split table</property> + <object class="GtkSpinButton" id="repeatheadersb"> <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="dontsplitcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|dontsplitcb">Does not divide the table across pages.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="repeatrows"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="margin-start">24</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="converttexttable|label3">The first </property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">repeatheadersb</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</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="converttexttable|label4">rows</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="repeatheadersb"> - <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">0</property> - </packing> - </child> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> - <child> - <object class="GtkButton" id="autofmt"> - <property name="label" translatable="yes" context="converttexttable|autofmt">AutoFormat...</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="autofmt-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|autofmt">Opens the AutoFormat dialog, where you can select a predefined layout for table.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="autofmt"> + <property name="label" translatable="yes" context="converttexttable|autofmt">AutoFormat...</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="autofmt-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="converttexttable|extended_tip|autofmt">Opens the AutoFormat dialog, where you can select a predefined layout for table.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/createauthorentry.ui b/sw/uiconfig/swriter/ui/createauthorentry.ui index e5d88ce1bc07..780f55466540 100644 --- a/sw/uiconfig/swriter/ui/createauthorentry.ui +++ b/sw/uiconfig/swriter/ui/createauthorentry.ui @@ -77,110 +77,102 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box"> <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">18</property> + <property name="homogeneous">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="leftgrid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="spacing">18</property> - <property name="homogeneous">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="leftgrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">12</property> - <property name="column_spacing">6</property> - <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> - <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="rightgrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">12</property> - <property name="column_spacing">6</property> - <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> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <property name="row_spacing">12</property> + <property name="column_spacing">6</property> + <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> + <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="rightgrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> + <property name="column_spacing">6</property> + <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> + <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/createautomarkdialog.ui b/sw/uiconfig/swriter/ui/createautomarkdialog.ui index d19ffa80268e..0a4b17f9039d 100644 --- a/sw/uiconfig/swriter/ui/createautomarkdialog.ui +++ b/sw/uiconfig/swriter/ui/createautomarkdialog.ui @@ -80,20 +80,14 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="area"> <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="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="area"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/dropcapspage.ui b/sw/uiconfig/swriter/ui/dropcapspage.ui index 6ce710f397aa..3117f7a9e637 100644 --- a/sw/uiconfig/swriter/ui/dropcapspage.ui +++ b/sw/uiconfig/swriter/ui/dropcapspage.ui @@ -45,158 +45,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="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="GtkCheckButton" id="checkCB_SWITCH"> + <property name="label" translatable="yes" context="dropcapspage|checkCB_SWITCH">_Display drop caps</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="checkCB_SWITCH"> - <property name="label" translatable="yes" context="dropcapspage|checkCB_SWITCH">_Display drop caps</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="checkCB_SWITCH-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|checkCB_SWITCH">Applies the drop cap settings to the selected paragraph.</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="checkCB_WORD"> - <property name="label" translatable="yes" context="dropcapspage|checkCB_WORD">_Whole word</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="checkCB_WORD-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|checkCB_WORD">Displays the first letter of the first word in the paragraph as a drop cap, and the remaining letters of the word as large type.</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="labelFT_DROPCAPS"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="dropcapspage|labelFT_DROPCAPS">Number of _characters:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinFLD_DROPCAPS</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelTXT_LINES"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="dropcapspage|labelTXT_LINES">_Lines:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinFLD_LINES</property> - <property name="xalign">1</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="checkCB_SWITCH-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|checkCB_SWITCH">Applies the drop cap settings to the selected paragraph.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkLabel" id="labelTXT_DISTANCE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="dropcapspage|labelTXT_DISTANCE">_Space to text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinFLD_DISTANCE</property> - <property name="xalign">1</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="checkCB_WORD"> + <property name="label" translatable="yes" context="dropcapspage|checkCB_WORD">_Whole word</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="checkCB_WORD-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|checkCB_WORD">Displays the first letter of the first word in the paragraph as a drop cap, and the remaining letters of the word as large type.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="spinFLD_DROPCAPS"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentFLD_DROPCAPS</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinFLD_DROPCAPS-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|spinFLD_DROPCAPS">Enter the number of characters to convert to drop caps.</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="labelFT_DROPCAPS"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="dropcapspage|labelFT_DROPCAPS">Number of _characters:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinFLD_DROPCAPS</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelTXT_LINES"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="dropcapspage|labelTXT_LINES">_Lines:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinFLD_LINES</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelTXT_DISTANCE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="dropcapspage|labelTXT_DISTANCE">_Space to text:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinFLD_DISTANCE</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinFLD_DROPCAPS"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentFLD_DROPCAPS</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinFLD_DROPCAPS-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|spinFLD_DROPCAPS">Enter the number of characters to convert to drop caps.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="spinFLD_LINES"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentFLD_LINES</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinFLD_LINES-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|spinFLD_LINES">Enter the number of lines that you want the drop cap to extend downward from the first line of the paragraph. Shorter paragraphs will not get drop caps.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinFLD_LINES"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentFLD_LINES</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinFLD_LINES-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|spinFLD_LINES">Enter the number of lines that you want the drop cap to extend downward from the first line of the paragraph. Shorter paragraphs will not get drop caps.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="spinFLD_DISTANCE"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentFLD_DISTANCE</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinFLD_DISTANCE-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|spinFLD_DISTANCE">Enter the amount of space to leave between the drop caps and the rest of the text in the paragraph.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinFLD_DISTANCE"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentFLD_DISTANCE</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinFLD_DISTANCE-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|spinFLD_DISTANCE">Enter the amount of space to leave between the drop caps and the rest of the text in the paragraph.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> </child> </object> </child> @@ -223,79 +217,73 @@ <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="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="labelTXT_TEXT"> <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="labelTXT_TEXT"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="dropcapspage|labelTXT_TEXT">_Text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entryEDT_TEXT</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="GtkLabel" id="labelTXT_TEMPLATE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="dropcapspage|labelTXT_TEMPLATE">Character st_yle:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">comboBOX_TEMPLATE</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="GtkEntry" id="entryEDT_TEXT"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">9</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="entryEDT_TEXT-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|entryEDT_TEXT">Enter the text that you want to display as drop caps instead of the first letters of the paragraph.</property> - </object> - </child> + <property name="label" translatable="yes" context="dropcapspage|labelTXT_TEXT">_Text:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entryEDT_TEXT</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="GtkLabel" id="labelTXT_TEMPLATE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="dropcapspage|labelTXT_TEMPLATE">Character st_yle:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">comboBOX_TEMPLATE</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="GtkEntry" id="entryEDT_TEXT"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="max_length">9</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="entryEDT_TEXT-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|entryEDT_TEXT">Enter the text that you want to display as drop caps instead of the first letters of the paragraph.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="comboBOX_TEMPLATE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="comboBOX_TEMPLATE-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|comboBOX_TEMPLATE">Select the formatting style that you want to apply to the drop caps.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="comboBOX_TEMPLATE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="comboBOX_TEMPLATE-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dropcapspage|extended_tip|comboBOX_TEMPLATE">Select the formatting style that you want to apply to the drop caps.</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> @@ -322,31 +310,25 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">24</property> + <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <property name="margin-top">24</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">center</property> - <property name="valign">start</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> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="drawingareaWN_EXAMPLE"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="drawingareaWN_EXAMPLE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">start</property> - </object> - </child> + <property name="halign">center</property> + <property name="valign">start</property> </object> </child> </object> diff --git a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui index b419e941e18b..812fa505dd11 100644 --- a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui +++ b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui @@ -154,61 +154,53 @@ <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="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"> <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="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="list"> <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="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">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/editsectiondialog.ui b/sw/uiconfig/swriter/ui/editsectiondialog.ui index 58449464cbb6..5f315ce39798 100644 --- a/sw/uiconfig/swriter/ui/editsectiondialog.ui +++ b/sw/uiconfig/swriter/ui/editsectiondialog.ui @@ -134,88 +134,80 @@ <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="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="GtkEntry" id="curname"> <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="GtkEntry" id="curname"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="curname-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|curname">Type a name for the new section.</property> - </object> - </child> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="curname-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|curname">Type a name for the new section.</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> + <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="tree"> <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> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> <child> - <object class="GtkTreeView" id="tree"> - <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> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererPixbuf" id="cellrenderertext4"/> - <attributes> - <attribute name="pixbuf">0</attribute> - </attributes> - </child> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererPixbuf" id="cellrenderertext4"/> + <attributes> + <attribute name="pixbuf">0</attribute> + </attributes> </child> - <child internal-child="accessible"> - <object class="AtkObject" id="tree-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|tree">Type the name of the section that you want to edit, or click a name in the Section list.</property> - </object> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="tree-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|tree">Type the name of the section that you want to edit, or click a name in the Section list.</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">1</property> + </packing> </child> </object> </child> @@ -251,202 +243,187 @@ <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="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> + <object class="GtkCheckButton" id="link"> + <property name="label" translatable="yes" context="editsectiondialog|link">_Link</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="inconsistent">True</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="editsectiondialog|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="editsectiondialog|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="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="dde-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|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="grid4"> + <object class="GtkGrid" id="grid8"> <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="margin-start">12</property> <child> - <object class="GtkCheckButton" id="link"> - <property name="label" translatable="yes" context="editsectiondialog|link">_Link</property> + <object class="GtkButton" id="file"> + <property name="label" translatable="yes" context="editsectiondialog|file">Browse...</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="receives_default">True</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="inconsistent">True</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="editsectiondialog|extended_tip|link">Inserts the contents of another document or section from another document in the current section.</property> + <object class="AtkObject" id="file-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|file">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="editsectiondialog|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="hexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="activates_default">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="dde-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|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="editsectiondialog|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="GtkLabel" id="sectionft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="editsectiondialog|sectionft">_Section</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">section</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="GtkAlignment" id="ddedepend"> + <object class="GtkComboBoxText" id="section"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="left_padding">12</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="section-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|section">Select the section in the file that you want to insert as a link.</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="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkLabel" id="filenameft"> <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="GtkButton" id="file"> - <property name="label" translatable="yes" context="editsectiondialog|file">Browse...</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="file-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|file">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="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="filename-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|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="GtkLabel" id="sectionft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="editsectiondialog|sectionft">_Section</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">section</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="section"> - <property name="visible">True</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" 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="section-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|section">Select the section in the file that you want to insert as a link.</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="GtkBox" id="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="filenameft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="editsectiondialog|filenameft">_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="ddeft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="editsectiondialog|ddeft">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> + <property name="label" translatable="yes" context="editsectiondialog|filenameft">_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="ddeft"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="editsectiondialog|ddeft">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">2</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> </object> </child> @@ -474,37 +451,62 @@ <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="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> + <object class="GtkCheckButton" id="protect"> + <property name="label" translatable="yes" context="editsectiondialog|protect">_Protect</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="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="inconsistent">True</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="editsectiondialog|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="grid5"> + <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="column_spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkCheckButton" id="protect"> - <property name="label" translatable="yes" context="editsectiondialog|protect">_Protect</property> + <object class="GtkCheckButton" id="withpassword"> + <property name="label" translatable="yes" context="editsectiondialog|withpassword">Wit_h password</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="hexpand">True</property> <property name="use_underline">True</property> <property name="xalign">0</property> - <property name="inconsistent">True</property> <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="password"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="protect-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|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="editsectiondialog|extended_tip|withpassword">Protects the selected section with a password. The password must have a minimum of 5 characters.</property> </object> </child> </object> @@ -514,70 +516,31 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment7"> + <object class="GtkButton" id="password"> + <property name="label" translatable="yes" context="editsectiondialog|password">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" id="grid9"> - <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="editsectiondialog|withpassword">Wit_h password</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> - <accessibility> - <relation type="label-for" target="password"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="withpassword-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|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="password"> - <property name="label" translatable="yes" context="editsectiondialog|password">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="password-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|password">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="password-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|password">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> @@ -605,38 +568,55 @@ <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="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> + <object class="GtkCheckButton" id="hide"> + <property name="label" translatable="yes" context="editsectiondialog|hide">Hide</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="inconsistent">True</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="editsectiondialog|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="grid6"> + <object class="GtkGrid" id="grid10"> <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="margin-start">12</property> <child> - <object class="GtkCheckButton" id="hide"> - <property name="label" translatable="yes" context="editsectiondialog|hide">Hide</property> + <object class="GtkLabel" id="conditionft"> <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="editsectiondialog|conditionft">_With Condition</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">condition</property> <property name="xalign">0</property> - <property name="inconsistent">True</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="editsectiondialog|extended_tip|hide">Hides and prevents the selected section from being printed.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> @@ -644,59 +624,28 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment8"> + <object class="GtkEntry" id="condition"> <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="grid10"> - <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="conditionft"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="editsectiondialog|conditionft">_With Condition</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">condition</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="condition"> - <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> - <child internal-child="accessible"> - <object class="AtkObject" id="condition-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|condition">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> + <child internal-child="accessible"> + <object class="AtkObject" id="condition-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="editsectiondialog|extended_tip|condition">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> @@ -724,39 +673,32 @@ <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="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="grid7"> + <object class="GtkCheckButton" id="editinro"> + <property name="label" translatable="yes" context="editsectiondialog|editinro">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="receives_default">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="editinro"> - <property name="label" translatable="yes" context="editsectiondialog|editinro">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="hexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="inconsistent">True</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="use_underline">True</property> + <property name="xalign">0</property> + <property name="inconsistent">True</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> diff --git a/sw/uiconfig/swriter/ui/endnotepage.ui b/sw/uiconfig/swriter/ui/endnotepage.ui index a4e94460a7c9..45a3c1ebf48d 100644 --- a/sw/uiconfig/swriter/ui/endnotepage.ui +++ b/sw/uiconfig/swriter/ui/endnotepage.ui @@ -23,130 +23,124 @@ <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="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="grid6"> + <object class="GtkLabel" id="label19"> <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="label19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="endnotepage|label19">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="label22"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="endnotepage|label22">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="offset"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="endnotepage|offset">Start at</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="label25"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="endnotepage|label25">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="GtkSpinButton" id="offsetnf"> - <property name="visible">True</property> - <property name="can_focus">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="endnotepage|extended_tip|offsetnf">Enter the number for the first endnote in the document.</property> - </object> - </child> + <property name="label" translatable="yes" context="endnotepage|label19">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="label22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="endnotepage|label22">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="offset"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="endnotepage|offset">Start at</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="label25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="endnotepage|label25">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="GtkSpinButton" id="offsetnf"> + <property name="visible">True</property> + <property name="can_focus">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="endnotepage|extended_tip|offsetnf">Enter the number for the first endnote in the document.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</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="endnotepage|extended_tip|prefix">Enter the text that you want to display in front of the endnote number in the note text.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</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="endnotepage|extended_tip|prefix">Enter the text that you want to display in front of the endnote 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="endnotepage|extended_tip|suffix">Enter the text that you want to display after the endnote 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="endnotepage|extended_tip|suffix">Enter the text that you want to display after the endnote 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="endnotepage|extended_tip|numberinglb">Enter the number for the first endnote in the document.</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="endnotepage|extended_tip|numberinglb">Enter the number for the first endnote in the document.</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> @@ -173,131 +167,125 @@ <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="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="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="grid8"> + <object class="GtkLabel" id="label20"> <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="label20"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="endnotepage|label20">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="endnotepage|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="endnotepage|extended_tip|parastylelb">Select the paragraph style for the endnote 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="endnotepage|extended_tip|pagestylelb">Select the page style that you want to use for endnotes.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label27"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="endnotepage|label27">Text area</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="endnotepage|label20">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="endnotepage|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="endnotepage|extended_tip|parastylelb">Select the paragraph style for the endnote text. Only special styles can be selected.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label28"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="endnotepage|label28">Endnote area</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="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="endnotepage|extended_tip|pagestylelb">Select the page style that you want to use for endnotes.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</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="endnotepage|extended_tip|charanchorstylelb">Select the character style that you want to use for endnote anchors in the text area of your document.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label27"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="endnotepage|label27">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="label28"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="endnotepage|label28">Endnote area</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="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="endnotepage|extended_tip|charanchorstylelb">Select the character style that you want to use for endnote anchors in the text area of your document.</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="endnotepage|extended_tip|charstylelb">Select the character style that you want to use for the endnote numbers in the endnote area.</property> - </object> - </child> + </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="endnotepage|extended_tip|charstylelb">Select the character style that you want to use for the endnote numbers in the endnote area.</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> diff --git a/sw/uiconfig/swriter/ui/envformatpage.ui b/sw/uiconfig/swriter/ui/envformatpage.ui index ace1fa3fac62..1a585307ba40 100644 --- a/sw/uiconfig/swriter/ui/envformatpage.ui +++ b/sw/uiconfig/swriter/ui/envformatpage.ui @@ -90,194 +90,182 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkFrame" id="frame4"> <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="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="GtkFrame" id="frame4"> + <!-- 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="column_spacing">18</property> + <property name="column_homogeneous">True</property> + <property name="margin-top">6</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="top_padding">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkSpinButton" id="leftaddr"> + <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="leftaddr-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|leftaddr">Enter the amount of space that you want to leave between the left edge of the envelope and the addressee field.</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="grid4"> + <object class="GtkSpinButton" id="topaddr"> + <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="topaddr-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|topaddr">Enter the amount of space that you want to leave between the top edge of the envelope and the addressee field.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</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="column_spacing">18</property> - <property name="column_homogeneous">True</property> + <property name="orientation">vertical</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="GtkSpinButton" id="leftaddr"> - <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="leftaddr-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|leftaddr">Enter the amount of space that you want to leave between the left edge of the envelope and the addressee field.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="topaddr"> - <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="topaddr-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|topaddr">Enter the amount of space that you want to leave between the top edge of the envelope and the addressee field.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</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="orientation">vertical</property> - <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="envformatpage|label5">from left</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">leftaddr</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> - </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="orientation">vertical</property> - <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="envformatpage|label6">from top</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">topaddr</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> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="envformatpage|label5">from left</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">leftaddr</property> + <property name="xalign">0</property> </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> + </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="orientation">vertical</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <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="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="envformatpage|label7">Format</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addredit</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="GtkMenuButton" id="addredit"> - <property name="label" translatable="yes" context="envformatpage|addredit">Edit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="draw_indicator">True</property> - <property name="popup">editmenu1</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="addredit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|addredit">Click and choose the text formatting style for the addressee field that you want to edit.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="envformatpage|label6">from top</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">topaddr</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="expand">False</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">1</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="label4"> + <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="label" translatable="yes" context="envformatpage|label4">Position</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="envformatpage|label7">Format</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">addredit</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="GtkMenuButton" id="addredit"> + <property name="label" translatable="yes" context="envformatpage|addredit">Edit</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="draw_indicator">True</property> + <property name="popup">editmenu1</property> + <child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="addredit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|addredit">Click and choose the text formatting style for the addressee field that you want to edit.</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">0</property> + </packing> </child> </object> </child> + <child type="label"> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="envformatpage|label4">Position</property> + </object> + </child> </object> </child> <child type="label"> @@ -305,195 +293,183 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkFrame" id="frame5"> <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="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="GtkFrame" id="frame5"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <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="column_spacing">18</property> + <property name="column_homogeneous">True</property> + <property name="margin-top">6</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="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkSpinButton" id="leftsender"> + <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="leftsender-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|leftsender">Enter the amount of space that you want to leave between the left edge of the envelope and the sender field.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="topsender"> + <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="topsender-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|topsender">Enter the amount of space that you want to leave between the top edge of the envelope and the sender field.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</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> - <property name="column_spacing">18</property> - <property name="column_homogeneous">True</property> + <property name="orientation">vertical</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="label8"> <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="leftsender"> - <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="leftsender-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|leftsender">Enter the amount of space that you want to leave between the left edge of the envelope and the sender field.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="topsender"> - <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="topsender-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|topsender">Enter the amount of space that you want to leave between the top edge of the envelope and the sender field.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</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> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="envformatpage|label8">from left</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">leftsender</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> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">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> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="envformatpage|label9">from top</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">topsender</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> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="envformatpage|label8">from left</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">leftsender</property> + <property name="xalign">0</property> </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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">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> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkLabel" id="label9"> <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="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="envformatpage|label10">Format</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">senderedit</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="GtkMenuButton" id="senderedit"> - <property name="label" translatable="yes" context="envformatpage|senderedit">Edit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="draw_indicator">True</property> - <property name="popup">editmenu2</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="senderedit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|senderedit">Click and choose the text formatting style for the sender field that you want to edit.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="envformatpage|label9">from top</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">topsender</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="expand">False</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">1</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="label11"> + <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="label" translatable="yes" context="envformatpage|label11">Position</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="envformatpage|label10">Format</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">senderedit</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="GtkMenuButton" id="senderedit"> + <property name="label" translatable="yes" context="envformatpage|senderedit">Edit</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="draw_indicator">True</property> + <property name="popup">editmenu2</property> + <child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="senderedit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|senderedit">Click and choose the text formatting style for the sender field that you want to edit.</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">0</property> + </packing> </child> </object> </child> + <child type="label"> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="envformatpage|label11">Position</property> + </object> + </child> </object> </child> <child type="label"> @@ -521,134 +497,109 @@ <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="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> <!-- 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="valign">start</property> + <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="envformatpage|label12">F_ormat</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">format</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="label13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="envformatpage|label13">_Width</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="label14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="envformatpage|label14">_Height</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">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="width"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</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="width-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|width">Enter the width of the envelope.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="height"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</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="height-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|height">Enter the height of the envelope.</property> - </object> - </child> + <property name="label" translatable="yes" context="envformatpage|label12">F_ormat</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">format</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="label13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="envformatpage|label13">_Width</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="label14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="envformatpage|label14">_Height</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">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="width"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</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="width-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|width">Enter the width of the envelope.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="format"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="format-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|format">Select the envelope size that want, or select "User Defined", and then enter the width and the height of the custom size.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="height"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</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="height-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|height">Enter the height of the envelope.</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> - <object class="GtkDrawingArea" id="preview"> + <object class="GtkComboBoxText" id="format"> <property name="visible">True</property> <property name="can_focus">False</property> <child internal-child="accessible"> - <object class="AtkObject" id="preview-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="envformatpage|preview-atkobject">Preview</property> + <object class="AtkObject" id="format-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envformatpage|extended_tip|format">Select the envelope size that want, or select "User Defined", and then enter the width and the height of the custom size.</property> </object> </child> </object> @@ -658,6 +609,25 @@ </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkDrawingArea" id="preview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="envformatpage|preview-atkobject">Preview</property> + </object> + </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/envprinterpage.ui b/sw/uiconfig/swriter/ui/envprinterpage.ui index f2543bed9d31..838849515c6e 100644 --- a/sw/uiconfig/swriter/ui/envprinterpage.ui +++ b/sw/uiconfig/swriter/ui/envprinterpage.ui @@ -87,344 +87,338 @@ <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="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="GtkRadioButton" id="top"> + <property name="label" translatable="yes" context="envprinterpage|top">_Print from top</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="top-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envprinterpage|extended_tip|top">Feeds the envelope with the print side face up in the printer tray.</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="GtkRadioButton" id="bottom"> + <property name="label" translatable="yes" context="envprinterpage|bottom">Print from _bottom</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">top</property> + <child internal-child="accessible"> + <object class="AtkObject" id="bottom-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envprinterpage|extended_tip|bottom">Feeds the envelope with the print side face down in the printer tray.</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="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="envprinterpage|label3">_Shift right</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">right</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="label4"> <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="label" translatable="yes" context="envprinterpage|label4">Shift _down</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">5</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="right"> + <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="envprinterpage|extended_tip|right">Enter the amount to shift the print area to the right.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="down"> + <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="down-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envprinterpage|extended_tip|down">Enter the amount to shift the print area down.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="lower"> + <property name="can_focus">False</property> + <property name="column_spacing">6</property> <child> - <object class="GtkRadioButton" id="top"> - <property name="label" translatable="yes" context="envprinterpage|top">_Print from top</property> + <object class="GtkRadioButton" id="horileftl"> <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="tooltip_text" translatable="yes" context="envprinterpage|horileftl|tooltip_text">Horizontal Left</property> + <property name="image">image1</property> + <property name="always_show_image">True</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="top-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envprinterpage|extended_tip|top">Feeds the envelope with the print side face up in the printer tray.</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> <child> - <object class="GtkRadioButton" id="bottom"> - <property name="label" translatable="yes" context="envprinterpage|bottom">Print from _bottom</property> + <object class="GtkRadioButton" id="horicenterl"> <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="tooltip_text" translatable="yes" context="envprinterpage|horicenterl|tooltip_text">Horizontal Center</property> + <property name="image">image2</property> + <property name="always_show_image">True</property> <property name="draw_indicator">True</property> - <property name="group">top</property> - <child internal-child="accessible"> - <object class="AtkObject" id="bottom-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envprinterpage|extended_tip|bottom">Feeds the envelope with the print side face down in the printer tray.</property> - </object> - </child> + <property name="group">horileftl</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkRadioButton" id="horirightl"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="envprinterpage|label3">_Shift right</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">right</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|horirightl|tooltip_text">Horizontal Right</property> + <property name="image">image3</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">horileftl</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="vertleftl"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|vertleftl|tooltip_text">Vertical Left</property> + <property name="image">image4</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">horileftl</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="vertcenterl"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|vertcenterl|tooltip_text">Vertical Center</property> + <property name="image">image5</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">horileftl</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="vertrightl"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|vertrightl|tooltip_text">Vertical Right</property> + <property name="image">image6</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">horileftl</property> + </object> + <packing> + <property name="left_attach">5</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="width">2</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="upper"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">6</property> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkRadioButton" id="horileftu"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="envprinterpage|label4">Shift _down</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">down</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|horileftu|tooltip_text">Horizontal Left</property> + <property name="image">image7</property> + <property name="always_show_image">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkSpinButton" id="right"> + <object class="GtkRadioButton" id="horicenteru"> <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="envprinterpage|extended_tip|right">Enter the amount to shift the print area to the right.</property> - </object> - </child> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|horicenteru|tooltip_text">Horizontal Center</property> + <property name="image">image8</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">horileftu</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkSpinButton" id="down"> + <object class="GtkRadioButton" id="horirightu"> <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="down-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envprinterpage|extended_tip|down">Enter the amount to shift the print area down.</property> - </object> - </child> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|horirightu|tooltip_text">Horizontal Right</property> + <property name="image">image9</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">horileftu</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</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="lower"> - <property name="can_focus">False</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkRadioButton" id="horileftl"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|horileftl|tooltip_text">Horizontal Left</property> - <property name="image">image1</property> - <property name="always_show_image">True</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="horicenterl"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|horicenterl|tooltip_text">Horizontal Center</property> - <property name="image">image2</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftl</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="horirightl"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|horirightl|tooltip_text">Horizontal Right</property> - <property name="image">image3</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftl</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="vertleftl"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|vertleftl|tooltip_text">Vertical Left</property> - <property name="image">image4</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftl</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="vertcenterl"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|vertcenterl|tooltip_text">Vertical Center</property> - <property name="image">image5</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftl</property> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="vertrightl"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|vertrightl|tooltip_text">Vertical Right</property> - <property name="image">image6</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftl</property> - </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">0</property> - </packing> - </child> + <object class="GtkRadioButton" id="vertleftu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|vertleftu|tooltip_text">Vertical Left</property> + <property name="image">image10</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">horileftu</property> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">3</property> <property name="top_attach">0</property> - <property name="width">2</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="upper"> + <object class="GtkRadioButton" id="vertcenteru"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkRadioButton" id="horileftu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|horileftu|tooltip_text">Horizontal Left</property> - <property name="image">image7</property> - <property name="always_show_image">True</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="horicenteru"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|horicenteru|tooltip_text">Horizontal Center</property> - <property name="image">image8</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftu</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="horirightu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|horirightu|tooltip_text">Horizontal Right</property> - <property name="image">image9</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftu</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="vertleftu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|vertleftu|tooltip_text">Vertical Left</property> - <property name="image">image10</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftu</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="vertcenteru"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|vertcenteru|tooltip_text">Vertical Center</property> - <property name="image">image11</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftu</property> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="vertrightu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="envprinterpage|vertrightu|tooltip_text">Vertical Right</property> - <property name="image">image12</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">horileftu</property> - </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|vertcenteru|tooltip_text">Vertical Center</property> + <property name="image">image11</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">horileftu</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="left_attach">4</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="vertrightu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="envprinterpage|vertrightu|tooltip_text">Vertical Right</property> + <property name="image">image12</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">horileftu</property> + </object> + <packing> + <property name="left_attach">5</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="width">2</property> + </packing> </child> </object> </child> @@ -453,53 +447,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="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="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="GtkButton" id="setup"> + <property name="label" translatable="yes" context="envprinterpage|setup">Setup...</property> <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="setup"> - <property name="label" translatable="yes" context="envprinterpage|setup">Setup...</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="setup-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="envprinterpage|extended_tip|setup">Opens the Print Setup dialog where you can define additional printer settings, such as paper format and orientation.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="printername"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="envprinterpage|printername">Printer Name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">setup</property> - <property name="xalign">0</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="setup-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="envprinterpage|extended_tip|setup">Opens the Print Setup dialog where you can define additional printer settings, such as paper format and orientation.</property> </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="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="printername"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="envprinterpage|printername">Printer Name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">setup</property> + <property name="xalign">0</property> + </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/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui index fa79e0320b78..09611021919d 100644 --- a/sw/uiconfig/swriter/ui/exchangedatabases.ui +++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui @@ -103,197 +103,189 @@ <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="column_homogeneous">True</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="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="exchangedatabases|label5">Databases in Use</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">inuselb</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="exchangedatabases|label6">_Available Databases</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">availablelb</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="GtkButton" id="browse"> - <property name="label" translatable="yes" context="exchangedatabases|browse">Browse...</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="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="browse-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="exchangedatabases|extended_tip|browse">Opens a file open dialog to select a database file (*.odb). The selected file is added to the Available Databases list.</property> - </object> - </child> + <property name="label" translatable="yes" context="exchangedatabases|label5">Databases in Use</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">inuselb</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="exchangedatabases|label6">_Available Databases</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">availablelb</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="GtkButton" id="browse"> + <property name="label" translatable="yes" context="exchangedatabases|browse">Browse...</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="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="browse-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="exchangedatabases|extended_tip|browse">Opens a file open dialog to select a database file (*.odb). The selected file is added to the Available Databases list.</property> </object> - <packing> - <property name="left_attach">1</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="margin_top">12</property> - <property name="margin_bottom">12</property> - <property name="label" translatable="yes" context="exchangedatabases|label7">Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left. + </object> + <packing> + <property name="left_attach">1</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="margin_top">12</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes" context="exchangedatabases|label7">Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left. Use the browse button to select a database file.</property> - <property name="wrap">True</property> - <property name="width_chars">72</property> - <property name="max_width_chars">72</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> + <property name="wrap">True</property> + <property name="width_chars">72</property> + <property name="max_width_chars">72</property> + <property name="xalign">0</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="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="inuselb"> + <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">liststore1</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="inuselb"> - <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">liststore1</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="treeviewcolumn2"> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererPixbuf" id="cellrenderertext4"/> - <attributes> - <attribute name="pixbuf">0</attribute> - </attributes> - </child> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererPixbuf" id="cellrenderertext4"/> + <attributes> + <attribute name="pixbuf">0</attribute> + </attributes> </child> - <child internal-child="accessible"> - <object class="AtkObject" id="inuselb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="exchangedatabases|extended_tip|inuselb">Lists the databases that are currently in use.</property> - </object> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="inuselb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="exchangedatabases|extended_tip|inuselb">Lists the databases that are currently in use.</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">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="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="availablelb"> + <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-selection2"/> + </child> <child> - <object class="GtkTreeView" id="availablelb"> - <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-selection2"/> - </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="availablelb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="exchangedatabases|extended_tip|availablelb">Lists the databases that are registered in %PRODUCTNAME.</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="availablelb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="exchangedatabases|extended_tip|availablelb">Lists the databases that are registered in %PRODUCTNAME.</property> + </object> + </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/footnoteareapage.ui b/sw/uiconfig/swriter/ui/footnoteareapage.ui index 7c6eecdb9d9b..5f5ffb56bcfd 100644 --- a/sw/uiconfig/swriter/ui/footnoteareapage.ui +++ b/sw/uiconfig/swriter/ui/footnoteareapage.ui @@ -47,128 +47,121 @@ <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="GtkRadioButton" id="maxheightpage"> + <property name="label" translatable="yes" context="footnoteareapage|maxheightpage">_Not larger than page area</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="maxheightpage"> - <property name="label" translatable="yes" context="footnoteareapage|maxheightpage">_Not larger than page area</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="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">maxheight</property> - <child internal-child="accessible"> - <object class="AtkObject" id="maxheightpage-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|maxheightpage">Automatically adjusts the height of the footnote area depending on the number of footnotes.</property> - </object> - </child> + <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">maxheight</property> + <child internal-child="accessible"> + <object class="AtkObject" id="maxheightpage-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|maxheightpage">Automatically adjusts the height of the footnote area depending on the number of footnotes.</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="maxheight"> - <property name="label" translatable="yes" context="footnoteareapage|maxheight">Maximum footnote _height</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> - <property name="group">maxheightpage</property> - <accessibility> - <relation type="label-for" target="maxheightsb"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="maxheight-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|maxheight">Sets a maximum height for the footnote area. Enable this option, then enter the height.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="footnoteareapage|label3">Space to text</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spacetotext</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="maxheight"> + <property name="label" translatable="yes" context="footnoteareapage|maxheight">Maximum footnote _height</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> + <property name="group">maxheightpage</property> + <accessibility> + <relation type="label-for" target="maxheightsb"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="maxheight-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|maxheight">Sets a maximum height for the footnote area. Enable this option, then enter the height.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="spacetotext"> - <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="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spacetotext-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|spacetotext">Enter the amount of space to leave between the bottom page margin and the first line of text in the footnote area.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="footnoteareapage|label3">Space to text</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spacetotext</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="GtkSpinButton" id="spacetotext"> + <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="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spacetotext-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|spacetotext">Enter the amount of space to leave between the bottom page margin and the first line of text in the footnote area.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="maxheightsb"> - <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">adjustment1</property> - <property name="digits">2</property> - <accessibility> - <relation type="labelled-by" target="maxheight"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="maxheightsb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|maxheightsb">Enter the maximum height for the footnote area.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="maxheightsb"> + <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">adjustment1</property> + <property name="digits">2</property> + <accessibility> + <relation type="labelled-by" target="maxheight"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="maxheightsb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|maxheightsb">Enter the maximum height for the footnote area.</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> @@ -197,240 +190,233 @@ <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="GtkLabel" id="label4"> <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="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="footnoteareapage|label4">_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">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="footnoteareapage|label5">_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">1</property> - </packing> - </child> - <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="footnoteareapage|label6">_Thickness</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">thickness</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="hexpand">True</property> - <property name="label" translatable="yes" context="footnoteareapage|label7">_Color</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">color</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="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="footnoteareapage|label8">_Length</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">length</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="footnoteareapage|label4">_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">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="footnoteareapage|label5">_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">1</property> + </packing> + </child> + <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="footnoteareapage|label6">_Thickness</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">thickness</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="hexpand">True</property> + <property name="label" translatable="yes" context="footnoteareapage|label7">_Color</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">color</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="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="footnoteareapage|label8">_Length</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">length</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="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="footnoteareapage|label9">_Spacing to footnote contents</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spacingtocontents</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="GtkComboBoxText" id="position"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="footnoteareapage|position">Left</item> + <item translatable="yes" context="footnoteareapage|position">Centered</item> + <item translatable="yes" context="footnoteareapage|position">Right</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="position-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|position">Select the horizontal alignment for the line that separates the main text from the footnote area.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="style"> + <property name="label" translatable="no"></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="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="footnoteareapage|label9">_Spacing to footnote contents</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spacingtocontents</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkComboBoxText" id="position"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="footnoteareapage|position">Left</item> - <item translatable="yes" context="footnoteareapage|position">Centered</item> - <item translatable="yes" context="footnoteareapage|position">Right</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="position-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|position">Select the horizontal alignment for the line that separates the main text from the footnote area.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="style-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|style">Select the formatting style for the separator line. If you do not want a separator line, choose "None".</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">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="color"> + <property name="label" translatable="no"></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="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child> - <object class="GtkMenuButton" id="style"> - <property name="label" translatable="no"></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="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="style-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|style">Select the formatting style for the separator line. If you do not want a separator line, choose "None".</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkMenuButton" id="color"> - <property name="label" translatable="no"></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="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="color-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|color">Select the color of the separator line.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="color-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|color">Select the color of the separator line.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="length"> - <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">adjustment4</property> - <child internal-child="accessible"> - <object class="AtkObject" id="length-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|length">Enter the length of the separator line as a percentage of the page width area.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="length"> + <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">adjustment4</property> + <child internal-child="accessible"> + <object class="AtkObject" id="length-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|length">Enter the length of the separator line as a percentage of the page width area.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="spacingtocontents"> - <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">adjustment5</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spacingtocontents-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|spacingtocontents">Enter the amount of space to leave between the separator line and the first line of the footnote area.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spacingtocontents"> + <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">adjustment5</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spacingtocontents-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|spacingtocontents">Enter the amount of space to leave between the separator line and the first line of the footnote area.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="thickness"> - <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">adjustment3</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="thickness-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|thickness">Select the thickness of the separator line.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="thickness"> + <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">adjustment3</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="thickness-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnoteareapage|extended_tip|thickness">Select the thickness of the separator line.</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> diff --git a/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui index 1acddb43d97d..e17097aa4987 100644 --- a/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui +++ b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui @@ -28,236 +28,228 @@ <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="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="margin-start">12</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="row_spacing">6</property> <child> + <object class="GtkCheckButton" id="ftnntnum"> + <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntnum">_Restart numbering</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="ftnntnum-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnntnum">Restarts the footnote numbering at the number that you specify.</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="grid2"> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin-start">12</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="GtkCheckButton" id="ftnntnum"> - <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntnum">_Restart numbering</property> + <object class="GtkSpinButton" id="ftnoffset"> <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> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> <child internal-child="accessible"> - <object class="AtkObject" id="ftnntnum-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnntnum">Restarts the footnote numbering at the number that you specify.</property> + <object class="AtkObject" id="ftnoffset-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnoffset">Enter the number that you want to assign the footnote.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> + <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="grid3"> + <object class="GtkLabel" id="ftnoffset_label"> <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="GtkSpinButton" id="ftnoffset"> - <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="ftnoffset-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnoffset">Enter the number that you want to assign the footnote.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="ftnoffset_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnoffset_label">_Start at:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">ftnoffset</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="label" translatable="yes" context="footnotesendnotestabpage|ftnoffset_label">_Start at:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">ftnoffset</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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ftnntnumfmt"> + <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntnumfmt">Custom _format</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> + </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="grid4"> + <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="GtkCheckButton" id="ftnntnumfmt"> - <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntnumfmt">Custom _format</property> + <object class="GtkEntry" id="ftnsuffix"> <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="max_length">50</property> + <property name="activates_default">True</property> + <property name="width_chars">6</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ftnsuffix-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnsuffix">Enter the text that you want to display after the footnote number.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="ftnsuffix_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnsuffix_label">Aft_er:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">ftnsuffix</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <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="grid4"> + <object class="GtkComboBoxText" id="ftnnumviewbox"> <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="GtkEntry" id="ftnsuffix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">50</property> - <property name="activates_default">True</property> - <property name="width_chars">6</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ftnsuffix-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnsuffix">Enter the text that you want to display after the footnote number.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="ftnsuffix_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnsuffix_label">Aft_er:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">ftnsuffix</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="ftnnumviewbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ftnnumviewbox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnnumviewbox">Select the numbering style for the footnotes.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="ftnprefix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">50</property> - <property name="activates_default">True</property> - <property name="width_chars">6</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ftnprefix-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnprefix">Enter the text that you want to display in front of the footnote number.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="ftnnumviewbox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnnumviewbox">Select the numbering style for the footnotes.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="ftnprefix_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">24</property> - <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnprefix_label">Be_fore:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">ftnprefix</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="GtkEntry" id="ftnprefix"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="max_length">50</property> + <property name="activates_default">True</property> + <property name="width_chars">6</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ftnprefix-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnprefix">Enter the text that you want to display in front of the footnote number.</property> </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="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="ftnprefix_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">24</property> + <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnprefix_label">Be_fore:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">ftnprefix</property> + <property name="xalign">0</property> + </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">1</property> + <property name="top_attach">3</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="ftnntattextend"> - <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntattextend">Collec_t at end of text</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="ftnntattextend-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnntattextend">Adds footnotes at the end of the section. If the section spans more than one page, the footnotes are added to the bottom of the page on which the footnote anchors appear.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ftnntattextend"> + <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntattextend">Collec_t at end of text</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="ftnntattextend-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|ftnntattextend">Adds footnotes at the end of the section. If the section spans more than one page, the footnotes are added to the bottom of the page on which the footnote anchors appear.</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> @@ -286,24 +278,48 @@ <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="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="endntattextend"> + <property name="label" translatable="yes" context="footnotesendnotestabpage|endntattextend">C_ollect at end of section</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="endntattextend-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endntattextend">Adds endnotes at the end of the section.</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="grid5"> + <object class="GtkGrid" id="grid6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin-start">12</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="row_spacing">6</property> <child> - <object class="GtkCheckButton" id="endntattextend"> - <property name="label" translatable="yes" context="footnotesendnotestabpage|endntattextend">C_ollect at end of section</property> + <object class="GtkCheckButton" id="endntnum"> + <property name="label" translatable="yes" context="footnotesendnotestabpage|endntnum">_Restart numbering</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -312,8 +328,8 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="endntattextend-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endntattextend">Adds endnotes at the end of the section.</property> + <object class="AtkObject" id="endntnum-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endntnum">Restarts the endnote numbering at the number that you specify.</property> </object> </child> </object> @@ -324,203 +340,171 @@ </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="margin-start">12</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="GtkCheckButton" id="endntnum"> - <property name="label" translatable="yes" context="footnotesendnotestabpage|endntnum">_Restart numbering</property> + <object class="GtkSpinButton" id="endoffset"> <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> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> <child internal-child="accessible"> - <object class="AtkObject" id="endntnum-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endntnum">Restarts the endnote numbering at the number that you specify.</property> + <object class="AtkObject" id="endoffset-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endoffset">Enter the number that you want to assign the endnote.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> + <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="grid7"> + <object class="GtkLabel" id="endoffset_label"> <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="GtkSpinButton" id="endoffset"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="endoffset-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endoffset">Enter the number that you want to assign the endnote.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="endoffset_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="footnotesendnotestabpage|endoffset_label">_Start at:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">endoffset</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="label" translatable="yes" context="footnotesendnotestabpage|endoffset_label">_Start at:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">endoffset</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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="endntnumfmt"> + <property name="label" translatable="yes" context="footnotesendnotestabpage|endntnumfmt">_Custom format</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> + <child internal-child="accessible"> + <object class="AtkObject" id="endntnumfmt-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endntnumfmt">Specifies a custom numbering format for endnotes.</property> + </object> + </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="grid8"> + <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="GtkCheckButton" id="endntnumfmt"> - <property name="label" translatable="yes" context="footnotesendnotestabpage|endntnumfmt">_Custom format</property> + <object class="GtkEntry" id="endsuffix"> <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> + <property name="max_length">50</property> + <property name="activates_default">True</property> + <property name="width_chars">6</property> <child internal-child="accessible"> - <object class="AtkObject" id="endntnumfmt-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endntnumfmt">Specifies a custom numbering format for endnotes.</property> + <object class="AtkObject" id="endsuffix-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endsuffix">Enter the text that you want to display after the endnote number.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left_attach">4</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkLabel" id="endsuffix_label"> <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="GtkEntry" id="endsuffix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">50</property> - <property name="activates_default">True</property> - <property name="width_chars">6</property> - <child internal-child="accessible"> - <object class="AtkObject" id="endsuffix-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endsuffix">Enter the text that you want to display after the endnote number.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="endsuffix_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="footnotesendnotestabpage|endsuffix_label">Aft_er:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">endsuffix</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="endnumviewbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="endnumviewbox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endnumviewbox">Select the numbering style for the endnotes.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="endprefix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">50</property> - <property name="activates_default">True</property> - <property name="width_chars">6</property> - <child internal-child="accessible"> - <object class="AtkObject" id="endprefix-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endprefix">Enter the text that you want to display in front of the endnote number</property> - </object> - </child> + <property name="label" translatable="yes" context="footnotesendnotestabpage|endsuffix_label">Aft_er:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">endsuffix</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="endnumviewbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="endnumviewbox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endnumviewbox">Select the numbering style for the endnotes.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="endprefix_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">24</property> - <property name="label" translatable="yes" context="footnotesendnotestabpage|endprefix_label">Be_fore:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">endprefix</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="GtkEntry" id="endprefix"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="max_length">50</property> + <property name="activates_default">True</property> + <property name="width_chars">6</property> + <child internal-child="accessible"> + <object class="AtkObject" id="endprefix-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="footnotesendnotestabpage|extended_tip|endprefix">Enter the text that you want to display in front of the endnote number</property> </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="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="endprefix_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">24</property> + <property name="label" translatable="yes" context="footnotesendnotestabpage|endprefix_label">Be_fore:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">endprefix</property> + <property name="xalign">0</property> + </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">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> </object> </child> diff --git a/sw/uiconfig/swriter/ui/frmurlpage.ui b/sw/uiconfig/swriter/ui/frmurlpage.ui index bd423a2beb7a..6633b295cdc0 100644 --- a/sw/uiconfig/swriter/ui/frmurlpage.ui +++ b/sw/uiconfig/swriter/ui/frmurlpage.ui @@ -18,155 +18,147 @@ <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="url"> <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="url"> - <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="url-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|url">Enter the complete path to the file that you want to open.</property> - </object> - </child> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="url-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|url">Enter the complete path to the file that you want to open.</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> + <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="frmurlpage|extended_tip|name">Enter a name for the hyperlink.</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="GtkLabel" id="url_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmurlpage|url_label">_URL:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">url</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="name_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmurlpage|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">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="frame_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="frmurlpage|frame_label">_Frame:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">frame</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="GtkButtonBox" id="buttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="layout_style">start</property> <child> - <object class="GtkEntry" id="name"> + <object class="GtkButton" id="search"> + <property name="label" translatable="yes" context="frmurlpage|search">_Browse...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="name-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|name">Enter a name for the hyperlink.</property> + <object class="AtkObject" id="search-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|search">Locate the file that you want the hyperlink to open, and then click Open.</property> </object> </child> </object> <packing> - <property name="left_attach">1</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">0</property> </packing> </child> - <child> - <object class="GtkLabel" id="url_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmurlpage|url_label">_URL:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">url</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="name_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmurlpage|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">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="frame_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="frmurlpage|frame_label">_Frame:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">frame</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="GtkComboBoxText" id="frame"> + <property name="visible">True</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" id="comboboxtext-entry"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButtonBox" id="buttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="search"> - <property name="label" translatable="yes" context="frmurlpage|search">_Browse...</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="search-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|search">Locate the file that you want the hyperlink to open, and then click Open.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="frame-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|frame">Specify the name of the frame where you want to open the targeted file.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="frame"> - <property name="visible">True</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" 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="frame-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|frame">Specify the name of the frame where you want to open the targeted file.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> </child> </object> </child> @@ -195,65 +187,57 @@ <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="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="server"> + <property name="label" translatable="yes" context="frmurlpage|server">_Server-side image map</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="receives_default">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="GtkCheckButton" id="server"> - <property name="label" translatable="yes" context="frmurlpage|server">_Server-side image map</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="server-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|server">Uses a server-side image map.</property> - </object> - </child> + <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="server-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|server">Uses a server-side image map.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="client"> - <property name="label" translatable="yes" context="frmurlpage|client">_Client-side image map</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="client-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|client">Uses the image map that you created for the selected object.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="client"> + <property name="label" translatable="yes" context="frmurlpage|client">_Client-side image map</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="client-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="frmurlpage|extended_tip|client">Uses the image map that you created for the selected object.</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> diff --git a/sw/uiconfig/swriter/ui/indentpage.ui b/sw/uiconfig/swriter/ui/indentpage.ui index 016a86129538..87bbe86a6a70 100644 --- a/sw/uiconfig/swriter/ui/indentpage.ui +++ b/sw/uiconfig/swriter/ui/indentpage.ui @@ -39,85 +39,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="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="label1"> <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="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="indentpage|label1">_Before section</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">before</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="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="indentpage|label3">_After section</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">after</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="before"> - <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="before-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="indentpage|extended_tip|before">Specifies the indents before the section, at the left margin.</property> - </object> - </child> + <property name="label" translatable="yes" context="indentpage|label1">_Before section</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">before</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="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="indentpage|label3">_After section</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">after</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="before"> + <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="before-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="indentpage|extended_tip|before">Specifies the indents before the section, at the left margin.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="after"> - <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="after-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="indentpage|extended_tip|after">Specifies the indents after the section, at the right margin.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="after"> + <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="after-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="indentpage|extended_tip|after">Specifies the indents after the section, at the right margin.</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> @@ -138,36 +131,30 @@ </packing> </child> <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="halign">center</property> + <property name="valign">start</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">24</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <property name="margin-top">24</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">center</property> - <property name="valign">start</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> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="preview"> <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="halign">center</property> - <property name="valign">start</property> - <child internal-child="accessible"> - <object class="AtkObject" id="preview-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="indentpage|preview-atkobject">Example</property> - </object> - </child> + <property name="halign">center</property> + <property name="valign">start</property> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="indentpage|preview-atkobject">Example</property> </object> </child> </object> diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui index 3477e981185d..9c376826eae9 100644 --- a/sw/uiconfig/swriter/ui/indexentry.ui +++ b/sw/uiconfig/swriter/ui/indexentry.ui @@ -148,474 +148,468 @@ <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="grid101"> <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="grid101"> + <object class="GtkGrid" id="grid1"> <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">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="typeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-end">6</property> + <property name="label" translatable="yes" context="indexentry|typeft">Index</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">typecb</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="typecb"> <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">6</property> - <child> - <object class="GtkLabel" id="typeft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-end">6</property> - <property name="label" translatable="yes" context="indexentry|typeft">Index</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">typecb</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="typecb"> - <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="new"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="indexentry|new|tooltip_text">New User-defined Index</property> - <property name="image">image1</property> - <accessibility> - <relation type="member-of" target="label1"/> - </accessibility> - </object> - <packing> - <property name="left_attach">2</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="margin-end">6</property> - <property name="label" translatable="yes" context="indexentry|label3">Entry</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entryed</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="key1ft"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="margin-end">6</property> - <property name="label" translatable="yes" context="indexentry|key1ft">1st key</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">key1cb</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="key2ft"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="margin-end">6</property> - <property name="label" translatable="yes" context="indexentry|key2ft">2nd key</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">key2cb</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="levelft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-end">6</property> - <property name="label" translatable="yes" context="indexentry|levelft">Level</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">levelnf</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="levelnf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="phonetic0ft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="margin-start">12</property> - <property name="margin-end">6</property> - <property name="label" translatable="yes" context="indexentry|phonetic0ft">Phonetic reading</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">phonetic0ed</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="phonetic1ft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="margin-start">12</property> - <property name="margin-end">6</property> - <property name="label" translatable="yes" context="indexentry|phonetic1ft">Phonetic reading</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">phonetic1ed</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="phonetic2ft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="margin-start">12</property> - <property name="margin-end">6</property> - <property name="label" translatable="yes" context="indexentry|phonetic2ft">Phonetic reading</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">phonetic2ed</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="phonetic0ed"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="phonetic1ed"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="phonetic2ed"> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="new"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="indexentry|new|tooltip_text">New User-defined Index</property> + <property name="image">image1</property> + <accessibility> + <relation type="member-of" target="label1"/> + </accessibility> + </object> + <packing> + <property name="left_attach">2</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="margin-end">6</property> + <property name="label" translatable="yes" context="indexentry|label3">Entry</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entryed</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="key1ft"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="margin-end">6</property> + <property name="label" translatable="yes" context="indexentry|key1ft">1st key</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">key1cb</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="key2ft"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="margin-end">6</property> + <property name="label" translatable="yes" context="indexentry|key2ft">2nd key</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">key2cb</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="levelft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-end">6</property> + <property name="label" translatable="yes" context="indexentry|levelft">Level</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">levelnf</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="levelnf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="phonetic0ft"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="margin-start">12</property> + <property name="margin-end">6</property> + <property name="label" translatable="yes" context="indexentry|phonetic0ft">Phonetic reading</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">phonetic0ed</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="phonetic1ft"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="margin-start">12</property> + <property name="margin-end">6</property> + <property name="label" translatable="yes" context="indexentry|phonetic1ft">Phonetic reading</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">phonetic1ed</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="phonetic2ft"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="margin-start">12</property> + <property name="margin-end">6</property> + <property name="label" translatable="yes" context="indexentry|phonetic2ft">Phonetic reading</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">phonetic2ed</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="phonetic0ed"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="phonetic1ed"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="phonetic2ed"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="key1cb"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</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="no_show_all">True</property> <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="key1cb"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</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> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="key2cb"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</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="activates_default">True</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="sync"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="indexentry|sync|tooltip_text">Update entry from selection</property> - <property name="image">image6</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entryed"> - <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="key2cb"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</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="activates_default">True</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">1</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="sync"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="indexentry|sync|tooltip_text">Update entry from selection</property> + <property name="image">image6</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entryed"> + <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">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">0</property> + </packing> + </child> + <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="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkCheckButton" id="mainentrycb"> + <property name="label" translatable="yes" context="indexentry|mainentrycb">Main entry</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> <child> + <object class="GtkCheckButton" id="applytoallcb"> + <property name="label" translatable="yes" context="indexentry|applytoallcb">Apply to all similar texts</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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="searchcasesensitivecb"> + <property name="label" translatable="yes" context="indexentry|searchcasesensitivecb">Match case</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="margin-start">12</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">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="searchcasewordonlycb"> + <property name="label" translatable="yes" context="indexentry|searchcasewordonlycb">Whole words only</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="margin-start">12</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">3</property> + </packing> + </child> + <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">end</property> <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="row_homogeneous">True</property> + <property name="column_homogeneous">True</property> <child> - <object class="GtkCheckButton" id="mainentrycb"> - <property name="label" translatable="yes" context="indexentry|mainentrycb">Main entry</property> - <property name="visible">True</property> + <object class="GtkButton" id="previous"> <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="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="image">image2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="previous-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="indexentry|extended_tip|previous">Jumps to the previous index entry of the same type in the document.</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="applytoallcb"> - <property name="label" translatable="yes" context="indexentry|applytoallcb">Apply to all similar texts</property> + <object class="GtkButton" id="next"> <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> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="image">image3</property> + <child internal-child="accessible"> + <object class="AtkObject" id="next-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="indexentry|extended_tip|next">Jumps to the next index entry of the same type in the document.</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="GtkCheckButton" id="searchcasesensitivecb"> - <property name="label" translatable="yes" context="indexentry|searchcasesensitivecb">Match case</property> + <object class="GtkButton" id="first"> <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="margin-start">12</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="image">image4</property> + <child internal-child="accessible"> + <object class="AtkObject" id="first-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="indexentry|extended_tip|first">Jumps to the first index entry of the same type in the document.</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="searchcasewordonlycb"> - <property name="label" translatable="yes" context="indexentry|searchcasewordonlycb">Whole words only</property> + <object class="GtkButton" id="last"> <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="margin-start">12</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">3</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="halign">end</property> - <property name="valign">end</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="row_homogeneous">True</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkButton" id="previous"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="image">image2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="previous-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="indexentry|extended_tip|previous">Jumps to the previous index entry of the same type in the document.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="next"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="image">image3</property> - <child internal-child="accessible"> - <object class="AtkObject" id="next-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="indexentry|extended_tip|next">Jumps to the next index entry of the same type in the document.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="first"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="image">image4</property> - <child internal-child="accessible"> - <object class="AtkObject" id="first-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="indexentry|extended_tip|first">Jumps to the first index entry of the same type in the document.</property> - </object> - </child> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="image">image5</property> + <child internal-child="accessible"> + <object class="AtkObject" id="last-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="indexentry|extended_tip|last">Jumps to the last index entry of the same type in the document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="last"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="image">image5</property> - <child internal-child="accessible"> - <object class="AtkObject" id="last-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="indexentry|extended_tip|last">Jumps to the last index entry of the same type in the document.</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">0</property> - <property name="height">4</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> + <property name="height">4</property> </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/insertautotextdialog.ui b/sw/uiconfig/swriter/ui/insertautotextdialog.ui index 539cfd4bd934..97b7c3f6223e 100644 --- a/sw/uiconfig/swriter/ui/insertautotextdialog.ui +++ b/sw/uiconfig/swriter/ui/insertautotextdialog.ui @@ -93,44 +93,38 @@ <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="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="treeview"> <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="headers_clickable">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="treeview"> - <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="headers_clickable">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="treeviewcolumn1"> + <property name="resizable">True</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderer1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui index e453d2f5e71e..5c4ed18a45ce 100644 --- a/sw/uiconfig/swriter/ui/insertbreak.ui +++ b/sw/uiconfig/swriter/ui/insertbreak.ui @@ -86,164 +86,158 @@ <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="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="box1"> + <object class="GtkRadioButton" id="linerb"> + <property name="label" translatable="yes" context="insertbreak|linerb">Line break</property> <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="linerb"> - <property name="label" translatable="yes" context="insertbreak|linerb">Line break</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">pagerb</property> - <child internal-child="accessible"> - <object class="AtkObject" id="linerb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|linerb-atkobject">Ends the current line, and moves the text found to the right of the cursor to the next line, without creating a new paragraph.</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="columnrb"> - <property name="label" translatable="yes" context="insertbreak|columnrb">Column break</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">pagerb</property> - <child internal-child="accessible"> - <object class="AtkObject" id="columnrb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|columnrb-atkobject">Inserts a manual column break (in a multiple column layout), and moves the text found to the right of the cursor to the beginning of the next column. A manual column break is indicated by a nonprinting border at the top of the new column.</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">pagerb</property> + <child internal-child="accessible"> + <object class="AtkObject" id="linerb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|linerb-atkobject">Ends the current line, and moves the text found to the right of the cursor to the next line, without creating a new paragraph.</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="pagerb"> - <property name="label" translatable="yes" context="insertbreak|pagerb">Page break</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="pagerb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|pagerb-atkobject">Inserts a manual page break, and moves the text found to the right of the cursor to the beginning of the next page. The inserted page break is indicated by a nonprinting border at the top of the new page.</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="columnrb"> + <property name="label" translatable="yes" context="insertbreak|columnrb">Column break</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">pagerb</property> + <child internal-child="accessible"> + <object class="AtkObject" id="columnrb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|columnrb-atkobject">Inserts a manual column break (in a multiple column layout), and moves the text found to the right of the cursor to the beginning of the next column. A manual column break is indicated by a nonprinting border at the top of the new column.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="styleft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="label" translatable="yes" context="insertbreak|styleft">Page Style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">stylelb</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> + <child> + <object class="GtkRadioButton" id="pagerb"> + <property name="label" translatable="yes" context="insertbreak|pagerb">Page break</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="pagerb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|pagerb-atkobject">Inserts a manual page break, and moves the text found to the right of the cursor to the beginning of the next page. The inserted page break is indicated by a nonprinting border at the top of the new page.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="stylelb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active">0</property> - <items> - <item translatable="yes" context="insertbreak|liststore1">[None]</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="stylelb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|stylelb-atkobject">Select the page style for the page that follows the manual page break.</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="GtkLabel" id="styleft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="label" translatable="yes" context="insertbreak|styleft">Page Style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">stylelb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="stylelb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <items> + <item translatable="yes" context="insertbreak|liststore1">[None]</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="stylelb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|stylelb-atkobject">Select the page style for the page that follows the manual page break.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="pagenumcb"> - <property name="label" translatable="yes" context="insertbreak|pagenumcb">Change page number</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin_top">6</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="pagenumcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|pagenumcb-atkobject">Assigns the page number that you specify to the page that follows the manual page break. This option is only available if you assign a different page style to the page that follows manual page break.</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="GtkCheckButton" id="pagenumcb"> + <property name="label" translatable="yes" context="insertbreak|pagenumcb">Change page number</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_top">6</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="pagenumcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|pagenumcb-atkobject">Assigns the page number that you specify to the page that follows the manual page break. This option is only available if you assign a different page style to the page that follows manual page break.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="pagenumsb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <accessibility> - <relation type="labelled-by" target="pagenumcb"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="pagenumsb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|pagenumsb-atkobject">Enter the new page number for the page that follows the manual page break.</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="GtkSpinButton" id="pagenumsb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <accessibility> + <relation type="labelled-by" target="pagenumcb"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="pagenumsb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|pagenumsb-atkobject">Enter the new page number for the page that follows the manual page break.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui index 35e0f52b1da6..e6a1d1419b32 100644 --- a/sw/uiconfig/swriter/ui/insertcaption.ui +++ b/sw/uiconfig/swriter/ui/insertcaption.ui @@ -119,19 +119,13 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkEntry" id="caption_edit"> <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="GtkEntry" id="caption_edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> </object> </child> <child type="label"> @@ -159,180 +153,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="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="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> + <object class="GtkLabel" id="numbering_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="insertcaption|numbering_label">Numbering:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numbering</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="grid1"> + <object class="GtkLabel" id="separator_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="insertcaption|separator_label">Separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">separator_edit</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="position_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="insertcaption|position_label">Position:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">position</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> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="numbering_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="insertcaption|numbering_label">Numbering:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numbering</property> + <child internal-child="accessible"> + <object class="AtkObject" id="numbering-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|numbering">Select the type of numbering that you want to use in the caption.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel" id="separator_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="insertcaption|separator_label">Separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">separator_edit</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="position_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="insertcaption|position_label">Position:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">position</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="insertcaption|extended_tip|numbering">Select the type of numbering that you want to use in the caption.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="separator_edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="text" translatable="yes" context="insertcaption|separator_edit">: </property> + <child internal-child="accessible"> + <object class="AtkObject" id="separator_edit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|separator_edit">Enter optional text characters to appear between the number and the caption text.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="separator_edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="text" translatable="yes" context="insertcaption|separator_edit">: </property> - <child internal-child="accessible"> - <object class="AtkObject" id="separator_edit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|separator_edit">Enter optional text characters to appear between the number and the caption text.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="num_separator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="insertcaption|num_separator">Numbering separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">num_separator_edit</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="num_separator_edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="text" translatable="yes" context="insertcaption|num_separator_edit">. </property> + <child internal-child="accessible"> + <object class="AtkObject" id="num_separator_edit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|num_separator_edit">Type the text that you want to appear after the caption number.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkLabel" id="num_separator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="insertcaption|num_separator">Numbering separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">num_separator_edit</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="position"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="position-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|position">Adds the caption above or below the selected item. This option is only available for some objects.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkEntry" id="num_separator_edit"> - <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="insertcaption|label4">Category:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">category</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="visible">True</property> + <property name="can_focus">False</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="hexpand">True</property> <property name="activates_default">True</property> - <property name="text" translatable="yes" context="insertcaption|num_separator_edit">. </property> - <child internal-child="accessible"> - <object class="AtkObject" id="num_separator_edit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|num_separator_edit">Type the text that you want to appear after the caption number.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="position"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="position-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|position">Adds the caption above or below the selected item. This option is only available for some objects.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="insertcaption|label4">Category:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">category</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="visible">True</property> - <property name="can_focus">False</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="insertcaption|extended_tip|category">Select the caption category, or type a name to create a new category. The category text appears before the caption number in the caption label. Each predefined caption category is formatted with a paragraph style of the same name.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="category-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|category">Select the caption category, or type a name to create a new category. The category text appears before the caption number in the caption label. Each predefined caption category is formatted with a paragraph style of the same name.</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> @@ -361,28 +349,22 @@ <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="top_padding">6</property> - <property name="left_padding">12</property> + <property name="can_focus">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="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">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> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="preview"> <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> - </object> - </child> </object> </child> </object> diff --git a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui index 756bb820a6a3..a229053d7816 100644 --- a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui +++ b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui @@ -240,347 +240,340 @@ <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="grid4"> <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="grid4"> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|label4">Database _columns</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">box2</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="tablecolft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|tablecolft">Tab_le column(s)</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">tablecols</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="GtkButtonBox" id="buttonbox1"> <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="orientation">vertical</property> + <property name="spacing">12</property> + <property name="layout_style">start</property> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkButton" id="allright"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|label4">Database _columns</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">box2</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="allright-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|allright">Moves all listed database fields into the Table column(s) list box.</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="GtkLabel" id="tablecolft"> + <object class="GtkButton" id="oneright"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|tablecolft">Tab_le column(s)</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">tablecols</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="oneright-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|oneright">Moves the selected database field into the Table column(s) list box.</property> + </object> + </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkButtonBox" id="buttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="allright"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="allright-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|allright">Moves all listed database fields into the Table column(s) list 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="GtkButton" id="oneright"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="oneright-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|oneright">Moves the selected database field into the Table column(s) list box.</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="toedit"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="image">image5</property> - <child internal-child="accessible"> - <object class="AtkObject" id="toedit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|toedit">Moves the fields that you selected in the Database columns list box into the selection field.</property> - </object> - </child> + <object class="GtkButton" id="toedit"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="image">image5</property> + <child internal-child="accessible"> + <object class="AtkObject" id="toedit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|toedit">Moves the fields that you selected in the Database columns list box into the selection field.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="oneleft"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image3</property> - <child internal-child="accessible"> - <object class="AtkObject" id="oneleft-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|oneleft">Removes the selected database field from the Table column(s) list box</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="oneleft"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image3</property> + <child internal-child="accessible"> + <object class="AtkObject" id="oneleft-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|oneleft">Removes the selected database field from the Table column(s) list box</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - <property name="secondary">True</property> - </packing> </child> - <child> - <object class="GtkButton" id="allleft"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image4</property> - <child internal-child="accessible"> - <object class="AtkObject" id="allleft-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|allleft">Removes all database fields from the Table column(s) list box.</property> - </object> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + <property name="secondary">True</property> + </packing> + </child> + <child> + <object class="GtkButton" id="allleft"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image4</property> + <child internal-child="accessible"> + <object class="AtkObject" id="allleft-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|allleft">Removes all database fields from the Table column(s) list box.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - <property name="secondary">True</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">5</property> + <property name="secondary">True</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</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="vexpand">True</property> + <property name="orientation">vertical</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="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="tablecols"> <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="tablecols"> - <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="tablecols-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tablecols">Lists all database columns to be inserted into the document.</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="tablecols-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tablecols">Lists all database columns to be inserted into the document.</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" 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="textview"> <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="textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="textview-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|textview">Lists the database columns that you selected to be inserted into the document. You can also enter text here. This text will be also inserted into the document.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="textview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|textview">Lists the database columns that you selected to be inserted into the document. You can also enter text here. This text will be also inserted into the document.</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">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">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box2"> + <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="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="tabledbcols"> <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="tabledbcols"> - <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="tabledbcols-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tabledbcols">Specifies the database columns to be inserted into the text table.</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="tabledbcols-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tabledbcols">Specifies the database columns to be inserted into the text table.</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="tabletxtcols"> <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="tabletxtcols"> - <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="tabletxtcols-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tabletxtcols">Select the database columns that you want to insert it in the document.</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="tabletxtcols-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tabletxtcols">Select the database columns that you want to insert it in the document.</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">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> - <child> - <placeholder/> - </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -607,240 +600,233 @@ <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="top_padding">6</property> - <property name="left_padding">12</property> + <property name="column_spacing">18</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="grid6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="column_spacing">18</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkCheckButton" id="tableheading"> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|tableheading">Insert table heading</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="tableheading"> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|tableheading">Insert table heading</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="tableheading-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tableheading">Specifies whether to insert a heading line for the columns in the text table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="columnname"> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|columnname">Apply column _name</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="columnname-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|columnname">Uses the field names of the database table as headings for each of the text table columns.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="rowonly"> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|rowonly">Create row only</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">columnname</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rowonly-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|rowonly">Inserts an empty heading line into the text table.</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="tableheading-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tableheading">Specifies whether to insert a heading line for the columns in the text table.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkButton" id="tableformat"> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|tableformat">Pr_operties...</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="tableformat-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tableformat">Opens the Table Format dialog, which enables you to define the table properties such as borders, background, and column width.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="columnname"> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|columnname">Apply column _name</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="columnname-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|columnname">Uses the field names of the database table as headings for each of the text table columns.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkButton" id="autoformat"> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|autoformat">Aut_oFormat...</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="autoformat-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|autoformat">Opens the AutoFormat dialog, in which you can select format styles that are immediately applied when inserting the 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="rowonly"> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|rowonly">Create row only</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">columnname</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rowonly-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|rowonly">Inserts an empty heading line into the text table.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="parastylelabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|parastylelabel">Paragraph _style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">parastyle</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="GtkButton" id="tableformat"> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|tableformat">Pr_operties...</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="tableformat-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|tableformat">Opens the Table Format dialog, which enables you to define the table properties such as borders, background, and column width.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="parastyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <accessibility> - <relation type="labelled-by" target="userdefined"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="parastyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|parastyle">This is where you can select other Paragraph Styles to apply to the paragraph you want to insert into the document.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="autoformat"> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|autoformat">Aut_oFormat...</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="autoformat-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|autoformat">Opens the AutoFormat dialog, in which you can select format styles that are immediately applied when inserting the table.</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">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="parastylelabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|parastylelabel">Paragraph _style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">parastyle</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="grid7"> + <object class="GtkComboBoxText" id="parastyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="fromdatabase"> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|fromdatabase">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="fromdatabase-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|fromdatabase">Accepts the database formats.</property> - </object> - </child> + <property name="hexpand">True</property> + <accessibility> + <relation type="labelled-by" target="userdefined"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="parastyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|parastyle">This is where you can select other Paragraph Styles to apply to the paragraph you want to insert into the document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="userdefined"> - <property name="label" translatable="yes" context="insertdbcolumnsdialog|userdefined">_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">fromdatabase</property> - <accessibility> - <relation type="label-for" target="numformat"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="userdefined-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|userdefined">Specifies a format from the list, if the format information of certain data fields is not accepted.</property> - </object> - </child> + </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> + <!-- 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> + <child> + <object class="GtkRadioButton" id="fromdatabase"> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|fromdatabase">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="fromdatabase-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|fromdatabase">Accepts the database formats.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="numformat"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <accessibility> - <relation type="labelled-by" target="userdefined"/> - </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="userdefined"> + <property name="label" translatable="yes" context="insertdbcolumnsdialog|userdefined">_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">fromdatabase</property> + <accessibility> + <relation type="label-for" target="numformat"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="userdefined-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertdbcolumnsdialog|extended_tip|userdefined">Specifies a format from the list, if the format information of certain data fields is not accepted.</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">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="numformat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">12</property> + <accessibility> + <relation type="labelled-by" target="userdefined"/> + </accessibility> + </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">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui index b35131da3bb4..a54e68dd61b0 100644 --- a/sw/uiconfig/swriter/ui/insertfootnote.ui +++ b/sw/uiconfig/swriter/ui/insertfootnote.ui @@ -144,111 +144,105 @@ <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="halign">start</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="GtkRadioButton" id="automatic"> + <property name="label" translatable="yes" context="insertfootnote|automatic">Automatic</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="automatic"> - <property name="label" translatable="yes" context="insertfootnote|automatic">Automatic</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="automatic-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|automatic">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</property> - </object> - </child> + <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="automatic-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|automatic">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</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="character"> - <property name="label" translatable="yes" context="insertfootnote|character">Character:</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> - <property name="group">automatic</property> - <accessibility> - <relation type="label-for" target="characterentry"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="character-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|character">Choose this option to define a character or symbol for the current footnote.</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="GtkRadioButton" id="character"> + <property name="label" translatable="yes" context="insertfootnote|character">Character:</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> + <property name="group">automatic</property> + <accessibility> + <relation type="label-for" target="characterentry"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="character-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|character">Choose this option to define a character or symbol for the current footnote.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="characterentry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="max_length">10</property> - <property name="activates_default">True</property> - <property name="width_chars">4</property> - <accessibility> - <relation type="labelled-by" target="character"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="characterentry-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="insertfootnote|characterentry-atkobject">Character</property> - <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|characterentry">Choose this option to define a character or symbol for the current footnote.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="characterentry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="max_length">10</property> + <property name="activates_default">True</property> + <property name="width_chars">4</property> + <accessibility> + <relation type="labelled-by" target="character"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="characterentry-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="insertfootnote|characterentry-atkobject">Character</property> + <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|characterentry">Choose this option to define a character or symbol for the current footnote.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkButton" id="choosecharacter"> - <property name="label" translatable="yes" context="insertfootnote|choosecharacter">Choose…</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> - <child internal-child="accessible"> - <object class="AtkObject" id="choosecharacter-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|choosecharacter">Inserts a special character as a footnote or endnote anchor.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="choosecharacter"> + <property name="label" translatable="yes" context="insertfootnote|choosecharacter">Choose…</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> + <child internal-child="accessible"> + <object class="AtkObject" id="choosecharacter-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|choosecharacter">Inserts a special character as a footnote or endnote anchor.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -276,64 +270,58 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <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="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="box2"> + <object class="GtkRadioButton" id="footnote"> + <property name="label" translatable="yes" context="insertfootnote|footnote">Footnote</property> <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="footnote"> - <property name="label" translatable="yes" context="insertfootnote|footnote">Footnote</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="footnote-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|footnote">Inserts a footnote anchor at the current cursor position in the document, and adds a footnote to the bottom of the page.</property> - </object> - </child> + <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="footnote-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|footnote">Inserts a footnote anchor at the current cursor position in the document, and adds a footnote to the bottom of the page.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="endnote"> - <property name="label" translatable="yes" context="insertfootnote|endnote">Endnote</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> - <property name="group">footnote</property> - <child internal-child="accessible"> - <object class="AtkObject" id="endnote-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|endnote">Inserts an endnote anchor at the current cursor position in the document, and adds an endnote at the end of the document.</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="endnote"> + <property name="label" translatable="yes" context="insertfootnote|endnote">Endnote</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> + <property name="group">footnote</property> + <child internal-child="accessible"> + <object class="AtkObject" id="endnote-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertfootnote|extended_tip|endnote">Inserts an endnote anchor at the current cursor position in the document, and adds an endnote at the end of the document.</property> </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/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui index cb46ffc886b8..7d28bdb94e7a 100644 --- a/sw/uiconfig/swriter/ui/inserttable.ui +++ b/sw/uiconfig/swriter/ui/inserttable.ui @@ -126,129 +126,122 @@ <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="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="GtkEntry" id="nameedit"> <property name="visible">True</property> - <property name="can_focus">False</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="GtkEntry" id="nameedit"> - <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="nameedit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|nameedit">Enter a name for the table.</property> - </object> - </child> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="nameedit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|nameedit">Enter a name for the table.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">3</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="inserttable|label3">_Name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nameedit</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="3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="inserttable|3">_Columns:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">colspin</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="colspin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <property name="value">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="colspin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|colspin">Enter the number of columns that you want in the table.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">3</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="inserttable|label3">_Name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nameedit</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="3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="inserttable|3">_Columns:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">colspin</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="colspin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <property name="value">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="colspin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|colspin">Enter the number of columns that you want in the table.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel" id="4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="inserttable|4">_Rows:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">rowspin</property> - <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="inserttable|4">_Rows:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">rowspin</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="rowspin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <property name="value">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rowspin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|rowspin">Enter the number of rows that you want in the table.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="rowspin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <property name="value">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rowspin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|rowspin">Enter the number of rows that you want in the table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbwarning"> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="inserttable|lbwarning">Warning : Large tables may adversely affect performance and compatibility</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">4</property> - </packing> - </child> </object> - </child> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbwarning"> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="inserttable|lbwarning">Warning : Large tables may adversely affect performance and compatibility</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">4</property> + </packing> + </child> </object> </child> <child type="label"> @@ -277,130 +270,122 @@ <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="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"> + <object class="GtkCheckButton" id="headercb"> + <property name="label" translatable="yes" context="inserttable|headercb">Hea_ding</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">6</property> - <child> - <object class="GtkCheckButton" id="headercb"> - <property name="label" translatable="yes" context="inserttable|headercb">Hea_ding</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.00000000022351741291</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="headercb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|headercb">Includes a heading row in the table.</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.00000000022351741291</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="headercb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|headercb">Includes a heading row in the table.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="repeatcb"> - <property name="label" translatable="yes" context="inserttable|repeatcb">Repeat heading rows on new _pages</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="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="repeatcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|repeatcb">Repeats the heading of the table at the top of subsequent page if the table spans more than one page.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="repeatcb"> + <property name="label" translatable="yes" context="inserttable|repeatcb">Repeat heading rows on new _pages</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="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="repeatcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|repeatcb">Repeats the heading of the table at the top of subsequent page if the table spans more than one page.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="dontsplitcb"> + <property name="label" translatable="yes" context="inserttable|dontsplitcb">Don’t _split table over 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> + <child internal-child="accessible"> + <object class="AtkObject" id="dontsplitcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|dontsplitcb">Prevents the table from spanning more than one page.</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">3</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="repeatgroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="margin-start">30</property> + <property name="column_spacing">12</property> <child> - <object class="GtkCheckButton" id="dontsplitcb"> - <property name="label" translatable="yes" context="inserttable|dontsplitcb">Don’t _split table over pages</property> + <object class="GtkSpinButton" id="repeatheaderspin"> <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="activates_default">True</property> + <property name="adjustment">adjustment3</property> + <property name="value">1</property> <child internal-child="accessible"> - <object class="AtkObject" id="dontsplitcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|dontsplitcb">Prevents the table from spanning more than one page.</property> + <object class="AtkObject" id="repeatheaderspin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|repeatheaderspin">Select the number of rows that you want to use for the heading.</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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="repeatgroup"> + <object class="GtkLabel" id="repeatheaderafter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="margin-start">30</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkSpinButton" id="repeatheaderspin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment3</property> - <property name="value">1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="repeatheaderspin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|repeatheaderspin">Select the number of rows that you want to use for the heading.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="repeatheaderafter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="inserttable|repeatheaderafter">Heading ro_ws:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">repeatheaderspin</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="inserttable|repeatheaderafter">Heading ro_ws:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">repeatheaderspin</property> </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">2</property> + </packing> </child> </object> </child> @@ -430,82 +415,76 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment"> + <!-- 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="hexpand">True</property> + <property name="vexpand">True</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=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkDrawingArea" id="previewinstable"> <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">6</property> - <child> - <object class="GtkDrawingArea" id="previewinstable"> - <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="previewinstable-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|previewinstable">Displays a preview of the current selection.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="previewinstable-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|previewinstable">Displays a preview of the current selection.</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> + <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="formatlbinstable"> <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"/> + </child> <child> - <object class="GtkTreeView" id="formatlbinstable"> - <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"/> - </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="formatlbinstable-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|formatlbinstable">Select a predefined style for the new table.</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="formatlbinstable-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="inserttable|extended_tip|formatlbinstable">Select a predefined style for the new table.</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> </object> </child> diff --git a/sw/uiconfig/swriter/ui/labeloptionspage.ui b/sw/uiconfig/swriter/ui/labeloptionspage.ui index 5fc81948e883..810d229804e3 100644 --- a/sw/uiconfig/swriter/ui/labeloptionspage.ui +++ b/sw/uiconfig/swriter/ui/labeloptionspage.ui @@ -31,105 +31,121 @@ <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="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="GtkRadioButton" id="entirepage"> + <property name="label" translatable="yes" context="labeloptionspage|entirepage">_Entire 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="entirepage-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|entirepage">Creates a full page of labels or business cards.</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="singlelabel"> + <property name="label" translatable="yes" context="labeloptionspage|singlelabel">_Single label</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> + <property name="group">entirepage</property> + <child internal-child="accessible"> + <object class="AtkObject" id="singlelabel-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|singlelabel">Prints a single label or business card on a page.</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" id="singlegrid"> <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="column_spacing">18</property> <child> - <object class="GtkRadioButton" id="entirepage"> - <property name="label" translatable="yes" context="labeloptionspage|entirepage">_Entire page</property> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <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="entirepage-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|entirepage">Creates a full page of labels or business cards.</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="labeloptionspage|label4">Colu_mn</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">cols</property> + <property name="xalign">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> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="singlelabel"> - <property name="label" translatable="yes" context="labeloptionspage|singlelabel">_Single label</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> - <property name="group">entirepage</property> - <child internal-child="accessible"> - <object class="AtkObject" id="singlelabel-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|singlelabel">Prints a single label or business card on a page.</property> + <child> + <object class="GtkSpinButton" id="cols"> + <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="cols-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|cols">Enter the number of labels or business cards that you want to have in a row on your page.</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> + <property name="top_attach">0</property> </packing> </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="singlegrid"> + <object class="GtkGrid" id="grid5"> <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="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="labeloptionspage|label4">Colu_mn</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">cols</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="cols"> - <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="cols-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|cols">Enter the number of labels or business cards that you want to have in a row on your page.</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="labeloptionspage|label5">Ro_w</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">rows</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -137,41 +153,15 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkSpinButton" id="rows"> <property name="visible">True</property> - <property name="can_focus">False</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="labeloptionspage|label5">Ro_w</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">rows</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="rows"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rows-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|rows">Enter the number of rows of labels or business cards that you want to have on your page.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rows-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|rows">Enter the number of rows of labels or business cards that you want to have on your page.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> @@ -182,31 +172,35 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="synchronize"> - <property name="label" translatable="yes" context="labeloptionspage|synchronize">Synchroni_ze 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="synchronize-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|synchronize">Allows you to edit a single label or business card and updates the contents of the remaining labels or business cards on the page when you click the Synchronize Labels button.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="synchronize"> + <property name="label" translatable="yes" context="labeloptionspage|synchronize">Synchroni_ze 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="synchronize-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|synchronize">Allows you to edit a single label or business card and updates the contents of the remaining labels or business cards on the page when you click the Synchronize Labels button.</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> @@ -235,53 +229,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="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="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="GtkButton" id="setup"> + <property name="label" translatable="yes" context="labeloptionspage|setup">Setup...</property> <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="setup"> - <property name="label" translatable="yes" context="labeloptionspage|setup">Setup...</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="setup-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|setup">Opens the Printer Setup dialog.</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="setup-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="labeloptionspage|extended_tip|setup">Opens the Printer Setup dialog.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="printername"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="labeloptionspage|printername">Printer Name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">setup</property> - <property name="xalign">0</property> - </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="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="printername"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="labeloptionspage|printername">Printer Name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">setup</property> + <property name="xalign">0</property> + </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/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui index 5c9ce0f9c1a4..6d6349dfd164 100644 --- a/sw/uiconfig/swriter/ui/linenumbering.ui +++ b/sw/uiconfig/swriter/ui/linenumbering.ui @@ -133,202 +133,196 @@ <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="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="characterstyle"> <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="characterstyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linenumbering|characterstyle">Character style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">styledropdown</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="format"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linenumbering|format">Format:</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="position"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linenumbering|position">Position:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">positiondropdown</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="spacing"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linenumbering|spacing">Spacing:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spacingspin</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="interval"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linenumbering|interval">Interval:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">intervalspin</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="linenumbering|characterstyle">Character style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">styledropdown</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="format"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="linenumbering|format">Format:</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="position"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="linenumbering|position">Position:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">positiondropdown</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="spacing"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="linenumbering|spacing">Spacing:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spacingspin</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="interval"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="linenumbering|interval">Interval:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">intervalspin</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="styledropdown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="styledropdown-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|styledropdown">Select the formatting style that you want to use for the line numbers.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="styledropdown"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="styledropdown-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|styledropdown">Select the formatting style that you want to use for the line numbers.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="formatdropdown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="formatdropdown-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|formatdropdown">Select the numbering style that you want to use.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="formatdropdown"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="formatdropdown-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|formatdropdown">Select the numbering style that you want to use.</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="positiondropdown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="linenumbering|positionstore">Left</item> + <item translatable="yes" context="linenumbering|positionstore">Right</item> + <item translatable="yes" context="linenumbering|positionstore">Inner</item> + <item translatable="yes" context="linenumbering|positionstore">Outer</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="positiondropdown-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|positiondropdown">Select where you want the line numbers to appear.</property> </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="positiondropdown"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="linenumbering|positionstore">Left</item> - <item translatable="yes" context="linenumbering|positionstore">Right</item> - <item translatable="yes" context="linenumbering|positionstore">Inner</item> - <item translatable="yes" context="linenumbering|positionstore">Outer</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="positiondropdown-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|positiondropdown">Select where you want the line numbers to appear.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spacingspin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="adjustment">spacingadjustment</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spacingspin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|spacingspin">Enter the amount of space that you want to leave between the line numbers and the text.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</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="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> <child> - <object class="GtkSpinButton" id="spacingspin"> + <object class="GtkSpinButton" id="intervalspin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="adjustment">spacingadjustment</property> - <property name="digits">2</property> + <property name="adjustment">intervaladjustment</property> <child internal-child="accessible"> - <object class="AtkObject" id="spacingspin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|spacingspin">Enter the amount of space that you want to leave between the line numbers and the text.</property> + <object class="AtkObject" id="intervalspin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|intervalspin">Enter the counting interval for the line numbers.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</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="GtkBox" id="box4"> + <object class="GtkLabel" id="intervallines"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkSpinButton" id="intervalspin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">intervaladjustment</property> - <child internal-child="accessible"> - <object class="AtkObject" id="intervalspin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|intervalspin">Enter the counting interval for the line numbers.</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="GtkLabel" id="intervallines"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linenumbering|intervallines">lines</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> + <property name="label" translatable="yes" context="linenumbering|intervallines">lines</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</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">1</property> + <property name="top_attach">4</property> + <property name="width">2</property> + </packing> </child> </object> </child> @@ -355,108 +349,102 @@ <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="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="text"> <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="text"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linenumbering|text">Text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">textentry</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="every"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linenumbering|every">Every:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">linesspin</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="linenumbering|text">Text:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">textentry</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="every"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="linenumbering|every">Every:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">linesspin</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="textentry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> + <property name="width_chars">3</property> + <child internal-child="accessible"> + <object class="AtkObject" id="textentry-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|textentry">Enter the text that you want to use as a separator.</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> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkEntry" id="textentry"> + <object class="GtkSpinButton" id="linesspin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="activates_default">True</property> - <property name="width_chars">3</property> + <property name="adjustment">lineadjustment</property> <child internal-child="accessible"> - <object class="AtkObject" id="textentry-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|textentry">Enter the text that you want to use as a separator.</property> + <object class="AtkObject" id="linesspin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|linesspin">Enter the number of lines to leave between the separators.</property> </object> </child> </object> <packing> - <property name="left_attach">1</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="GtkBox" id="box6"> + <object class="GtkLabel" id="lines"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkSpinButton" id="linesspin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">lineadjustment</property> - <child internal-child="accessible"> - <object class="AtkObject" id="linesspin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|linesspin">Enter the number of lines to leave between the separators.</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="GtkLabel" id="lines"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linenumbering|lines">lines</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> + <property name="label" translatable="yes" context="linenumbering|lines">lines</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</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">1</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> </child> </object> </child> @@ -483,98 +471,92 @@ <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="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="GtkCheckButton" id="blanklines"> + <property name="label" translatable="yes" context="linenumbering|blanklines">Blank lines</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="blanklines"> - <property name="label" translatable="yes" context="linenumbering|blanklines">Blank lines</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="blanklines-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|blanklines">Includes empty paragraphs in the line count.</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="blanklines-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|blanklines">Includes empty paragraphs in the line count.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="linesintextframes"> - <property name="label" translatable="yes" context="linenumbering|linesintextframes">Lines in text 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="linesintextframes-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|linesintextframes">Adds line numbers to text in frames. The numbering restarts in each frame, and is excluded from the line count in the main text area of the document.</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="GtkCheckButton" id="showfooterheadernumbering"> - <property name="label" translatable="yes" context="linenumbering|showfooterheadernumbering">Include header and footer</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="GtkCheckButton" id="linesintextframes"> + <property name="label" translatable="yes" context="linenumbering|linesintextframes">Lines in text 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="linesintextframes-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|linesintextframes">Adds line numbers to text in frames. The numbering restarts in each frame, and is excluded from the line count in the main text area of the document.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="restarteverynewpage"> - <property name="label" translatable="yes" context="linenumbering|restarteverynewpage">Restart every new 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> - <child internal-child="accessible"> - <object class="AtkObject" id="restarteverynewpage-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|restarteverynewpage">Restarts line numbering at the top of each page in the document.</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="GtkCheckButton" id="showfooterheadernumbering"> + <property name="label" translatable="yes" context="linenumbering|showfooterheadernumbering">Include header and footer</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="GtkCheckButton" id="restarteverynewpage"> + <property name="label" translatable="yes" context="linenumbering|restarteverynewpage">Restart every new 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> + <child internal-child="accessible"> + <object class="AtkObject" id="restarteverynewpage-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="linenumbering|extended_tip|restarteverynewpage">Restarts line numbering at the top of each page in the document.</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">3</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui b/sw/uiconfig/swriter/ui/mailconfigpage.ui index e856868cabc3..9a326509e859 100644 --- a/sw/uiconfig/swriter/ui/mailconfigpage.ui +++ b/sw/uiconfig/swriter/ui/mailconfigpage.ui @@ -24,137 +24,130 @@ <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="GtkEntry" id="displayname"> <property name="visible">True</property> - <property name="can_focus">False</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="GtkEntry" id="displayname"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="input_purpose">name</property> - <child internal-child="accessible"> - <object class="AtkObject" id="displayname-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|displayname">Enter your name.</property> - </object> - </child> + <property name="input_purpose">name</property> + <child internal-child="accessible"> + <object class="AtkObject" id="displayname-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|displayname">Enter your name.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkEntry" id="address"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="input_purpose">email</property> - <child internal-child="accessible"> - <object class="AtkObject" id="address-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|address">Enter your email address for replies.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="replyto"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="input_purpose">email</property> - <child internal-child="accessible"> - <object class="AtkObject" id="replyto-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|replyto">Enter the address to use for email replies.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="displayname_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mailconfigpage|displayname_label">_Your name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">displayname</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="address_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mailconfigpage|address_label">_Email address:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">address</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="address"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="input_purpose">email</property> + <child internal-child="accessible"> + <object class="AtkObject" id="address-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|address">Enter your email address for replies.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="replytocb"> - <property name="label" translatable="yes" context="mailconfigpage|replytocb">Send replies to _different email address</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="replytocb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|replytocb">Uses the email address that you enter in the Reply address text box as the reply-to email address.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="replyto"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="input_purpose">email</property> + <child internal-child="accessible"> + <object class="AtkObject" id="replyto-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|replyto">Enter the address to use for email replies.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="replyto_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mailconfigpage|replyto_label">_Reply address:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">replyto</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="displayname_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mailconfigpage|displayname_label">_Your name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">displayname</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="address_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mailconfigpage|address_label">_Email address:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">address</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="replytocb"> + <property name="label" translatable="yes" context="mailconfigpage|replytocb">Send replies to _different email address</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="replytocb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|replytocb">Uses the email address that you enter in the Reply address text box as the reply-to email address.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="replyto_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mailconfigpage|replyto_label">_Reply address:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">replyto</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -183,177 +176,170 @@ <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="GtkEntry" id="server"> <property name="visible">True</property> - <property name="can_focus">False</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="GtkEntry" id="server"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="server-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|server">Enter the SMTP server name.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="server-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|server">Enter the SMTP server name.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="buttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="margin-end">12</property> - <property name="orientation">vertical</property> - <property name="layout_style">center</property> - <child> - <object class="GtkButton" id="serverauthentication"> - <property name="label" translatable="yes" context="mailconfigpage|serverauthentication">Ser_ver Authentication…</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="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="serverauthentication-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|serverauthentication">Opens the Server Authentication dialog where you can specify the server authentication settings for secure email.</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="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="margin-end">12</property> + <property name="orientation">vertical</property> + <property name="layout_style">center</property> <child> - <object class="GtkSpinButton" id="port"> + <object class="GtkButton" id="serverauthentication"> + <property name="label" translatable="yes" context="mailconfigpage|serverauthentication">Ser_ver Authentication…</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="use_underline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="port-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|port">Enter the SMTP port.</property> + <object class="AtkObject" id="serverauthentication-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|serverauthentication">Opens the Server Authentication dialog where you can specify the server authentication settings for secure email.</property> </object> </child> </object> <packing> - <property name="left_attach">1</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">0</property> </packing> </child> - <child> - <object class="GtkLabel" id="server_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mailconfigpage|server_label">_Server name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">server</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="port"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="port-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|port">Enter the SMTP port.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="port_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mailconfigpage|port_label">_Port:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">port</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="server_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mailconfigpage|server_label">_Server name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">server</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="port_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mailconfigpage|port_label">_Port:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">port</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="secure"> + <property name="label" translatable="yes" context="mailconfigpage|secure">_Use secure connection (SSL)</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="secure-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|secure">When available, uses a secure connection to send emails.</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">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="orientation">vertical</property> + <property name="layout_style">center</property> <child> - <object class="GtkCheckButton" id="secure"> - <property name="label" translatable="yes" context="mailconfigpage|secure">_Use secure connection (SSL)</property> + <object class="GtkButton" id="test"> + <property name="label" translatable="yes" context="mailconfigpage|test">_Test Settings</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="receives_default">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="secure-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|secure">When available, uses a secure connection to send emails.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="buttonbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="orientation">vertical</property> - <property name="layout_style">center</property> - <child> - <object class="GtkButton" id="test"> - <property name="label" translatable="yes" context="mailconfigpage|test">_Test Settings</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="test-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|test">Opens the Test Account Settings dialog to test the current settings.</property> - </object> - </child> + <object class="AtkObject" id="test-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|test">Opens the Test Account Settings dialog to test the current settings.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </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">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/mailmergedialog.ui b/sw/uiconfig/swriter/ui/mailmergedialog.ui index 843d892c0fb0..5be169b67c1b 100644 --- a/sw/uiconfig/swriter/ui/mailmergedialog.ui +++ b/sw/uiconfig/swriter/ui/mailmergedialog.ui @@ -83,52 +83,45 @@ <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="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="document"> + <property name="label" translatable="yes" context="mailmergedialog|document">From this _document</property> <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="GtkRadioButton" id="document"> - <property name="label" translatable="yes" context="mailmergedialog|document">From this _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> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="template"> - <property name="label" translatable="yes" context="mailmergedialog|template">From a _template</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">document</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</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="template"> + <property name="label" translatable="yes" context="mailmergedialog|template">From a _template</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">document</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/mergeconnectdialog.ui b/sw/uiconfig/swriter/ui/mergeconnectdialog.ui index 1fe5353db459..17d0db6487c9 100644 --- a/sw/uiconfig/swriter/ui/mergeconnectdialog.ui +++ b/sw/uiconfig/swriter/ui/mergeconnectdialog.ui @@ -81,67 +81,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="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="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="existing"> + <property name="label" translatable="yes" context="mergeconnectdialog|existing">_Use existing</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="new"> + <property name="label" translatable="yes" context="mergeconnectdialog|new">_Create new connection</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">existing</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> <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="GtkRadioButton" id="existing"> - <property name="label" translatable="yes" context="mergeconnectdialog|existing">_Use existing</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="new"> - <property name="label" translatable="yes" context="mergeconnectdialog|new">_Create new connection</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">existing</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mergeconnectdialog|label2">Fields are used to personalize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source.</property> - <property name="wrap">True</property> - <property name="max_width_chars">52</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="mergeconnectdialog|label2">Fields are used to personalize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source.</property> + <property name="wrap">True</property> + <property name="max_width_chars">52</property> + <property name="xalign">0</property> + <property name="yalign">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/mergetabledialog.ui b/sw/uiconfig/swriter/ui/mergetabledialog.ui index 5d3f4d4f2bb9..8dcc175a2855 100644 --- a/sw/uiconfig/swriter/ui/mergetabledialog.ui +++ b/sw/uiconfig/swriter/ui/mergetabledialog.ui @@ -81,49 +81,43 @@ <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="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="prev"> + <property name="label" translatable="yes" context="mergetabledialog|prev">Join with _previous table</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkRadioButton" id="prev"> - <property name="label" translatable="yes" context="mergetabledialog|prev">Join with _previous table</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="next"> - <property name="label" translatable="yes" context="mergetabledialog|next">Join with _next table</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">prev</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</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="next"> + <property name="label" translatable="yes" context="mergetabledialog|next">Join with _next table</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">prev</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/mmmailbody.ui b/sw/uiconfig/swriter/ui/mmmailbody.ui index 29b5bd2b5a7d..07517814aab9 100644 --- a/sw/uiconfig/swriter/ui/mmmailbody.ui +++ b/sw/uiconfig/swriter/ui/mmmailbody.ui @@ -159,265 +159,102 @@ </packing> </child> <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="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="generalft"> <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="GtkLabel" id="generalft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmmailbody|generalft">General salutation</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">general</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="mmmailbody|generalft">General salutation</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">general</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="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-entry1"> + <property name="can_focus">True</property> + <property name="activates_default">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-entry1"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="general-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmmailbody|extended_tip|general">Select the default greeting to use if a personalized salutation cannot be created.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="general-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmmailbody|extended_tip|general">Select the default greeting to use if a personalized salutation cannot be created.</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> + <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="row_spacing">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <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="GtkAlignment" id="alignment3"> + <object class="GtkLabel" id="femalefi"> <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="mmmailbody|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="mmmailbody|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="mmmailbody|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="mmmailbody|femalecolft">Field name</property> - <property name="use_underline">True</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="mmmailbody|femalefieldft">Field value</property> - <property name="use_underline">True</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="mmmailbody|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="mmmailbody|extended_tip|newfemale">Opens the Custom Salutation dialog for a female recipient.</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="mmmailbody|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="mmmailbody|extended_tip|newmale">Opens the Custom Salutation dialog for a male recipient.</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="mmmailbody|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="mmmailbody|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="mmmailbody|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="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="femalefield-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmmailbody|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> + <property name="label" translatable="yes" context="mmmailbody|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="mmmailbody|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="mmmailbody|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> @@ -425,25 +262,170 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="personalized"> - <property name="label" translatable="yes" context="mmmailbody|personalized">Insert personalized salutation</property> + <object class="GtkLabel" id="femalecolft"> <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="mmmailbody|femalecolft">Field name</property> + <property name="use_underline">True</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="mmmailbody|femalefieldft">Field value</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">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="newfemale"> + <property name="label" translatable="yes" context="mmmailbody|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="personalized-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmmailbody|extended_tip|personalized">Adds a personalized salutation. To use the default salutation, clear this check box.</property> + <object class="AtkObject" id="newfemale-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmmailbody|extended_tip|newfemale">Opens the Custom Salutation dialog for a female recipient.</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="GtkButton" id="newmale"> + <property name="label" translatable="yes" context="mmmailbody|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="mmmailbody|extended_tip|newmale">Opens the Custom Salutation dialog for a male recipient.</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="mmmailbody|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="mmmailbody|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="mmmailbody|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="activates_default">True</property> + </object> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="femalefield-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmmailbody|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> + <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="mmmailbody|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="mmmailbody|extended_tip|personalized">Adds a personalized salutation. To use the default salutation, clear this check box.</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -451,6 +433,10 @@ </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> <packing> diff --git a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui index 6954a4029aba..a03b620601ce 100644 --- a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui +++ b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui @@ -19,125 +19,117 @@ <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="GtkLabel" id="letterft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="label" translatable="yes" context="mmoutputtypepage|letterft">Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient.</property> + <property name="wrap">True</property> + <property name="width_chars">72</property> + <property name="max_width_chars">72</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="emailft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="label" translatable="yes" context="mmoutputtypepage|emailft">Send email messages to a group of recipients. The email messages can contain a salutation. The email messages can be personalized for each recipient.</property> + <property name="wrap">True</property> + <property name="width_chars">72</property> + <property name="max_width_chars">72</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </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="grid2"> + <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="letterft"> + <object class="GtkRadioButton" id="letter"> + <property name="label" translatable="yes" context="mmoutputtypepage|letter">_Letter</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="label" translatable="yes" context="mmoutputtypepage|letterft">Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient.</property> - <property name="wrap">True</property> - <property name="width_chars">72</property> - <property name="max_width_chars">72</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="yalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">email</property> + <child internal-child="accessible"> + <object class="AtkObject" id="letter-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmoutputtypepage|extended_tip|letter">Creates a printable mail merge document.</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="GtkLabel" id="emailft"> + <object class="GtkRadioButton" id="email"> + <property name="label" translatable="yes" context="mmoutputtypepage|email">_Email message</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="label" translatable="yes" context="mmoutputtypepage|emailft">Send email messages to a group of recipients. The email messages can contain a salutation. The email messages can be personalized for each recipient.</property> - <property name="wrap">True</property> - <property name="width_chars">72</property> - <property name="max_width_chars">72</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="yalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="email-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmoutputtypepage|extended_tip|email">Creates mail merge documents that you can send as an email message or an email attachment.</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> <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="letter"> - <property name="label" translatable="yes" context="mmoutputtypepage|letter">_Letter</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">email</property> - <child internal-child="accessible"> - <object class="AtkObject" id="letter-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmoutputtypepage|extended_tip|letter">Creates a printable mail merge 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="email"> - <property name="label" translatable="yes" context="mmoutputtypepage|email">_Email message</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="email-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmoutputtypepage|extended_tip|email">Creates mail merge documents that you can send as an email message or an email attachment.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button1"> - <property name="label">layoutdetail-forheight</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> + <object class="GtkButton" id="button1"> + <property name="label">layoutdetail-forheight</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">2</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/mmresultsavedialog.ui b/sw/uiconfig/swriter/ui/mmresultsavedialog.ui index c8bf9597e79d..d3932ce00347 100644 --- a/sw/uiconfig/swriter/ui/mmresultsavedialog.ui +++ b/sw/uiconfig/swriter/ui/mmresultsavedialog.ui @@ -99,33 +99,79 @@ <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> + <object class="GtkRadioButton" id="singlerb"> + <property name="label" translatable="yes" context="mmresultsavedialog|singlerb">S_ave as a single large 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="singlerb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultsavedialog|extended_tip|singlerb">Saves the merged document as a single file.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="individualrb"> + <property name="label" translatable="yes" context="mmresultsavedialog|individualrb">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">singlerb</property> + <child internal-child="accessible"> + <object class="AtkObject" id="individualrb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultsavedialog|extended_tip|individualrb">Saves the merged document as a separate file for each recipient. The file names of the documents are constructed from the name that you enter, followed by an underscore, and the number of the current record.</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" id="grid3"> <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="singlerb"> - <property name="label" translatable="yes" context="mmresultsavedialog|singlerb">S_ave as a single large document</property> + <object class="GtkRadioButton" id="fromrb"> + <property name="label" translatable="yes" context="mmresultsavedialog|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">singlerb</property> + <accessibility> + <relation type="label-for" target="from"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="singlerb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultsavedialog|extended_tip|singlerb">Saves the merged document as a single file.</property> + <object class="AtkObject" id="fromrb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultsavedialog|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> @@ -135,115 +181,62 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="individualrb"> - <property name="label" translatable="yes" context="mmresultsavedialog|individualrb">Sa_ve as individual documents</property> + <object class="GtkLabel" id="toft"> <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="mmresultsavedialog|toft">_To</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">singlerb</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">adjustment1</property> + <accessibility> + <relation type="labelled-by" target="fromrb"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="individualrb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultsavedialog|extended_tip|individualrb">Saves the merged document as a separate file for each recipient. The file names of the documents are constructed from the name that you enter, followed by an underscore, and the number of the current record.</property> + <object class="AtkObject" id="from-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultsavedialog|extended_tip|from">Enter the number of the first record to include in the mail merge.</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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkSpinButton" id="to"> <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="mmresultsavedialog|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">singlerb</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="mmresultsavedialog|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="mmresultsavedialog|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">adjustment1</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="mmresultsavedialog|extended_tip|from">Enter the number of the first 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">adjustment2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="to-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmresultsavedialog|extended_tip|to">Enter the number of the last record to include in the mail merge.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text">1</property> + <property name="adjustment">adjustment2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="to-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmresultsavedialog|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="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left_attach">3</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> </object> </child> diff --git a/sw/uiconfig/swriter/ui/mmselectpage.ui b/sw/uiconfig/swriter/ui/mmselectpage.ui index 91de7e0c2456..0ca17dfa3b73 100644 --- a/sw/uiconfig/swriter/ui/mmselectpage.ui +++ b/sw/uiconfig/swriter/ui/mmselectpage.ui @@ -15,182 +15,176 @@ <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="hexpand">True</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="currentdoc"> + <property name="label" translatable="yes" context="mmselectpage|currentdoc">Use the current _document</property> <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="GtkRadioButton" id="currentdoc"> - <property name="label" translatable="yes" context="mmselectpage|currentdoc">Use the current _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="currentdoc-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|currentdoc">Uses the current Writer document as the base for the mail merge 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> + <child internal-child="accessible"> + <object class="AtkObject" id="currentdoc-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|currentdoc">Uses the current Writer document as the base for the mail merge document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="newdoc"> - <property name="label" translatable="yes" context="mmselectpage|newdoc">Create a ne_w 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">currentdoc</property> - <child internal-child="accessible"> - <object class="AtkObject" id="newdoc-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|newdoc">Creates a new Writer document to use for the mail merge.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="newdoc"> + <property name="label" translatable="yes" context="mmselectpage|newdoc">Create a ne_w 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">currentdoc</property> + <child internal-child="accessible"> + <object class="AtkObject" id="newdoc-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|newdoc">Creates a new Writer document to use for the mail merge.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="loaddoc"> - <property name="label" translatable="yes" context="mmselectpage|loaddoc">Start from _existing document</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> - <property name="group">currentdoc</property> - <child internal-child="accessible"> - <object class="AtkObject" id="loaddoc-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|loaddoc">Select an existing Writer document to use as the base for the mail merge 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="loaddoc"> + <property name="label" translatable="yes" context="mmselectpage|loaddoc">Start from _existing document</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> + <property name="group">currentdoc</property> + <child internal-child="accessible"> + <object class="AtkObject" id="loaddoc-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|loaddoc">Select an existing Writer document to use as the base for the mail merge document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="template"> - <property name="label" translatable="yes" context="mmselectpage|template">Start from a t_emplate</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> - <property name="group">currentdoc</property> - <child internal-child="accessible"> - <object class="AtkObject" id="template-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|template">Select the template that you want to create your mail merge document with.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="template"> + <property name="label" translatable="yes" context="mmselectpage|template">Start from a t_emplate</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> + <property name="group">currentdoc</property> + <child internal-child="accessible"> + <object class="AtkObject" id="template-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|template">Select the template that you want to create your mail merge document with.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="recentdoc"> - <property name="label" translatable="yes" context="mmselectpage|recentdoc">Start fro_m a recently saved starting 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">currentdoc</property> - <child internal-child="accessible"> - <object class="AtkObject" id="recentdoc-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|recentdoc">Use an existing mail merge document as the base for a new mail merge document.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="recentdoc"> + <property name="label" translatable="yes" context="mmselectpage|recentdoc">Start fro_m a recently saved starting 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">currentdoc</property> + <child internal-child="accessible"> + <object class="AtkObject" id="recentdoc-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|recentdoc">Use an existing mail merge document as the base for a new mail merge document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="recentdoclb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">18</property> - <child internal-child="accessible"> - <object class="AtkObject" id="recentdoclb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|recentdoclb">Select the document.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="recentdoclb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">18</property> + <child internal-child="accessible"> + <object class="AtkObject" id="recentdoclb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|recentdoclb">Select the document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> </child> - <child> - <object class="GtkButton" id="browsedoc"> - <property name="label" translatable="yes" context="mmselectpage|browsedoc">B_rowse...</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">18</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="browsedoc-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|browsedoc">Locate the Writer document that you want to use, and then click Open.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkButton" id="browsedoc"> + <property name="label" translatable="yes" context="mmselectpage|browsedoc">B_rowse...</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">18</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="browsedoc-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|browsedoc">Locate the Writer document that you want to use, and then click Open.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkButton" id="browsetemplate"> - <property name="label" translatable="yes" context="mmselectpage|browsetemplate">B_rowse...</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">18</property> - <property name="use_underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="browsetemplate-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|browsetemplate">Opens a template selector dialog.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="browsetemplate"> + <property name="label" translatable="yes" context="mmselectpage|browsetemplate">B_rowse...</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">18</property> + <property name="use_underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="browsetemplate-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|browsetemplate">Opens a template selector dialog.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/mmsendmails.ui b/sw/uiconfig/swriter/ui/mmsendmails.ui index 91be3250e36e..9e2820f49ee3 100644 --- a/sw/uiconfig/swriter/ui/mmsendmails.ui +++ b/sw/uiconfig/swriter/ui/mmsendmails.ui @@ -89,21 +89,15 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkLabel" id="label3"> <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="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="mmsendmails|label3">The connection to the outgoing mail server has been established</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes" context="mmsendmails|label3">The connection to the outgoing mail server has been established</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> </object> </child> <child type="label"> @@ -132,59 +126,30 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box2"> <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="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="box2"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkLabel" id="transferstatus"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="hexpand">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="transferstatus"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="mmsendmails|transferstatus">%1 of %2 emails sent</property> - <property name="xalign">0</property> - <property name="yalign">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="paused"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="mmsendmails|paused">Sending paused</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </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="mmsendmails|transferstatus">%1 of %2 emails sent</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> <packing> <property name="expand">False</property> @@ -193,110 +158,131 @@ </packing> </child> <child> - <object class="GtkProgressBar" id="progress"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="errorstatus"> + <object class="GtkLabel" id="paused"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> <property name="hexpand">True</property> - <property name="label" translatable="yes" context="mmsendmails|errorstatus">Emails not sent: %1</property> + <property name="label" translatable="yes" context="mmsendmails|paused">Sending paused</property> <property name="xalign">0</property> <property name="yalign">0</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</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="GtkProgressBar" id="progress"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="errorstatus"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="mmsendmails|errorstatus">Emails not sent: %1</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkExpander" id="details"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="resize_toplevel">True</property> <child> - <object class="GtkExpander" id="details"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="resize_toplevel">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="container"> <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_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="container"> - <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_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="treeviewcolumn0"> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn0"> - <child> - <object class="GtkCellRendererPixbuf" id="cellrenderertext9"/> - <attributes> - <attribute name="pixbuf">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererPixbuf" id="cellrenderertext9"/> + <attributes> + <attribute name="pixbuf">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <property name="title" translatable="yes" context="mmsendmails|nameft">Task</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="title" translatable="yes" context="mmsendmails|nameft">Task</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn3"> + <property name="title" translatable="yes" context="mmsendmails|statusft">Status</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn3"> - <property name="title" translatable="yes" context="mmsendmails|statusft">Status</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext3"/> - <attributes> - <attribute name="text">2</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="text">2</attribute> + </attributes> </child> </object> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mmsendmails|label5">Details</property> - <property name="use_underline">True</property> - </object> - </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mmsendmails|label5">Details</property> + <property name="use_underline">True</property> + </object> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/newuserindexdialog.ui b/sw/uiconfig/swriter/ui/newuserindexdialog.ui index 264203402ec3..f618df8b4457 100644 --- a/sw/uiconfig/swriter/ui/newuserindexdialog.ui +++ b/sw/uiconfig/swriter/ui/newuserindexdialog.ui @@ -81,49 +81,41 @@ <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="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="newuserindexdialog|label2">_Name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entry</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="entry"> + <property name="visible">True</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="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="newuserindexdialog|label2">_Name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entry</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="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">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="activates_default">True</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/numberingnamedialog.ui b/sw/uiconfig/swriter/ui/numberingnamedialog.ui index 5c7c7d000815..87ac1dd3790f 100644 --- a/sw/uiconfig/swriter/ui/numberingnamedialog.ui +++ b/sw/uiconfig/swriter/ui/numberingnamedialog.ui @@ -91,83 +91,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="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="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="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="form"> <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="form"> - <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="form-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numberingnamedialog|extended_tip|form">Click a numbering style in the list, and then enter a name for the style. The numbers correspond to the outline level that the styles are assigned to.</property> - </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="entry"> - <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="entry-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numberingnamedialog|extended_tip|entry">Click a numbering style in the list, and then enter a name for the style. The numbers correspond to the outline level that the styles are assigned to.</property> + <object class="AtkObject" id="form-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numberingnamedialog|extended_tip|form">Click a numbering style in the list, and then enter a name for the style. The numbers correspond to the outline level that the styles are assigned to.</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> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry"> + <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="entry-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numberingnamedialog|extended_tip|entry">Click a numbering style in the list, and then enter a name for the style. The numbers correspond to the outline level that the styles are assigned to.</property> + </object> + </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/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui index 8f6785caa39b..43cd8c57d782 100644 --- a/sw/uiconfig/swriter/ui/numparapage.ui +++ b/sw/uiconfig/swriter/ui/numparapage.ui @@ -27,61 +27,55 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="boxOUTLINE"> <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" id="boxOUTLINE"> + <object class="GtkLabel" id="labelFT_OUTLINE_LEVEL"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="labelFT_OUTLINE_LEVEL"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="numparapage|labelFT_OUTLINE_LEVEL">Outline level:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">comboLB_OUTLINE_LEVEL</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="comboLB_OUTLINE_LEVEL"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Text Body</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 1</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 2</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 3</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 4</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 5</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 6</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 7</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 8</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 9</item> - <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 10</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="comboLB_OUTLINE_LEVEL-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|comboLB_OUTLINE_LEVEL">Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style.</property> - </object> - </child> + <property name="label" translatable="yes" context="numparapage|labelFT_OUTLINE_LEVEL">Outline level:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">comboLB_OUTLINE_LEVEL</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="comboLB_OUTLINE_LEVEL"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Text Body</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 1</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 2</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 3</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 4</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 5</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 6</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 7</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 8</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 9</item> + <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 10</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="comboLB_OUTLINE_LEVEL-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|comboLB_OUTLINE_LEVEL">Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style.</property> </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> @@ -109,30 +103,50 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <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="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="box2"> + <object class="GtkBox" id="boxNUMBER_STYLE"> <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="boxNUMBER_STYLE"> + <object class="GtkLabel" id="labelFT_NUMBER_STYLE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="numparapage|labelFT_NUMBER_STYLE">_Numbering style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">comboLB_NUMBER_STYLE</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="GtkBox" id="boxSubNumber_Style"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="labelFT_NUMBER_STYLE"> + <object class="GtkComboBoxText" id="comboLB_NUMBER_STYLE"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="numparapage|labelFT_NUMBER_STYLE">_Numbering style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">comboLB_NUMBER_STYLE</property> - <property name="xalign">0</property> + <items> + <item translatable="yes" context="numparapage|comboLB_NUMBER_STYLE">None</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="comboLB_NUMBER_STYLE-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|comboLB_NUMBER_STYLE">Select the Numbering Style that you want to apply to the paragraph.</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -141,46 +155,15 @@ </packing> </child> <child> - <object class="GtkBox" id="boxSubNumber_Style"> + <object class="GtkButton" id="editnumstyle"> + <property name="label" translatable="yes" context="numparapage|editnumstyle">Edit Style</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkComboBoxText" id="comboLB_NUMBER_STYLE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="numparapage|comboLB_NUMBER_STYLE">None</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="comboLB_NUMBER_STYLE-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|comboLB_NUMBER_STYLE">Select the Numbering Style that you want to apply to the paragraph.</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="editnumstyle"> - <property name="label" translatable="yes" context="numparapage|editnumstyle">Edit Style</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="editnumstyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|editnumstyle">Edit the properties of the selected numbering style.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="editnumstyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|editnumstyle">Edit the properties of the selected numbering style.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -193,101 +176,106 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="checkCB_NEW_START"> - <property name="label" translatable="yes" context="numparapage|checkCB_NEW_START">R_estart at this paragraph</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="hexpand">True</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="inconsistent">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="checkCB_NEW_START-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_NEW_START">Restarts the numbering at the current paragraph.</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="checkCB_NEW_START"> + <property name="label" translatable="yes" context="numparapage|checkCB_NEW_START">R_estart at this paragraph</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="hexpand">True</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="inconsistent">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="checkCB_NEW_START-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_NEW_START">Restarts the numbering at the current paragraph.</property> </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> + <child> + <object class="GtkBox" id="boxNEW_START"> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="boxNEW_START"> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box4"> + <object class="GtkCheckButton" id="checkCB_NUMBER_NEW_START"> + <property name="label" translatable="yes" context="numparapage|checkCB_NUMBER_NEW_START">S_tart with:</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkCheckButton" id="checkCB_NUMBER_NEW_START"> - <property name="label" translatable="yes" context="numparapage|checkCB_NUMBER_NEW_START">S_tart 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="inconsistent">True</property> - <property name="draw_indicator">True</property> - <accessibility> - <relation type="label-for" target="spinNF_NEW_START"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="checkCB_NUMBER_NEW_START-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_NUMBER_NEW_START">Select this check box, and then enter the number that you want to assign to the paragraph.</property> - </object> - </child> + <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="inconsistent">True</property> + <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="spinNF_NEW_START"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="checkCB_NUMBER_NEW_START-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_NUMBER_NEW_START">Select this check box, and then enter the number that you want to assign to the paragraph.</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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSpinButton" id="spinNF_NEW_START"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentSTART_WITH</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinNF_NEW_START-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|spinNF_NEW_START">Enter the number that you want to assign to the paragraph.</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="spinNF_NEW_START"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentSTART_WITH</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinNF_NEW_START-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|spinNF_NEW_START">Enter the number that you want to assign to the paragraph.</property> </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">2</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> @@ -315,32 +303,86 @@ <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="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="GtkCheckButton" id="checkCB_COUNT_PARA"> + <property name="label" translatable="yes" context="numparapage|checkCB_COUNT_PARA">_Include this paragraph in line numbering</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="inconsistent">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="checkCB_COUNT_PARA-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_COUNT_PARA">Includes the current paragraph in the line numbering.</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="checkCB_RESTART_PARACOUNT"> + <property name="label" translatable="yes" context="numparapage|checkCB_RESTART_PARACOUNT">Rest_art at this paragraph</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="inconsistent">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="checkCB_RESTART_PARACOUNT-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_RESTART_PARACOUNT">Restarts the line numbering at the current paragraph, or at the number that you enter.</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="box1"> + <object class="GtkBox" id="boxRESTART_NO"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="checkCB_COUNT_PARA"> - <property name="label" translatable="yes" context="numparapage|checkCB_COUNT_PARA">_Include this paragraph in line numbering</property> + <object class="GtkBox" id="box3"> <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="inconsistent">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="checkCB_COUNT_PARA-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_COUNT_PARA">Includes the current paragraph in the line numbering.</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="labelFT_RESTART_NO"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="numparapage|labelFT_RESTART_NO">_Start with:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinNF_RESTART_PARA</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> @@ -350,19 +392,14 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="checkCB_RESTART_PARACOUNT"> - <property name="label" translatable="yes" context="numparapage|checkCB_RESTART_PARACOUNT">Rest_art at this paragraph</property> + <object class="GtkSpinButton" id="spinNF_RESTART_PARA"> <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="inconsistent">True</property> - <property name="draw_indicator">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentNF_RESTART_PARA</property> <child internal-child="accessible"> - <object class="AtkObject" id="checkCB_RESTART_PARACOUNT-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_RESTART_PARACOUNT">Restarts the line numbering at the current paragraph, or at the number that you enter.</property> + <object class="AtkObject" id="spinNF_RESTART_PARA-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|spinNF_RESTART_PARA">Enter the number at which to restart the line numbering</property> </object> </child> </object> @@ -372,67 +409,12 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkBox" id="boxRESTART_NO"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkBox" id="box3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="labelFT_RESTART_NO"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="numparapage|labelFT_RESTART_NO">_Start with:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinNF_RESTART_PARA</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="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinNF_RESTART_PARA"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentNF_RESTART_PARA</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinNF_RESTART_PARA-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|spinNF_RESTART_PARA">Enter the number at which to restart the line numbering</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">2</property> - </packing> - </child> </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/optfonttabpage.ui b/sw/uiconfig/swriter/ui/optfonttabpage.ui index 05f0d31731a7..ed1938bb55fa 100644 --- a/sw/uiconfig/swriter/ui/optfonttabpage.ui +++ b/sw/uiconfig/swriter/ui/optfonttabpage.ui @@ -18,346 +18,339 @@ <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="GtkLabel" id="font_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="font_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="optfonttabpage|font_label">Font</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="optfonttabpage|font_label">Font</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="GtkLabel" id="size_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optfonttabpage|size_label">_Size</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">standardheight</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="default_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optfonttabpage|default_label">De_fault:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">standardbox</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="heading_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optfonttabpage|heading_label">Headin_g:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">titlebox</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="list_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optfonttabpage|list_label">_List:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">listbox</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="caption_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optfonttabpage|caption_label">C_aption:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">labelbox</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="index_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optfonttabpage|index_label">_Index:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">idxbox</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="GtkComboBoxText" id="standardbox"> + <property name="visible">True</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" id="standardbox-entry"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="standardbox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|standardbox">Specifies the font to be used for the Default Paragraph Style.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="titlebox"> + <property name="visible">True</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" id="titlebox-entry"> + <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> - <child> - <object class="GtkLabel" id="size_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optfonttabpage|size_label">_Size</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">standardheight</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="titlebox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|titlebox">Specifies the font to be used for headings.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="default_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optfonttabpage|default_label">De_fault:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">standardbox</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="listbox"> + <property name="visible">True</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" id="listbox-entry"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel" id="heading_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optfonttabpage|heading_label">Headin_g:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">titlebox</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="listbox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|listbox">Specifies the fonts for lists and numbering and all derived styles.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="list_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optfonttabpage|list_label">_List:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">listbox</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="labelbox"> + <property name="visible">True</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" id="labelbox-entry"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkLabel" id="caption_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optfonttabpage|caption_label">C_aption:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">labelbox</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="labelbox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|labelbox">Specifies the font used for the captions of images and tables.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkLabel" id="index_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optfonttabpage|index_label">_Index:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">idxbox</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="GtkComboBoxText" id="idxbox"> + <property name="visible">True</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" id="idxbox-entry"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="standardbox"> - <property name="visible">True</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" id="standardbox-entry"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="standardbox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|standardbox">Specifies the font to be used for the Default Paragraph Style.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="idxbox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|idxbox">Specifies the font used for indexes, alphabetical indexes, and tables of contents.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="titlebox"> - <property name="visible">True</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" id="titlebox-entry"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="titlebox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|titlebox">Specifies the font to be used for headings.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="standardheight"> + <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> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="listbox"> - <property name="visible">True</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" id="listbox-entry"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="listbox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|listbox">Specifies the fonts for lists and numbering and all derived styles.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="standardheight-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|standardheight">Specifies the size of the font.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="labelbox"> - <property name="visible">True</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" id="labelbox-entry"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="labelbox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|labelbox">Specifies the font used for the captions of images and tables.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="titleheight"> + <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> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="idxbox"> - <property name="visible">True</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" id="idxbox-entry"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="idxbox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|idxbox">Specifies the font used for indexes, alphabetical indexes, and tables of contents.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="titleheight-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|titleheight">Specifies the size of the font.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="standardheight"> - <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> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="standardheight-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|standardheight">Specifies the size of the font.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="listheight"> + <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> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="titleheight"> - <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> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="titleheight-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|titleheight">Specifies the size of the font.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="listheight-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|listheight">Specifies the size of the font.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="listheight"> - <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> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="listheight-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|listheight">Specifies the size of the font.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="labelheight"> + <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> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="labelheight"> - <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> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="labelheight-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|labelheight">Specifies the size of the font.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="labelheight-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|labelheight">Specifies the size of the font.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="indexheight"> - <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> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="indexheight-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|indexheight">Specifies the size of the font.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="indexheight"> + <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> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">5</property> - </packing> </child> - <child> - <placeholder/> + <child internal-child="accessible"> + <object class="AtkObject" id="indexheight-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|indexheight">Specifies the size of the font.</property> + </object> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/opttestpage.ui b/sw/uiconfig/swriter/ui/opttestpage.ui index 5d20704072dd..70b51ecaf4aa 100644 --- a/sw/uiconfig/swriter/ui/opttestpage.ui +++ b/sw/uiconfig/swriter/ui/opttestpage.ui @@ -14,191 +14,185 @@ <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="row_homogeneous">True</property> + <property name="column_homogeneous">True</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="unused"> + <property name="label" translatable="no">unused</property> <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="row_homogeneous">True</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkCheckButton" id="unused"> - <property name="label" translatable="no">unused</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> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="dynamic"> - <property name="label" translatable="no">dynamic</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> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="nocalm"> - <property name="label" translatable="no">No calm</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">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="wysiwygdbg"> - <property name="label" translatable="no">WYSIWYG debug</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">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="winformat"> - <property name="label" translatable="no">win format</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">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="noscreenadj"> - <property name="label" translatable="no">No screen adj</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">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="noscroll"> - <property name="label" translatable="no">No Scroll</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">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="AutoFormatByInput"> - <property name="label" translatable="no">AutoFormat by Input</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">1</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="DrawingLayerNotLoading"> - <property name="label" translatable="no">DrawingLayerNotLoading</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">1</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="noidle"> - <property name="label" translatable="no">No idle format</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">4</property> - <property name="width">1</property> - <property name="height">1</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> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="dynamic"> + <property name="label" translatable="no">dynamic</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> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="nocalm"> + <property name="label" translatable="no">No calm</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">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="wysiwygdbg"> + <property name="label" translatable="no">WYSIWYG debug</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">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="winformat"> + <property name="label" translatable="no">win format</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">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="noscreenadj"> + <property name="label" translatable="no">No screen adj</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">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="noscroll"> + <property name="label" translatable="no">No Scroll</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">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="AutoFormatByInput"> + <property name="label" translatable="no">AutoFormat by Input</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">1</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="DrawingLayerNotLoading"> + <property name="label" translatable="no">DrawingLayerNotLoading</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">1</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="noidle"> + <property name="label" translatable="no">No idle format</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">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/pagemargincontrol.ui b/sw/uiconfig/swriter/ui/pagemargincontrol.ui index f9df8c065ead..84893bc0fdb9 100644 --- a/sw/uiconfig/swriter/ui/pagemargincontrol.ui +++ b/sw/uiconfig/swriter/ui/pagemargincontrol.ui @@ -266,178 +266,172 @@ <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="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <property name="margin-start">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="pagemargincontrol|label4">_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">2</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="pagemargincontrol|label5">_Bottom</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">bottom</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="GtkBox" id="box1"> <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="GtkLabel" id="label4"> + <object class="GtkLabel" id="leftLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pagemargincontrol|label4">_Top</property> + <property name="label" translatable="yes" context="pagemargincontrol|leftLabel">_Left</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">top</property> + <property name="mnemonic_widget">left</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel" id="innerLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pagemargincontrol|label5">_Bottom</property> + <property name="label" translatable="yes" context="pagemargincontrol|innerLabel">I_nner</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">bottom</property> + <property name="mnemonic_widget">left</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</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> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkLabel" id="rightLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="leftLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pagemargincontrol|leftLabel">_Left</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">left</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="innerLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pagemargincontrol|innerLabel">I_nner</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">left</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> + <property name="label" translatable="yes" context="pagemargincontrol|rightLabel">_Right</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">right</property> + <property name="xalign">0</property> </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="GtkLabel" id="outerLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="rightLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pagemargincontrol|rightLabel">_Right</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">right</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="outerLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pagemargincontrol|outerLabel">O_uter</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">right</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">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="left"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="right"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="adjustment">adjustment2</property> - <property name="digits">2</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="top"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="adjustment">adjustment3</property> - <property name="digits">2</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="bottom"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="adjustment">adjustment4</property> - <property name="digits">2</property> + <property name="label" translatable="yes" context="pagemargincontrol|outerLabel">O_uter</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">right</property> + <property name="xalign">0</property> </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">1</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="left"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="right"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="adjustment">adjustment2</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="top"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="adjustment">adjustment3</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="bottom"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="adjustment">adjustment4</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/picturepage.ui b/sw/uiconfig/swriter/ui/picturepage.ui index fcd558eb8ccc..df6c0c12e5c2 100644 --- a/sw/uiconfig/swriter/ui/picturepage.ui +++ b/sw/uiconfig/swriter/ui/picturepage.ui @@ -22,67 +22,61 @@ <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="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="GtkButton" id="browse"> + <property name="label" translatable="yes" context="picturepage|browse">Browse...</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="GtkButton" id="browse"> - <property name="label" translatable="yes" context="picturepage|browse">Browse...</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="browse-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|browse">Locate the new graphic file that you want to link to, and then click Open.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry"> - <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="entry-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|entry">Displays the path to the linked graphic file. To change the link, click the Browse button and then locate the file that you want to link to.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="browse-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|browse">Locate the new graphic file that you want to link to, and then click Open.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="picturepage|label1">_File name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entry</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="GtkEntry" id="entry"> + <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="entry-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|entry">Displays the path to the linked graphic file. To change the link, click the Browse button and then locate the file that you want to link to.</property> </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="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="picturepage|label1">_File name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entry</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -112,158 +106,152 @@ <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="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">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="grid1"> + <object class="GtkCheckButton" id="vert"> + <property name="label" translatable="yes" context="picturepage|vert">_Vertically</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="vert"> - <property name="label" translatable="yes" context="picturepage|vert">_Vertically</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="vert-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|vert">Flips the selected image vertically.</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="vert-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|vert">Flips the selected image vertically.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="hori"> - <property name="label" translatable="yes" context="picturepage|hori">Hori_zontally</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="hori-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|hori">Flips the selected image horizontally.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="hori"> + <property name="label" translatable="yes" context="picturepage|hori">Hori_zontally</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="hori-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|hori">Flips the selected image horizontally.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="allpages"> - <property name="label" translatable="yes" context="picturepage|allpages">On all 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="active">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="allpages-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|allpages">Flips the selected image horizontally on all pages.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="allpages"> + <property name="label" translatable="yes" context="picturepage|allpages">On all 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="active">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="allpages-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|allpages">Flips the selected image horizontally on all pages.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="leftpages"> - <property name="label" translatable="yes" context="picturepage|leftpages">On left 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> - <property name="group">allpages</property> - <child internal-child="accessible"> - <object class="AtkObject" id="leftpages-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|leftpages">Flips the selected image horizontally only on even pages.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="leftpages"> + <property name="label" translatable="yes" context="picturepage|leftpages">On left 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> + <property name="group">allpages</property> + <child internal-child="accessible"> + <object class="AtkObject" id="leftpages-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|leftpages">Flips the selected image horizontally only on even pages.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="rightpages"> - <property name="label" translatable="yes" context="picturepage|rightpages">On right 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> - <property name="group">allpages</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rightpages-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|rightpages">Flips the selected image horizontally only on odd pages.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rightpages"> + <property name="label" translatable="yes" context="picturepage|rightpages">On right 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> + <property name="group">allpages</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rightpages-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="picturepage|extended_tip|rightpages">Flips the selected image horizontally only on odd pages.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</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="GtkScrolledWindow"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">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="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> <child> - <object class="GtkViewport"> + <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> - <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> - </object> - </child> </object> </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="height">5</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="height">5</property> + </packing> </child> </object> </child> @@ -291,52 +279,26 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box4"> <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="box4"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> <property name="spacing">12</property> <child> - <object class="GtkBox" id="box5"> + <object class="GtkLabel" id="FT_ANGLE"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="FT_ANGLE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="picturepage|FT_ANGLE">_Angle:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">NF_ANGLE</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="GtkSpinButton" id="NF_ANGLE"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentANGLE</property> - <property name="digits">2</property> - <property name="wrap">True</property> - </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="picturepage|FT_ANGLE">_Angle:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">NF_ANGLE</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -345,39 +307,54 @@ </packing> </child> <child> - <object class="GtkBox" id="box6"> + <object class="GtkSpinButton" id="NF_ANGLE"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentANGLE</property> + <property name="digits">2</property> + <property name="wrap">True</property> + </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="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="GtkDrawingArea" id="CTL_ANGLE"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkDrawingArea" id="CTL_ANGLE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="tooltip_text" translatable="yes" context="picturepage|CTL_ANGLE|tooltip_text">Rotation Angle</property> - <property name="halign">center</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="FT_ANGLEPRESETS"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="picturepage|FT_ANGLEPRESETS">Default _settings:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">CTL_ANGLE</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="tooltip_text" translatable="yes" context="picturepage|CTL_ANGLE|tooltip_text">Rotation Angle</property> + <property name="halign">center</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="FT_ANGLEPRESETS"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="picturepage|FT_ANGLEPRESETS">Default _settings:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">CTL_ANGLE</property> </object> <packing> <property name="expand">False</property> @@ -386,6 +363,11 @@ </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/printeroptions.ui b/sw/uiconfig/swriter/ui/printeroptions.ui index dc5b27d47313..7555538a8355 100644 --- a/sw/uiconfig/swriter/ui/printeroptions.ui +++ b/sw/uiconfig/swriter/ui/printeroptions.ui @@ -14,42 +14,106 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <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="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="box2"> + <object class="GtkCheckButton" id="pagebackground"> + <property name="label" translatable="yes" context="printeroptions|pagebackground">Page background</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="GtkCheckButton" id="pictures"> + <property name="label" translatable="yes" context="printeroptions|pictures">Images and other graphic 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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="hiddentext"> + <property name="label" translatable="yes" context="printeroptions|hiddentext">Hidden text</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="GtkCheckButton" id="placeholders"> + <property name="label" translatable="yes" context="printeroptions|placeholders">Text placeholders</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">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formcontrols"> + <property name="label" translatable="yes" context="printeroptions|formcontrols">Form controls</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">4</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="pagebackground"> - <property name="label" translatable="yes" context="printeroptions|pagebackground">Page background</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="GtkCheckButton" id="pictures"> - <property name="label" translatable="yes" context="printeroptions|pictures">Images and other graphic objects</property> + <object class="GtkLabel" id="label1"> <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">5</property> + <property name="label" translatable="yes" context="printeroptions|formcontrols">Comments:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="mnemonic_widget">writercomments</property> </object> <packing> <property name="expand">False</property> @@ -58,92 +122,22 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="hiddentext"> - <property name="label" translatable="yes" context="printeroptions|hiddentext">Hidden text</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="GtkCheckButton" id="placeholders"> - <property name="label" translatable="yes" context="printeroptions|placeholders">Text placeholders</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">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="formcontrols"> - <property name="label" translatable="yes" context="printeroptions|formcontrols">Form controls</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">4</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box3"> + <object class="GtkComboBoxText" id="writercomments"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">5</property> - <property name="label" translatable="yes" context="printeroptions|formcontrols">Comments:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">writercomments</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="writercomments"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> </child> </object> </child> @@ -171,22 +165,16 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkCheckButton" id="textinblack"> + <property name="label" translatable="yes" context="printeroptions|textinblack">Print text in black</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="textinblack"> - <property name="label" translatable="yes" context="printeroptions|textinblack">Print text in black</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="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> </object> </child> <child type="label"> @@ -213,22 +201,16 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkCheckButton" id="autoblankpages"> + <property name="label" translatable="yes" context="printeroptions|autoblankpages">Print automatically inserted blank pages</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="autoblankpages"> - <property name="label" translatable="yes" context="printeroptions|autoblankpages">Print automatically inserted blank 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> - </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> </object> </child> <child type="label"> diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui index 9cd373a3e714..279d3e4981ec 100644 --- a/sw/uiconfig/swriter/ui/printoptionspage.ui +++ b/sw/uiconfig/swriter/ui/printoptionspage.ui @@ -22,138 +22,132 @@ <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="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="GtkCheckButton" id="graphics"> + <property name="label" translatable="yes" context="printoptionspage|graphics">_Images and objects</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkCheckButton" id="graphics"> - <property name="label" translatable="yes" context="printoptionspage|graphics">_Images and 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="graphics-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|graphics">Specifies whether the graphics of your text document are printed.</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="graphics-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|graphics">Specifies whether the graphics of your text document are printed.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="formcontrols"> - <property name="label" translatable="yes" context="printoptionspage|formcontrols">Form control_s</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="formcontrols-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formcontrols">Specifies whether the form control fields of the text document are printed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formcontrols"> + <property name="label" translatable="yes" context="printoptionspage|formcontrols">Form control_s</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="formcontrols-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formcontrols">Specifies whether the form control fields of the text document are printed.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="background"> - <property name="label" translatable="yes" context="printoptionspage|background">Page ba_ckground</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="background-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|background">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="background"> + <property name="label" translatable="yes" context="printoptionspage|background">Page ba_ckground</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="background-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|background">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="inblack"> - <property name="label" translatable="yes" context="printoptionspage|inblack">Print text in blac_k</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="inblack-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|inblack">Specifies whether to always print text in black.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="inblack"> + <property name="label" translatable="yes" context="printoptionspage|inblack">Print text in blac_k</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="inblack-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|inblack">Specifies whether to always print text in black.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="hiddentext"> - <property name="label" translatable="yes" context="printoptionspage|hiddentext">Hidden te_xt</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">Enable this option to print text that is marked as hidden.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="hiddentext"> + <property name="label" translatable="yes" context="printoptionspage|hiddentext">Hidden te_xt</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">Enable this option to print text that is marked as hidden.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="textplaceholder"> - <property name="label" translatable="yes" context="printoptionspage|textplaceholder">Text _placeholder</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="textplaceholder-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|textplaceholder">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="textplaceholder"> + <property name="label" translatable="yes" context="printoptionspage|textplaceholder">Text _placeholder</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="textplaceholder-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|textplaceholder">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> </child> </object> </child> @@ -180,99 +174,93 @@ <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="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="leftpages"> + <property name="label" translatable="yes" context="printoptionspage|leftpages">_Left pages</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkCheckButton" id="leftpages"> - <property name="label" translatable="yes" context="printoptionspage|leftpages">_Left 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> - <child internal-child="accessible"> - <object class="AtkObject" id="leftpages-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|leftpages">Specifies whether to print all left (even numbered) pages of 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="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="leftpages-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|leftpages">Specifies whether to print all left (even numbered) pages of the document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="rightpages"> - <property name="label" translatable="yes" context="printoptionspage|rightpages">_Right 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> - <child internal-child="accessible"> - <object class="AtkObject" id="rightpages-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rightpages">Specifies whether to print all right (odd numbered) pages of the 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="rightpages"> + <property name="label" translatable="yes" context="printoptionspage|rightpages">_Right 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> + <child internal-child="accessible"> + <object class="AtkObject" id="rightpages-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rightpages">Specifies whether to print all right (odd numbered) pages of the document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="brochure"> - <property name="label" translatable="yes" context="printoptionspage|brochure">Broch_ure</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="brochure-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|brochure">Select the Brochure option to print your document in brochure format.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="brochure"> + <property name="label" translatable="yes" context="printoptionspage|brochure">Broch_ure</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="brochure-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|brochure">Select the Brochure option to print your document in brochure format.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="rtl"> - <property name="label" translatable="yes" context="printoptionspage|rtl">Right to Left</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="rtl-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rtl">Check to print the pages of the brochure in the correct order for a right-to-left script.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="rtl"> + <property name="label" translatable="yes" context="printoptionspage|rtl">Right to Left</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="rtl-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rtl">Check to print the pages of the brochure in the correct order for a right-to-left script.</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> @@ -299,123 +287,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="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="GtkRadioButton" id="none"> + <property name="label" translatable="yes" context="printoptionspage|none">_None</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="none"> - <property name="label" translatable="yes" context="printoptionspage|none">_None</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="none-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|none">Specifies whether comments in your document are printed.</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="none-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|none">Specifies whether comments in your document are printed.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="only"> - <property name="label" translatable="yes" context="printoptionspage|only">Comments _only</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">none</property> - <child internal-child="accessible"> - <object class="AtkObject" id="only-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|only">Specifies whether comments in your document are printed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="only"> + <property name="label" translatable="yes" context="printoptionspage|only">Comments _only</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">none</property> + <child internal-child="accessible"> + <object class="AtkObject" id="only-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|only">Specifies whether comments in your document are printed.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="end"> - <property name="label" translatable="yes" context="printoptionspage|end">End of docu_ment</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">none</property> - <child internal-child="accessible"> - <object class="AtkObject" id="end-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|end">Specifies whether comments in your document are printed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="end"> + <property name="label" translatable="yes" context="printoptionspage|end">End of docu_ment</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">none</property> + <child internal-child="accessible"> + <object class="AtkObject" id="end-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|end">Specifies whether comments in your document are printed.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="endpage"> - <property name="label" translatable="yes" context="printoptionspage|endpage">_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">none</property> - <child internal-child="accessible"> - <object class="AtkObject" id="endpage-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|endpage">Specifies whether comments in your document are printed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="endpage"> + <property name="label" translatable="yes" context="printoptionspage|endpage">_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">none</property> + <child internal-child="accessible"> + <object class="AtkObject" id="endpage-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|endpage">Specifies whether comments in your document are printed.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="inmargins"> - <property name="label" translatable="yes" context="printoptionspage|inmargins">In margins</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">none</property> - <child internal-child="accessible"> - <object class="AtkObject" id="inmargins-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|inmargins">Specifies whether comments in your document are printed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="inmargins"> + <property name="label" translatable="yes" context="printoptionspage|inmargins">In margins</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">none</property> + <child internal-child="accessible"> + <object class="AtkObject" id="inmargins-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|inmargins">Specifies whether comments in your document are printed.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> </child> </object> </child> @@ -452,74 +434,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="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="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="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="printoptionspage|label5">_Fax:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fax</property> - <child internal-child="accessible"> - <object class="AtkObject" id="label5-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|label5">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="fax"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="fax-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fax">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</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">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="blankpages"> - <property name="label" translatable="yes" context="printoptionspage|blankpages">Print _automatically inserted blank pages</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="label" translatable="yes" context="printoptionspage|label5">_Fax:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="mnemonic_widget">fax</property> <child internal-child="accessible"> - <object class="AtkObject" id="blankpages-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|blankpages">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</property> + <object class="AtkObject" id="label5-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|label5">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</property> </object> </child> </object> @@ -529,26 +466,65 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="papertray"> - <property name="label" translatable="yes" context="printoptionspage|papertray">_Paper tray from printer settings</property> + <object class="GtkComboBoxText" id="fax"> <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="can_focus">False</property> <child internal-child="accessible"> - <object class="AtkObject" id="papertray-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|papertray">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</property> + <object class="AtkObject" id="fax-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fax">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</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">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="blankpages"> + <property name="label" translatable="yes" context="printoptionspage|blankpages">Print _automatically inserted blank 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> + <child internal-child="accessible"> + <object class="AtkObject" id="blankpages-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|blankpages">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="papertray"> + <property name="label" translatable="yes" context="printoptionspage|papertray">_Paper tray from printer settings</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="papertray-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|papertray">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</property> + </object> + </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/privateuserpage.ui b/sw/uiconfig/swriter/ui/privateuserpage.ui index 97dd15c92d49..3bc42610fc41 100644 --- a/sw/uiconfig/swriter/ui/privateuserpage.ui +++ b/sw/uiconfig/swriter/ui/privateuserpage.ui @@ -11,26 +11,121 @@ <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> + <object class="GtkLabel" id="nameft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="privateuserpage|nameft">First/last _name/initials:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">firstname</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="streetft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="privateuserpage|streetft">_Street:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">street</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="countryft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="privateuserpage|countryft">Co_untry/state:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">country</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="titleft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="privateuserpage|titleft">_Title/profession:</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">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="phoneft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="privateuserpage|phoneft">Fa_x:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fax</property> + <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="phoneft-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="privateuserpage|phoneft-atkobject">Home telephone number</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="faxft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="privateuserpage|faxft">Homepage/email:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">url</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> <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="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="nameft"> + <object class="GtkEntry" id="firstname"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="privateuserpage|nameft">First/last _name/initials:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">firstname</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="firstname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|firstname-atkobject">First name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | firstname">Type your first name.</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -38,557 +133,456 @@ </packing> </child> <child> - <object class="GtkLabel" id="streetft"> + <object class="GtkEntry" id="lastname"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="privateuserpage|streetft">_Street:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">street</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="lastname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|lastname-atkobject">Last name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | lastname">Type your last name.</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">0</property> </packing> </child> <child> - <object class="GtkLabel" id="countryft"> + <object class="GtkEntry" id="shortname"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="privateuserpage|countryft">Co_untry/state:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">country</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="width_chars">7</property> + <child internal-child="accessible"> + <object class="AtkObject" id="shortname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|shortname-atkobject">Initials</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | shortname">Type your initials.</property> + </object> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left_attach">2</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> + <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="column_spacing">12</property> <child> - <object class="GtkLabel" id="titleft"> + <object class="GtkEntry" id="title"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="privateuserpage|titleft">_Title/profession:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">title</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="title-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|title-atkobject">Title</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | title">Type your title in this field.</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="phoneft"> + <object class="GtkEntry" id="job"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="privateuserpage|phoneft">Fa_x:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fax</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="phoneft-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="privateuserpage|phoneft-atkobject">Home telephone number</property> + <object class="AtkObject" id="job-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|job-atkobject">Position</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | job">Type your profession</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <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">5</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="column_spacing">12</property> <child> - <object class="GtkLabel" id="faxft"> + <object class="GtkEntry" id="fax"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="privateuserpage|faxft">Homepage/email:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">url</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fax-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|fax-atkobject">Home telephone number</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | fax">Type your fax number in this field.</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="top_attach">0</property> + <property name="width">2</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <!-- 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="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkEntry" id="url"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="firstname"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="firstname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|firstname-atkobject">First name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | firstname">Type your first name.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="lastname"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="lastname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|lastname-atkobject">Last name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | lastname">Type your last name.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="shortname"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="width_chars">7</property> - <child internal-child="accessible"> - <object class="AtkObject" id="shortname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|shortname-atkobject">Initials</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | shortname">Type your initials.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="url-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|url-atkobject">Fax number</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | url">Enter your home page</property> </object> - <packing> - <property name="left_attach">2</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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkEntry" id="email"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="title"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="title-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|title-atkobject">Title</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | title">Type your title in this field.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="job"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="job-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|job-atkobject">Position</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | job">Type your profession</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="email-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|email-atkobject">email address</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | email">Type your email address.</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">5</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="eastnameft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="privateuserpage|eastnameft">First/last _name/initials 2:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">firstname2</property> + <property name="xalign">0</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="grid9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkEntry" id="firstname2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="fax"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="fax-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|fax-atkobject">Home telephone number</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | fax">Type your fax number in this field.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="firstname2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|firstname2-atkobject">Last name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | firstname2">Type your first name</property> </object> - <packing> - <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">1</property> - <property name="top_attach">7</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="grid7"> + <object class="GtkEntry" id="lastname2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="url"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="url-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|url-atkobject">Fax number</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | url">Enter your home page</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="email"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="email-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|email-atkobject">email address</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | email">Type your email address.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="lastname2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|lastname2-atkobject">First name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | lastname2">Type your last name </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">8</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="eastnameft"> + <object class="GtkEntry" id="shortname2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="privateuserpage|eastnameft">First/last _name/initials 2:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">firstname2</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="width_chars">7</property> + <child internal-child="accessible"> + <object class="AtkObject" id="shortname2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|shortname2-atkobject">Initials</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | shortname2">Type your initials</property> + </object> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">2</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> + <child> + <object class="GtkLabel" id="icityft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="privateuserpage|icityft">_Zip/city:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">izip</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> + <object class="GtkEntry" id="icity"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="firstname2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="firstname2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|firstname2-atkobject">Last name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | firstname2">Type your first name</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="lastname2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="lastname2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|lastname2-atkobject">First name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | lastname2">Type your last name </property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="shortname2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="width_chars">7</property> - <child internal-child="accessible"> - <object class="AtkObject" id="shortname2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|shortname2-atkobject">Initials</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | shortname2">Type your initials</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="icity-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|icity-atkobject">City</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | icity">Type the city where you live.</property> </object> - <packing> - <property name="left_attach">2</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> <child> - <object class="GtkLabel" id="icityft"> + <object class="GtkEntry" id="izip"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="privateuserpage|icityft">_Zip/city:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">izip</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="izip-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|izip-atkobject">Zip code</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | izip">Type your ZIP in this field.</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> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</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> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid11"> + <object class="GtkEntry" id="street"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="icity"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="icity-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|icity-atkobject">City</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | icity">Type the city where you live.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="izip"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="width_chars">15</property> - <child internal-child="accessible"> - <object class="AtkObject" id="izip-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|izip-atkobject">Zip code</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | izip">Type your ZIP in this field.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="street-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | street">Type the name of your street in this field.</property> </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="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">2</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkEntry" id="country"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <child> - <object class="GtkEntry" id="street"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="street-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | street">Type the name of your street in this field.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="country-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | country">Type the country name</property> </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="top_attach">2</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="grid12"> + <object class="GtkEntry" id="state"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="country"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="country-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | country">Type the country name</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="state"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="state-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | state">Type your state.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="state-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | state">Type your state.</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">4</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="titleft1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="privateuserpage|titleft1">Phone/mobile:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">phone</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</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="hexpand">True</property> + <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="titleft1"> + <object class="GtkEntry" id="phone"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="privateuserpage|titleft1">Phone/mobile:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">phone</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="phone-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|phone-atkobject">Title</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | phone">Type your phone number</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkEntry" id="mobile"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="phone"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="phone-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|phone-atkobject">Title</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | phone">Type your phone number</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="mobile"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="mobile-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|mobile-atkobject">Position</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | mobile">Type your mobile phone number</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="mobile-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|mobile-atkobject">Position</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | mobile">Type your mobile phone number</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">6</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/renameentrydialog.ui b/sw/uiconfig/swriter/ui/renameentrydialog.ui index 49d72eeb1eb4..ef1f8c06c4c9 100644 --- a/sw/uiconfig/swriter/ui/renameentrydialog.ui +++ b/sw/uiconfig/swriter/ui/renameentrydialog.ui @@ -83,19 +83,13 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkEntry" id="entry"> <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="GtkEntry" id="entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">start</property> - <property name="activates_default">True</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="valign">start</property> + <property name="activates_default">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/renameobjectdialog.ui b/sw/uiconfig/swriter/ui/renameobjectdialog.ui index 45dc0ae1e7fc..fdc635ff99e2 100644 --- a/sw/uiconfig/swriter/ui/renameobjectdialog.ui +++ b/sw/uiconfig/swriter/ui/renameobjectdialog.ui @@ -81,49 +81,41 @@ <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="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="renameobjectdialog|label2">New name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entry</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="entry"> + <property name="visible">True</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="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="renameobjectdialog|label2">New name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entry</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="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">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="activates_default">True</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/rowheight.ui b/sw/uiconfig/swriter/ui/rowheight.ui index e3e1b64fb55e..ae81a983b9ca 100644 --- a/sw/uiconfig/swriter/ui/rowheight.ui +++ b/sw/uiconfig/swriter/ui/rowheight.ui @@ -86,59 +86,53 @@ <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="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="box1"> + <object class="GtkSpinButton" id="heightmf"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkSpinButton" id="heightmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</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="heightmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="rowheight|extended_tip|heightmf">Enter the height that you want for the selected row(s).</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="halign">start</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="heightmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="rowheight|extended_tip|heightmf">Enter the height that you want for the selected row(s).</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="fit"> - <property name="label" translatable="yes" context="rowheight|fit">_Fit to 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="fit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="rowheight|extended_tip|fit">Automatically adjusts the row height to match the contents of the cells.</property> - </object> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fit"> + <property name="label" translatable="yes" context="rowheight|fit">_Fit to 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="fit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="rowheight|extended_tip|fit">Automatically adjusts the row height to match the contents of the cells.</property> </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/savelabeldialog.ui b/sw/uiconfig/swriter/ui/savelabeldialog.ui index 3645831a618e..503f18450c08 100644 --- a/sw/uiconfig/swriter/ui/savelabeldialog.ui +++ b/sw/uiconfig/swriter/ui/savelabeldialog.ui @@ -81,85 +81,79 @@ <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="label2"> <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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="savelabeldialog|label2">Brand</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="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="savelabeldialog|label3">T_ype</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="savelabeldialog|label2">Brand</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="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="savelabeldialog|label3">T_ype</property> + <property name="use_underline">True</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="type"> + <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="type-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="savelabeldialog|extended_tip|type">Enter or select a label type.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="type"> - <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="brand"> + <property name="visible">True</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" id="comboboxtext-entry"> <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="type-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="savelabeldialog|extended_tip|type">Enter or select a label type.</property> - </object> - </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="brand"> - <property name="visible">True</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" 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="brand-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="savelabeldialog|extended_tip|brand">Enter or select the desired brand.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="brand-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="savelabeldialog|extended_tip|brand">Enter or select the desired brand.</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/selectautotextdialog.ui b/sw/uiconfig/swriter/ui/selectautotextdialog.ui index 16aef3f39850..b2d82740d43c 100644 --- a/sw/uiconfig/swriter/ui/selectautotextdialog.ui +++ b/sw/uiconfig/swriter/ui/selectautotextdialog.ui @@ -89,40 +89,34 @@ <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="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="treeview"> <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="treeview"> - <property name="visible">True</property> - <property name="can_focus">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> diff --git a/sw/uiconfig/swriter/ui/selectblockdialog.ui b/sw/uiconfig/swriter/ui/selectblockdialog.ui index 664f1b5f01bc..48c4be2a4971 100644 --- a/sw/uiconfig/swriter/ui/selectblockdialog.ui +++ b/sw/uiconfig/swriter/ui/selectblockdialog.ui @@ -174,105 +174,99 @@ <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="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="GtkRadioButton" id="never"> + <property name="label" translatable="yes" context="selectblockdialog|never">N_ever include the country/region</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="never"> - <property name="label" translatable="yes" context="selectblockdialog|never">N_ever include the country/region</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="never-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectblockdialog|extended_tip|never">Excludes country or regional information from the address block.</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="never-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectblockdialog|extended_tip|never">Excludes country or regional information from the address block.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="always"> - <property name="label" translatable="yes" context="selectblockdialog|always">_Always include the country/region</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">never</property> - <child internal-child="accessible"> - <object class="AtkObject" id="always-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectblockdialog|extended_tip|always">Includes country or regional information in the address block.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="always"> + <property name="label" translatable="yes" context="selectblockdialog|always">_Always include the country/region</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">never</property> + <child internal-child="accessible"> + <object class="AtkObject" id="always-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectblockdialog|extended_tip|always">Includes country or regional information in the address block.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="dependent"> - <property name="label" translatable="yes" context="selectblockdialog|dependent">Only _include the country/region if it is not:</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">never</property> - <accessibility> - <relation type="label-for" target="country"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="dependent-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectblockdialog|extended_tip|dependent">Only includes country or regional information in the address block if the value differs from the value that you enter in the text box.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="dependent"> + <property name="label" translatable="yes" context="selectblockdialog|dependent">Only _include the country/region if it is not:</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">never</property> + <accessibility> + <relation type="label-for" target="country"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="dependent-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectblockdialog|extended_tip|dependent">Only includes country or regional information in the address block if the value differs from the value that you enter in the text box.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkEntry" id="country"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin-start">12</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <accessibility> - <relation type="labelled-by" target="dependent"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="country-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectblockdialog|extended_tip|country">Enter the country/region string that shall not be printed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="country"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin-start">12</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <accessibility> + <relation type="labelled-by" target="dependent"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="country-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectblockdialog|extended_tip|country">Enter the country/region string that shall not be printed.</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> diff --git a/sw/uiconfig/swriter/ui/selectindexdialog.ui b/sw/uiconfig/swriter/ui/selectindexdialog.ui index b3c94da844ed..1282d25f6dc5 100644 --- a/sw/uiconfig/swriter/ui/selectindexdialog.ui +++ b/sw/uiconfig/swriter/ui/selectindexdialog.ui @@ -75,71 +75,65 @@ <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="top_padding">6</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</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="GtkLabel" id="type"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="type"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">treeview</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> + <property name="use_underline">True</property> + <property name="mnemonic_widget">treeview</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="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="treeview"> <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="treeview"> - <property name="visible">True</property> - <property name="can_focus">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="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/sidebarstylepresets.ui b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui index 0feedc675c05..7df9c8eabba2 100644 --- a/sw/uiconfig/swriter/ui/sidebarstylepresets.ui +++ b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui @@ -9,47 +9,41 @@ <property name="row_homogeneous">True</property> <property name="column_homogeneous">True</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="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkScrolledWindow" id="valuesetwin"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</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="GtkScrolledWindow" id="valuesetwin"> + <object class="GtkViewport"> <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> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="valueset"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="valueset"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</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> </object> <packing> diff --git a/sw/uiconfig/swriter/ui/sidebartheme.ui b/sw/uiconfig/swriter/ui/sidebartheme.ui index 4b53876b6849..f2097dd29fd1 100644 --- a/sw/uiconfig/swriter/ui/sidebartheme.ui +++ b/sw/uiconfig/swriter/ui/sidebartheme.ui @@ -17,131 +17,123 @@ <property name="row_spacing">6</property> <property name="column_spacing">6</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="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sidebartheme|label1">Fonts</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">listbox_fonts</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="GtkScrolledWindow"> + <property name="visible">True</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">6</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sidebartheme|label1">Fonts</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">listbox_fonts</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="listbox_fonts"> <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"/> + </child> <child> - <object class="GtkTreeView" id="listbox_fonts"> - <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"/> - </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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sidebartheme|label2">Colors</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">valueset_colors</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="apply"> + <property name="label">gtk-apply</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="valuesetwin"> + <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="GtkLabel" id="label2"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sidebartheme|label2">Colors</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">valueset_colors</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="apply"> - <property name="label">gtk-apply</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="valuesetwin"> - <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"> + <object class="GtkDrawingArea" id="valueset_colors"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="valueset_colors"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> </object> </child> </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> <packing> diff --git a/sw/uiconfig/swriter/ui/splittable.ui b/sw/uiconfig/swriter/ui/splittable.ui index 7ce1d3c78217..9811231d1f04 100644 --- a/sw/uiconfig/swriter/ui/splittable.ui +++ b/sw/uiconfig/swriter/ui/splittable.ui @@ -78,104 +78,98 @@ <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">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="copyheading"> + <property name="label" translatable="yes" context="splittable|copyheading">Copy heading</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="GtkRadioButton" id="copyheading"> - <property name="label" translatable="yes" context="splittable|copyheading">Copy heading</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="relief">half</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="copyheading-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="splittable|extended_tip|copyheading">Includes the first row of the original table as the first row of the second table.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="relief">half</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="copyheading-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="splittable|extended_tip|copyheading">Includes the first row of the original table as the first row of the second table.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="customheadingapplystyle"> - <property name="label" translatable="yes" context="splittable|customheadingapplystyle">Custom heading (apply Style)</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">copyheading</property> - <child internal-child="accessible"> - <object class="AtkObject" id="customheadingapplystyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="splittable|extended_tip|customheadingapplystyle">Inserts a blank header row in the second table that is formatted with the style of the first row in the original table.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="customheadingapplystyle"> + <property name="label" translatable="yes" context="splittable|customheadingapplystyle">Custom heading (apply Style)</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">copyheading</property> + <child internal-child="accessible"> + <object class="AtkObject" id="customheadingapplystyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="splittable|extended_tip|customheadingapplystyle">Inserts a blank header row in the second table that is formatted with the style of the first row in the original table.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="customheading"> - <property name="label" translatable="yes" context="splittable|customheading">Custom heading</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">copyheading</property> - <child internal-child="accessible"> - <object class="AtkObject" id="customheading-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="splittable|extended_tip|customheading">Inserts an additional blank row in the second table.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="customheading"> + <property name="label" translatable="yes" context="splittable|customheading">Custom heading</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">copyheading</property> + <child internal-child="accessible"> + <object class="AtkObject" id="customheading-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="splittable|extended_tip|customheading">Inserts an additional blank row in the second table.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="noheading"> - <property name="label" translatable="yes" context="splittable|noheading">No heading</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">copyheading</property> - <child internal-child="accessible"> - <object class="AtkObject" id="noheading-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="splittable|extended_tip|noheading">Splits the table without copying the header row.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="noheading"> + <property name="label" translatable="yes" context="splittable|noheading">No heading</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">copyheading</property> + <child internal-child="accessible"> + <object class="AtkObject" id="noheading-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="splittable|extended_tip|noheading">Splits the table without copying the header row.</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> diff --git a/sw/uiconfig/swriter/ui/tablecolumnpage.ui b/sw/uiconfig/swriter/ui/tablecolumnpage.ui index b0325c66fec8..3c4f7233c94d 100644 --- a/sw/uiconfig/swriter/ui/tablecolumnpage.ui +++ b/sw/uiconfig/swriter/ui/tablecolumnpage.ui @@ -168,281 +168,274 @@ <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="grid17"> <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="grid17"> - <property name="visible">True</property> - <property name="can_focus">False</property> + <object class="GtkSpinButton" id="width2"> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="halign">center</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkSpinButton" id="width2"> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="halign">center</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="width2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width2-atkobject">Column 2 Width</property> - <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width2">Enter the width that you want for the column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="width3"> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="halign">center</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="width3-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width3-atkobject">Column 3 Width</property> - <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width3">Enter the width that you want for the column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="width4"> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="halign">center</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="width4-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width4-atkobject">Column 4 Width</property> - <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width4">Enter the width that you want for the column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">6</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="width5"> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="halign">center</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="width5-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width5-atkobject">Column 5 Width</property> - <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width5">Enter the width that you want for the column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">8</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="width6"> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment7</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="width6-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width6-atkobject">Column 6 Width</property> - <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width6">Enter the width that you want for the column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">10</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="6"> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">_6</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width6</property> - </object> - <packing> - <property name="left_attach">10</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="1"> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">_1</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width1</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="width2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width2-atkobject">Column 2 Width</property> + <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width2">Enter the width that you want for the column.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="2"> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">_2</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width2</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="width3"> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="halign">center</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="width3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width3-atkobject">Column 3 Width</property> + <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width3">Enter the width that you want for the column.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="3"> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">_3</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width3</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="width4"> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="halign">center</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="width4-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width4-atkobject">Column 4 Width</property> + <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width4">Enter the width that you want for the column.</property> </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="5"> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">_5</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width5</property> + </object> + <packing> + <property name="left_attach">6</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="width5"> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="halign">center</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="width5-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width5-atkobject">Column 5 Width</property> + <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width5">Enter the width that you want for the column.</property> </object> - <packing> - <property name="left_attach">8</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="4"> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">_4</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width4</property> + </object> + <packing> + <property name="left_attach">8</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="width6"> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment7</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="width6-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width6-atkobject">Column 6 Width</property> + <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width6">Enter the width that you want for the column.</property> </object> - <packing> - <property name="left_attach">6</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="width1"> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="halign">center</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="width1-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width1-atkobject">Column 1 Width</property> - <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width1">Enter the width that you want for the column.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">10</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="6"> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label">_6</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">width6</property> + </object> + <packing> + <property name="left_attach">10</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="1"> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label">_1</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">width1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="2"> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label">_2</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">width2</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="3"> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label">_3</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">width3</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="5"> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label">_5</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">width5</property> + </object> + <packing> + <property name="left_attach">8</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="4"> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label">_4</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">width4</property> + </object> + <packing> + <property name="left_attach">6</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="width1"> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="halign">center</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="width1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width1-atkobject">Column 1 Width</property> + <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width1">Enter the width that you want for the column.</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="GtkButton" id="back"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">start</property> - <property name="image">image7</property> - <property name="always_show_image">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="back-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|back">Displays the table columns found to the left of the current column.</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="GtkButton" id="back"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="image">image7</property> + <property name="always_show_image">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="back-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|back">Displays the table columns found to the left of the current column.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="next"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> - <property name="image">image8</property> - <property name="always_show_image">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="next-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|next">Displays the table columns found to the right of the current column.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="next"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="image">image8</property> + <property name="always_show_image">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="next-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|next">Displays the table columns found to the right of the current column.</property> </object> - <packing> - <property name="left_attach">11</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">11</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui index c0b70a3c1078..63fac647e29e 100644 --- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui +++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui @@ -29,146 +29,36 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment8"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid19"> <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="grid19"> + <object class="GtkGrid" id="grid20"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">5</property> + <property name="column_homogeneous">True</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid20"> + <object class="GtkCheckButton" id="break"> + <property name="label" translatable="yes" context="tabletextflowpage|break">_Break</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">5</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkCheckButton" id="break"> - <property name="label" translatable="yes" context="tabletextflowpage|break">_Break</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="tabletextflowpage|extended_tip|break">Select this check box, and then select the type of break that you want to associate with the table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="page"> - <property name="label" translatable="yes" context="tabletextflowpage|page">_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> - <accessibility> - <relation type="member-of" target="break"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="page-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|page">Inserts a page break before or after the table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="column"> - <property name="label" translatable="yes" context="tabletextflowpage|column">Col_umn</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">page</property> - <accessibility> - <relation type="member-of" target="break"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="column-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|column">Inserts a column break before or after the table on a multi-column page.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="before"> - <property name="label" translatable="yes" context="tabletextflowpage|before">Be_fore</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="break"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="before-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|before">Inserts a page or column break before the table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="after"> - <property name="label" translatable="yes" context="tabletextflowpage|after">_After</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">before</property> - <accessibility> - <relation type="member-of" target="break"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="after-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|after">Inserts a page or column break after the table.</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="break-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|break">Select this check box, and then select the type of break that you want to associate with the table.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> <packing> @@ -177,139 +67,316 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid21"> + <object class="GtkRadioButton" id="page"> + <property name="label" translatable="yes" context="tabletextflowpage|page">_Page</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">10</property> - <child> - <object class="GtkCheckButton" id="pagestyle"> - <property name="label" translatable="yes" context="tabletextflowpage|pagestyle">With Page St_yle</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin-start">22</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <accessibility> - <relation type="label-for" target="pagestylelb"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="pagestyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|pagestyle">Applies the page style that you specify to the first page that follows the page break.</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> + <accessibility> + <relation type="member-of" target="break"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="page-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|page">Inserts a page break before or after the table.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="pagenoft"> - <property name="label" translatable="yes" context="tabletextflowpage|pagenoft">Page _number</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="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="column"> + <property name="label" translatable="yes" context="tabletextflowpage|column">Col_umn</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">page</property> + <accessibility> + <relation type="member-of" target="break"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="column-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|column">Inserts a column break before or after the table on a multi-column page.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="pagenonf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <accessibility> - <relation type="labelled-by" target="pagenoft"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="pagenonf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|pagenonf">Enter the page number for the first page that follows the break. If you want to continue the current page numbering, leave the checkbox unchecked.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="before"> + <property name="label" translatable="yes" context="tabletextflowpage|before">Be_fore</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="break"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="before-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|before">Inserts a page or column break before the table.</property> </object> - <packing> - <property name="left_attach">3</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> - <accessibility> - <relation type="labelled-by" target="pagestyle"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="pagestylelb-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="tabletextflowpage|pagestylelb-atkobject">With Page Style</property> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|pagestylelb">Select the page style that you want to apply to the first page that follows the break.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="after"> + <property name="label" translatable="yes" context="tabletextflowpage|after">_After</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">before</property> + <accessibility> + <relation type="member-of" target="break"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="after-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|after">Inserts a page or column break after the table.</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="left_attach">2</property> <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="split"> - <property name="label" translatable="yes" context="tabletextflowpage|split">Allow _table to split across pages and columns</property> + <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="grid21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">10</property> + <child> + <object class="GtkCheckButton" id="pagestyle"> + <property name="label" translatable="yes" context="tabletextflowpage|pagestyle">With Page St_yle</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="margin-start">22</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="pagestylelb"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="split-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|split">Allows a page break or column break between the rows of a table.</property> + <object class="AtkObject" id="pagestyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|pagestyle">Applies the page style that you specify to the first page that follows the page break.</property> </object> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="splitrow"> - <property name="label" translatable="yes" context="tabletextflowpage|splitrow">Allow row to break a_cross pages and columns</property> + <object class="GtkCheckButton" id="pagenoft"> + <property name="label" translatable="yes" context="tabletextflowpage|pagenoft">Page _number</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="margin-start">18</property> <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="inconsistent">True</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="GtkSpinButton" id="pagenonf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <accessibility> + <relation type="labelled-by" target="pagenoft"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="splitrow-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|splitrow">Allows a page break or column break inside a row of the table.</property> + <object class="AtkObject" id="pagenonf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|pagenonf">Enter the page number for the first page that follows the break. If you want to continue the current page numbering, leave the checkbox unchecked.</property> </object> </child> </object> <packing> + <property name="left_attach">3</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> + <accessibility> + <relation type="labelled-by" target="pagestyle"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="pagestylelb-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="tabletextflowpage|pagestylelb-atkobject">With Page Style</property> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|pagestylelb">Select the page style that you want to apply to the first page that follows the break.</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="GtkCheckButton" id="split"> + <property name="label" translatable="yes" context="tabletextflowpage|split">Allow _table to split across pages and 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="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="split-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|split">Allows a page break or column break between the rows of a table.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="splitrow"> + <property name="label" translatable="yes" context="tabletextflowpage|splitrow">Allow row to break a_cross pages and columns</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin-start">18</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="inconsistent">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="splitrow-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|splitrow">Allows a page break or column break inside a row of the table.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="keep"> + <property name="label" translatable="yes" context="tabletextflowpage|keep">_Keep with next paragraph</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="keep-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|keep">Keeps the table and the following paragraph together when you insert the break.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label40"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tabletextflowpage|label40">Text _orientation</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">textorientation</property> + </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="GtkCheckButton" id="keep"> - <property name="label" translatable="yes" context="tabletextflowpage|keep">_Keep with next paragraph</property> + <object class="GtkComboBoxText" id="textorientation"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item id="0" translatable="yes" context="tabletextflowpage|liststore1">Horizontal</item> + <item id="2" translatable="yes" context="tabletextflowpage|liststore1">Vertical (top to bottom)</item> + <item id="5" translatable="yes" context="tabletextflowpage|liststore1">Vertical (bottom to top)</item> + <item id="4" translatable="yes" context="tabletextflowpage|liststore1">Use superordinate object settings</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="textorientation-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|textorientation">Select the orientation for the text in the cells.</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">6</property> + </packing> + </child> + <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="column_spacing">24</property> + <child> + <object class="GtkCheckButton" id="headline"> + <property name="label" translatable="yes" context="tabletextflowpage|headline">R_epeat heading</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -317,29 +384,29 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="keep-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|keep">Keeps the table and the following paragraph together when you insert the break.</property> + <object class="AtkObject" id="headline-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|headline">Repeats the table heading on a new page when the table spans more than one page.</property> </object> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">0</property> </packing> </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid23"> + <object class="GtkGrid" id="repeatheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="column_spacing">10</property> <child> - <object class="GtkLabel" id="label40"> + <object class="GtkLabel" id="label38"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tabletextflowpage|label40">Text _orientation</property> + <property name="label" translatable="yes" context="tabletextflowpage|label38">The first </property> <property name="use_underline">True</property> - <property name="mnemonic_widget">textorientation</property> + <property name="mnemonic_widget">repeatheadernf</property> </object> <packing> <property name="left_attach">0</property> @@ -347,118 +414,44 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="textorientation"> + <object class="GtkLabel" id="label39"> <property name="visible">True</property> <property name="can_focus">False</property> - <items> - <item id="0" translatable="yes" context="tabletextflowpage|liststore1">Horizontal</item> - <item id="2" translatable="yes" context="tabletextflowpage|liststore1">Vertical (top to bottom)</item> - <item id="5" translatable="yes" context="tabletextflowpage|liststore1">Vertical (bottom to top)</item> - <item id="4" translatable="yes" context="tabletextflowpage|liststore1">Use superordinate object settings</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="textorientation-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|textorientation">Select the orientation for the text in the cells.</property> - </object> - </child> + <property name="label" translatable="yes" context="tabletextflowpage|label39">rows</property> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">2</property> <property name="top_attach">0</property> </packing> </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <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="column_spacing">24</property> <child> - <object class="GtkCheckButton" id="headline"> - <property name="label" translatable="yes" context="tabletextflowpage|headline">R_epeat heading</property> + <object class="GtkSpinButton" id="repeatheadernf"> <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="activates_default">True</property> + <property name="adjustment">adjustment2</property> <child internal-child="accessible"> - <object class="AtkObject" id="headline-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|headline">Repeats the table heading on a new page when the table spans more than one page.</property> + <object class="AtkObject" id="repeatheadernf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|repeatheadernf">Enter the number of rows to include in the heading.</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="repeatheader"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">10</property> - <child> - <object class="GtkLabel" id="label38"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tabletextflowpage|label38">The first </property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">repeatheadernf</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label39"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tabletextflowpage|label39">rows</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="repeatheadernf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="repeatheadernf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|repeatheadernf">Enter the number of rows to include in the heading.</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">0</property> </packing> </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">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> </child> </object> </child> @@ -485,51 +478,45 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment9"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid24"> <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="grid24"> + <object class="GtkLabel" id="label41"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label41"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tabletextflowpage|label41">_Vertical alignment</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">vertorient</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="vertorient"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item id="0" translatable="yes" context="tabletextflowpage|liststore2">Top</item> - <item id="1" translatable="yes" context="tabletextflowpage|liststore2">Centered</item> - <item id="2" translatable="yes" context="tabletextflowpage|liststore2">Bottom</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="vertorient-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|vertorient">Specify the vertical text alignment for the cells in the table.</property> - </object> - </child> + <property name="label" translatable="yes" context="tabletextflowpage|label41">_Vertical alignment</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">vertorient</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="vertorient"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item id="0" translatable="yes" context="tabletextflowpage|liststore2">Top</item> + <item id="1" translatable="yes" context="tabletextflowpage|liststore2">Centered</item> + <item id="2" translatable="yes" context="tabletextflowpage|liststore2">Bottom</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="vertorient-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|vertorient">Specify the vertical text alignment for the cells in the table.</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/testmailsettings.ui b/sw/uiconfig/swriter/ui/testmailsettings.ui index f8ab0e14c8f9..222446879837 100644 --- a/sw/uiconfig/swriter/ui/testmailsettings.ui +++ b/sw/uiconfig/swriter/ui/testmailsettings.ui @@ -86,137 +86,131 @@ <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="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="grid2"> + <object class="GtkLabel" id="establish"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="testmailsettings|establish">Establish network connection</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="GtkLabel" id="find"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="testmailsettings|find">Find outgoing mail server</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="result1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="testmailsettings|result1">Successful</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="result2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="testmailsettings|result2">Failed</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> <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="establish"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="testmailsettings|establish">Establish network connection</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="GtkLabel" id="find"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="testmailsettings|find">Find outgoing mail server</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="result1"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="testmailsettings|result1">Successful</property> - <property name="xalign">0</property> + <property name="stock">gtk-dialog-error</property> </object> <packing> - <property name="left_attach">2</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="GtkLabel" id="result2"> + <object class="GtkImage" id="image3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="testmailsettings|result2">Failed</property> - <property name="xalign">0</property> + <property name="stock">gtk-apply</property> </object> <packing> - <property name="left_attach">2</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">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox"> + <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-error</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="stock">gtk-dialog-error</property> </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"> + <object class="GtkImage" id="image4"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-error</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="stock">gtk-apply</property> </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> @@ -246,49 +240,43 @@ <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="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="scrolledwindow1"> <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> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkTextView" id="errors"> <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="errors"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="editable">False</property> - <property name="wrap_mode">word</property> - <property name="cursor_visible">False</property> - <property name="buffer">textbuffer1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="errors-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|errors">In the Errors list box you can read an explanation of any errors encountered while testing the settings.</property> - </object> - </child> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + <property name="cursor_visible">False</property> + <property name="buffer">textbuffer1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="errors-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|errors">In the Errors list box you can read an explanation of any errors encountered while testing the settings.</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> </object> </child> diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui index df26f67188cb..19f1c000ddfc 100644 --- a/sw/uiconfig/swriter/ui/textgridpage.ui +++ b/sw/uiconfig/swriter/ui/textgridpage.ui @@ -49,123 +49,117 @@ <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="top_padding">6</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="GridGrid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="GridGrid"> + <object class="GtkRadioButton" id="radioRB_NOGRID"> + <property name="label" translatable="yes" context="textgridpage|radioRB_NOGRID">No grid</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="radioRB_NOGRID"> - <property name="label" translatable="yes" context="textgridpage|radioRB_NOGRID">No grid</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="radioRB_NOGRID-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|radioRB_NOGRID">Adds or removes a text grid for lines or characters to the current page style.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="radioRB_LINESGRID"> - <property name="label" translatable="yes" context="textgridpage|radioRB_LINESGRID">Grid (lines only)</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">radioRB_NOGRID</property> - <child internal-child="accessible"> - <object class="AtkObject" id="radioRB_LINESGRID-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|radioRB_LINESGRID">Adds or removes a text grid for lines or characters to the current page 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="active">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="radioRB_NOGRID-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|radioRB_NOGRID">Adds or removes a text grid for lines or characters to the current page style.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="radioRB_CHARSGRID"> - <property name="label" translatable="yes" context="textgridpage|radioRB_CHARSGRID">Grid (lines and 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> - <property name="group">radioRB_NOGRID</property> - <child internal-child="accessible"> - <object class="AtkObject" id="radioRB_CHARSGRID-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|radioRB_CHARSGRID">Adds or removes a text grid for lines or characters to the current page style.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="radioRB_LINESGRID"> + <property name="label" translatable="yes" context="textgridpage|radioRB_LINESGRID">Grid (lines only)</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">radioRB_NOGRID</property> + <child internal-child="accessible"> + <object class="AtkObject" id="radioRB_LINESGRID-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|radioRB_LINESGRID">Adds or removes a text grid for lines or characters to the current page style.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="checkCB_SNAPTOCHARS"> - <property name="label" translatable="yes" context="textgridpage|checkCB_SNAPTOCHARS">_Snap to characters</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="margin-start">12</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="GtkRadioButton" id="radioRB_CHARSGRID"> + <property name="label" translatable="yes" context="textgridpage|radioRB_CHARSGRID">Grid (lines and 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> + <property name="group">radioRB_NOGRID</property> + <child internal-child="accessible"> + <object class="AtkObject" id="radioRB_CHARSGRID-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|radioRB_CHARSGRID">Adds or removes a text grid for lines or characters to the current page style.</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> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkDrawingArea" id="drawingareaWN_EXAMPLE"> + <object class="GtkCheckButton" id="checkCB_SNAPTOCHARS"> + <property name="label" translatable="yes" context="textgridpage|checkCB_SNAPTOCHARS">_Snap to characters</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="margin-start">12</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <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="GtkDrawingArea" id="drawingareaWN_EXAMPLE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -194,223 +188,96 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box4"> <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="box4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <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">18</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">18</property> + <property name="valign">start</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="row_homogeneous">True</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="labelFT_CHARSPERLINE"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="row_homogeneous">True</property> - <child> - <object class="GtkLabel" id="labelFT_CHARSPERLINE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="textgridpage|labelFT_CHARSPERLINE">Characters per line:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinNF_CHARSPERLINE</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinNF_CHARSPERLINE"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustmentCHARSPERLINE</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinNF_CHARSPERLINE-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|spinNF_CHARSPERLINE">Enter the maximum number of characters that you want on a line.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelFT_CHARRANGE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" context="textgridpage|labelFT_CHARRANGE">(1-45)</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelFT_LINESPERPAGE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="textgridpage|labelFT_LINESPERPAGE">Lines per page:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinNF_LINESPERPAGE</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinNF_LINESPERPAGE"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="input_purpose">digits</property> - <property name="adjustment">adjustmentLINESPERPAGE</property> - <property name="numeric">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinNF_LINESPERPAGE-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|spinNF_LINESPERPAGE">Enter the maximum number of lines that you want on a page.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelFT_LINERANGE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" context="textgridpage|labelFT_LINERANGE">(1-48)</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="textgridpage|labelFT_CHARSPERLINE">Characters per line:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinNF_CHARSPERLINE</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinNF_CHARSPERLINE"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustmentCHARSPERLINE</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinNF_CHARSPERLINE-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|spinNF_CHARSPERLINE">Enter the maximum number of characters that you want on a line.</property> </object> - <packing> - <property name="left_attach">2</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> + <child> + <object class="GtkLabel" id="labelFT_CHARRANGE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" context="textgridpage|labelFT_CHARRANGE">(1-45)</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelFT_LINESPERPAGE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="textgridpage|labelFT_LINESPERPAGE">Lines per page:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinNF_LINESPERPAGE</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="grid3"> + <object class="GtkSpinButton" id="spinNF_LINESPERPAGE"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkSpinButton" id="spinMF_CHARWIDTH"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentMetric2</property> - <property name="digits">2</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelFT_CHARWIDTH"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="textgridpage|labelFT_CHARWIDTH">Character _width:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinMF_CHARWIDTH</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelFT_RUBYSIZE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="textgridpage|labelFT_RUBYSIZE">Max. Ruby text size:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinMF_RUBYSIZE</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinMF_RUBYSIZE"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentMetric1</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinMF_RUBYSIZE-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|spinMF_RUBYSIZE">Enter the font size for the Ruby text.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelFT_TEXTSIZE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="textgridpage|labelFT_TEXTSIZE">Max. base text size:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinMF_TEXTSIZE</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinMF_TEXTSIZE"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentMetric</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinMF_TEXTSIZE-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|spinMF_TEXTSIZE">Enter the maximum base text size. A large value results in less characters per line.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="input_purpose">digits</property> + <property name="adjustment">adjustmentLINESPERPAGE</property> + <property name="numeric">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinNF_LINESPERPAGE-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|spinNF_LINESPERPAGE">Enter the maximum number of lines that you want on a page.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> @@ -418,37 +285,158 @@ <property name="top_attach">0</property> </packing> </child> + <child> + <object class="GtkLabel" id="labelFT_LINERANGE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" context="textgridpage|labelFT_LINERANGE">(1-48)</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </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> - <object class="GtkCheckButton" id="checkCB_RUBYBELOW"> - <property name="label" translatable="yes" context="textgridpage|checkCB_RUBYBELOW">Ruby text below/left from base text</property> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</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="checkCB_RUBYBELOW-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|checkCB_RUBYBELOW">Displays Ruby text to the left of or below the base text.</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkSpinButton" id="spinMF_CHARWIDTH"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentMetric2</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelFT_CHARWIDTH"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="textgridpage|labelFT_CHARWIDTH">Character _width:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinMF_CHARWIDTH</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelFT_RUBYSIZE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="textgridpage|labelFT_RUBYSIZE">Max. Ruby text size:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinMF_RUBYSIZE</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinMF_RUBYSIZE"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentMetric1</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinMF_RUBYSIZE-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|spinMF_RUBYSIZE">Enter the font size for the Ruby text.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelFT_TEXTSIZE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="textgridpage|labelFT_TEXTSIZE">Max. base text size:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinMF_TEXTSIZE</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinMF_TEXTSIZE"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentMetric</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinMF_TEXTSIZE-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|spinMF_TEXTSIZE">Enter the maximum base text size. A large value results in less characters per line.</property> + </object> + </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> + <property name="left_attach">1</property> + <property name="top_attach">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="GtkCheckButton" id="checkCB_RUBYBELOW"> + <property name="label" translatable="yes" context="textgridpage|checkCB_RUBYBELOW">Ruby text below/left from base text</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="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="checkCB_RUBYBELOW-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|checkCB_RUBYBELOW">Displays Ruby text to the left of or below the base text.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> </child> </object> </child> @@ -476,106 +464,100 @@ <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="GtkCheckButton" id="checkCB_DISPLAY"> + <property name="label" translatable="yes" context="textgridpage|checkCB_DISPLAY">Display grid</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="checkCB_DISPLAY"> - <property name="label" translatable="yes" context="textgridpage|checkCB_DISPLAY">Display grid</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="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="checkCB_DISPLAY-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|checkCB_DISPLAY">Specifies the printing and color options of the text grid.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkCB_PRINT"> - <property name="label" translatable="yes" context="textgridpage|checkCB_PRINT">Print grid</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="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="checkCB_PRINT-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|checkCB_PRINT">Specifies the printing and color options of the text grid.</property> - </object> - </child> + <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="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="checkCB_DISPLAY-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|checkCB_DISPLAY">Specifies the printing and color options of the text grid.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel" id="labelFT_COLOR"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="textgridpage|labelFT_COLOR">Grid color:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">listLB_COLOR</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="listLB_COLOR"> - <property name="label" translatable="no"></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="valign">center</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="listLB_COLOR-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|listLB_COLOR">Specifies the printing and color options of the text grid.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkCB_PRINT"> + <property name="label" translatable="yes" context="textgridpage|checkCB_PRINT">Print grid</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="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="checkCB_PRINT-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|checkCB_PRINT">Specifies the printing and color options of the text grid.</property> </object> - <packing> - <property name="left_attach">2</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="GtkLabel" id="labelFT_COLOR"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="textgridpage|labelFT_COLOR">Grid color:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">listLB_COLOR</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="listLB_COLOR"> + <property name="label" translatable="no"></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="valign">center</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child> <placeholder/> </child> - <child> - <placeholder/> + <child internal-child="accessible"> + <object class="AtkObject" id="listLB_COLOR-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textgridpage|extended_tip|listLB_COLOR">Specifies the printing and color options of the text grid.</property> + </object> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/tocstylespage.ui b/sw/uiconfig/swriter/ui/tocstylespage.ui index c82ffe562655..269bf26fd9d9 100644 --- a/sw/uiconfig/swriter/ui/tocstylespage.ui +++ b/sw/uiconfig/swriter/ui/tocstylespage.ui @@ -40,204 +40,196 @@ <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="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">18</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="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocstylespage|label1">_Levels</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">levels</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="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tocstylespage|label2">Paragraph _Styles</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">styles</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="GtkScrolledWindow"> + <property name="visible">True</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">18</property> + <property name="shadow_type">in</property> <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocstylespage|label1">_Levels</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">levels</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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tocstylespage|label2">Paragraph _Styles</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">styles</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="GtkScrolledWindow"> + <object class="GtkTreeView" id="levels"> <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="levels"> - <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="levels-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocstylespage|extended_tip|levels">Select the index level that you change the formatting of.</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="levels-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocstylespage|extended_tip|levels">Select the index level that you change the formatting of.</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">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="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="styles"> <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="styles"> - <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="styles-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocstylespage|extended_tip|styles">Select the paragraph style that you want to apply to the selected index level, and then click the Assign (<) button.</property> - </object> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="default"> - <property name="label" translatable="yes" context="tocstylespage|default">_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="valign">center</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="tocstylespage|extended_tip|default">Resets the formatting of the selected level to the "Default" paragraph style.</property> + <object class="AtkObject" id="styles-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocstylespage|extended_tip|styles">Select the paragraph style that you want to apply to the selected index level, and then click the Assign (<) button.</property> </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="edit"> - <property name="label" translatable="yes" context="tocstylespage|edit">_Edit</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="valign">center</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="tocstylespage|extended_tip|edit">Opens the Paragraph Style dialog, where you can modify the selected paragraph style.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="default"> + <property name="label" translatable="yes" context="tocstylespage|default">_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="valign">center</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="tocstylespage|extended_tip|default">Resets the formatting of the selected level to the "Default" paragraph style.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="assign"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - <property name="valign">start</property> - <property name="image">image1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="assign-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tocstylespage|extended_tip|assign">Formats the selected index level with the selected paragraph style.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="edit"> + <property name="label" translatable="yes" context="tocstylespage|edit">_Edit</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="valign">center</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="tocstylespage|extended_tip|edit">Opens the Paragraph Style dialog, where you can modify the selected paragraph style.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="assign"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="image">image1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="assign-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tocstylespage|extended_tip|assign">Formats the selected index level with the selected paragraph style.</property> + </object> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui b/sw/uiconfig/swriter/ui/viewoptionspage.ui index 8cb6fde80a39..88e63f7436b2 100644 --- a/sw/uiconfig/swriter/ui/viewoptionspage.ui +++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui @@ -31,37 +31,31 @@ <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="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="helplines"> + <property name="label" translatable="yes" context="viewoptionspage|helplines">Helplines _While Moving</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckButton" id="helplines"> - <property name="label" translatable="yes" context="viewoptionspage|helplines">Helplines _While Moving</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="helplines-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|helplines">Displays snap lines around the frames when frames are moved. You can select the Helplines While Moving option to show the exact position of the object using lineal values.</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="helplines-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|helplines">Displays snap lines around the frames when frames are moved. You can select the Helplines While Moving option to show the exact position of the object using lineal values.</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> @@ -89,113 +83,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="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="GtkCheckButton" id="graphics"> + <property name="label" translatable="yes" context="viewoptionspage|graphics">_Images and objects</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkCheckButton" id="graphics"> - <property name="label" translatable="yes" context="viewoptionspage|graphics">_Images and 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="graphics-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|graphics">Specifies whether to display images and objects on the screen.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="tables"> - <property name="label" translatable="yes" context="viewoptionspage|tables">_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="tables-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tables">Displays the tables contained in your 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="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="graphics-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|graphics">Specifies whether to display images and objects on the screen.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="drawings"> - <property name="label" translatable="yes" context="viewoptionspage|drawings">Dra_wings and controls</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="drawings-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|drawings">Displays the drawings and controls contained in your 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="tables"> + <property name="label" translatable="yes" context="viewoptionspage|tables">_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="tables-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tables">Displays the tables contained in your document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="comments"> - <property name="label" translatable="yes" context="viewoptionspage|comments">_Comments</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="comments-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|comments">Displays comments. Click a comment to edit the text. Use the context menu in Navigator to locate or delete a comment. Use the comments's context menu to delete this comment or all comments or all comments of this author.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="drawings"> + <property name="label" translatable="yes" context="viewoptionspage|drawings">Dra_wings and controls</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="drawings-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|drawings">Displays the drawings and controls contained in your document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="resolvedcomments"> - <property name="label" translatable="yes" context="viewoptionspage|resolvedcomments">_Resolved comments</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">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="comments"> + <property name="label" translatable="yes" context="viewoptionspage|comments">_Comments</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="comments-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|comments">Displays comments. Click a comment to edit the text. Use the context menu in Navigator to locate or delete a comment. Use the comments's context menu to delete this comment or all comments or all comments of this author.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="resolvedcomments"> + <property name="label" translatable="yes" context="viewoptionspage|resolvedcomments">_Resolved comments</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">4</property> + </packing> </child> </object> </child> @@ -223,59 +211,53 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="fieldsalignment"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid"> <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=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkCheckButton" id="hiddentextfield"> + <property name="label" translatable="yes" context="viewoptionspage|hiddentextfield">Hidden te_xt</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="hiddentextfield"> - <property name="label" translatable="yes" context="viewoptionspage|hiddentextfield">Hidden te_xt</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="hiddentextfield-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hiddentextfield">Displays text that is hidden by Conditional Text or Hidden Text fields.</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="hiddentextfield-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hiddentextfield">Displays text that is hidden by Conditional Text or Hidden Text fields.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="hiddenparafield"> - <property name="label" translatable="yes" context="viewoptionspage|hiddenparafield">Hidden p_aragraphs</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="hiddenparafield-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hiddenparafield">If you have inserted text using the Hidden Paragraph field, specifies whether to display the hidden paragraph.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="hiddenparafield"> + <property name="label" translatable="yes" context="viewoptionspage|hiddenparafield">Hidden p_aragraphs</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="hiddenparafield-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hiddenparafield">If you have inserted text using the Hidden Paragraph field, specifies whether to display the hidden paragraph.</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> @@ -303,54 +285,48 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="fieldsalignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid"> <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=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkCheckButton" id="changesinmargin"> + <property name="label" translatable="yes" context="viewoptionspage|changesinmargin">Tracked _deletions in margin</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="changesinmargin"> - <property name="label" translatable="yes" context="viewoptionspage|changesinmargin">Tracked _deletions in margin</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="changesinmargin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|changesinmargin">Displays text that is hidden by Conditional Text or Hidden Text fields.</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="changesinmargin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|changesinmargin">Displays text that is hidden by Conditional Text or Hidden Text fields.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="changestooltip"> - <property name="label" translatable="yes" context="viewoptionspage|changestooltip">_Tooltips on tracked 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="draw_indicator">True</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">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="changestooltip"> + <property name="label" translatable="yes" context="viewoptionspage|changestooltip">_Tooltips on tracked 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="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -391,20 +367,44 @@ <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="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> + <object class="GtkCheckButton" id="smoothscroll"> + <property name="label" translatable="yes" context="viewoptionspage|smoothscroll">S_mooth scroll</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="smoothscroll-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|smoothscroll">Activates the smooth page scrolling function. </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="grid6"> <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="smoothscroll"> - <property name="label" translatable="yes" context="viewoptionspage|smoothscroll">S_mooth scroll</property> + <object class="GtkCheckButton" id="vruler"> + <property name="label" translatable="yes" context="viewoptionspage|vruler">Verti_cal ruler</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -412,8 +412,8 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="smoothscroll-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|smoothscroll">Activates the smooth page scrolling function. </property> + <object class="AtkObject" id="vruler-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|vruler">Displays the vertical ruler. Select the desired measurement unit from the corresponding list.</property> </object> </child> </object> @@ -423,105 +423,71 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkComboBoxText" id="hrulercombobox"> <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="vruler"> - <property name="label" translatable="yes" context="viewoptionspage|vruler">Verti_cal ruler</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="vruler-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|vruler">Displays the vertical ruler. Select the desired measurement unit from the corresponding list.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="hrulercombobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="hrulercombobox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hrulercombobox">Displays the horizontal ruler. Select the desired measurement unit from the corresponding list.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="hrulercombobox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hrulercombobox">Displays the horizontal ruler. Select the desired measurement unit from the corresponding list.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="vrulercombobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="vrulercombobox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|vrulercombobox">Displays the vertical ruler. Select the desired measurement unit from the corresponding list.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="vrulercombobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="vrulercombobox-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|vrulercombobox">Displays the vertical ruler. Select the desired measurement unit from the corresponding list.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="vrulerright"> - <property name="label" translatable="yes" context="viewoptionspage|vrulerright">Right-aligned</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="vrulerright-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|vrulerright">Aligns the vertical ruler with the right border.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="vrulerright"> + <property name="label" translatable="yes" context="viewoptionspage|vrulerright">Right-aligned</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="vrulerright-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|vrulerright">Aligns the vertical ruler with the right border.</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="GtkLabel" id="hruler"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="viewoptionspage|hruler">Hori_zontal ruler</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">hrulercombobox</property> - <property name="ellipsize">end</property> - <child internal-child="accessible"> - <object class="AtkObject" id="hruler-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hruler">Displays the horizontal ruler. Select the desired measurement unit from the corresponding list.</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="GtkLabel" id="hruler"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="viewoptionspage|hruler">Hori_zontal ruler</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">hrulercombobox</property> + <property name="ellipsize">end</property> + <child internal-child="accessible"> + <object class="AtkObject" id="hruler-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hruler">Displays the horizontal ruler. Select the desired measurement unit from the corresponding list.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> @@ -530,6 +496,10 @@ </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -557,45 +527,39 @@ <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="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="grid5"> + <object class="GtkComboBoxText" id="measureunit"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkComboBoxText" id="measureunit"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="measureunit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|measureunit">Specifies the Unit for HTML documents.</property> - </object> - </child> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="measureunit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|measureunit">Specifies the Unit for HTML documents.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="measureunitlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="viewoptionspage|measureunitlabel">Measurement unit</property> - </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="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="measureunitlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="viewoptionspage|measureunitlabel">Measurement unit</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -623,49 +587,43 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="outlinealignment"> + <object class="GtkGrid"> <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="GtkGrid"> + <object class="GtkCheckButton" id="outlinecontentvisibilitybutton"> + <property name="label" translatable="yes" context="viewoptionspage|outlinecontentvisibilitybutton">_Show outline content visibility button</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="outlinecontentvisibilitybutton"> - <property name="label" translatable="yes" context="viewoptionspage|outlinecontentvisibilitybutton">_Show outline content visibility button</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> - <child> - <object class="GtkCheckButton" id="suboutlinelevelsascontent"> - <property name="label" translatable="yes" context="viewoptionspage|suboutlinelevelscontent">Include sub _levels</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin-start">12</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> + <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> + <child> + <object class="GtkCheckButton" id="suboutlinelevelsascontent"> + <property name="label" translatable="yes" context="viewoptionspage|suboutlinelevelscontent">Include sub _levels</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin-start">12</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> </object> </child> diff --git a/sw/uiconfig/swriter/ui/wrappage.ui b/sw/uiconfig/swriter/ui/wrappage.ui index 15086a436ad0..fdc1e5f5f573 100644 --- a/sw/uiconfig/swriter/ui/wrappage.ui +++ b/sw/uiconfig/swriter/ui/wrappage.ui @@ -38,43 +38,232 @@ <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="grid11"> <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="column_spacing">18</property> + <property name="row_homogeneous">True</property> + <property name="column_homogeneous">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkRadioButton" id="none"> + <property name="label" translatable="yes" context="wrappage|none">_Wrap Off</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="none-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|none">Places the object on a separate line in the document. The Text in the document appears above and below the object, but not on the sides of the object.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="before"> + <property name="label" translatable="yes" context="wrappage|before">Be_fore</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">none</property> + <child internal-child="accessible"> + <object class="AtkObject" id="before-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|before">Wraps text on the left side of the object if there is enough space.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="after"> + <property name="label" translatable="yes" context="wrappage|after">Aft_er</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">none</property> + <child internal-child="accessible"> + <object class="AtkObject" id="after-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|after">Wraps text on the right side of the object if there is enough space.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="parallel"> + <property name="label" translatable="yes" context="wrappage|parallel">_Parallel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">none</property> + <child internal-child="accessible"> + <object class="AtkObject" id="parallel-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|parallel">Wraps text on all four sides of the border frame of the object.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="through"> + <property name="label" translatable="yes" context="wrappage|through">Thro_ugh</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">none</property> + <child internal-child="accessible"> + <object class="AtkObject" id="through-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|through">Places the object in front of the text.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="optimal"> + <property name="label" translatable="yes" context="wrappage|optimal">_Optimal</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">none</property> + <child internal-child="accessible"> + <object class="AtkObject" id="optimal-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|optimal">Automatically wraps text to the left, to the right, or on all four sides of the border frame of the object. If the distance between the object and the page margin is less than 2 cm, the text is not wrapped.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</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="wrappage|label1">Settings</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> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> + <child> + <object class="GtkFrame" id="backgroundgradientframe1"> + <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> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid11"> + <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">12</property> - <property name="column_spacing">18</property> - <property name="row_homogeneous">True</property> - <property name="column_homogeneous">True</property> + <property name="vexpand">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> - <object class="GtkRadioButton" id="none"> - <property name="label" translatable="yes" context="wrappage|none">_Wrap Off</property> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="wrappage|label4">L_eft:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">left</property> <property name="xalign">0</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="none-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|none">Places the object on a separate line in the document. The Text in the document appears above and below the object, but not on the sides of the object.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> @@ -82,322 +271,118 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="before"> - <property name="label" translatable="yes" context="wrappage|before">Be_fore</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="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="wrappage|label5">_Right:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">right</property> <property name="xalign">0</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">none</property> - <child internal-child="accessible"> - <object class="AtkObject" id="before-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|before">Wraps text on the left side of the object if there is enough space.</property> - </object> - </child> </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="GtkRadioButton" id="after"> - <property name="label" translatable="yes" context="wrappage|after">Aft_er</property> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="wrappage|label6">_Top:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">top</property> <property name="xalign">0</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">none</property> - <child internal-child="accessible"> - <object class="AtkObject" id="after-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|after">Wraps text on the right side of the object if there is enough space.</property> - </object> - </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkRadioButton" id="parallel"> - <property name="label" translatable="yes" context="wrappage|parallel">_Parallel</property> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="wrappage|label7">_Bottom:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">bottom</property> <property name="xalign">0</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">none</property> - <child internal-child="accessible"> - <object class="AtkObject" id="parallel-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|parallel">Wraps text on all four sides of the border frame of the object.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkRadioButton" id="through"> - <property name="label" translatable="yes" context="wrappage|through">Thro_ugh</property> + <object class="GtkSpinButton" id="left"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">none</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="through-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|through">Places the object in front of the text.</property> + <object class="AtkObject" id="left-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|left">Enter the amount of space that you want between the left edge of the object and the text.</property> </object> </child> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkRadioButton" id="optimal"> - <property name="label" translatable="yes" context="wrappage|optimal">_Optimal</property> + <object class="GtkSpinButton" id="right"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">none</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="optimal-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|optimal">Automatically wraps text to the left, to the right, or on all four sides of the border frame of the object. If the distance between the object and the page margin is less than 2 cm, the text is not wrapped.</property> + <object class="AtkObject" id="right-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|right">Enter the amount of space that you want between the right edge of the object and the text.</property> </object> </child> </object> <packing> - <property name="left_attach">2</property> + <property name="left_attach">1</property> <property name="top_attach">1</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="wrappage|label1">Settings</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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="vexpand">True</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkFrame" id="backgroundgradientframe1"> - <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="GtkAlignment" id="alignment1"> - <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> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkSpinButton" id="top"> <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="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="wrappage|label4">L_eft:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">left</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="wrappage|label5">_Right:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">right</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="label" translatable="yes" context="wrappage|label6">_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">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="wrappage|label7">_Bottom:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">bottom</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="left"> - <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="left-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|left">Enter the amount of space that you want between the left edge of the object and the text.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="right"> - <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="wrappage|extended_tip|right">Enter the amount of space that you want between the right edge of the object and the text.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</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="adjustment">adjustment3</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="top-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|top">Enter the amount of space that you want between the top edge of the object and the text.</property> - </object> - </child> + <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="top-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|top">Enter the amount of space that you want between the top edge of the object and the text.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="bottom"> - <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="bottom-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|bottom">Enter the amount of space that you want between the bottom edge of the object and the text.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="bottom"> + <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="bottom-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|bottom">Enter the amount of space that you want between the bottom edge of the object and the text.</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> @@ -426,117 +411,109 @@ <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="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="grid3"> + <object class="GtkCheckButton" id="anchoronly"> + <property name="label" translatable="yes" context="wrappage|anchoronly">_First paragraph</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">6</property> - <child> - <object class="GtkCheckButton" id="anchoronly"> - <property name="label" translatable="yes" context="wrappage|anchoronly">_First paragraph</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="anchoronly-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|anchoronly">Starts a new paragraph below the object after you press Enter.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="transparent"> - <property name="label" translatable="yes" context="wrappage|transparent">In bac_kground</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="transparent-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|transparent">Moves the selected object to the background. This option is only available if you selected the Through wrap type.</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="anchoronly-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|anchoronly">Starts a new paragraph below the object after you press Enter.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="outline"> - <property name="label" translatable="yes" context="wrappage|outline">_Contour</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="outline-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|outline">Wraps text around the shape of the object. This option is not available for the Through wrap type, or for frames.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="transparent"> + <property name="label" translatable="yes" context="wrappage|transparent">In bac_kground</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="transparent-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|transparent">Moves the selected object to the background. This option is only available if you selected the Through wrap type.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="outside"> - <property name="label" translatable="yes" context="wrappage|outside">Outside only</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="outside-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|outside">Wraps text only around the contour of the object, but not in open areas within the object shape.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="outline"> + <property name="label" translatable="yes" context="wrappage|outline">_Contour</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="outline-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|outline">Wraps text around the shape of the object. This option is not available for the Through wrap type, or for frames.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="allowoverlap"> - <property name="label" translatable="yes" context="wrappage|outside">Allow overlap</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">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="outside"> + <property name="label" translatable="yes" context="wrappage|outside">Outside only</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="outside-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="wrappage|extended_tip|outside">Wraps text only around the contour of the object, but not in open areas within the object shape.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="allowoverlap"> + <property name="label" translatable="yes" context="wrappage|outside">Allow overlap</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">4</property> + </packing> </child> </object> </child> |