diff options
83 files changed, 12792 insertions, 13882 deletions
diff --git a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui index 2a52c2e9416b..8351946b9abc 100644 --- a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui +++ b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui @@ -97,74 +97,66 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkButton" id="rbfilterarea"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="column_spacing">12</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <child> - <object class="GtkButton" id="rbfilterarea"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="rbfilterarea-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="advancedfilterdialog|extended_tip|rbfilterarea">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="rbfilterarea-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="advancedfilterdialog|extended_tip|rbfilterarea">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="lbfilterarea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="lbfilterarea-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="advancedfilterdialog|extended_tip|lbfilterarea">Select the named range, or enter the cell range that contains the filter criteria that you want to use.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="lbfilterarea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="lbfilterarea-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="advancedfilterdialog|extended_tip|lbfilterarea">Select the named range, or enter the cell range that contains the filter criteria that you want to use.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkEntry" id="edfilterarea"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - <child internal-child="accessible"> - <object class="AtkObject" id="edfilterarea-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="advancedfilterdialog|extended_tip|edfilterarea">Select the named range, or enter the cell range that contains the filter criteria that you want to use.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="edfilterarea"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + <child internal-child="accessible"> + <object class="AtkObject" id="edfilterarea-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="advancedfilterdialog|extended_tip|edfilterarea">Select the named range, or enter the cell range that contains the filter criteria that you want to use.</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/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui index a648d4e39f0c..cc33060def10 100644 --- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui +++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui @@ -87,99 +87,93 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="input-range-label"> <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="input-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="analysisofvariancedialog|input-range-label">Input range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">input-range-edit</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="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="analysisofvariancedialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="input-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="input-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="analysisofvariancedialog|input-range-label">Input range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">input-range-edit</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="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="analysisofvariancedialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="input-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="input-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -207,53 +201,47 @@ <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="grid8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkRadioButton" id="radio-single-factor"> + <property name="label" translatable="yes" context="analysisofvariancedialog|radio-single-factor">Single factor</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="GtkRadioButton" id="radio-single-factor"> - <property name="label" translatable="yes" context="analysisofvariancedialog|radio-single-factor">Single factor</property> - <property name="visible">True</property> - <property 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="radio-two-factor"> - <property name="label" translatable="yes" context="analysisofvariancedialog|radio-two-factor">Two factor</property> - <property name="visible">True</property> - <property name="can_focus">True</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">radio-single-factor</property> - </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">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="radio-two-factor"> + <property name="label" translatable="yes" context="analysisofvariancedialog|radio-two-factor">Two factor</property> + <property name="visible">True</property> + <property name="can_focus">True</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">radio-single-factor</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -281,54 +269,48 @@ <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="grid7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="analysisofvariancedialog|groupedby-columns-radio">Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="analysisofvariancedialog|groupedby-columns-radio">Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="analysisofvariancedialog|groupedby-rows-radio">Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="yalign">0.5600000023841858</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="analysisofvariancedialog|groupedby-rows-radio">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5600000023841858</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -356,77 +338,71 @@ <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="grid6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> + <child> + <object class="GtkLabel" id="alpha-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="analysisofvariancedialog|alpha-label">Alpha:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">alpha-spin</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="grid6"> + <object class="GtkSpinButton" id="alpha-spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text" translatable="yes" context="analysisofvariancedialog|alpha-spin">0,05</property> + <property name="adjustment">alpha-adjustment</property> + <property name="digits">2</property> + <property name="value">0.05</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="rows-per-sample-label"> <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="alpha-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="analysisofvariancedialog|alpha-label">Alpha:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">alpha-spin</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="alpha-spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text" translatable="yes" context="analysisofvariancedialog|alpha-spin">0,05</property> - <property name="adjustment">alpha-adjustment</property> - <property name="digits">2</property> - <property name="value">0.05</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="rows-per-sample-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="analysisofvariancedialog|rows-per-sample-label">Rows per sample:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">rows-per-sample-spin</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="rows-per-sample-spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text">1</property> - <property name="value">1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="analysisofvariancedialog|rows-per-sample-label">Rows per sample:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">rows-per-sample-spin</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="rows-per-sample-spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text">1</property> + <property name="value">1</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/autoformattable.ui b/sc/uiconfig/scalc/ui/autoformattable.ui index f2823ddb7308..0bb5a0f22b16 100644 --- a/sc/uiconfig/scalc/ui/autoformattable.ui +++ b/sc/uiconfig/scalc/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">Choose a predefined AutoFormat to apply to a selected area in your sheet.</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">Choose a predefined AutoFormat to apply to a selected area in your sheet.</property> + </object> + </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> @@ -191,76 +181,80 @@ <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">Allows you to add the current formatting of a range of at least 4 x 4 cells to the list of predefined AutoFormats.</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">Allows you to add the current formatting of a range of at least 4 x 4 cells to the list of predefined AutoFormats.</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> - </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> - <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> - <child internal-child="accessible"> - <object class="AtkObject" id="rename-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|rename">Opens a dialog where you can change the name of the selected AutoFormat.</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="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> + <child internal-child="accessible"> + <object class="AtkObject" id="rename-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|rename">Opens a dialog where you can change the name of the selected AutoFormat.</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">2</property> </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -288,139 +282,133 @@ <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">When marked, specifies that you want to retain the number format of the selected format.</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">When marked, specifies that you want to retain the number format of the selected format.</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">When marked, specifies that you want to retain the border of the selected format.</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">When marked, specifies that you want to retain the border of the selected format.</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">When marked, specifies that you want to retain the font of the selected 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="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">When marked, specifies that you want to retain the font of the selected format.</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">When marked, specifies that you want to retain the pattern of the selected format.</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">When marked, specifies that you want to retain the pattern of the selected format.</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">When marked, specifies that you want to retain the alignment of the selected format.</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">When marked, specifies that you want to retain the alignment of the selected format.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="autofitcb"> - <property name="label" translatable="yes" context="autoformattable|autofitcb">A_utoFit width and height</property> - <property name="visible">True</property> - <property name="can_focus">True</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="autofitcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|autofitcb">When marked, specifies that you want to retain the width and height of the selected cells of the selected format.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="autofitcb"> + <property name="label" translatable="yes" context="autoformattable|autofitcb">A_utoFit width and height</property> + <property name="visible">True</property> + <property name="can_focus">True</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="autofitcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="autoformattable|extended_tip|autofitcb">When marked, specifies that you want to retain the width and height of the selected cells of the selected format.</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> diff --git a/sc/uiconfig/scalc/ui/cellprotectionpage.ui b/sc/uiconfig/scalc/ui/cellprotectionpage.ui index e131bfe393be..a5c368b6dd7c 100644 --- a/sc/uiconfig/scalc/ui/cellprotectionpage.ui +++ b/sc/uiconfig/scalc/ui/cellprotectionpage.ui @@ -18,107 +18,100 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="protection1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkCheckButton" id="checkProtected"> + <property name="label" translatable="yes" context="cellprotectionpage|checkProtected">_Protected</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="checkProtected"> - <property name="label" translatable="yes" context="cellprotectionpage|checkProtected">_Protected</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="inconsistent">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="checkProtected-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cellprotectionpage|extended_tip|checkProtected">Prevents the selected cells from being modified.</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="active">True</property> + <property name="inconsistent">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="checkProtected-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cellprotectionpage|extended_tip|checkProtected">Prevents the selected cells from being modified.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="checkHideFormula"> - <property name="label" translatable="yes" context="cellprotectionpage|checkHideFormula">Hide _formula</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> - <child internal-child="accessible"> - <object class="AtkObject" id="checkHideFormula-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cellprotectionpage|extended_tip|checkHideFormula">Hides formulas in the selected cells.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkHideFormula"> + <property name="label" translatable="yes" context="cellprotectionpage|checkHideFormula">Hide _formula</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> + <child internal-child="accessible"> + <object class="AtkObject" id="checkHideFormula-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cellprotectionpage|extended_tip|checkHideFormula">Hides formulas in the selected cells.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="checkHideAll"> - <property name="label" translatable="yes" context="cellprotectionpage|checkHideAll">Hide _all</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> - <property name="inconsistent">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="checkHideAll-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cellprotectionpage|extended_tip|checkHideAll">Hides formulas and contents of the selected cells.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkHideAll"> + <property name="label" translatable="yes" context="cellprotectionpage|checkHideAll">Hide _all</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="inconsistent">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="checkHideAll-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cellprotectionpage|extended_tip|checkHideAll">Hides formulas and contents of the selected cells.</property> </object> - <packing> - <property name="left_attach">0</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="halign">end</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="cellprotectionpage|label1">Cell protection is only effective after the current sheet has been protected. + </object> + <packing> + <property name="left_attach">0</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="halign">end</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="cellprotectionpage|label1">Cell protection is only effective after the current sheet has been protected. Select 'Protect Sheet' from the 'Tools' menu.</property> - <property name="wrap">True</property> - <property name="max_width_chars">52</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="height">3</property> - </packing> - </child> + <property name="wrap">True</property> + <property name="max_width_chars">52</property> + <property name="xalign">0</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="height">3</property> + </packing> </child> </object> </child> @@ -147,55 +140,49 @@ Select 'Protect Sheet' from the 'Tools' menu.</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="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="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="checkHidePrinting"> + <property name="label" translatable="yes" context="cellprotectionpage|checkHidePrinting">Hide _when printing</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="checkHidePrinting"> - <property name="label" translatable="yes" context="cellprotectionpage|checkHidePrinting">Hide _when printing</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</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="checkHidePrinting-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="cellprotectionpage|extended_tip|checkHidePrinting">Keeps the selected cells from being printed.</property> - </object> - </child> - </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="halign">end</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="cellprotectionpage|label4">The cells selected will be omitted when printing.</property> - <property name="wrap">True</property> - <property name="width_chars">52</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="receives_default">False</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="checkHidePrinting-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="cellprotectionpage|extended_tip|checkHidePrinting">Keeps the selected cells from being printed.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="cellprotectionpage|label4">The cells selected will be omitted when printing.</property> + <property name="wrap">True</property> + <property name="width_chars">52</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/changesourcedialog.ui b/sc/uiconfig/scalc/ui/changesourcedialog.ui index 4cc08af50231..5961395fb7d4 100644 --- a/sc/uiconfig/scalc/ui/changesourcedialog.ui +++ b/sc/uiconfig/scalc/ui/changesourcedialog.ui @@ -83,48 +83,42 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkCheckButton" id="col"> + <property name="label" translatable="yes" context="changesourcedialog|col">First _column as label</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkCheckButton" id="col"> - <property name="label" translatable="yes" context="changesourcedialog|col">First _column as label</property> - <property name="visible">True</property> - <property name="can_focus">True</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="row"> - <property name="label" translatable="yes" context="changesourcedialog|row">First _row as label</property> - <property name="visible">True</property> - <property name="can_focus">True</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="row"> + <property name="label" translatable="yes" context="changesourcedialog|row">First _row as label</property> + <property name="visible">True</property> + <property name="can_focus">True</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/sc/uiconfig/scalc/ui/chisquaretestdialog.ui b/sc/uiconfig/scalc/ui/chisquaretestdialog.ui index d9e7659ec060..99c7210931c4 100644 --- a/sc/uiconfig/scalc/ui/chisquaretestdialog.ui +++ b/sc/uiconfig/scalc/ui/chisquaretestdialog.ui @@ -80,99 +80,93 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="input-range-label"> <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="input-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="chisquaretestdialog|input-range-label">Input range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="input-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="chisquaretestdialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="chisquaretestdialog|input-range-label">Input range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="input-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="chisquaretestdialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -200,53 +194,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="chisquaretestdialog|groupedby-columns-radio">_Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="chisquaretestdialog|groupedby-columns-radio">_Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="chisquaretestdialog|groupedby-rows-radio">_Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="chisquaretestdialog|groupedby-rows-radio">_Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/colorrowdialog.ui b/sc/uiconfig/scalc/ui/colorrowdialog.ui index 18ff8f7c31bd..0210cede39db 100644 --- a/sc/uiconfig/scalc/ui/colorrowdialog.ui +++ b/sc/uiconfig/scalc/ui/colorrowdialog.ui @@ -81,62 +81,56 @@ <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="GtkRadioButton" id="columns"> + <property name="label" translatable="yes" context="colorrowdialog|columns">_Columns</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="columns"> - <property name="label" translatable="yes" context="colorrowdialog|columns">_Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="columns-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|columns">Select the Columns option to summarize the contents of the selected columns in a list.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="columns-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|columns">Select the Columns option to summarize the contents of the selected columns in a list.</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="rows"> - <property name="label" translatable="yes" context="colorrowdialog|rows">_Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">columns</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rows-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rows">Select the Rows option to summarize the contents of the selected rows in a 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="GtkRadioButton" id="rows"> + <property name="label" translatable="yes" context="colorrowdialog|rows">_Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">columns</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rows-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rows">Select the Rows option to summarize the contents of the selected rows in a list.</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/sc/uiconfig/scalc/ui/condformatmanager.ui b/sc/uiconfig/scalc/ui/condformatmanager.ui index 56bfb7ec834e..ae4f40497c7c 100644 --- a/sc/uiconfig/scalc/ui/condformatmanager.ui +++ b/sc/uiconfig/scalc/ui/condformatmanager.ui @@ -94,71 +94,91 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="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="receives_default">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> <child> - <object class="GtkTreeView" id="CONTAINER"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">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="condformatmanager|STR_HEADER_RANGE">Range</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="title" translatable="yes" context="condformatmanager|STR_HEADER_RANGE">Range</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="condformatmanager|STR_HEADER_FIRST_CONDITION">First Condition</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="title" translatable="yes" context="condformatmanager|STR_HEADER_FIRST_CONDITION">First Condition</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="CONTAINER-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="condformatmanager|extended_tip|CONTAINER">The Conditional Formats list displays the active conditional formatting rules set in the current spreadsheet.</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="CONTAINER-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="condformatmanager|extended_tip|CONTAINER">The Conditional Formats list displays the active conditional formatting rules set in the current spreadsheet.</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="add"> + <property name="label" translatable="yes" context="condformatmanager|add">Add</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="add-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="condformatmanager|extended_tip|add">Here you can add, edit or remove one or several conditional formattings.</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -167,73 +187,47 @@ </packing> </child> <child> - <object class="GtkButtonBox" id="buttonbox2"> + <object class="GtkButton" id="edit"> + <property name="label" translatable="yes" context="condformatmanager|edit">Edit...</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="add"> - <property name="label" translatable="yes" context="condformatmanager|add">Add</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="add-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="condformatmanager|extended_tip|add">Here you can add, edit or remove one or several conditional formattings.</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="edit"> - <property name="label" translatable="yes" context="condformatmanager|edit">Edit...</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="edit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="condformatmanager|extended_tip|edit">Here you can add, edit or remove one or several conditional formattings.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="edit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="condformatmanager|extended_tip|edit">Here you can add, edit or remove one or several conditional formattings.</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="remove"> - <property name="label" translatable="yes" context="condformatmanager|remove">Remove</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="remove-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="condformatmanager|extended_tip|remove">Here you can add, edit or remove one or several conditional formattings.</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="remove"> + <property name="label" translatable="yes" context="condformatmanager|remove">Remove</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="remove-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="condformatmanager|extended_tip|remove">Here you can add, edit or remove one or several conditional formattings.</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">1</property> + <property name="position">2</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/sc/uiconfig/scalc/ui/conditionalformatdialog.ui b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui index c8b941009c34..f8c4e7e9594d 100644 --- a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui +++ b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui @@ -93,80 +93,99 @@ <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="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_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> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkScrolledWindow" id="listwindow"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="listwindow"> + <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="shadow_type">in</property> + <property name="can_focus">False</property> <child> - <object class="GtkViewport"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="list"> <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> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="list"> - <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> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="list-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|list">List of the conditions defined for the cell range in order of evaluation.</property> - </object> - </child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="list-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|list">List of the conditions defined for the cell range in order of evaluation.</property> </object> </child> </object> </child> </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</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">True</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="conditionalformatdialog|extended_tip|add">Here you can add, edit or remove one or several conditional formattings.</property> + </object> + </child> + </object> <packing> <property name="expand">False</property> <property name="fill">True</property> @@ -174,95 +193,68 @@ </packing> </child> <child> - <object class="GtkButtonBox" id="buttonbox1"> + <object class="GtkButton" id="delete"> + <property name="label">gtk-delete</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</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">True</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="conditionalformatdialog|extended_tip|add">Here you can add, edit or remove one or several conditional formattings.</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="delete"> - <property name="label">gtk-delete</property> - <property name="visible">True</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="delete-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|delete">Deletes the selected element or elements without requiring confirmation.</property> - </object> - </child> + <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="delete-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|delete">Deletes the selected element or elements without requiring confirmation.</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="up"> - <property name="label">gtk-go-up</property> - <property name="visible">True</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="up-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|up">Increase priority of the selected condition.</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="up"> + <property name="label">gtk-go-up</property> + <property name="visible">True</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="up-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|up">Increase priority of the selected condition.</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="down"> - <property name="label">gtk-go-down</property> - <property name="visible">True</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="down-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|down">Decrease priority of the selected condition.</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="down"> + <property name="label">gtk-go-down</property> + <property name="visible">True</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="down-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|down">Decrease priority of the selected condition.</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">1</property> + <property name="position">3</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -290,66 +282,60 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkLabel" id="ftassign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="ftassign"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="label" translatable="yes" context="conditionalformatdialog|ftassign">Range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">edassign</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edassign"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="rbassign"> - <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="rbassign-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|rbassign">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + <property name="valign">center</property> + <property name="label" translatable="yes" context="conditionalformatdialog|ftassign">Range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">edassign</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="edassign"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="rbassign"> + <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="rbassign-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|rbassign">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</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">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/consolidatedialog.ui b/sc/uiconfig/scalc/ui/consolidatedialog.ui index b889ceaeeb4c..f598dcbc1642 100644 --- a/sc/uiconfig/scalc/ui/consolidatedialog.ui +++ b/sc/uiconfig/scalc/ui/consolidatedialog.ui @@ -466,64 +466,56 @@ <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="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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkCheckButton" id="byrow"> + <property name="label" translatable="yes" context="consolidatedialog|byrow">_Row labels</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> - <child> - <object class="GtkCheckButton" id="byrow"> - <property name="label" translatable="yes" context="consolidatedialog|byrow">_Row labels</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="byrow-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="consolidatedialog|extended_tip|byrow">Uses the row labels to arrange the consolidated data.</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="byrow-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="consolidatedialog|extended_tip|byrow">Uses the row labels to arrange the consolidated data.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="bycol"> - <property name="label" translatable="yes" context="consolidatedialog|bycol">C_olumn labels</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="bycol-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="consolidatedialog|extended_tip|bycol">Uses the column labels to arrange the consolidated data.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="bycol"> + <property name="label" translatable="yes" context="consolidatedialog|bycol">C_olumn labels</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="bycol-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="consolidatedialog|extended_tip|bycol">Uses the column labels to arrange the consolidated data.</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> @@ -553,29 +545,23 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="can_focus">False</property> + <object class="GtkCheckButton" id="refs"> + <property name="label" translatable="yes" context="consolidatedialog|refs">_Link to source data</property> <property name="valign">start</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkCheckButton" id="refs"> - <property name="label" translatable="yes" context="consolidatedialog|refs">_Link to source data</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="refs-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="consolidatedialog|extended_tip|refs">Links the data in the consolidation range to the source data, and automatically updates the results of the consolidation when the source data is changed.</property> - </object> - </child> + <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="margin-start">12</property> + <property name="margin-top">6</property> + <child internal-child="accessible"> + <object class="AtkObject" id="refs-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="consolidatedialog|extended_tip|refs">Links the data in the consolidation range to the source data, and automatically updates the results of the consolidation when the source data is changed.</property> </object> </child> </object> diff --git a/sc/uiconfig/scalc/ui/correlationdialog.ui b/sc/uiconfig/scalc/ui/correlationdialog.ui index 8caa22e0d772..a3be66a1327e 100644 --- a/sc/uiconfig/scalc/ui/correlationdialog.ui +++ b/sc/uiconfig/scalc/ui/correlationdialog.ui @@ -80,98 +80,92 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-end">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="input-range-label"> <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="input-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="correlationdialog|input-range-label">Input range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">input-range-edit</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="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="correlationdialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="input-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="input-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="correlationdialog|input-range-label">Input range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">input-range-edit</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="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="correlationdialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="input-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="input-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -199,53 +193,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-end">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="correlationdialog|groupedby-columns-radio">Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="correlationdialog|groupedby-columns-radio">Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="correlationdialog|groupedby-rows-radio">Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="correlationdialog|groupedby-rows-radio">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui b/sc/uiconfig/scalc/ui/covariancedialog.ui index 21f86f37be05..df579475da0a 100644 --- a/sc/uiconfig/scalc/ui/covariancedialog.ui +++ b/sc/uiconfig/scalc/ui/covariancedialog.ui @@ -80,98 +80,92 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="input-range-label"> <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="input-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="covariancedialog|input-range-label">Input range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="input-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="covariancedialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="covariancedialog|input-range-label">Input range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="input-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="covariancedialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -199,53 +193,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="covariancedialog|groupedby-columns-radio">Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="covariancedialog|groupedby-columns-radio">Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="covariancedialog|groupedby-rows-radio">Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="covariancedialog|groupedby-rows-radio">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/createnamesdialog.ui b/sc/uiconfig/scalc/ui/createnamesdialog.ui index 647390b348b8..28bf3ba6e592 100644 --- a/sc/uiconfig/scalc/ui/createnamesdialog.ui +++ b/sc/uiconfig/scalc/ui/createnamesdialog.ui @@ -83,104 +83,98 @@ <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="GtkCheckButton" id="top"> + <property name="label" translatable="yes" context="createnamesdialog|top">_Top row</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="top"> - <property name="label" translatable="yes" context="createnamesdialog|top">_Top row</property> - <property name="visible">True</property> - <property name="can_focus">True</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="top-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="createnamesdialog|extended_tip|top">Creates the range names from the header row of the selected range.</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="top-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="createnamesdialog|extended_tip|top">Creates the range names from the header row of the selected range.</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="left"> - <property name="label" translatable="yes" context="createnamesdialog|left">_Left column</property> - <property name="visible">True</property> - <property name="can_focus">True</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="left-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="createnamesdialog|extended_tip|left">Creates the range names from the entries in the first column of the selected sheet range.</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="left"> + <property name="label" translatable="yes" context="createnamesdialog|left">_Left column</property> + <property name="visible">True</property> + <property name="can_focus">True</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="left-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="createnamesdialog|extended_tip|left">Creates the range names from the entries in the first column of the selected sheet range.</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="bottom"> - <property name="label" translatable="yes" context="createnamesdialog|bottom">_Bottom row</property> - <property name="visible">True</property> - <property 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.49000000953674316</property> - <property name="image_position">right</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="bottom-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="createnamesdialog|extended_tip|bottom">Creates the range names from the entries in the last row of the selected sheet range.</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="bottom"> + <property name="label" translatable="yes" context="createnamesdialog|bottom">_Bottom row</property> + <property name="visible">True</property> + <property 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.49000000953674316</property> + <property name="image_position">right</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="bottom-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="createnamesdialog|extended_tip|bottom">Creates the range names from the entries in the last row of the selected sheet range.</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="right"> - <property name="label" translatable="yes" context="createnamesdialog|right">_Right column</property> - <property name="visible">True</property> - <property name="can_focus">True</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="right-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="createnamesdialog|extended_tip|right">Creates the range names from the entries in the last column of the selected sheet range.</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="GtkCheckButton" id="right"> + <property name="label" translatable="yes" context="createnamesdialog|right">_Right column</property> + <property name="visible">True</property> + <property name="can_focus">True</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="right-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="createnamesdialog|extended_tip|right">Creates the range names from the entries in the last column of the selected sheet range.</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/sc/uiconfig/scalc/ui/dapiservicedialog.ui b/sc/uiconfig/scalc/ui/dapiservicedialog.ui index 75f9565f2ab0..71ca577e770b 100644 --- a/sc/uiconfig/scalc/ui/dapiservicedialog.ui +++ b/sc/uiconfig/scalc/ui/dapiservicedialog.ui @@ -86,152 +86,144 @@ <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">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="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="dapiservicedialog|label2">_Service</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="halign">start</property> + <property name="label" translatable="yes" context="dapiservicedialog|label3">So_urce</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="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="dapiservicedialog|label4">_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">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="dapiservicedialog|label5">Us_er</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="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="dapiservicedialog|label6">_Password</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="GtkEntry" id="password"> + <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">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="user"> + <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">3</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> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="source"> + <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">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="service"> <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="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="dapiservicedialog|label2">_Service</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="halign">start</property> - <property name="label" translatable="yes" context="dapiservicedialog|label3">So_urce</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="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="dapiservicedialog|label4">_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">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="dapiservicedialog|label5">Us_er</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="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="dapiservicedialog|label6">_Password</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="GtkEntry" id="password"> - <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">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="user"> - <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">3</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> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="source"> - <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">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="service"> - <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> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/databaroptions.ui b/sc/uiconfig/scalc/ui/databaroptions.ui index 798d9b58a4e6..b32aafaf434e 100644 --- a/sc/uiconfig/scalc/ui/databaroptions.ui +++ b/sc/uiconfig/scalc/ui/databaroptions.ui @@ -73,111 +73,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="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="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="databaroptions|label4">Minimum:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">min</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="halign">end</property> + <property name="label" translatable="yes" context="databaroptions|label5">Maximum:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">max</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="min"> <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="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="databaroptions|label4">Minimum:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">min</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="halign">end</property> - <property name="label" translatable="yes" context="databaroptions|label5">Maximum:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">max</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="min"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="databaroptions|min">Automatic</item> - <item translatable="yes" context="databaroptions|min">Minimum</item> - <item translatable="yes" context="databaroptions|min">Maximum</item> - <item translatable="yes" context="databaroptions|min">Percentile</item> - <item translatable="yes" context="databaroptions|min">Value</item> - <item translatable="yes" context="databaroptions|min">Percent</item> - <item translatable="yes" context="databaroptions|min">Formula</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="max"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="databaroptions|max">Automatic</item> - <item translatable="yes" context="databaroptions|max">Minimum</item> - <item translatable="yes" context="databaroptions|max">Maximum</item> - <item translatable="yes" context="databaroptions|max">Percentile</item> - <item translatable="yes" context="databaroptions|max">Value</item> - <item translatable="yes" context="databaroptions|max">Percent</item> - <item translatable="yes" context="databaroptions|max">Formula</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="min_value"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="max_value"> - <property name="visible">True</property> - <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> + <items> + <item translatable="yes" context="databaroptions|min">Automatic</item> + <item translatable="yes" context="databaroptions|min">Minimum</item> + <item translatable="yes" context="databaroptions|min">Maximum</item> + <item translatable="yes" context="databaroptions|min">Percentile</item> + <item translatable="yes" context="databaroptions|min">Value</item> + <item translatable="yes" context="databaroptions|min">Percent</item> + <item translatable="yes" context="databaroptions|min">Formula</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="max"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="databaroptions|max">Automatic</item> + <item translatable="yes" context="databaroptions|max">Minimum</item> + <item translatable="yes" context="databaroptions|max">Maximum</item> + <item translatable="yes" context="databaroptions|max">Percentile</item> + <item translatable="yes" context="databaroptions|max">Value</item> + <item translatable="yes" context="databaroptions|max">Percent</item> + <item translatable="yes" context="databaroptions|max">Formula</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="min_value"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="max_value"> + <property name="visible">True</property> + <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> </object> </child> @@ -205,105 +199,99 @@ <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="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> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="databaroptions|label6">Positive:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">positive_colour</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="databaroptions|label7">Negative:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">negative_colour</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="positive_colour"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> + </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="grid2"> + <object class="GtkMenuButton" id="negative_colour"> <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="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="databaroptions|label6">Positive:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">positive_colour</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="databaroptions|label7">Negative:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">negative_colour</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="positive_colour"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="negative_colour"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="databaroptions|label10">Fill:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fill_type</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="fill_type"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="databaroptions|fill_type">Color</item> - <item translatable="yes" context="databaroptions|fill_type">Gradient</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="databaroptions|label10">Fill:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fill_type</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="fill_type"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="databaroptions|fill_type">Color</item> + <item translatable="yes" context="databaroptions|fill_type">Gradient</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -331,79 +319,73 @@ <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="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> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="databaroptions|label8">Position of vertical axis:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">axis_pos</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="databaroptions|label9">Color of vertical axis:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">axis_colour</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="grid4"> + <object class="GtkComboBoxText" id="axis_pos"> <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="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="databaroptions|label8">Position of vertical axis:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">axis_pos</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="databaroptions|label9">Color of vertical axis:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">axis_colour</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="axis_pos"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="databaroptions|axis_pos">Automatic</item> - <item translatable="yes" context="databaroptions|axis_pos">Middle</item> - <item translatable="yes" context="databaroptions|axis_pos">None</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="axis_colour"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <items> + <item translatable="yes" context="databaroptions|axis_pos">Automatic</item> + <item translatable="yes" context="databaroptions|axis_pos">Middle</item> + <item translatable="yes" context="databaroptions|axis_pos">None</item> + </items> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="axis_colour"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -431,71 +413,65 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="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="grid3"> + <object class="GtkLabel" id="label12"> <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="GtkLabel" id="label12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="databaroptions|label12">Minimum bar length (%):</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">min_length</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="halign">end</property> - <property name="label" translatable="yes" context="databaroptions|label13">Maximum bar length (%):</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">max_length</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="min_length"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="max_length"> - <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> + <property name="halign">end</property> + <property name="label" translatable="yes" context="databaroptions|label12">Minimum bar length (%):</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">min_length</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="halign">end</property> + <property name="label" translatable="yes" context="databaroptions|label13">Maximum bar length (%):</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">max_length</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="min_length"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="max_length"> + <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> </object> </child> diff --git a/sc/uiconfig/scalc/ui/datafielddialog.ui b/sc/uiconfig/scalc/ui/datafielddialog.ui index 219ca8733e16..89e216082294 100644 --- a/sc/uiconfig/scalc/ui/datafielddialog.ui +++ b/sc/uiconfig/scalc/ui/datafielddialog.ui @@ -98,69 +98,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="margin_top">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <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="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="functions"> <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="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection2"/> + </child> <child> - <object class="GtkTreeView" id="functions"> - <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="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Macro Library List-selection2"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn5"> + <property name="resizable">True</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn5"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer4"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="functions-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafielddialog|extended_tip|functions">Click the type of subtotal that you want to calculate. This option is only available if the User-defined option is selected.</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="functions-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafielddialog|extended_tip|functions">Click the type of subtotal that you want to calculate. This option is only available if the User-defined option is selected.</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> @@ -241,126 +232,119 @@ <property name="can_focus">True</property> <property name="resize_toplevel">True</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> + <property name="hexpand">True</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">6</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="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datafielddialog|label4">_Type:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">type</property> - <property name="ellipsize">end</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="basefieldft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datafielddialog|basefieldft">_Base field:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">basefield</property> - <property name="ellipsize">end</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="baseitemft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datafielddialog|baseitemft">Ba_se item:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">baseitem</property> - <property name="ellipsize">end</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="type"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="datafielddialog|type">Normal</item> - <item translatable="yes" context="datafielddialog|type">Difference from</item> - <item translatable="yes" context="datafielddialog|type">% of</item> - <item translatable="yes" context="datafielddialog|type">% difference from</item> - <item translatable="yes" context="datafielddialog|type">Running total in</item> - <item translatable="yes" context="datafielddialog|type">% of row</item> - <item translatable="yes" context="datafielddialog|type">% of column</item> - <item translatable="yes" context="datafielddialog|type">% of total</item> - <item translatable="yes" context="datafielddialog|type">Index</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="type-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafielddialog|extended_tip|type">Select the type of calculating of the displayed value for the data field.</property> - </object> - </child> + <property name="label" translatable="yes" context="datafielddialog|label4">_Type:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">type</property> + <property name="ellipsize">end</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="basefieldft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="datafielddialog|basefieldft">_Base field:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">basefield</property> + <property name="ellipsize">end</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="baseitemft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="datafielddialog|baseitemft">Ba_se item:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">baseitem</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="type"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="datafielddialog|type">Normal</item> + <item translatable="yes" context="datafielddialog|type">Difference from</item> + <item translatable="yes" context="datafielddialog|type">% of</item> + <item translatable="yes" context="datafielddialog|type">% difference from</item> + <item translatable="yes" context="datafielddialog|type">Running total in</item> + <item translatable="yes" context="datafielddialog|type">% of row</item> + <item translatable="yes" context="datafielddialog|type">% of column</item> + <item translatable="yes" context="datafielddialog|type">% of total</item> + <item translatable="yes" context="datafielddialog|type">Index</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="type-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafielddialog|extended_tip|type">Select the type of calculating of the displayed value for the data field.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="basefield"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="basefield-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafielddialog|extended_tip|basefield">Select the field from which the respective value is taken as base for the calculation.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="basefield"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="basefield-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafielddialog|extended_tip|basefield">Select the field from which the respective value is taken as base for the calculation.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="baseitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="datafielddialog|baseitem">- previous item -</item> - <item translatable="yes" context="datafielddialog|baseitem">- next item -</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="baseitem-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafielddialog|extended_tip|baseitem">Select the item of the base field from which the respective value is taken as base for the calculation.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="baseitem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="datafielddialog|baseitem">- previous item -</item> + <item translatable="yes" context="datafielddialog|baseitem">- next item -</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="baseitem-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafielddialog|extended_tip|baseitem">Select the item of the base field from which the respective value is taken as base for the calculation.</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/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui index 5df1473bf0b7..9a11dc9645f3 100644 --- a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui +++ b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui @@ -110,105 +110,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="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="GtkRadioButton" id="ascending"> + <property name="label" translatable="yes" context="datafieldoptionsdialog|ascending">_Ascending</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="GtkRadioButton" id="ascending"> - <property name="label" translatable="yes" context="datafieldoptionsdialog|ascending">_Ascending</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ascending-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|ascending">Sorts the values from the lowest value to the highest value. If the selected field is the field for which the dialog was opened, the items are sorted by name. If a data field was selected, the items are sorted by the resultant value of the selected data field.</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="ascending-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|ascending">Sorts the values from the lowest value to the highest value. If the selected field is the field for which the dialog was opened, the items are sorted by name. If a data field was selected, the items are sorted by the resultant value of the selected data field.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="descending"> - <property name="label" translatable="yes" context="datafieldoptionsdialog|descending">_Descending</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">ascending</property> - <child internal-child="accessible"> - <object class="AtkObject" id="descending-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|descending">Sorts the values descending from the highest value to the lowest value. If the selected field is the field for which the dialog was opened, the items are sorted by name. If a data field was selected, the items are sorted by the resultant value of the selected data field.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="descending"> + <property name="label" translatable="yes" context="datafieldoptionsdialog|descending">_Descending</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">ascending</property> + <child internal-child="accessible"> + <object class="AtkObject" id="descending-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|descending">Sorts the values descending from the highest value to the lowest value. If the selected field is the field for which the dialog was opened, the items are sorted by name. If a data field was selected, the items are sorted by the resultant value of the selected data field.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="manual"> - <property name="label" translatable="yes" context="datafieldoptionsdialog|manual">_Manual</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">ascending</property> - <child internal-child="accessible"> - <object class="AtkObject" id="manual-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|manual">Sorts values alphabetically.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="manual"> + <property name="label" translatable="yes" context="datafieldoptionsdialog|manual">_Manual</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">ascending</property> + <child internal-child="accessible"> + <object class="AtkObject" id="manual-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|manual">Sorts values alphabetically.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="sortby"> - <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="sortby-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|sortby">Select the data field that you want to sort columns or rows by.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="sortby"> + <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="sortby-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|sortby">Select the data field that you want to sort columns or rows by.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -235,91 +228,85 @@ <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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkCheckButton" id="repeatitemlabels"> + <property name="label" translatable="yes" context="datafieldoptionsdialog|repeatitemlabels">_Repeat item labels</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="repeatitemlabels"> - <property name="label" translatable="yes" context="datafieldoptionsdialog|repeatitemlabels">_Repeat item labels</property> - <property name="visible">True</property> - <property name="can_focus">True</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">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="emptyline"> - <property name="label" translatable="yes" context="datafieldoptionsdialog|emptyline">_Empty line after each item</property> - <property name="visible">True</property> - <property name="can_focus">True</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="emptyline-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|emptyline">Adds an empty row after the data for each item in the pivot table.</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="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datafieldoptionsdialog|label3">_Layout:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">layout</property> - <property name="xalign">0</property> + <property name="can_focus">True</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">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="emptyline"> + <property name="label" translatable="yes" context="datafieldoptionsdialog|emptyline">_Empty line after each item</property> + <property name="visible">True</property> + <property name="can_focus">True</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="emptyline-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|emptyline">Adds an empty row after the data for each item in the pivot table.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="layout"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="datafieldoptionsdialog|layout">Tabular layout</item> - <item translatable="yes" context="datafieldoptionsdialog|layout">Outline layout with subtotals at the top</item> - <item translatable="yes" context="datafieldoptionsdialog|layout">Outline layout with subtotals at the bottom</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="layout-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|layout">Select the layout mode for the field in the list box.</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="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="datafieldoptionsdialog|label3">_Layout:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">layout</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="layout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="datafieldoptionsdialog|layout">Tabular layout</item> + <item translatable="yes" context="datafieldoptionsdialog|layout">Outline layout with subtotals at the top</item> + <item translatable="yes" context="datafieldoptionsdialog|layout">Outline layout with subtotals at the bottom</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="layout-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|layout">Select the layout mode for the field in the list box.</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> @@ -346,149 +333,143 @@ <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="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="show"> + <property name="label" translatable="yes" context="datafieldoptionsdialog|show">_Show:</property> + <property name="visible">True</property> + <property name="can_focus">True</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="items"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="show-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|show">Turns on the automatic show feature.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="showfromft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="datafieldoptionsdialog|showfromft">_From:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">from</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="usingft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="datafieldoptionsdialog|usingft">_Using field:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">using</property> + <property name="xalign">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="grid4"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkCheckButton" id="show"> - <property name="label" translatable="yes" context="datafieldoptionsdialog|show">_Show:</property> - <property name="visible">True</property> - <property name="can_focus">True</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="items"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="show-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|show">Turns on the automatic show feature.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="showfromft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datafieldoptionsdialog|showfromft">_From:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">from</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="usingft"> + <object class="GtkLabel" id="showft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datafieldoptionsdialog|usingft">_Using field:</property> + <property name="label" translatable="yes" context="datafieldoptionsdialog|showft">items</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">using</property> + <property name="mnemonic_widget">layout</property> <property name="xalign">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="grid5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="showft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datafieldoptionsdialog|showft">items</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">layout</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="GtkSpinButton" id="items"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> - <accessibility> - <relation type="labelled-by" target="show"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="items-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|items">Enter the maximum number of items that you want to show automatically.</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> - <object class="GtkComboBoxText" id="from"> + <object class="GtkSpinButton" id="items"> <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="datafieldoptionsdialog|from">Top</item> - <item translatable="yes" context="datafieldoptionsdialog|from">Bottom</item> - </items> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + <accessibility> + <relation type="labelled-by" target="show"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="from-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|from">Shows the top or bottom items in the specified sort order.</property> + <object class="AtkObject" id="items-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|items">Enter the maximum number of items that you want to show automatically.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> - <child> - <object class="GtkComboBoxText" id="using"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="using-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|using">Select the data field that you want to sort the data by.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="from"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="datafieldoptionsdialog|from">Top</item> + <item translatable="yes" context="datafieldoptionsdialog|from">Bottom</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="from-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|from">Shows the top or bottom items in the specified sort order.</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">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="using"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="using-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|using">Select the data field that you want to sort the data by.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -517,67 +498,59 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</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="hideitems"> <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="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection2"/> + </child> <child> - <object class="GtkTreeView" id="hideitems"> - <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="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Macro Library List-selection2"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn4"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn4"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer5"/> - <attributes> - <attribute name="visible">3</attribute> - <attribute name="active">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererToggle" id="cellrenderer5"/> + <attributes> + <attribute name="visible">3</attribute> + <attribute name="active">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn5"> + <property name="resizable">True</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn5"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer4"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="hideitems-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|hideitems">Select the items that you want to hide from the calculations.</property> - </object> + <object class="GtkCellRendererText" id="cellrenderer4"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="hideitems-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="datafieldoptionsdialog|extended_tip|hideitems">Select the items that you want to hide from the calculations.</property> + </object> + </child> </object> </child> </object> diff --git a/sc/uiconfig/scalc/ui/datastreams.ui b/sc/uiconfig/scalc/ui/datastreams.ui index a0348679d78c..4724a654ac3d 100644 --- a/sc/uiconfig/scalc/ui/datastreams.ui +++ b/sc/uiconfig/scalc/ui/datastreams.ui @@ -85,69 +85,24 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="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"> + <object class="GtkBox" id="box12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="hexpand">True</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="box12"> + <object class="GtkLabel" id="label6"> <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="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datastreams|label6">URL:</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="url"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="datastreams|url|tooltip_text">Enter the URL of the source document in the local file system or Internet here.</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="URLBox-entry"> - <property name="can_focus">True</property> - <property name="activates_default">True</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="browse"> - <property name="label" translatable="yes" context="datastreams|browse">_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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="datastreams|label6">URL:</property> </object> <packing> <property name="expand">False</property> @@ -156,108 +111,141 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame4"> + <object class="GtkComboBoxText" id="url"> <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="alignment5"> - <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="grid2"> - <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="valuesinline"> - <property name="label" translatable="yes" context="datastreams|valuesinline">value1,value2,...,valueN, and fill into range:</property> - <property name="visible">True</property> - <property 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="addressvalue"> - <property name="label" translatable="yes" context="datastreams|addressvalue">address,value</property> - <property name="visible">True</property> - <property name="can_focus">True</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">valuesinline</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="range"> - <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> - <child> - <placeholder/> - </child> - </object> - </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="datastreams|label4">Interpret stream data as</property> + <property name="tooltip_text" translatable="yes" context="datastreams|url|tooltip_text">Enter the URL of the source document in the local file system or Internet here.</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="URLBox-entry"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">6</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="refresh_ui"> - <property name="label" translatable="yes" context="datastreams|refresh_ui">Empty lines trigger UI refresh</property> + <object class="GtkButton" id="browse"> + <property name="label" translatable="yes" context="datastreams|browse">_Browse...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="receives_default">True</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="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="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="grid2"> + <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="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkRadioButton" id="valuesinline"> + <property name="label" translatable="yes" context="datastreams|valuesinline">value1,value2,...,valueN, and fill into range:</property> + <property name="visible">True</property> + <property 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="addressvalue"> + <property name="label" translatable="yes" context="datastreams|addressvalue">address,value</property> + <property name="visible">True</property> + <property name="can_focus">True</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">valuesinline</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="range"> + <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> + <child> + <placeholder/> + </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="datastreams|label4">Interpret stream data as</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">6</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="refresh_ui"> + <property name="label" translatable="yes" context="datastreams|refresh_ui">Empty lines trigger UI refresh</property> + <property name="visible">True</property> + <property 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="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child> @@ -293,69 +281,63 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <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="datadown"> + <property name="label" translatable="yes" context="datastreams|datadown">Move existing data down</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="datadown"> - <property name="label" translatable="yes" context="datastreams|datadown">Move existing data down</property> - <property name="visible">True</property> - <property name="can_focus">True</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="GtkRadioButton" id="rangedown"> - <property name="label" translatable="yes" context="datastreams|rangedown">Move the range down</property> - <property name="visible">True</property> - <property 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">datadown</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="nomove"> - <property name="label" translatable="yes" context="datastreams|nomove">Overwrite existing data</property> - <property name="visible">True</property> - <property name="can_focus">True</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">datadown</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="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="GtkRadioButton" id="rangedown"> + <property name="label" translatable="yes" context="datastreams|rangedown">Move the range down</property> + <property name="visible">True</property> + <property 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">datadown</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="nomove"> + <property name="label" translatable="yes" context="datastreams|nomove">Overwrite existing data</property> + <property name="visible">True</property> + <property name="can_focus">True</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">datadown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> @@ -383,69 +365,63 @@ <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="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="grid3"> + <object class="GtkRadioButton" id="maxlimit"> + <property name="label" translatable="yes" context="datastreams|maxlimit">Limit to:</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkRadioButton" id="maxlimit"> - <property name="label" translatable="yes" context="datastreams|maxlimit">Limit to:</property> - <property name="visible">True</property> - <property 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="GtkEntry" id="limit"> - <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">1000</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="unlimited"> - <property name="label" translatable="yes" context="datastreams|unlimited">_Unlimited</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="valign">start</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">maxlimit</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="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="GtkEntry" id="limit"> + <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">1000</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="unlimited"> + <property name="label" translatable="yes" context="datastreams|unlimited">_Unlimited</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">maxlimit</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui b/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui index 773a56b28fc6..5b0857e4be38 100644 --- a/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui +++ b/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui @@ -110,78 +110,71 @@ <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="entrygrid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="entrygrid"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">3</property> + <property name="vscrollbar_policy">always</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="entry-list"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="vscrollbar_policy">always</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-selection3"/> + </child> <child> - <object class="GtkTreeView" id="entry-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-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> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <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="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="definedatabaserangedialog|extended_tip|entry">Enter a name for the database range that you want to define, or select an existing name from the list.</property> - </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="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="definedatabaserangedialog|extended_tip|entry">Enter a name for the database range that you want to define, or select an existing name from the list.</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> @@ -210,53 +203,47 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box3"> + <property name="hexpand">True</property> <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="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkEntry" id="assign"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkEntry" id="assign"> - <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="assign-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|assign">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + <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="assign-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|assign">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</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="assignrb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="assignrb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|assignrb">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</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="assignrb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="assignrb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|assignrb">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</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> @@ -348,159 +335,152 @@ <property name="can_focus">True</property> <property name="resize_toplevel">True</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="Options"> <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="orientation">vertical</property> + <property name="spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="Options"> + <object class="GtkCheckButton" id="ContainsColumnLabels"> + <property name="label" translatable="yes" context="definedatabaserangedialog|ContainsColumnLabels">Co_ntains column labels</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">3</property> - <child> - <object class="GtkCheckButton" id="ContainsColumnLabels"> - <property name="label" translatable="yes" context="definedatabaserangedialog|ContainsColumnLabels">Co_ntains column labels</property> - <property name="visible">True</property> - <property name="can_focus">True</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="ContainsColumnLabels-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|ContainsColumnLabels">Selected cell ranges contains labels.</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="ContainsTotalsRow"> - <property name="label" translatable="yes" context="definedatabaserangedialog|ContainsTotalsRow">Contains _totals row</property> - <property name="visible">True</property> - <property name="can_focus">True</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="InsertOrDeleteCells"> - <property name="label" translatable="yes" context="definedatabaserangedialog|InsertOrDeleteCells">Insert or delete _cells</property> - <property name="visible">True</property> - <property name="can_focus">True</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="InsertOrDeleteCells-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|InsertOrDeleteCells">Automatically inserts new rows and columns into the database range in your document when new records are added to the database.</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="GtkCheckButton" id="KeepFormatting"> - <property name="label" translatable="yes" context="definedatabaserangedialog|KeepFormatting">Keep _formatting</property> - <property name="visible">True</property> - <property name="can_focus">True</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="KeepFormatting-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|KeepFormatting">Applies the existing cell format of headers and first data row to the whole database range.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="DontSaveImportedData"> - <property name="label" translatable="yes" context="definedatabaserangedialog|DontSaveImportedData">Don't save _imported data</property> - <property name="visible">True</property> - <property name="can_focus">True</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="DontSaveImportedData-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|DontSaveImportedData">Only saves a reference to the database, and not the contents of the cells.</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="ContainsColumnLabels-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|ContainsColumnLabels">Selected cell ranges contains labels.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> </child> - <child> - <object class="GtkLabel" id="Source"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="definedatabaserangedialog|Source">Source:</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="GtkCheckButton" id="ContainsTotalsRow"> + <property name="label" translatable="yes" context="definedatabaserangedialog|ContainsTotalsRow">Contains _totals row</property> + <property name="visible">True</property> + <property name="can_focus">True</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="InsertOrDeleteCells"> + <property name="label" translatable="yes" context="definedatabaserangedialog|InsertOrDeleteCells">Insert or delete _cells</property> + <property name="visible">True</property> + <property name="can_focus">True</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="InsertOrDeleteCells-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|InsertOrDeleteCells">Automatically inserts new rows and columns into the database range in your document when new records are added to the database.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> </child> - <child> - <object class="GtkLabel" id="Operations"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="definedatabaserangedialog|Operations">Operations:</property> - <property name="xalign">0</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="KeepFormatting"> + <property name="label" translatable="yes" context="definedatabaserangedialog|KeepFormatting">Keep _formatting</property> + <property name="visible">True</property> + <property name="can_focus">True</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="KeepFormatting-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|KeepFormatting">Applies the existing cell format of headers and first data row to the whole database range.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> </child> - <child> - <object class="GtkLabel" id="invalid"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="definedatabaserangedialog|invalid">Invalid range</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="GtkCheckButton" id="DontSaveImportedData"> + <property name="label" translatable="yes" context="definedatabaserangedialog|DontSaveImportedData">Don't save _imported data</property> + <property name="visible">True</property> + <property name="can_focus">True</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="DontSaveImportedData-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="definedatabaserangedialog|extended_tip|DontSaveImportedData">Only saves a reference to the database, and not the contents of the cells.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="Source"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="definedatabaserangedialog|Source">Source:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="Operations"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="definedatabaserangedialog|Operations">Operations:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="invalid"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="definedatabaserangedialog|invalid">Invalid range</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/deletecells.ui b/sc/uiconfig/scalc/ui/deletecells.ui index e1a27c6ee775..b0bbba1b9863 100644 --- a/sc/uiconfig/scalc/ui/deletecells.ui +++ b/sc/uiconfig/scalc/ui/deletecells.ui @@ -80,106 +80,100 @@ <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="GtkBox" id="box1"> + <object class="GtkRadioButton" id="up"> + <property name="label" translatable="yes" context="deletecells|up">Shift cells _up</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="up"> - <property name="label" translatable="yes" context="deletecells|up">Shift cells _up</property> - <property name="visible">True</property> - <property 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="up-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|up">Fills the space produced by the deleted cells with the cells underneath it.</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="up-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|up">Fills the space produced by the deleted cells with the cells underneath it.</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="left"> - <property name="label" translatable="yes" context="deletecells|left">Shift cells _left</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">up</property> - <child internal-child="accessible"> - <object class="AtkObject" id="left-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|left">Fills the resulting space by the cells to the right of the deleted cells.</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="left"> + <property name="label" translatable="yes" context="deletecells|left">Shift cells _left</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">up</property> + <child internal-child="accessible"> + <object class="AtkObject" id="left-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|left">Fills the resulting space by the cells to the right of the deleted cells.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="rows"> - <property name="label" translatable="yes" context="deletecells|rows">Delete entire _row(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> - <property name="group">up</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rows-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|rows">After selecting at least one cell, deletes the entire row from the sheet.</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="GtkRadioButton" id="rows"> + <property name="label" translatable="yes" context="deletecells|rows">Delete entire _row(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> + <property name="group">up</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rows-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|rows">After selecting at least one cell, deletes the entire row from the sheet.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="cols"> - <property name="label" translatable="yes" context="deletecells|cols">Delete entire _column(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> - <property name="group">up</property> - <child internal-child="accessible"> - <object class="AtkObject" id="cols-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|cols">After selecting at least one cell, deletes the entire column from the sheet.</property> - </object> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="cols"> + <property name="label" translatable="yes" context="deletecells|cols">Delete entire _column(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> + <property name="group">up</property> + <child internal-child="accessible"> + <object class="AtkObject" id="cols-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|cols">After selecting at least one cell, deletes the entire column from the sheet.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/deletecontents.ui b/sc/uiconfig/scalc/ui/deletecontents.ui index c27ce717f180..0dc922bafc52 100644 --- a/sc/uiconfig/scalc/ui/deletecontents.ui +++ b/sc/uiconfig/scalc/ui/deletecontents.ui @@ -80,20 +80,45 @@ <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">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkCheckButton" id="deleteall"> + <property name="label" translatable="yes" context="deletecontents|deleteall">Delete _all</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="deleteall-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|deleteall">Deletes all content from the selected cell range.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> <child> - <object class="GtkCheckButton" id="deleteall"> - <property name="label" translatable="yes" context="deletecontents|deleteall">Delete _all</property> + <object class="GtkCheckButton" id="text"> + <property name="label" translatable="yes" context="deletecontents|text">_Text</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -101,176 +126,145 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="deleteall-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|deleteall">Deletes all content from the selected cell range.</property> + <object class="AtkObject" id="text-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|text">Deletes text only. Formats, formulas, numbers and dates are not affected.</property> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkCheckButton" id="numbers"> + <property name="label" translatable="yes" context="deletecontents|numbers">_Numbers</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="column_homogeneous">True</property> - <child> - <object class="GtkCheckButton" id="text"> - <property name="label" translatable="yes" context="deletecontents|text">_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> - <child internal-child="accessible"> - <object class="AtkObject" id="text-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|text">Deletes text only. Formats, formulas, numbers and dates are not affected.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="numbers"> - <property name="label" translatable="yes" context="deletecontents|numbers">_Numbers</property> - <property name="visible">True</property> - <property name="can_focus">True</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="numbers-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|numbers">Deletes numbers only. Formats and formulas remain unchanged.</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="numbers-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|numbers">Deletes numbers only. Formats and formulas remain unchanged.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="datetime"> - <property name="label" translatable="yes" context="deletecontents|datetime">_Date & time</property> - <property name="visible">True</property> - <property name="can_focus">True</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="datetime-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|datetime">Deletes date and time values. Formats, text, numbers and formulas remain unchanged.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="datetime"> + <property name="label" translatable="yes" context="deletecontents|datetime">_Date & time</property> + <property name="visible">True</property> + <property name="can_focus">True</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="datetime-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|datetime">Deletes date and time values. Formats, text, numbers and formulas remain unchanged.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="formulas"> - <property name="label" translatable="yes" context="deletecontents|formulas">_Formulas</property> - <property name="visible">True</property> - <property name="can_focus">True</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="formulas-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|formulas">Deletes formulas. Text, numbers, formats, dates and times remain unchanged.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formulas"> + <property name="label" translatable="yes" context="deletecontents|formulas">_Formulas</property> + <property name="visible">True</property> + <property name="can_focus">True</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="formulas-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|formulas">Deletes formulas. Text, numbers, formats, dates and times remain unchanged.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="comments"> - <property name="label" translatable="yes" context="deletecontents|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="deletecontents|extended_tip|comments">Deletes comments added to cells. All other elements remain unchanged.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="comments"> + <property name="label" translatable="yes" context="deletecontents|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="deletecontents|extended_tip|comments">Deletes comments added to cells. All other elements remain unchanged.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="formats"> - <property name="label" translatable="yes" context="deletecontents|formats">For_mats</property> - <property name="visible">True</property> - <property name="can_focus">True</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="formats-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|formats">Deletes format attributes applied to cells. All cell content remains unchanged.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formats"> + <property name="label" translatable="yes" context="deletecontents|formats">For_mats</property> + <property name="visible">True</property> + <property name="can_focus">True</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="formats-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|formats">Deletes format attributes applied to cells. All cell content remains unchanged.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="objects"> - <property name="label" translatable="yes" context="deletecontents|objects">_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="objects-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|objects">Deletes objects. All cell content remains unchanged.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="objects"> + <property name="label" translatable="yes" context="deletecontents|objects">_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="objects-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|objects">Deletes objects. All cell content remains unchanged.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> </packing> </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/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui index b522f9cfff2c..acd6b3c9b08d 100644 --- a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui +++ b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui @@ -80,99 +80,93 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="input-range-label"> <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="input-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="descriptivestatisticsdialog|input-range-label">Input range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="input-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="descriptivestatisticsdialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="descriptivestatisticsdialog|input-range-label">Input range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="input-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="descriptivestatisticsdialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -200,53 +194,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="descriptivestatisticsdialog|groupedby-columns-radio">_Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="descriptivestatisticsdialog|groupedby-columns-radio">_Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="descriptivestatisticsdialog|groupedby-rows-radio">_Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="descriptivestatisticsdialog|groupedby-rows-radio">_Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/doubledialog.ui b/sc/uiconfig/scalc/ui/doubledialog.ui index 407ed22854ce..7aa96c1de694 100644 --- a/sc/uiconfig/scalc/ui/doubledialog.ui +++ b/sc/uiconfig/scalc/ui/doubledialog.ui @@ -68,20 +68,14 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkEntry" id="value"> <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="value"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="activates_default">True</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="halign">start</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/sc/uiconfig/scalc/ui/erroralerttabpage.ui b/sc/uiconfig/scalc/ui/erroralerttabpage.ui index e5f3bbe46385..7baadecd51d2 100644 --- a/sc/uiconfig/scalc/ui/erroralerttabpage.ui +++ b/sc/uiconfig/scalc/ui/erroralerttabpage.ui @@ -42,144 +42,136 @@ <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="action_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> + <property name="label" translatable="yes" context="erroralerttabpage|action_label">_Action:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">actionCB</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="title_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="erroralerttabpage|title_label">_Title:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">erroralert_title</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="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">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="GtkLabel" id="action_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="erroralerttabpage|action_label">_Action:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">actionCB</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="title_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="erroralerttabpage|title_label">_Title:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">erroralert_title</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="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkTextView" id="errorMsg"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="errorMsg"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="errorMsg-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="erroralerttabpage|extended_tip|errorMsg">Enter the message that you want to display when invalid data is entered in a cell.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="errorMsg-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="erroralerttabpage|extended_tip|errorMsg">Enter the message that you want to display when invalid data is entered in a cell.</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="GtkEntry" id="erroralert_title"> - <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> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="errormsg_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="erroralerttabpage|errormsg_label">_Error message:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">errorMsg</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> - <object class="GtkButton" id="browseBtn"> - <property name="label" translatable="yes" context="erroralerttabpage|browseBtn">_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="browseBtn-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="erroralerttabpage|extended_tip|browseBtn">Opens the Macro dialog where you can select the macro that is executed when invalid data is entered in a cell. The macro is executed after the error message is displayed.</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="GtkEntry" id="erroralert_title"> + <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> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="errormsg_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="erroralerttabpage|errormsg_label">_Error message:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">errorMsg</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> + <object class="GtkButton" id="browseBtn"> + <property name="label" translatable="yes" context="erroralerttabpage|browseBtn">_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="browseBtn-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="erroralerttabpage|extended_tip|browseBtn">Opens the Macro dialog where you can select the macro that is executed when invalid data is entered in a cell. The macro is executed after the error message is displayed.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="actionCB"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="erroralerttabpage|actionCB">Stop</item> - <item translatable="yes" context="erroralerttabpage|actionCB">Warning</item> - <item translatable="yes" context="erroralerttabpage|actionCB">Information</item> - <item translatable="yes" context="erroralerttabpage|actionCB">Macro</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="actionCB-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="erroralerttabpage|extended_tip|actionCB">Select the action that you want to occur when invalid data is entered in a cell.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="actionCB"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="erroralerttabpage|actionCB">Stop</item> + <item translatable="yes" context="erroralerttabpage|actionCB">Warning</item> + <item translatable="yes" context="erroralerttabpage|actionCB">Information</item> + <item translatable="yes" context="erroralerttabpage|actionCB">Macro</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="actionCB-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="erroralerttabpage|extended_tip|actionCB">Select the action that you want to occur when invalid data is entered in a cell.</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/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui index f65c33a0ba15..fb2c0862da0f 100644 --- a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui +++ b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui @@ -86,99 +86,93 @@ <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="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="input-range-label"> <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="input-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="exponentialsmoothingdialog|input-range-label">Input range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="input-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="exponentialsmoothingdialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="exponentialsmoothingdialog|input-range-label">Input range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="input-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="exponentialsmoothingdialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -206,53 +200,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="exponentialsmoothingdialog|groupedby-columns-radio">Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="exponentialsmoothingdialog|groupedby-columns-radio">Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="exponentialsmoothingdialog|groupedby-rows-radio">Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="exponentialsmoothingdialog|groupedby-rows-radio">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -280,50 +268,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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="smoothing-factor-label"> <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="smoothing-factor-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="exponentialsmoothingdialog|smoothing-factor-label">Smoothing factor:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">smoothing-factor-spin</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="smoothing-factor-spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text">0,20</property> - <property name="adjustment">smoothing-factor-adjustment</property> - <property name="digits">2</property> - <property name="value">0.20000000298023224</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="exponentialsmoothingdialog|smoothing-factor-label">Smoothing factor:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">smoothing-factor-spin</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="smoothing-factor-spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text">0,20</property> + <property name="adjustment">smoothing-factor-adjustment</property> + <property name="digits">2</property> + <property name="value">0.20000000298023224</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/externaldata.ui b/sc/uiconfig/scalc/ui/externaldata.ui index 779c09cb0581..fc7dbf88df16 100644 --- a/sc/uiconfig/scalc/ui/externaldata.ui +++ b/sc/uiconfig/scalc/ui/externaldata.ui @@ -103,77 +103,70 @@ <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="hexpand">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="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkComboBoxText" id="url"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkComboBoxText" id="url"> + <property name="tooltip_text" translatable="yes" context="externaldata|url|tooltip_text">Enter the URL of the source document in the local file system or Internet here.</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="externaldata|url|tooltip_text">Enter the URL of the source document in the local file system or Internet here.</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="url-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|url">Enter the URL or the file name that contains the data that you want to insert, and then press Enter.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="browse"> - <property name="label" translatable="yes" context="externaldata|browse">_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="browse-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|browse">Open a file dialog to locate the file containing the data you want to insert.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="url-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|url">Enter the URL or the file name that contains the data that you want to insert, and then press Enter.</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="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> + <child> + <object class="GtkButton" id="browse"> + <property name="label" translatable="yes" context="externaldata|browse">_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="browse-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|browse">Open a file dialog to locate the file containing the data you want to insert.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> </object> </child> @@ -204,58 +197,81 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="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="box4"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="ranges"> <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="ranges"> - <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> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="ranges-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|ranges">Select the table or the data range that you want to insert.</property> - </object> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="ranges-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|ranges">Select the table or the data range that you want to insert.</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkCheckButton" id="reload"> + <property name="label" translatable="yes" context="externaldata|reload">_Update every:</property> + <property name="visible">True</property> + <property name="can_focus">True</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="delay"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="reload-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|reload">Enter the number of seconds to wait before the external data are reloaded into the current document.</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -264,25 +280,22 @@ </packing> </child> <child> - <object class="GtkBox" id="box5"> + <object class="GtkBox" id="box6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="reload"> - <property name="label" translatable="yes" context="externaldata|reload">_Update every:</property> + <object class="GtkSpinButton" id="delay"> <property name="visible">True</property> <property name="can_focus">True</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">adjustment1</property> <accessibility> - <relation type="label-for" target="delay"/> + <relation type="labelled-by" target="reload"/> </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="reload-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|reload">Enter the number of seconds to wait before the external data are reloaded into the current document.</property> + <object class="AtkObject" id="delay-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|delay">Enter the number of seconds to wait before the external data are reloaded into the current document.</property> </object> </child> </object> @@ -293,44 +306,11 @@ </packing> </child> <child> - <object class="GtkBox" id="box6"> + <object class="GtkLabel" id="secondsft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkSpinButton" id="delay"> - <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="reload"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="delay-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="externaldata|extended_tip|delay">Enter the number of seconds to wait before the external data are reloaded into the current 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="GtkLabel" id="secondsft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="externaldata|secondsft">_seconds</property> - <property name="use_underline">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="externaldata|secondsft">_seconds</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -346,6 +326,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/sc/uiconfig/scalc/ui/filldlg.ui b/sc/uiconfig/scalc/ui/filldlg.ui index 6c9b869ceb4f..597505f893f1 100644 --- a/sc/uiconfig/scalc/ui/filldlg.ui +++ b/sc/uiconfig/scalc/ui/filldlg.ui @@ -87,108 +87,101 @@ <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="hexpand">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="box1"> + <object class="GtkRadioButton" id="down"> + <property name="label" translatable="yes" context="filldlg|down">_Down</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="down"> - <property name="label" translatable="yes" context="filldlg|down">_Down</property> - <property name="visible">True</property> - <property 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="down-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|down">Creates a downward series in the selected cell range for the column using the defined increment to the end value.</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="down-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|down">Creates a downward series in the selected cell range for the column using the defined increment to the end value.</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="right"> - <property name="label" translatable="yes" context="filldlg|right">_Right</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">down</property> - <child internal-child="accessible"> - <object class="AtkObject" id="right-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|right">Creates a series running from left to right within the selected cell range using the defined increment to the end value.</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="right"> + <property name="label" translatable="yes" context="filldlg|right">_Right</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">down</property> + <child internal-child="accessible"> + <object class="AtkObject" id="right-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|right">Creates a series running from left to right within the selected cell range using the defined increment to the end value.</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="up"> - <property name="label" translatable="yes" context="filldlg|up">_Up</property> - <property name="visible">True</property> - <property name="can_focus">True</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">down</property> - <child internal-child="accessible"> - <object class="AtkObject" id="up-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|up">Creates an upward series in the cell range of the column using the defined increment to the end value.</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="up"> + <property name="label" translatable="yes" context="filldlg|up">_Up</property> + <property name="visible">True</property> + <property name="can_focus">True</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">down</property> + <child internal-child="accessible"> + <object class="AtkObject" id="up-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|up">Creates an upward series in the cell range of the column using the defined increment to the end value.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="left"> - <property name="label" translatable="yes" context="filldlg|left">_Left</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">down</property> - <child internal-child="accessible"> - <object class="AtkObject" id="left-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|left">Creates a series running from right to left in the selected cell range using the defined increment to the end value.</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="GtkRadioButton" id="left"> + <property name="label" translatable="yes" context="filldlg|left">_Left</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">down</property> + <child internal-child="accessible"> + <object class="AtkObject" id="left-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|left">Creates a series running from right to left in the selected cell range using the defined increment to the end value.</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> @@ -217,108 +210,101 @@ <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="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="linear"> + <property name="label" translatable="yes" context="filldlg|linear">Li_near</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="linear"> - <property name="label" translatable="yes" context="filldlg|linear">Li_near</property> - <property name="visible">True</property> - <property 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="linear-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|linear">Creates a linear number series using the defined increment and end value.</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="linear-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|linear">Creates a linear number series using the defined increment and end value.</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="growth"> - <property name="label" translatable="yes" context="filldlg|growth">_Growth</property> - <property name="visible">True</property> - <property name="can_focus">True</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">linear</property> - <child internal-child="accessible"> - <object class="AtkObject" id="growth-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|growth">Creates a growth series using the defined increment and end value.</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="growth"> + <property name="label" translatable="yes" context="filldlg|growth">_Growth</property> + <property name="visible">True</property> + <property name="can_focus">True</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">linear</property> + <child internal-child="accessible"> + <object class="AtkObject" id="growth-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|growth">Creates a growth series using the defined increment and end value.</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="date"> - <property name="label" translatable="yes" context="filldlg|date">Da_te</property> - <property name="visible">True</property> - <property name="can_focus">True</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">linear</property> - <child internal-child="accessible"> - <object class="AtkObject" id="date-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|date">Creates a date series using the defined increment and end date.</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="date"> + <property name="label" translatable="yes" context="filldlg|date">Da_te</property> + <property name="visible">True</property> + <property name="can_focus">True</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">linear</property> + <child internal-child="accessible"> + <object class="AtkObject" id="date-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|date">Creates a date series using the defined increment and end date.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="autofill"> - <property name="label" translatable="yes" context="filldlg|autofill">_AutoFill</property> - <property name="visible">True</property> - <property name="can_focus">True</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">linear</property> - <child internal-child="accessible"> - <object class="AtkObject" id="autofill-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|autofill">Forms a series directly in the sheet.</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="GtkRadioButton" id="autofill"> + <property name="label" translatable="yes" context="filldlg|autofill">_AutoFill</property> + <property name="visible">True</property> + <property name="can_focus">True</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">linear</property> + <child internal-child="accessible"> + <object class="AtkObject" id="autofill-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|autofill">Forms a series directly in the sheet.</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> @@ -347,109 +333,102 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box3"> <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="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkRadioButton" id="day"> + <property name="label" translatable="yes" context="filldlg|day">Da_y</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="day"> - <property name="label" translatable="yes" context="filldlg|day">Da_y</property> - <property name="visible">True</property> - <property 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="day-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|day">Use the Date series type and this option to create a series using all seven days of the week. Unit of Increment is day.</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="day-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|day">Use the Date series type and this option to create a series using all seven days of the week. Unit of Increment is day.</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="week"> - <property name="label" translatable="yes" context="filldlg|week">_Weekday</property> - <property name="visible">True</property> - <property 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">day</property> - <child internal-child="accessible"> - <object class="AtkObject" id="week-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|week">Use the Date series type and this option to create a series only using the five weekdays. Unit of Increment is day.</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="week"> + <property name="label" translatable="yes" context="filldlg|week">_Weekday</property> + <property name="visible">True</property> + <property 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">day</property> + <child internal-child="accessible"> + <object class="AtkObject" id="week-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|week">Use the Date series type and this option to create a series only using the five weekdays. Unit of Increment is day.</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="month"> - <property name="label" translatable="yes" context="filldlg|month">_Month</property> - <property name="visible">True</property> - <property name="can_focus">True</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">day</property> - <child internal-child="accessible"> - <object class="AtkObject" id="month-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|month">Use the Date series type and this option to form a series which unit of Increment is month.</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="month"> + <property name="label" translatable="yes" context="filldlg|month">_Month</property> + <property name="visible">True</property> + <property name="can_focus">True</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">day</property> + <child internal-child="accessible"> + <object class="AtkObject" id="month-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|month">Use the Date series type and this option to form a series which unit of Increment is month.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="year"> - <property name="label" translatable="yes" context="filldlg|year">Y_ear</property> - <property name="visible">True</property> - <property name="can_focus">True</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">day</property> - <child internal-child="accessible"> - <object class="AtkObject" id="year-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|year">Use the Date series type and this option to create a series which unit of Increment is year.</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="GtkRadioButton" id="year"> + <property name="label" translatable="yes" context="filldlg|year">Y_ear</property> + <property name="visible">True</property> + <property name="can_focus">True</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">day</property> + <child internal-child="accessible"> + <object class="AtkObject" id="year-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="filldlg|extended_tip|year">Use the Date series type and this option to create a series which unit of Increment is year.</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/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui index 685dce65d710..83b7ca98fd00 100644 --- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui +++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui @@ -80,111 +80,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="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="labelConvT2N"> <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="labelConvT2N"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formulacalculationoptions|labelConvT2N">Conversion from text to number:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">comboConversion</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="GtkCheckButton" id="checkEmptyAsZero"> - <property name="label" translatable="yes" context="formulacalculationoptions|checkEmptyAsZero">Treat _empty string as zero</property> - <property name="visible">True</property> - <property name="can_focus">True</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">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelSyntaxRef"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="formulacalculationoptions|labelSyntaxRef">Reference syntax for string reference:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">comboSyntaxRef</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="comboSyntaxRef"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item id="0" translatable="yes" context="formulacalculationoptions|comboSyntaxRef">Use formula syntax</item> - <item id="1">Calc A1</item> - <item id="2">Excel A1</item> - <item id="3">Excel R1C1</item> - <item id="4">Calc A1 | Excel A1</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="comboConversion"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item id="0" translatable="yes" context="formulacalculationoptions|comboConversion">Generate #VALUE! error</item> - <item id="1" translatable="yes" context="formulacalculationoptions|comboConversion">Treat as zero</item> - <item id="2" translatable="yes" context="formulacalculationoptions|comboConversion">Convert only if unambiguous</item> - <item id="3" translatable="yes" context="formulacalculationoptions|comboConversion">Convert also locale dependent</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="current_doc"> - <property name="label" translatable="yes" context="formulacalculationoptions|current_doc">Apply those settings to current document 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> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="formulacalculationoptions|labelConvT2N">Conversion from text to number:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">comboConversion</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="GtkCheckButton" id="checkEmptyAsZero"> + <property name="label" translatable="yes" context="formulacalculationoptions|checkEmptyAsZero">Treat _empty string as zero</property> + <property name="visible">True</property> + <property name="can_focus">True</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">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelSyntaxRef"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="formulacalculationoptions|labelSyntaxRef">Reference syntax for string reference:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">comboSyntaxRef</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="comboSyntaxRef"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item id="0" translatable="yes" context="formulacalculationoptions|comboSyntaxRef">Use formula syntax</item> + <item id="1">Calc A1</item> + <item id="2">Excel A1</item> + <item id="3">Excel R1C1</item> + <item id="4">Calc A1 | Excel A1</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="comboConversion"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item id="0" translatable="yes" context="formulacalculationoptions|comboConversion">Generate #VALUE! error</item> + <item id="1" translatable="yes" context="formulacalculationoptions|comboConversion">Treat as zero</item> + <item id="2" translatable="yes" context="formulacalculationoptions|comboConversion">Convert only if unambiguous</item> + <item id="3" translatable="yes" context="formulacalculationoptions|comboConversion">Convert also locale dependent</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="current_doc"> + <property name="label" translatable="yes" context="formulacalculationoptions|current_doc">Apply those settings to current document 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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/fourieranalysisdialog.ui b/sc/uiconfig/scalc/ui/fourieranalysisdialog.ui index 7e51d2b55112..7d939309af36 100644 --- a/sc/uiconfig/scalc/ui/fourieranalysisdialog.ui +++ b/sc/uiconfig/scalc/ui/fourieranalysisdialog.ui @@ -87,117 +87,111 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="input-range-label"> <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="input-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="fourieranalysisdialog|input-range-label">Input range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="input-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="fourieranalysisdialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="withlabels-check"> - <property name="label" translatable="yes" context="fourieranalysisdialog|withlabels-check">Input range has label</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">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="label" translatable="yes" context="fourieranalysisdialog|input-range-label">Input range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="input-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="fourieranalysisdialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="withlabels-check"> + <property name="label" translatable="yes" context="fourieranalysisdialog|withlabels-check">Input range has label</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">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -225,53 +219,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="fourieranalysisdialog|groupedby-columns-radio">_Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="fourieranalysisdialog|groupedby-columns-radio">_Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="fourieranalysisdialog|groupedby-rows-radio">_Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="fourieranalysisdialog|groupedby-rows-radio">_Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -299,82 +287,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"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="inverse-check"> + <property name="label" translatable="yes" context="fourieranalysisdialog|inverse-check">Inverse</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="margin_bottom">3</property> + <property name="draw_indicator">True</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"> + <object class="GtkCheckButton" id="polar-check"> + <property name="label" translatable="yes" context="fourieranalysisdialog|polar-check">Output in polar form</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="margin_bottom">3</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="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">6</property> - <child> - <object class="GtkCheckButton" id="inverse-check"> - <property name="label" translatable="yes" context="fourieranalysisdialog|inverse-check">Inverse</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="margin_bottom">3</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="polar-check"> - <property name="label" translatable="yes" context="fourieranalysisdialog|polar-check">Output in polar form</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="margin_bottom">3</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="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin-end">5</property> - <property name="margin_top">4</property> - <property name="label" translatable="yes" context="fourieranalysisdialog|label4">Minimum magnitude for polar form output (in dB)</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">minmagnitude-spin</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="minmagnitude-spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="valign">center</property> + <property name="margin-end">5</property> + <property name="margin_top">4</property> + <property name="label" translatable="yes" context="fourieranalysisdialog|label4">Minimum magnitude for polar form output (in dB)</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">minmagnitude-spin</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="minmagnitude-spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/goalseekdlg.ui b/sc/uiconfig/scalc/ui/goalseekdlg.ui index e75cd02aa8d3..4dc19e32539b 100644 --- a/sc/uiconfig/scalc/ui/goalseekdlg.ui +++ b/sc/uiconfig/scalc/ui/goalseekdlg.ui @@ -89,149 +89,142 @@ <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="formulatext"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="goalseekdlg|formulatext">_Formula cell:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">formulaedit</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="goalseekdlg|label3">Target _value:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">target</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="vartext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="goalseekdlg|vartext">Variable _cell:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">varedit</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="formulaedit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="formulatext"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="goalseekdlg|formulatext">_Formula cell:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">formulaedit</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="formulaedit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|formulaedit">In the formula cell, enter the reference of the cell which contains the formula. It contains the current cell reference.</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="goalseekdlg|label3">Target _value:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">target</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="vartext"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="goalseekdlg|vartext">Variable _cell:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">varedit</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="formulaedit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="formulaedit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|formulaedit">In the formula cell, enter the reference of the cell which contains the formula. It contains the current cell reference.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="target"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="target-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|target">Specifies the value you want to achieve as a new result.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="target"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="target-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|target">Specifies the value you want to achieve as a new result.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="varedit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="varedit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|varedit">Specifies the reference for the cell that contains the value you want to adjust in order to reach the target.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="varedit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="varedit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|varedit">Specifies the reference for the cell that contains the value you want to adjust in order to reach the target.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="formulabutton"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="formulabutton-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|formulabutton">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="formulabutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="formulabutton-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|formulabutton">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="varbutton"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="varbutton-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|varbutton">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="varbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="varbutton-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="goalseekdlg|extended_tip|varbutton">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/groupbydate.ui b/sc/uiconfig/scalc/ui/groupbydate.ui index 4896616a7a90..8e00f6d8b8ef 100644 --- a/sc/uiconfig/scalc/ui/groupbydate.ui +++ b/sc/uiconfig/scalc/ui/groupbydate.ui @@ -107,72 +107,66 @@ <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="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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkRadioButton" id="auto_start"> + <property name="label" translatable="yes" context="groupbydate|auto_start">_Automatically</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> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="auto_start"> - <property name="label" translatable="yes" context="groupbydate|auto_start">_Automatically</property> - <property name="visible">True</property> - <property 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="manual_start"> - <property name="label" translatable="yes" context="groupbydate|manual_start">_Manually at:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">auto_start</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="start_date"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</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">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="manual_start"> + <property name="label" translatable="yes" context="groupbydate|manual_start">_Manually at:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">auto_start</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="start_date"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</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">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -200,73 +194,67 @@ <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="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> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="auto_end"> + <property name="label" translatable="yes" context="groupbydate|auto_end">A_utomatically</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> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="auto_end"> - <property name="label" translatable="yes" context="groupbydate|auto_end">A_utomatically</property> - <property name="visible">True</property> - <property 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="manual_end"> - <property name="label" translatable="yes" context="groupbydate|manual_end">Ma_nually at:</property> - <property name="visible">True</property> - <property 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">auto_end</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="end_date"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</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">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="manual_end"> + <property name="label" translatable="yes" context="groupbydate|manual_end">Ma_nually at:</property> + <property name="visible">True</property> + <property 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">auto_end</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="end_date"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</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">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -296,136 +284,128 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">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="days"> + <property name="label" translatable="yes" context="groupbydate|days">Number of _days:</property> + <property name="visible">True</property> + <property 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="label-for" target="days_value"/> + </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="grid3"> + <object class="GtkRadioButton" id="intervals"> + <property name="label" translatable="yes" context="groupbydate|intervals">_Intervals:</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="valign">start</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">days</property> + <accessibility> + <relation type="label-for" target="interval_list"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="days_value"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + <accessibility> + <relation type="labelled-by" target="days"/> + </accessibility> + </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="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkRadioButton" id="days"> - <property name="label" translatable="yes" context="groupbydate|days">Number of _days:</property> - <property name="visible">True</property> - <property 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="label-for" target="days_value"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="intervals"> - <property name="label" translatable="yes" context="groupbydate|intervals">_Intervals:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="valign">start</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">days</property> - <accessibility> - <relation type="label-for" target="interval_list"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="days_value"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> - <accessibility> - <relation type="labelled-by" target="days"/> - </accessibility> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="interval_list"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="model">liststore1</property> + <property name="headers_visible">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection2"/> + </child> <child> - <object class="GtkTreeView" id="interval_list"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Macro Library List-selection2"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn4"> + <property name="resizable">True</property> + <property name="spacing">6</property> + <property name="alignment">0.5</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn4"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="alignment">0.5</property> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer5"/> - <attributes> - <attribute name="visible">3</attribute> - <attribute name="active">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererToggle" id="cellrenderer5"/> + <attributes> + <attribute name="visible">3</attribute> + <attribute name="active">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn5"> + <property name="resizable">True</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn5"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer4"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderer4"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> - <accessibility> - <relation type="labelled-by" target="intervals"/> - </accessibility> </object> </child> + <accessibility> + <relation type="labelled-by" target="intervals"/> + </accessibility> </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/sc/uiconfig/scalc/ui/groupbynumber.ui b/sc/uiconfig/scalc/ui/groupbynumber.ui index 25cd4fbdabd0..7a7b3ba6f460 100644 --- a/sc/uiconfig/scalc/ui/groupbynumber.ui +++ b/sc/uiconfig/scalc/ui/groupbynumber.ui @@ -89,74 +89,68 @@ <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="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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkRadioButton" id="auto_start"> + <property name="label" translatable="yes" context="groupbynumber|auto_start">_Automatically</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="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="manual_start"> + <property name="label" translatable="yes" context="groupbynumber|manual_start">_Manually at:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">auto_start</property> + <accessibility> + <relation type="label-for" target="edit_start"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="edit_start"> + <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="GtkRadioButton" id="auto_start"> - <property name="label" translatable="yes" context="groupbynumber|auto_start">_Automatically</property> - <property name="visible">True</property> - <property 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="manual_start"> - <property name="label" translatable="yes" context="groupbynumber|manual_start">_Manually at:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">auto_start</property> - <accessibility> - <relation type="label-for" target="edit_start"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edit_start"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <accessibility> - <relation type="labelled-by" target="manual_start"/> - </accessibility> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="activates_default">True</property> + <accessibility> + <relation type="labelled-by" target="manual_start"/> + </accessibility> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -184,73 +178,67 @@ <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="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> + <property name="margin-top">6</property> + <child> + <object class="GtkRadioButton" id="auto_end"> + <property name="label" translatable="yes" context="groupbynumber|auto_end">A_utomatically</property> + <property name="visible">True</property> + <property 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> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="manual_end"> + <property name="label" translatable="yes" context="groupbynumber|manual_end">Ma_nually at:</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="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">auto_end</property> + <accessibility> + <relation type="label-for" target="edit_end"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="edit_end"> + <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="GtkRadioButton" id="auto_end"> - <property name="label" translatable="yes" context="groupbynumber|auto_end">A_utomatically</property> - <property name="visible">True</property> - <property 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="manual_end"> - <property name="label" translatable="yes" context="groupbynumber|manual_end">Ma_nually at:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">auto_end</property> - <accessibility> - <relation type="label-for" target="edit_end"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edit_end"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <accessibility> - <relation type="labelled-by" target="manual_end"/> - </accessibility> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <accessibility> + <relation type="labelled-by" target="manual_end"/> + </accessibility> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -278,18 +266,12 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkEntry" id="edit_by"> <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="edit_by"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> + <property name="can_focus">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"> diff --git a/sc/uiconfig/scalc/ui/groupdialog.ui b/sc/uiconfig/scalc/ui/groupdialog.ui index 693155da9be2..99765774c3f9 100644 --- a/sc/uiconfig/scalc/ui/groupdialog.ui +++ b/sc/uiconfig/scalc/ui/groupdialog.ui @@ -82,53 +82,47 @@ <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="vexpand">True</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="rows"> + <property name="label" translatable="yes" context="groupdialog|rows">_Rows</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="rows"> - <property name="label" translatable="yes" context="groupdialog|rows">_Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</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="GtkRadioButton" id="cols"> - <property name="label" translatable="yes" context="groupdialog|cols">_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> - <property name="group">rows</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="cols"> + <property name="label" translatable="yes" context="groupdialog|cols">_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> + <property name="group">rows</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/headerfootercontent.ui b/sc/uiconfig/scalc/ui/headerfootercontent.ui index 42922596b7de..a7b33287f4c3 100644 --- a/sc/uiconfig/scalc/ui/headerfootercontent.ui +++ b/sc/uiconfig/scalc/ui/headerfootercontent.ui @@ -482,18 +482,12 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkLabel" id="label2"> <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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="headerfootercontent|label2">Use the buttons to change the font or insert field commands such as date, time, etc.</property> - </object> - </child> + <property name="label" translatable="yes" context="headerfootercontent|label2">Use the buttons to change the font or insert field commands such as date, time, etc.</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> </object> </child> <child type="label"> diff --git a/sc/uiconfig/scalc/ui/imoptdialog.ui b/sc/uiconfig/scalc/ui/imoptdialog.ui index a4886a35b0d9..0623eb8aba27 100644 --- a/sc/uiconfig/scalc/ui/imoptdialog.ui +++ b/sc/uiconfig/scalc/ui/imoptdialog.ui @@ -90,250 +90,240 @@ <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="charsetft"> <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="charsetft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="imoptdialog|charsetft">_Character set:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="label" translatable="yes" context="imoptdialog|charsetft">_Character set:</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="fieldft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="imoptdialog|fieldft">_Field delimiter:</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">1</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="imoptdialog|textft">Strin_g delimiter:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">text</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="GtkCheckButton" id="asshown"> + <property name="label" translatable="yes" context="imoptdialog|asshown">Save cell content as _shown</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="asshown-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|asshown">Enabled by default, data will be saved as displayed, including applied number formats. If this checkbox is not marked, raw data content will be saved, as in older versions of the software.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="fieldft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="imoptdialog|fieldft">_Field delimiter:</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">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formulas"> + <property name="label" translatable="yes" context="imoptdialog|formulas">Save cell fo_rmulas instead of calculated values</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">4</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="quoteall"> + <property name="label" translatable="yes" context="imoptdialog|quoteall">_Quote all text cells</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="quoteall-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|quoteall">Exports all text cells with leading and trailing quote characters as set in the Text delimiter box. If not checked, only those text cells get quoted that contain the Field delimiter character.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</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="imoptdialog|textft">Strin_g delimiter:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">text</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fixedwidth"> + <property name="label" translatable="yes" context="imoptdialog|fixedwidth">Fixed column _width</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="fixedwidth-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|fixedwidth">Exports all data fields with a fixed width.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="asshown"> - <property name="label" translatable="yes" context="imoptdialog|asshown">Save cell content as _shown</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field"> + <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="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="asshown-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|asshown">Enabled by default, data will be saved as displayed, including applied number formats. If this checkbox is not marked, raw data content will be saved, as in older versions of the software.</property> - </object> - </child> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="formulas"> - <property name="label" translatable="yes" context="imoptdialog|formulas">Save cell fo_rmulas instead of calculated values</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="field-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|field">Choose or enter the field delimiter, which separates data fields.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="quoteall"> - <property name="label" translatable="yes" context="imoptdialog|quoteall">_Quote all text cells</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="quoteall-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|quoteall">Exports all text cells with leading and trailing quote characters as set in the Text delimiter box. If not checked, only those text cells get quoted that contain the Field delimiter character.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="fixedwidth"> - <property name="label" translatable="yes" context="imoptdialog|fixedwidth">Fixed column _width</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="text"> + <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-entry2"> <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="fixedwidth-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|fixedwidth">Exports all data fields with a fixed width.</property> - </object> - </child> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="field"> - <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="field-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|field">Choose or enter the field delimiter, which separates data fields.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="text-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|text">Choose or enter the text delimiter, which encloses every data field.</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">2</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> - <object class="GtkComboBoxText" id="text"> - <property name="visible">True</property> + <object class="GtkComboBoxText" id="charsetdropdown"> <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> + <property name="no_show_all">True</property> + <property name="hexpand">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="text-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|text">Choose or enter the text delimiter, which encloses every data field.</property> + <object class="AtkObject" id="charsetdropdown-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|charsetdropdown">Specifies the character set for text export.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <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="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkComboBoxText" id="charsetdropdown"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="charsetdropdown-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|charsetdropdown">Specifies the character set for text export.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="charsetlist"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="model">liststore1</property> + <property name="headers_visible">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection2"/> + </child> <child> - <object class="GtkTreeView" id="charsetlist"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Macro Library List-selection2"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn5"> + <property name="resizable">True</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn5"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer4"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="charsetlist-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|charsetlist">Select the character set from the options used for import/export.</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="charsetlist-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="imoptdialog|extended_tip|charsetlist">Select the character set from the options used for import/export.</property> + </object> + </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> @@ -342,6 +332,10 @@ </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/insertcells.ui b/sc/uiconfig/scalc/ui/insertcells.ui index de26aeb8193a..b87cbf5260d7 100644 --- a/sc/uiconfig/scalc/ui/insertcells.ui +++ b/sc/uiconfig/scalc/ui/insertcells.ui @@ -80,106 +80,100 @@ <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="GtkBox" id="box1"> + <object class="GtkRadioButton" id="down"> + <property name="label" translatable="yes" context="insertcells|down">Shift cells _down</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="down"> - <property name="label" translatable="yes" context="insertcells|down">Shift cells _down</property> - <property name="visible">True</property> - <property 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="down-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertcells|extended_tip|down">Moves the contents of the selected range downward when cells are inserted.</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="down-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertcells|extended_tip|down">Moves the contents of the selected range downward when cells are inserted.</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="right"> - <property name="label" translatable="yes" context="insertcells|right">Shift cells _right</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">down</property> - <child internal-child="accessible"> - <object class="AtkObject" id="right-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertcells|extended_tip|right">Moves the contents of the selected range to the right when cells are inserted.</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="right"> + <property name="label" translatable="yes" context="insertcells|right">Shift cells _right</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">down</property> + <child internal-child="accessible"> + <object class="AtkObject" id="right-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertcells|extended_tip|right">Moves the contents of the selected range to the right when cells are inserted.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="rows"> - <property name="label" translatable="yes" context="insertcells|rows">Entire ro_w</property> - <property name="visible">True</property> - <property name="can_focus">True</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">down</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rows-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertcells|extended_tip|rows">Inserts an entire row. The position of the row is determined by the selection on the sheet.</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="GtkRadioButton" id="rows"> + <property name="label" translatable="yes" context="insertcells|rows">Entire ro_w</property> + <property name="visible">True</property> + <property name="can_focus">True</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">down</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rows-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertcells|extended_tip|rows">Inserts an entire row. The position of the row is determined by the selection on the sheet.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="cols"> - <property name="label" translatable="yes" context="insertcells|cols">Entire _column</property> - <property name="visible">True</property> - <property name="can_focus">True</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">down</property> - <child internal-child="accessible"> - <object class="AtkObject" id="cols-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertcells|extended_tip|cols">Inserts an entire column. The number of columns to be inserted is determined by the selected number of columns.</property> - </object> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="cols"> + <property name="label" translatable="yes" context="insertcells|cols">Entire _column</property> + <property name="visible">True</property> + <property name="can_focus">True</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">down</property> + <child internal-child="accessible"> + <object class="AtkObject" id="cols-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertcells|extended_tip|cols">Inserts an entire column. The number of columns to be inserted is determined by the selected number of columns.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/insertsheet.ui b/sc/uiconfig/scalc/ui/insertsheet.ui index 1a7d5e8a2318..abf7445d01a2 100644 --- a/sc/uiconfig/scalc/ui/insertsheet.ui +++ b/sc/uiconfig/scalc/ui/insertsheet.ui @@ -101,62 +101,56 @@ <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="GtkRadioButton" id="before"> + <property name="label" translatable="yes" context="insertsheet|before">B_efore current sheet</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="before"> - <property name="label" translatable="yes" context="insertsheet|before">B_efore current sheet</property> - <property name="visible">True</property> - <property 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="before-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|before">Inserts a new sheet directly before the current sheet.</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="before-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|before">Inserts a new sheet directly before the current sheet.</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="after"> - <property name="label" translatable="yes" context="insertsheet|after">_After current sheet</property> - <property name="visible">True</property> - <property name="can_focus">True</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> - <child internal-child="accessible"> - <object class="AtkObject" id="after-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|after">Inserts a new sheet directly after the current sheet.</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="after"> + <property name="label" translatable="yes" context="insertsheet|after">_After current sheet</property> + <property name="visible">True</property> + <property name="can_focus">True</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> + <child internal-child="accessible"> + <object class="AtkObject" id="after-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|after">Inserts a new sheet directly after the current sheet.</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> @@ -186,315 +180,294 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="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="box3"> + <object class="GtkBox" id="box4"> <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="box4"> + <object class="GtkRadioButton" id="new"> + <property name="label" translatable="yes" context="insertsheet|new">_New sheet</property> + <property name="visible">True</property> + <property 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="new-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|new">Creates a new sheet. Enter a sheet name in the Name field. Allowed characters are letters, numbers, spaces, and the underline character.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkRadioButton" id="new"> - <property name="label" translatable="yes" context="insertsheet|new">_New sheet</property> + <object class="GtkLabel" id="countft"> <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="insertsheet|countft">N_o. of sheets:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">countnf</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="GtkLabel" id="nameft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="insertsheet|nameft">Na_me:</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">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="countnf"> + <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> <child internal-child="accessible"> - <object class="AtkObject" id="new-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|new">Creates a new sheet. Enter a sheet name in the Name field. Allowed characters are letters, numbers, spaces, and the underline character.</property> + <object class="AtkObject" id="countnf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|countnf">Specifies the number of sheets to be created.</property> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkEntry" id="nameed"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="left_padding">12</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="countft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="insertsheet|countft">N_o. of sheets:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">countnf</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="nameft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="insertsheet|nameft">Na_me:</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">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="countnf"> - <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> - <child internal-child="accessible"> - <object class="AtkObject" id="countnf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|countnf">Specifies the number of sheets to be created.</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="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">52</property> - <property name="text" translatable="yes" context="insertsheet|nameed">Sheet...</property> - <child internal-child="accessible"> - <object class="AtkObject" id="nameed-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|nameed">Specifies the name of the new sheet.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="activates_default">True</property> + <property name="width_chars">52</property> + <property name="text" translatable="yes" context="insertsheet|nameed">Sheet...</property> + <child internal-child="accessible"> + <object class="AtkObject" id="nameed-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|nameed">Specifies the name of the new sheet.</property> </object> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> </object> <packing> + <property name="expand">True</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="box5"> + <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="GtkRadioButton" id="fromfile"> + <property name="label" translatable="yes" context="insertsheet|fromfile">_From file</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">new</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fromfile-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|fromfile">Inserts a sheet from an existing file into the current 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="GtkBox" id="box5"> + <!-- 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="orientation">vertical</property> - <property name="spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkRadioButton" id="fromfile"> - <property name="label" translatable="yes" context="insertsheet|fromfile">_From file</property> + <object class="GtkLabel" id="path"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">new</property> - <child internal-child="accessible"> - <object class="AtkObject" id="fromfile-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|fromfile">Inserts a sheet from an existing file into the current document.</property> - </object> - </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="left_padding">12</property> + <property name="shadow_type">in</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkTreeView" id="tables"> <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="path"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> + <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> <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> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> <child> - <object class="GtkTreeView" id="tables"> - <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> - <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="tables-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="insertsheet|tables-atkobject">Tables in file</property> - <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|tables">If you selected a file by using the Browse button, the sheets contained in it are displayed in the list box. The file path is displayed below this box. Select the sheet to be inserted from the list box.</property> - </object> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">12</property> - <child> - <object class="GtkButton" id="browse"> - <property name="label" translatable="yes" context="insertsheet|browse">_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="browse-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|browse">Opens a dialog for selecting a file.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="link"> - <property name="label" translatable="yes" context="insertsheet|link">Lin_k</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="valign">start</property> - <property name="vexpand">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="link-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|link">Select to insert the sheet as a link instead as a copy. The links can be updated to show the current contents.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="tables-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="insertsheet|tables-atkobject">Tables in file</property> + <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|tables">If you selected a file by using the Browse button, the sheets contained in it are displayed in the list box. The file path is displayed below this box. Select the sheet to be inserted from the list box.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </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="row_spacing">12</property> + <child> + <object class="GtkButton" id="browse"> + <property name="label" translatable="yes" context="insertsheet|browse">_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="browse-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|browse">Opens a dialog for selecting a file.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="link"> + <property name="label" translatable="yes" context="insertsheet|link">Lin_k</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="valign">start</property> + <property name="vexpand">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="link-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertsheet|extended_tip|link">Select to insert the sheet as a link instead as a copy. The links can be updated to show the current contents.</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> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/integerdialog.ui b/sc/uiconfig/scalc/ui/integerdialog.ui index 3728e23fd4f5..6ac880628d4f 100644 --- a/sc/uiconfig/scalc/ui/integerdialog.ui +++ b/sc/uiconfig/scalc/ui/integerdialog.ui @@ -75,21 +75,15 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkSpinButton" id="value"> <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="GtkSpinButton" id="value"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> </object> </child> <child type="label"> diff --git a/sc/uiconfig/scalc/ui/managenamesdialog.ui b/sc/uiconfig/scalc/ui/managenamesdialog.ui index 34d106fa4ddc..c177da5f7c7d 100644 --- a/sc/uiconfig/scalc/ui/managenamesdialog.ui +++ b/sc/uiconfig/scalc/ui/managenamesdialog.ui @@ -345,100 +345,94 @@ <property name="can_focus">True</property> <property name="resize_toplevel">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="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="GtkCheckButton" id="printrange"> + <property name="label" translatable="yes" context="managenamesdialog|printrange">_Print range</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="column_homogeneous">True</property> - <child> - <object class="GtkCheckButton" id="printrange"> - <property name="label" translatable="yes" context="managenamesdialog|printrange">_Print range</property> - <property name="visible">True</property> - <property name="can_focus">True</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="printrange-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="managenamesdialog|extended_tip|printrange">Defines the area as a print range.</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="printrange-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="managenamesdialog|extended_tip|printrange">Defines the area as a print range.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="filter"> - <property name="label" translatable="yes" context="managenamesdialog|filter">_Filter</property> - <property name="visible">True</property> - <property name="can_focus">True</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="filter-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="managenamesdialog|extended_tip|filter">Defines the selected area to be used in an advanced filter.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="filter"> + <property name="label" translatable="yes" context="managenamesdialog|filter">_Filter</property> + <property name="visible">True</property> + <property name="can_focus">True</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="filter-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="managenamesdialog|extended_tip|filter">Defines the selected area to be used in an advanced filter.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="colheader"> - <property name="label" translatable="yes" context="managenamesdialog|colheader">Repeat _column</property> - <property name="visible">True</property> - <property name="can_focus">True</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="colheader-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="managenamesdialog|extended_tip|colheader">Defines the area as a repeating column.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="colheader"> + <property name="label" translatable="yes" context="managenamesdialog|colheader">Repeat _column</property> + <property name="visible">True</property> + <property name="can_focus">True</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="colheader-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="managenamesdialog|extended_tip|colheader">Defines the area as a repeating column.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="rowheader"> - <property name="label" translatable="yes" context="managenamesdialog|rowheader">Repeat _row</property> - <property name="visible">True</property> - <property name="can_focus">True</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="rowheader-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="managenamesdialog|extended_tip|rowheader">Defines the area as a repeating row.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="rowheader"> + <property name="label" translatable="yes" context="managenamesdialog|rowheader">Repeat _row</property> + <property name="visible">True</property> + <property name="can_focus">True</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="rowheader-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="managenamesdialog|extended_tip|rowheader">Defines the area as a repeating row.</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/sc/uiconfig/scalc/ui/movecopysheet.ui b/sc/uiconfig/scalc/ui/movecopysheet.ui index dee2bcb2ebb8..a2afd2812996 100644 --- a/sc/uiconfig/scalc/ui/movecopysheet.ui +++ b/sc/uiconfig/scalc/ui/movecopysheet.ui @@ -85,57 +85,51 @@ <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="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkRadioButton" id="move"> + <property name="label" translatable="yes" context="movecopysheet|move">_Move</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkRadioButton" id="move"> - <property name="label" translatable="yes" context="movecopysheet|move">_Move</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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="copy"> - <property name="label" translatable="yes" context="movecopysheet|copy">C_opy</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">move</property> - <child internal-child="accessible"> - <object class="AtkObject" id="copy-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="movecopysheet|extended_tip|copy">Specifies that the sheet is to be copied. If the option is unmarked, the sheet is moved.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</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="GtkRadioButton" id="copy"> + <property name="label" translatable="yes" context="movecopysheet|copy">C_opy</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">move</property> + <child internal-child="accessible"> + <object class="AtkObject" id="copy-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="movecopysheet|extended_tip|copy">Specifies that the sheet is to be copied. If the option is unmarked, the sheet is moved.</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> @@ -166,137 +160,124 @@ <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">12</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">12</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkLabel" id="toDocumentLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="toDocumentLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="movecopysheet|toDocumentLabel">To _document</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">toDocument</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="GtkComboBoxText" id="toDocument"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="movecopysheet|toDocument">(current document)</item> - <item translatable="yes" context="movecopysheet|toDocument">- new document -</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="toDocument-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="movecopysheet|extended_tip|toDocument">Indicates where the current sheet is to be moved or copied to.</property> - </object> - </child> + <property name="label" translatable="yes" context="movecopysheet|toDocumentLabel">To _document</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">toDocument</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="GtkComboBoxText" id="toDocument"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="movecopysheet|toDocument">(current document)</item> + <item translatable="yes" context="movecopysheet|toDocument">- new document -</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="toDocument-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="movecopysheet|extended_tip|toDocument">Indicates where the current sheet is to be moved or copied to.</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> + <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="box4"> + <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="box4"> + <object class="GtkLabel" id="insertBeforeLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="movecopysheet|insertBeforeLabel">_Insert before</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">insertBefore</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" 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="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="insertBeforeLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="movecopysheet|insertBeforeLabel">_Insert before</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">insertBefore</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="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkTreeView" id="insertBefore"> <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="insertBefore"> - <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="insertBefore-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="movecopysheet|extended_tip|insertBefore">The current sheet is moved or copied in front of the selected sheet.</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="insertBefore-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="movecopysheet|extended_tip|insertBefore">The current sheet is moved or copied in front of the selected sheet.</property> + </object> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -306,6 +287,11 @@ </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -338,89 +324,83 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box6"> <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="box6"> + <object class="GtkEntry" id="newName"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</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="newNameWarn"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkEntry" id="newName"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</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="newNameWarn"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</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> - <child> - <object class="GtkLabel" id="warnunused"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="valign">start</property> - <property name="label" translatable="yes" context="movecopysheet|warnunused">This name is already used.</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="GtkLabel" id="warnempty"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="valign">start</property> - <property name="label" translatable="yes" context="movecopysheet|warnempty">Name is empty.</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">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="warninvalid"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="valign">start</property> - <property name="label" translatable="yes" context="movecopysheet|warninvalid">Name contains one or more invalid characters.</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">4</property> - </packing> - </child> + <property name="valign">start</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> + <child> + <object class="GtkLabel" id="warnunused"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="label" translatable="yes" context="movecopysheet|warnunused">This name is already used.</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="GtkLabel" id="warnempty"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="label" translatable="yes" context="movecopysheet|warnempty">Name is empty.</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">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="warninvalid"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="label" translatable="yes" context="movecopysheet|warninvalid">Name contains one or more invalid characters.</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">4</property> + </packing> </child> </object> <packing> diff --git a/sc/uiconfig/scalc/ui/movingaveragedialog.ui b/sc/uiconfig/scalc/ui/movingaveragedialog.ui index e79e468ec89f..fb92dcc32655 100644 --- a/sc/uiconfig/scalc/ui/movingaveragedialog.ui +++ b/sc/uiconfig/scalc/ui/movingaveragedialog.ui @@ -87,117 +87,111 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="input-range-label"> <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="input-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="movingaveragedialog|input-range-label">Input range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="input-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="movingaveragedialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="trimrange-check"> - <property name="label" translatable="yes" context="movingaveragedialog|trimrange-check">Trim input range to actual data content</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="label" translatable="yes" context="movingaveragedialog|input-range-label">Input range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="input-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="movingaveragedialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="trimrange-check"> + <property name="label" translatable="yes" context="movingaveragedialog|trimrange-check">Trim input range to actual data content</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -225,53 +219,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="movingaveragedialog|groupedby-columns-radio">Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="movingaveragedialog|groupedby-columns-radio">Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="movingaveragedialog|groupedby-rows-radio">Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="movingaveragedialog|groupedby-rows-radio">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -299,48 +287,42 @@ <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="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="interval-label"> <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="interval-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="movingaveragedialog|interval-label">Interval:</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="GtkSpinButton" id="interval-spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text">2</property> - <property name="adjustment">interval-adjustment</property> - <property name="value">2</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="movingaveragedialog|interval-label">Interval:</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="GtkSpinButton" id="interval-spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text">2</property> + <property name="adjustment">interval-adjustment</property> + <property name="value">2</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui b/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui index 1ea255f0ae4b..3da4ed1d7a49 100644 --- a/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui +++ b/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui @@ -89,165 +89,159 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="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> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="formulasft"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="multipleoperationsdialog|formulasft">_Formulas:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">formulas</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="rowft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="multipleoperationsdialog|rowft">_Row input cell:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">row</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="colft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="multipleoperationsdialog|colft">_Column input cell:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">col</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="GtkEntry" id="formulas"> + <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> - <property name="row_homogeneous">True</property> - <child> - <object class="GtkLabel" id="formulasft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="multipleoperationsdialog|formulasft">_Formulas:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">formulas</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="rowft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="multipleoperationsdialog|rowft">_Row input cell:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">row</property> - <property name="xalign">0</property> + <property name="activates_default">True</property> + <property name="width_chars">35</property> + <child internal-child="accessible"> + <object class="AtkObject" id="formulas-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|formulas">Enter the cell references for the cells containing the formulas that you want to use in the multiple operation.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel" id="colft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="multipleoperationsdialog|colft">_Column input cell:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">col</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="GtkEntry" id="formulas"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">35</property> - <child internal-child="accessible"> - <object class="AtkObject" id="formulas-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|formulas">Enter the cell references for the cells containing the formulas that you want to use in the multiple operation.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="row"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">35</property> - <child internal-child="accessible"> - <object class="AtkObject" id="row-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|row">Enter the input cell reference that you want to use as a variable for the rows in the data table.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="row"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">35</property> + <child internal-child="accessible"> + <object class="AtkObject" id="row-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|row">Enter the input cell reference that you want to use as a variable for the rows in the data table.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="col"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">35</property> - <child internal-child="accessible"> - <object class="AtkObject" id="col-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|col">Enter the input cell reference that you want to use as a variable for the columns in the data table.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="col"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">35</property> + <child internal-child="accessible"> + <object class="AtkObject" id="col-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|col">Enter the input cell reference that you want to use as a variable for the columns in the data table.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="formulasref"> - <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="formulasref-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|formulasref">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="formulasref"> + <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="formulasref-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|formulasref">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="rowref"> - <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="rowref-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|rowref">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="rowref"> + <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="rowref-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|rowref">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkButton" id="colref"> - <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="colref-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|colref">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="colref"> + <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="colref-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="multipleoperationsdialog|extended_tip|colref">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/namerangesdialog.ui b/sc/uiconfig/scalc/ui/namerangesdialog.ui index 2440111260f4..6f44237ea014 100644 --- a/sc/uiconfig/scalc/ui/namerangesdialog.ui +++ b/sc/uiconfig/scalc/ui/namerangesdialog.ui @@ -103,288 +103,280 @@ <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="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="grid2"> + <object class="GtkEntry" id="edassign"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="edassign"> - <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="edassign-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|edassign">Displays the cell reference of each label range.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="rbassign"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="rbassign-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|rbassign">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="edassign-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|edassign">Displays the cell reference of each label range.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkButton" id="rbassign"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="column_spacing">12</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <child> - <object class="GtkRadioButton" id="colhead"> - <property name="label" translatable="yes" context="namerangesdialog|colhead">Contains _column labels</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> - <child internal-child="accessible"> - <object class="AtkObject" id="colhead-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|colhead">Includes column labels in the current label range.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkRadioButton" id="rowhead"> - <property name="label" translatable="yes" context="namerangesdialog|rowhead">Contains _row labels</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">colhead</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rowhead-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|rowhead">Includes row labels in the current label range.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="rbassign-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|rbassign">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</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">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> + </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="datarange"> + <object class="GtkRadioButton" id="colhead"> + <property name="label" translatable="yes" context="namerangesdialog|colhead">Contains _column labels</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="namerangesdialog|datarange">For _data range</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="mnemonic_widget">edassign2</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="colhead-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|colhead">Includes column labels in the current label range.</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkRadioButton" id="rowhead"> + <property name="label" translatable="yes" context="namerangesdialog|rowhead">Contains _row labels</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="column_spacing">12</property> - <child> - <object class="GtkEntry" id="edassign2"> - <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="edassign2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|edassign2">Sets the data range for which the selected label range is valid. To modify it, click in the sheet and select another range with the mouse.</property> - </object> - </child> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">colhead</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rowhead-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|rowhead">Includes row labels in the current label range.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="rbassign2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="rbassign2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|rbassign2">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</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="GtkLabel" id="datarange"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="namerangesdialog|datarange">For _data range</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">edassign2</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="grid4"> + <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="GtkEntry" id="edassign2"> + <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="edassign2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|edassign2">Sets the data range for which the selected label range is valid. To modify it, click in the sheet and select another range with the mouse.</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">4</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkButtonBox" id="buttonbox1"> + <object class="GtkButton" id="rbassign2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">12</property> - <property name="layout_style">center</property> + <property name="can_focus">True</property> + <property name="receives_default">True</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">True</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="namerangesdialog|extended_tip|add">Adds the current label range to the list.</property> - </object> - </child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="rbassign2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|rbassign2">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</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="delete"> - <property name="label">gtk-delete</property> - <property name="visible">True</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="delete-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|delete">Deletes the selected element or elements without requiring confirmation.</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">4</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="spacing">12</property> + <property name="layout_style">center</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">True</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="namerangesdialog|extended_tip|add">Adds the current label range to the list.</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">5</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkScrolledWindow"> + <object class="GtkButton" id="delete"> + <property name="label">gtk-delete</property> + <property name="visible">True</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="delete-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|delete">Deletes the selected element or elements without requiring confirmation.</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">5</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="GtkTreeView" id="range"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="model">liststore1</property> + <property name="headers_visible">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> <child> - <object class="GtkTreeView" id="range"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn3"> + <property name="resizable">True</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn3"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer3"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="range-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|range">Displays the cell reference of each label range.</property> - </object> + <object class="GtkCellRendererText" id="cellrenderer3"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="range-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="namerangesdialog|extended_tip|range">Displays the cell reference of each label range.</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/sc/uiconfig/scalc/ui/optcalculatepage.ui b/sc/uiconfig/scalc/ui/optcalculatepage.ui index bfea46988596..cfb2d8902fbd 100644 --- a/sc/uiconfig/scalc/ui/optcalculatepage.ui +++ b/sc/uiconfig/scalc/ui/optcalculatepage.ui @@ -28,38 +28,31 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkCheckButton" id="threadingenabled"> + <property name="label" translatable="yes" context="optcalculatepage|threadingenabled">Enable multi-threaded calculation</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="threadingenabled"> - <property name="label" translatable="yes" context="optcalculatepage|threadingenabled">Enable multi-threaded calculation</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="optcalculatepage|threadingenabled|tooltip_text">Enable multi-threaded calculation of formula-groups</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">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="optcalculatepage|threadingenabled|tooltip_text">Enable multi-threaded calculation of formula-groups</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">2</property> + </packing> </child> </object> </child> @@ -87,170 +80,158 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="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="case"> + <property name="label" translatable="yes" context="optcalculatepage|case">Case se_nsitive</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckButton" id="case"> - <property name="label" translatable="yes" context="optcalculatepage|case">Case se_nsitive</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="optcalculatepage|case|tooltip_text">Disable case sensitivity for interoperability with Microsoft Excel</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="case-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|case">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="optcalculatepage|case|tooltip_text">Disable case sensitivity for interoperability with Microsoft Excel</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="case-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|case">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="calc"> - <property name="label" translatable="yes" context="optcalculatepage|calc">_Precision as shown</property> - <property name="visible">True</property> - <property name="can_focus">True</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="calc-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|calc">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the Precision as shown option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="calc"> + <property name="label" translatable="yes" context="optcalculatepage|calc">_Precision as shown</property> + <property name="visible">True</property> + <property name="can_focus">True</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="calc-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|calc">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the Precision as shown option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="match"> - <property name="label" translatable="yes" context="optcalculatepage|match">Search criteria = and <> must apply to _whole cells</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="optcalculatepage|match|tooltip_text">Enable this for interoperability with Microsoft Excel</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="match-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|match">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When both, the Search criteria = and <> must apply to whole cells box and the Enable wildcards in formulas box are marked, %PRODUCTNAME Calc behaves exactly as Microsoft Excel when searching cells in the database functions.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="match"> + <property name="label" translatable="yes" context="optcalculatepage|match">Search criteria = and <> must apply to _whole cells</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="optcalculatepage|match|tooltip_text">Enable this for interoperability with Microsoft Excel</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="match-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|match">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When both, the Search criteria = and <> must apply to whole cells box and the Enable wildcards in formulas box are marked, %PRODUCTNAME Calc behaves exactly as Microsoft Excel when searching cells in the database functions.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="lookup"> - <property name="label" translatable="yes" context="optcalculatepage|lookup">_Automatically find column and row labels</property> - <property name="visible">True</property> - <property name="can_focus">True</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="lookup-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|lookup">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="lookup"> + <property name="label" translatable="yes" context="optcalculatepage|lookup">_Automatically find column and row labels</property> + <property name="visible">True</property> + <property name="can_focus">True</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="lookup-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|lookup">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</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> + <child> + <object class="GtkCheckButton" id="generalprec"> + <property name="label" translatable="yes" context="optcalculatepage|generalprec">_Limit decimals for general 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="generalprec-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|generalprec">You can specify the maximum number of decimal places that are shown by default for cells with General number format. If not enabled, cells with General number format show as many decimal places as the column width allows.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <property name="margin-start">18</property> <child> - <object class="GtkCheckButton" id="generalprec"> - <property name="label" translatable="yes" context="optcalculatepage|generalprec">_Limit decimals for general number format</property> + <object class="GtkLabel" id="precft"> <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="optcalculatepage|precft">_Decimal places:</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="generalprec-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|generalprec">You can specify the maximum number of decimal places that are shown by default for cells with General number format. If not enabled, cells with General number format show as many decimal places as the column width allows.</property> - </object> - </child> + <property name="mnemonic_widget">prec</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkAlignment"> + <object class="GtkSpinButton" id="prec"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">18</property> - <child> - <object class="GtkBox" id="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="precft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcalculatepage|precft">_Decimal places:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">prec</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="prec"> - <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="prec-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|prec">Defines the number of decimals to be displayed for numbers with the General number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </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="prec-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|prec">Defines the number of decimals to be displayed for numbers with the General number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</property> </object> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> </child> </object> </child> @@ -278,122 +259,110 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox"> + <object class="GtkCheckButton" id="iterate"> + <property name="label" translatable="yes" context="optcalculatepage|iterate">_Iterations</property> + <property name="visible">True</property> + <property name="can_focus">True</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="iterate-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|iterate">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">3</property> + <property name="row_spacing">3</property> + <property name="column_spacing">6</property> + <property name="margin-start">18</property> <child> - <object class="GtkCheckButton" id="iterate"> - <property name="label" translatable="yes" context="optcalculatepage|iterate">_Iterations</property> + <object class="GtkLabel" id="stepsft"> <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="optcalculatepage|stepsft">_Steps:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">steps</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="GtkLabel" id="minchangeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optcalculatepage|minchangeft">_Minimum change:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">minchange</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="steps"> + <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="iterate-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|iterate">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</property> + <object class="AtkObject" id="steps-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|steps">Sets the maximum number of iteration steps.</property> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkAlignment"> + <object class="GtkEntry" id="minchange"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">18</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="stepsft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcalculatepage|stepsft">_Steps:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">steps</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="minchangeft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optcalculatepage|minchangeft">_Minimum change:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">minchange</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="steps"> - <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="steps-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|steps">Sets the maximum number of iteration steps.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="minchange"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="width_chars">12</property> - <child internal-child="accessible"> - <object class="AtkObject" id="minchange-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|minchange">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">12</property> + <child internal-child="accessible"> + <object class="AtkObject" id="minchange-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|minchange">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</property> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">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> @@ -421,83 +390,77 @@ <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="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="GtkRadioButton" id="datestd"> + <property name="label" translatable="yes" context="optcalculatepage|datestd">12/30/1899 (defa_ult)</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkRadioButton" id="datestd"> - <property name="label" translatable="yes" context="optcalculatepage|datestd">12/30/1899 (defa_ult)</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="optcalculatepage|datestd|tooltip_text">Value 0 corresponds to 12/30/1899</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="datestd-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|datestd">Sets 12/30/1899 as day zero.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="optcalculatepage|datestd|tooltip_text">Value 0 corresponds to 12/30/1899</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="datestd-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|datestd">Sets 12/30/1899 as day zero.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="datesc10"> - <property name="label" translatable="yes" context="optcalculatepage|datesc10">01/01/1900 (Star_Calc 1.0)</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="optcalculatepage|datesc10|tooltip_text">Value 0 corresponds to 01/01/1900</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">datestd</property> - <child internal-child="accessible"> - <object class="AtkObject" id="datesc10-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|datesc10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="datesc10"> + <property name="label" translatable="yes" context="optcalculatepage|datesc10">01/01/1900 (Star_Calc 1.0)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="optcalculatepage|datesc10|tooltip_text">Value 0 corresponds to 01/01/1900</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">datestd</property> + <child internal-child="accessible"> + <object class="AtkObject" id="datesc10-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|datesc10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="date1904"> - <property name="label" translatable="yes" context="optcalculatepage|date1904">_01/01/1904</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="optcalculatepage|date1904|tooltip_text">0 corresponds to 01/01/1904</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">datestd</property> - <child internal-child="accessible"> - <object class="AtkObject" id="date1904-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|date1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="date1904"> + <property name="label" translatable="yes" context="optcalculatepage|date1904">_01/01/1904</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="optcalculatepage|date1904|tooltip_text">0 corresponds to 01/01/1904</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">datestd</property> + <child internal-child="accessible"> + <object class="AtkObject" id="date1904-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|date1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -524,81 +487,75 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="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="formulawildcards"> + <property name="label" translatable="yes" context="optcalculatepage|formulawildcards">Enable w_ildcards in formulas</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkRadioButton" id="formulawildcards"> - <property name="label" translatable="yes" context="optcalculatepage|formulawildcards">Enable w_ildcards in formulas</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="optcalculatepage|formulawildcards|tooltip_text">Enable wildcards for interoperability with Microsoft Excel</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="formulawildcards-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formulawildcards">Specifies that wildcards are enabled when searching and also for character string comparisons.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="optcalculatepage|formulawildcards|tooltip_text">Enable wildcards for interoperability with Microsoft Excel</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="formulawildcards-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formulawildcards">Specifies that wildcards are enabled when searching and also for character string comparisons.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="formularegex"> - <property name="label" translatable="yes" context="optcalculatepage|formularegex">Enable r_egular expressions in formulas</property> - <property name="visible">True</property> - <property name="can_focus">True</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">formulawildcards</property> - <child internal-child="accessible"> - <object class="AtkObject" id="formularegex-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formularegex">Specifies that regular expressions instead of simple wildcards are enabled when searching and also for character string comparisons.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="formularegex"> + <property name="label" translatable="yes" context="optcalculatepage|formularegex">Enable r_egular expressions in formulas</property> + <property name="visible">True</property> + <property name="can_focus">True</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">formulawildcards</property> + <child internal-child="accessible"> + <object class="AtkObject" id="formularegex-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formularegex">Specifies that regular expressions instead of simple wildcards are enabled when searching and also for character string comparisons.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="formulaliteral"> - <property name="label" translatable="yes" context="optcalculatepage|formulaliteral">No wildcards or regular expressions in formulas</property> - <property name="visible">True</property> - <property name="can_focus">True</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">formulawildcards</property> - <child internal-child="accessible"> - <object class="AtkObject" id="formulaliteral-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formulaliteral">Specifies that only literal strings are used when searching and also for character string comparisons.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="formulaliteral"> + <property name="label" translatable="yes" context="optcalculatepage|formulaliteral">No wildcards or regular expressions in formulas</property> + <property name="visible">True</property> + <property name="can_focus">True</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">formulawildcards</property> + <child internal-child="accessible"> + <object class="AtkObject" id="formulaliteral-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formulaliteral">Specifies that only literal strings are used when searching and also for character string comparisons.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/optchangespage.ui b/sc/uiconfig/scalc/ui/optchangespage.ui index b7371813435b..dbdb116b6b92 100644 --- a/sc/uiconfig/scalc/ui/optchangespage.ui +++ b/sc/uiconfig/scalc/ui/optchangespage.ui @@ -16,169 +16,162 @@ <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="label2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optchangespage|label2">Chan_ges:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">changes</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="optchangespage|label3">_Deletions:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">deletions</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="label" translatable="yes" context="optchangespage|label4">_Insertions:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">insertions</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="optchangespage|label5">_Moved entries:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entries</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="GtkMenuButton" id="changes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optchangespage|label2">Chan_ges:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">changes</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optchangespage|label3">_Deletions:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">deletions</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="changes-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|changes">Specifies the color for changes of cell contents.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="deletions"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optchangespage|label4">_Insertions:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">insertions</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optchangespage|label5">_Moved entries:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entries</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="deletions-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|deletions">Specifies the color to highlight deletions in a document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="entries"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> <child> - <object class="GtkMenuButton" id="changes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="changes-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|changes">Specifies the color for changes of cell contents.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkMenuButton" id="deletions"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="deletions-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|deletions">Specifies the color to highlight deletions in a document.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="entries-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|entries">Specifies the color to highlight moved cell contents.</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">3</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="insertions"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> <child> - <object class="GtkMenuButton" id="entries"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="entries-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|entries">Specifies the color to highlight moved cell contents.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkMenuButton" id="insertions"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="insertions-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|insertions">Specifies the color to highlight insertions in a document.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="insertions-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|insertions">Specifies the color to highlight insertions in a document.</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/sc/uiconfig/scalc/ui/optcompatibilitypage.ui b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui index 7d297d5298dd..891ce4371cf3 100644 --- a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui +++ b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui @@ -17,58 +17,50 @@ <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="vexpand">True</property> - <property name="label" translatable="yes" context="optcompatibilitypage|label2">Select desired _key binding type. Changing the key binding type may overwrite some of the existing key bindings.</property> - <property name="use_underline">True</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">keybindings</property> - <property name="width_chars">60</property> - <property name="max_width_chars">60</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="keybindings"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <items> - <item translatable="yes" context="optcompatibilitypage|keybindings">Default</item> - <item translatable="yes" context="optcompatibilitypage|keybindings">OpenOffice.org legacy</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="optcompatibilitypage|label2">Select desired _key binding type. Changing the key binding type may overwrite some of the existing key bindings.</property> + <property name="use_underline">True</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">keybindings</property> + <property name="width_chars">60</property> + <property name="max_width_chars">60</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="keybindings"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <items> + <item translatable="yes" context="optcompatibilitypage|keybindings">Default</item> + <item translatable="yes" context="optcompatibilitypage|keybindings">OpenOffice.org legacy</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/optdefaultpage.ui b/sc/uiconfig/scalc/ui/optdefaultpage.ui index 8b64d1e5a471..1b7229f66b16 100644 --- a/sc/uiconfig/scalc/ui/optdefaultpage.ui +++ b/sc/uiconfig/scalc/ui/optdefaultpage.ui @@ -21,87 +21,81 @@ <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="textsheetsnumber"> <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="textsheetsnumber"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optdefaultpage|textsheetsnumber">_Number of worksheets in new document:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">sheetsnumber</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="textsheetprefix"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optdefaultpage|textsheetprefix">_Prefix name for new worksheet:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">sheetprefix</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="sheetprefix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="sheetsnumber"> - <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">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="jumbo_sheets"> - <property name="label" translatable="yes" context="optdefaultpage|jumbo_sheets">_Enable very large spreadsheets (16m rows, 16384 cols)</property> - <property 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">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="optdefaultpage|textsheetsnumber">_Number of worksheets in new document:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">sheetsnumber</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="textsheetprefix"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optdefaultpage|textsheetprefix">_Prefix name for new worksheet:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">sheetprefix</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="sheetprefix"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="sheetsnumber"> + <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">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="jumbo_sheets"> + <property name="label" translatable="yes" context="optdefaultpage|jumbo_sheets">_Enable very large spreadsheets (16m rows, 16384 cols)</property> + <property 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">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/optdlg.ui b/sc/uiconfig/scalc/ui/optdlg.ui index 9f38a55f6b9e..3726f447195d 100644 --- a/sc/uiconfig/scalc/ui/optdlg.ui +++ b/sc/uiconfig/scalc/ui/optdlg.ui @@ -15,55 +15,49 @@ <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="forceBreaksCB"> + <property name="label" translatable="yes" context="optdlg|forceBreaksCB">_Always apply manual breaks</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="forceBreaksCB"> - <property name="label" translatable="yes" context="optdlg|forceBreaksCB">_Always apply manual breaks</property> - <property name="visible">True</property> - <property name="can_focus">True</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="suppressCB"> - <property name="label" translatable="yes" context="optdlg|suppressCB">_Suppress output of empty 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="suppressCB-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|suppressCB">Specifies that empty pages that have no cell contents or draw objects are not 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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="suppressCB"> + <property name="label" translatable="yes" context="optdlg|suppressCB">_Suppress output of empty 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="suppressCB-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|suppressCB">Specifies that empty pages that have no cell contents or draw objects are not printed.</property> </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> </object> </child> @@ -91,39 +85,33 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkCheckButton" id="printCB"> + <property name="label" translatable="yes" context="optdlg|printCB">_Print only selected sheets</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="printCB"> - <property name="label" translatable="yes" context="optdlg|printCB">_Print only selected sheets</property> - <property name="visible">True</property> - <property name="can_focus">True</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="printCB-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|printCB">Specifies that only contents from selected sheets are printed, even if you specify a wider range in the File - Print dialog or in the Format - Print Ranges dialog. Contents from sheets that are not selected will not be 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="printCB-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|printCB">Specifies that only contents from selected sheets are printed, even if you specify a wider range in the File - Print dialog or in the Format - Print Ranges dialog. Contents from sheets that are not selected will not be printed.</property> </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> </object> </child> diff --git a/sc/uiconfig/scalc/ui/optformula.ui b/sc/uiconfig/scalc/ui/optformula.ui index 5b0a0f624b80..d783f4122c6d 100644 --- a/sc/uiconfig/scalc/ui/optformula.ui +++ b/sc/uiconfig/scalc/ui/optformula.ui @@ -16,63 +16,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="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> + <object class="GtkCheckButton" id="englishfuncname"> + <property name="label" translatable="yes" context="optformula|englishfuncname">Use English function names</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> + <property name="hexpand">True</property> + <property name="column_spacing">12</property> <child> - <object class="GtkCheckButton" id="englishfuncname"> - <property name="label" translatable="yes" context="optformula|englishfuncname">Use English function names</property> + <object class="GtkComboBoxText" id="formulasyntax"> <property name="visible">True</property> - <property name="can_focus">True</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> + <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="formulasyntaxlabel"> <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="GtkComboBoxText" id="formulasyntax"> - <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="GtkLabel" id="formulasyntaxlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optformula|formulasyntaxlabel">Formula _syntax:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">formulasyntax</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="optformula|formulasyntaxlabel">Formula _syntax:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">formulasyntax</property> </object> <packing> <property name="left_attach">0</property> @@ -80,6 +70,10 @@ </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -106,79 +100,73 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="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="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="label9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optformula|label9">Excel 2007 and newer:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">ooxmlrecalc</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="optformula|label10">ODF spreadsheet (not saved by %PRODUCTNAME):</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">odfrecalc</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="ooxmlrecalc"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="optformula|ooxmlrecalc">Always recalculate</item> - <item translatable="yes" context="optformula|ooxmlrecalc">Never recalculate</item> - <item translatable="yes" context="optformula|ooxmlrecalc">Prompt user</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="odfrecalc"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="optformula|odfrecalc">Always recalculate</item> - <item translatable="yes" context="optformula|odfrecalc">Never recalculate</item> - <item translatable="yes" context="optformula|odfrecalc">Prompt user</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="optformula|label9">Excel 2007 and newer:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">ooxmlrecalc</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="optformula|label10">ODF spreadsheet (not saved by %PRODUCTNAME):</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">odfrecalc</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="ooxmlrecalc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="optformula|ooxmlrecalc">Always recalculate</item> + <item translatable="yes" context="optformula|ooxmlrecalc">Never recalculate</item> + <item translatable="yes" context="optformula|ooxmlrecalc">Prompt user</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="odfrecalc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="optformula|odfrecalc">Always recalculate</item> + <item translatable="yes" context="optformula|odfrecalc">Never recalculate</item> + <item translatable="yes" context="optformula|odfrecalc">Prompt user</item> + </items> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -206,29 +194,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="grid8"> <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> + <object class="GtkRadioButton" id="calcdefault"> + <property name="label" translatable="yes" context="optformula|calcdefault">Default 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="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> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkGrid" id="grid9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkRadioButton" id="calcdefault"> - <property name="label" translatable="yes" context="optformula|calcdefault">Default settings</property> + <object class="GtkRadioButton" id="calccustom"> + <property name="label" translatable="yes" context="optformula|calccustom">Custom (conversion of text to numbers and more):</property> <property name="visible">True</property> <property 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">calcdefault</property> </object> <packing> <property name="left_attach">0</property> @@ -236,47 +241,23 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid9"> + <object class="GtkButton" id="details"> + <property name="label" translatable="yes" context="optformula|details">Details…</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="calccustom"> - <property name="label" translatable="yes" context="optformula|calccustom">Custom (conversion of text to numbers and more):</property> - <property name="visible">True</property> - <property name="can_focus">True</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">calcdefault</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="details"> - <property name="label" translatable="yes" context="optformula|details">Details…</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">True</property> - </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="hexpand">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -304,125 +285,118 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="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="grid7"> + <object class="GtkLabel" id="label6"> <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="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optformula|label6">_Function:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">function</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optformula|label7">Array co_lumn:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">arraycolumn</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optformula|label8">Array _row:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">arrayrow</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="GtkEntry" id="function"> - <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">5</property> - <property name="max_width_chars">1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="arraycolumn"> - <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">5</property> - <property name="max_width_chars">1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="arrayrow"> - <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">5</property> - <property name="max_width_chars">1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="reset"> - <property name="label" translatable="yes" context="optformula|reset">Rese_t Separators Settings</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="label" translatable="yes" context="optformula|label6">_Function:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">function</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optformula|label7">Array co_lumn:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">arraycolumn</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="optformula|label8">Array _row:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">arrayrow</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="GtkEntry" id="function"> + <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">5</property> + <property name="max_width_chars">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="arraycolumn"> + <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">5</property> + <property name="max_width_chars">1</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="arrayrow"> + <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">5</property> + <property name="max_width_chars">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="reset"> + <property name="label" translatable="yes" context="optformula|reset">Rese_t Separators Settings</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/pastespecial.ui b/sc/uiconfig/scalc/ui/pastespecial.ui index e646c2f40882..0b58132f0907 100644 --- a/sc/uiconfig/scalc/ui/pastespecial.ui +++ b/sc/uiconfig/scalc/ui/pastespecial.ui @@ -111,180 +111,174 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=2 n-rows=4 --> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">3</property> - <property name="bottom-padding">6</property> - <property name="left-padding">12</property> + <property name="column-spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">3</property> + <property name="margin-bottom">6</property> <child> - <!-- n-columns=2 n-rows=4 --> - <object class="GtkGrid"> + <object class="GtkCheckButton" id="paste_all"> + <property name="label" translatable="yes" context="pastespecial|paste_all">_All</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="column-spacing">3</property> - <child> - <object class="GtkCheckButton" id="paste_all"> - <property name="label" translatable="yes" context="pastespecial|paste_all">_All</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="has-focus">True</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="paste_all-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|paste_all">Pastes all cell contents, comments, formats, and objects into the current document.</property> - </object> - </child> + <property name="can-focus">True</property> + <property name="has-focus">True</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="paste_all-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|paste_all">Pastes all cell contents, comments, formats, and objects into the current document.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="comments"> - <property name="label" translatable="yes" context="pastespecial|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="pastespecial|extended_tip|comments">Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="comments"> + <property name="label" translatable="yes" context="pastespecial|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="pastespecial|extended_tip|comments">Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation.</property> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="numbers"> - <property name="label" translatable="yes" context="pastespecial|numbers">_Numbers</property> - <property name="visible">True</property> - <property name="can-focus">True</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="numbers-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|numbers">Inserts cells containing numbers.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="numbers"> + <property name="label" translatable="yes" context="pastespecial|numbers">_Numbers</property> + <property name="visible">True</property> + <property name="can-focus">True</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="numbers-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|numbers">Inserts cells containing numbers.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="text"> - <property name="label" translatable="yes" context="pastespecial|text">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="text-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|text">Inserts cells containing text.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="text"> + <property name="label" translatable="yes" context="pastespecial|text">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="text-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|text">Inserts cells containing text.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="datetime"> - <property name="label" translatable="yes" context="pastespecial|datetime">_Date & time</property> - <property name="visible">True</property> - <property name="can-focus">True</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="datetime-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|datetime">Inserts cells containing date and time values.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="datetime"> + <property name="label" translatable="yes" context="pastespecial|datetime">_Date & time</property> + <property name="visible">True</property> + <property name="can-focus">True</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="datetime-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|datetime">Inserts cells containing date and time values.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="formats"> - <property name="label" translatable="yes" context="pastespecial|formats">For_mats</property> - <property name="visible">True</property> - <property name="can-focus">True</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="formats-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|formats">Inserts cell format attributes.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formats"> + <property name="label" translatable="yes" context="pastespecial|formats">For_mats</property> + <property name="visible">True</property> + <property name="can-focus">True</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="formats-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|formats">Inserts cell format attributes.</property> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="objects"> - <property name="label" translatable="yes" context="pastespecial|objects">Ob_jects</property> - <property name="visible">True</property> - <property name="can-focus">True</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="objects-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|objects">Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="objects"> + <property name="label" translatable="yes" context="pastespecial|objects">Ob_jects</property> + <property name="visible">True</property> + <property name="can-focus">True</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="objects-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|objects">Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects.</property> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="formulas"> - <property name="label" translatable="yes" context="pastespecial|formulas">F_ormulas</property> - <property name="visible">True</property> - <property name="can-focus">True</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="formulas-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|formulas">Inserts cells containing formulae.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formulas"> + <property name="label" translatable="yes" context="pastespecial|formulas">F_ormulas</property> + <property name="visible">True</property> + <property name="can-focus">True</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="formulas-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|formulas">Inserts cells containing formulae.</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> @@ -311,128 +305,122 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">3</property> - <property name="bottom-padding">6</property> - <property name="left-padding">12</property> + <property name="spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">3</property> + <property name="margin-bottom">6</property> <child> - <object class="GtkBox" id="box4"> + <object class="GtkRadioButton" id="none"> + <property name="label" translatable="yes" context="pastespecial|none">Non_e</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkRadioButton" id="none"> - <property name="label" translatable="yes" context="pastespecial|none">Non_e</property> - <property name="visible">True</property> - <property 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="pastespecial|extended_tip|none">Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents.</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="pastespecial|extended_tip|none">Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents.</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="add"> - <property name="label" translatable="yes" context="pastespecial|add">_Add</property> - <property name="visible">True</property> - <property name="can-focus">True</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="add-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|add">Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells.</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="add"> + <property name="label" translatable="yes" context="pastespecial|add">_Add</property> + <property name="visible">True</property> + <property name="can-focus">True</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="add-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|add">Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells.</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="subtract"> - <property name="label" translatable="yes" context="pastespecial|subtract">_Subtract</property> - <property name="visible">True</property> - <property name="can-focus">True</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="subtract-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|subtract">Subtracts the values in the clipboard cells from the values in the target cells.</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="subtract"> + <property name="label" translatable="yes" context="pastespecial|subtract">_Subtract</property> + <property name="visible">True</property> + <property name="can-focus">True</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="subtract-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|subtract">Subtracts the values in the clipboard cells from the values in the target cells.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="multiply"> - <property name="label" translatable="yes" context="pastespecial|multiply">_Multiply</property> - <property name="visible">True</property> - <property name="can-focus">True</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="multiply-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|multiply">Multiplies the values in the clipboard cells with the values in the target cells.</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="GtkRadioButton" id="multiply"> + <property name="label" translatable="yes" context="pastespecial|multiply">_Multiply</property> + <property name="visible">True</property> + <property name="can-focus">True</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="multiply-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|multiply">Multiplies the values in the clipboard cells with the values in the target cells.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="divide"> - <property name="label" translatable="yes" context="pastespecial|divide">_Divide</property> - <property name="visible">True</property> - <property name="can-focus">True</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="divide-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|divide">Divides the values in the target cells by the values in the clipboard cells.</property> - </object> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="divide"> + <property name="label" translatable="yes" context="pastespecial|divide">_Divide</property> + <property name="visible">True</property> + <property name="can-focus">True</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="divide-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|divide">Divides the values in the target cells by the values in the clipboard cells.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> </object> </child> @@ -460,84 +448,78 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">3</property> - <property name="bottom-padding">6</property> - <property name="left-padding">12</property> + <property name="spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">3</property> + <property name="margin-bottom">6</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkRadioButton" id="no_shift"> + <property name="label" translatable="yes" context="pastespecial|no_shift">Don't sh_ift</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkRadioButton" id="no_shift"> - <property name="label" translatable="yes" context="pastespecial|no_shift">Don't sh_ift</property> - <property name="visible">True</property> - <property 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="no_shift-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|no_shift">Inserted cells replace the target cells.</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="no_shift-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|no_shift">Inserted cells replace the target cells.</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="move_down"> - <property name="label" translatable="yes" context="pastespecial|move_down">_Down</property> - <property name="visible">True</property> - <property name="can-focus">True</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">no_shift</property> - <child internal-child="accessible"> - <object class="AtkObject" id="move_down-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|move_down">Target cells are shifted downward when you insert cells from the clipboard.</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="move_down"> + <property name="label" translatable="yes" context="pastespecial|move_down">_Down</property> + <property name="visible">True</property> + <property name="can-focus">True</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">no_shift</property> + <child internal-child="accessible"> + <object class="AtkObject" id="move_down-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|move_down">Target cells are shifted downward when you insert cells from the clipboard.</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="move_right"> - <property name="label" translatable="yes" context="pastespecial|move_right">_Right</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="xalign">0</property> - <property name="draw-indicator">True</property> - <property name="group">no_shift</property> - <child internal-child="accessible"> - <object class="AtkObject" id="move_right-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|move_right">Target cells are shifted to the right when you insert cells from the clipboard.</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="move_right"> + <property name="label" translatable="yes" context="pastespecial|move_right">_Right</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">no_shift</property> + <child internal-child="accessible"> + <object class="AtkObject" id="move_right-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|move_right">Target cells are shifted to the right when you insert cells from the clipboard.</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">2</property> + </packing> </child> </object> </child> @@ -565,99 +547,31 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">3</property> - <property name="bottom-padding">6</property> - <property name="left-padding">12</property> + <property name="orientation">vertical</property> + <property name="margin-start">12</property> + <property name="margin-top">3</property> + <property name="margin-bottom">6</property> <child> - <object class="GtkBox"> + <object class="GtkButtonBox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> + <property name="homogeneous">True</property> + <property name="layout-style">expand</property> <child> - <object class="GtkButtonBox"> + <object class="GtkButton" id="paste_values_only"> + <property name="label" translatable="yes" context="pastespecial|paste_values_only|label">_Values Only</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="homogeneous">True</property> - <property name="layout-style">expand</property> - <child> - <object class="GtkButton" id="paste_values_only"> - <property name="label" translatable="yes" context="pastespecial|paste_values_only|label">_Values Only</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="pastespecial|paste_values_only|tooltip_text">Values Only</property> - <property name="image">img_paste_values_only</property> - <property name="use-underline">True</property> - <property name="image-position">top</property> - <property name="always-show-image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="paste_values_formats"> - <property name="label" translatable="yes" context="pastespecial|paste_values_formats|label">Values & _Formats</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="pastespecial|paste_values_formats|tooltip_text">Values & Formats</property> - <property name="vexpand">True</property> - <property name="image">img_paste_values_formats</property> - <property name="use-underline">True</property> - <property name="image-position">top</property> - <property name="always-show-image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="paste_formats"> - <property name="label" translatable="yes" context="pastespecial|paste_format|label">Formats Onl_y</property> - <property name="height-request">60</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="pastespecial|paste_format|tooltip_text">Formats Only</property> - <property name="vexpand">True</property> - <property name="image">img_paste_formats</property> - <property name="use-underline">True</property> - <property name="image-position">top</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="paste_transpose"> - <property name="label" translatable="yes" context="pastespecial|paste_transpose|label">_Transpose All</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="pastespecial|paste_transpose|tooltip_text">Transpose All</property> - <property name="vexpand">True</property> - <property name="image">img_paste_transpose</property> - <property name="use-underline">True</property> - <property name="image-position">top</property> - <property name="always-show-image">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="pastespecial|paste_values_only|tooltip_text">Values Only</property> + <property name="image">img_paste_values_only</property> + <property name="use-underline">True</property> + <property name="image-position">top</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -666,23 +580,85 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="cbImmediately"> - <property name="label" translatable="yes" context="pastespecial|cbImmediately">_Run immediately</property> + <object class="GtkButton" id="paste_values_formats"> + <property name="label" translatable="yes" context="pastespecial|paste_values_formats|label">Values & _Formats</property> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="pastespecial|paste_values_formats|tooltip_text">Values & Formats</property> + <property name="vexpand">True</property> + <property name="image">img_paste_values_formats</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="image-position">top</property> + <property name="always-show-image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="paste_formats"> + <property name="label" translatable="yes" context="pastespecial|paste_format|label">Formats Onl_y</property> + <property name="height-request">60</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="pastespecial|paste_format|tooltip_text">Formats Only</property> + <property name="vexpand">True</property> + <property name="image">img_paste_formats</property> + <property name="use-underline">True</property> + <property name="image-position">top</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="paste_transpose"> + <property name="label" translatable="yes" context="pastespecial|paste_transpose|label">_Transpose All</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="pastespecial|paste_transpose|tooltip_text">Transpose All</property> + <property name="vexpand">True</property> + <property name="image">img_paste_transpose</property> + <property name="use-underline">True</property> + <property name="image-position">top</property> + <property name="always-show-image">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </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="cbImmediately"> + <property name="label" translatable="yes" context="pastespecial|cbImmediately">_Run immediately</property> + <property name="visible">True</property> + <property 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="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -710,80 +686,74 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <object class="GtkAlignment"> + <!-- n-columns=1 n-rows=3 --> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="top-padding">3</property> - <property name="bottom-padding">6</property> - <property name="left-padding">12</property> + <property name="column-spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">3</property> + <property name="margin-bottom">6</property> <child> - <!-- n-columns=1 n-rows=3 --> - <object class="GtkGrid"> + <object class="GtkCheckButton" id="link"> + <property name="label" translatable="yes" context="pastespecial|link">As _Link</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="column-spacing">3</property> - <child> - <object class="GtkCheckButton" id="link"> - <property name="label" translatable="yes" context="pastespecial|link">As _Link</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="xalign">0</property> - <property name="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="link-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|link">Inserts the cell range as a link, so that changes made to the cells in the source file are updated in the target file. To ensure that changes made to empty cells in the source file are updated in the target file, ensure that the "Paste All" option is also selected.</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="link-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|link">Inserts the cell range as a link, so that changes made to the cells in the source file are updated in the target file. To ensure that changes made to empty cells in the source file are updated in the target file, ensure that the "Paste All" option is also selected.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="transpose"> - <property name="label" translatable="yes" context="pastespecial|transpose">Trans_pose</property> - <property name="visible">True</property> - <property name="can-focus">True</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="transpose-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|transpose">The rows of the range in the clipboard are pasted to become columns of the output range. The columns of the range in the clipboard are pasted to become rows.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="transpose"> + <property name="label" translatable="yes" context="pastespecial|transpose">Trans_pose</property> + <property name="visible">True</property> + <property name="can-focus">True</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="transpose-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|transpose">The rows of the range in the clipboard are pasted to become columns of the output range. The columns of the range in the clipboard are pasted to become rows.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="skip_empty"> - <property name="label" translatable="yes" context="pastespecial|skip_empty">_Skip empty cells</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes" context="pastespecial|skip_empty">If enabled, blank cells in source will not override the target.</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="skip_empty-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|skip_empty">Empty cells from the clipboard do not replace target cells. If you use this option in conjunction with the "Multiply" or the "Divide" operation, the operation is not applied to the target cell of an empty cell in the clipboard.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="skip_empty"> + <property name="label" translatable="yes" context="pastespecial|skip_empty">_Skip empty cells</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes" context="pastespecial|skip_empty">If enabled, blank cells in source will not override the target.</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="skip_empty-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|skip_empty">Empty cells from the clipboard do not replace target cells. If you use this option in conjunction with the "Multiply" or the "Divide" operation, the operation is not applied to the target cell of an empty cell in the clipboard.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> </child> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/pivotfielddialog.ui b/sc/uiconfig/scalc/ui/pivotfielddialog.ui index 2bc4b2c90ad7..acdd68a5cb99 100644 --- a/sc/uiconfig/scalc/ui/pivotfielddialog.ui +++ b/sc/uiconfig/scalc/ui/pivotfielddialog.ui @@ -119,118 +119,109 @@ <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="margin_top">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <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="none"> + <property name="label" translatable="yes" context="pivotfielddialog|none">_None</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="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">auto</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="auto"> + <property name="label" translatable="yes" context="pivotfielddialog|auto">_Automatic</property> + <property name="visible">True</property> + <property name="can_focus">True</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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="user"> + <property name="label" translatable="yes" context="pivotfielddialog|user">_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">none</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">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="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="none"> - <property name="label" translatable="yes" context="pivotfielddialog|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> - <property name="group">auto</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="auto"> - <property name="label" translatable="yes" context="pivotfielddialog|auto">_Automatic</property> - <property name="visible">True</property> - <property name="can_focus">True</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> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="user"> - <property name="label" translatable="yes" context="pivotfielddialog|user">_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">none</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="functions"> <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="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection2"/> + </child> <child> - <object class="GtkTreeView" id="functions"> - <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="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Macro Library List-selection2"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn5"> + <property name="resizable">True</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn5"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer4"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="functions-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfielddialog|extended_tip|functions">Click the type of subtotal that you want to calculate. This option is only available if the User-defined option is selected.</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="functions-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfielddialog|extended_tip|functions">Click the type of subtotal that you want to calculate. This option is only available if the User-defined option is selected.</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> </child> diff --git a/sc/uiconfig/scalc/ui/pivotfilterdialog.ui b/sc/uiconfig/scalc/ui/pivotfilterdialog.ui index 28ecfdaf18b8..3c09df5700c6 100644 --- a/sc/uiconfig/scalc/ui/pivotfilterdialog.ui +++ b/sc/uiconfig/scalc/ui/pivotfilterdialog.ui @@ -84,321 +84,313 @@ <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="GtkComboBoxText" id="connect1"> <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="GtkComboBoxText" id="connect1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="pivotfilterdialog|connect1">AND</item> - <item translatable="yes" context="pivotfilterdialog|connect1">OR</item> - </items> - <accessibility> - <relation type="labelled-by" target="label2"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="connect1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|connect1">Select a logical operator for the filter.</property> - </object> - </child> + <items> + <item translatable="yes" context="pivotfilterdialog|connect1">AND</item> + <item translatable="yes" context="pivotfilterdialog|connect1">OR</item> + </items> + <accessibility> + <relation type="labelled-by" target="label2"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="connect1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|connect1">Select a logical operator for the filter.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="connect2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="pivotfilterdialog|connect2">AND</item> - <item translatable="yes" context="pivotfilterdialog|connect2">OR</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="connect2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|connect2">Select a logical operator for the filter.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="connect2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="pivotfilterdialog|connect2">AND</item> + <item translatable="yes" context="pivotfilterdialog|connect2">OR</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="connect2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|connect2">Select a logical operator for the filter.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</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="pivotfilterdialog|label2">Operator</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</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="pivotfilterdialog|label2">Operator</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="pivotfilterdialog|label3">Field name</property> + </object> + <packing> + <property name="left_attach">1</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="pivotfilterdialog|label4">Condition</property> + </object> + <packing> + <property name="left_attach">2</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="pivotfilterdialog|label5">Value</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <accessibility> + <relation type="labelled-by" target="label3"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="field1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|field1">Select the field that you want to use in the filter. If field names are not available, the column labels are listed.</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="pivotfilterdialog|label3">Field name</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <accessibility> + <relation type="labelled-by" target="label3"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="field2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|field2">Select the field that you want to use in the filter. If field names are not available, the column labels are listed.</property> </object> - <packing> - <property name="left_attach">1</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="pivotfilterdialog|label4">Condition</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <accessibility> + <relation type="labelled-by" target="label3"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="field3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|field3">Select the field that you want to use in the filter. If field names are not available, the column labels are listed.</property> </object> - <packing> - <property name="left_attach">2</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="pivotfilterdialog|label5">Value</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item>=</item> + <item><</item> + <item>></item> + <item><=</item> + <item>>=</item> + <item><></item> + </items> + <accessibility> + <relation type="labelled-by" target="label4"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cond1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|cond1">Select an operator to compare the Field name and Value entries.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="field1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <accessibility> - <relation type="labelled-by" target="label3"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="field1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|field1">Select the field that you want to use in the filter. If field names are not available, the column labels are listed.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="field2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <accessibility> - <relation type="labelled-by" target="label3"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="field2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|field2">Select the field that you want to use in the filter. If field names are not available, the column labels are listed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item>=</item> + <item><</item> + <item>></item> + <item><=</item> + <item>>=</item> + <item><></item> + </items> + <accessibility> + <relation type="labelled-by" target="label4"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cond2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|cond2">Select an operator to compare the Field name and Value entries.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="field3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <accessibility> - <relation type="labelled-by" target="label3"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="field3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|field3">Select the field that you want to use in the filter. If field names are not available, the column labels are listed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item>=</item> + <item><</item> + <item>></item> + <item><=</item> + <item>>=</item> + <item><></item> + </items> + <accessibility> + <relation type="labelled-by" target="label4"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cond3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|cond3">Select an operator to compare the Field name and Value entries.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="cond1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item>=</item> - <item><</item> - <item>></item> - <item><=</item> - <item>>=</item> - <item><></item> - </items> - <accessibility> - <relation type="labelled-by" target="label4"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="cond1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|cond1">Select an operator to compare the Field name and Value entries.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="val1"> + <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-entry2"> + <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="cond2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item>=</item> - <item><</item> - <item>></item> - <item><=</item> - <item>>=</item> - <item><></item> - </items> - <accessibility> - <relation type="labelled-by" target="label4"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="cond2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|cond2">Select an operator to compare the Field name and Value entries.</property> - </object> - </child> + <accessibility> + <relation type="labelled-by" target="label5"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="val1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|val1">Select the value that you want to compare to the selected field.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="cond3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item>=</item> - <item><</item> - <item>></item> - <item><=</item> - <item>>=</item> - <item><></item> - </items> - <accessibility> - <relation type="labelled-by" target="label4"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="cond3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|cond3">Select an operator to compare the Field name and Value entries.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="val2"> + <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-entry4"> + <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="val1"> - <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-entry2"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <accessibility> - <relation type="labelled-by" target="label5"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="val1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|val1">Select the value that you want to compare to the selected field.</property> - </object> - </child> + <accessibility> + <relation type="labelled-by" target="label5"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="val2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|val2">Select the value that you want to compare to the selected field.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="val2"> - <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-entry4"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <accessibility> - <relation type="labelled-by" target="label5"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="val2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|val2">Select the value that you want to compare to the selected field.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="val3"> + <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-entry6"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="val3"> - <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-entry6"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <accessibility> - <relation type="labelled-by" target="label5"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="val3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|val3">Select the value that you want to compare to the selected field.</property> - </object> - </child> + <accessibility> + <relation type="labelled-by" target="label5"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="val3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivotfilterdialog|extended_tip|val3">Select the value that you want to compare to the selected field.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui index cbc9d313ce4c..746144aa7fd8 100644 --- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui +++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui @@ -758,117 +758,111 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="hexpand">True</property> + <property name="row_spacing">3</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="grid3"> + <object class="GtkRadioButton" id="destination-radio-new-sheet"> + <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-new-sheet">New 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="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> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="destination-radio-selection"> + <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-selection">Selection</property> + <property name="visible">True</property> + <property name="can_focus">True</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">destination-radio-new-sheet</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="destination-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="row_spacing">3</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkRadioButton" id="destination-radio-new-sheet"> - <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-new-sheet">New sheet</property> - <property name="visible">True</property> - <property 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> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="destination-radio-selection"> - <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-selection">Selection</property> - <property name="visible">True</property> - <property name="can_focus">True</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">destination-radio-new-sheet</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="destination-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="destination-edit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|destination-edit">Select the area where you want to display the results of the pivot table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="destination-button"> - <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="destination-button-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|destination-button">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="destination-edit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|destination-edit">Select the area where you want to display the results of the pivot table.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="destination-list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="destination-list-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|destination-list">Select the area where you want to display the results of the pivot table.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="destination-button"> + <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="destination-button-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|destination-button">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</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="GtkRadioButton" id="destination-radio-named-range"> - <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-named-range">Named range</property> - <property name="visible">True</property> - <property name="can_focus">True</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">destination-radio-new-sheet</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="destination-list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="destination-list-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|destination-list">Select the area where you want to display the results of the pivot table.</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> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="destination-radio-named-range"> + <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-named-range">Named range</property> + <property name="visible">True</property> + <property name="can_focus">True</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">destination-radio-new-sheet</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -896,96 +890,90 @@ <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="hexpand">True</property> + <property name="row_spacing">3</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="grid4"> + <object class="GtkRadioButton" id="source-radio-selection"> + <property name="label" translatable="yes" context="pivottablelayoutdialog|source-radio-selection">Selection</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="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">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="source-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="row_spacing">3</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkRadioButton" id="source-radio-selection"> - <property name="label" translatable="yes" context="pivottablelayoutdialog|source-radio-selection">Selection</property> - <property name="visible">True</property> - <property 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">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="source-edit"> - <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="source-edit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|source-edit">Select the area that contains the data for the current pivot table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="source-button"> - <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="source-button-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|source-button">Select the area that contains the data for the current pivot table.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="source-radio-named-range"> - <property name="label" translatable="yes" context="pivottablelayoutdialog|source-radio-named-range">Named range</property> - <property name="visible">True</property> - <property name="can_focus">True</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">source-radio-selection</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="source-edit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|source-edit">Select the area that contains the data for the current pivot table.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="source-list"> - <property name="visible">True</property> - <property name="can_focus">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="source-button"> + <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="source-button-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|source-button">Select the area that contains the data for the current pivot table.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="source-radio-named-range"> + <property name="label" translatable="yes" context="pivottablelayoutdialog|source-radio-named-range">Named range</property> + <property name="visible">True</property> + <property name="can_focus">True</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">source-radio-selection</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="source-list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/printareasdialog.ui b/sc/uiconfig/scalc/ui/printareasdialog.ui index 2ec0f35b4d04..f1c8e018853d 100644 --- a/sc/uiconfig/scalc/ui/printareasdialog.ui +++ b/sc/uiconfig/scalc/ui/printareasdialog.ui @@ -97,79 +97,72 @@ <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="GtkButton" id="rbprintarea"> <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="receives_default">False</property> <child> - <object class="GtkButton" id="rbprintarea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="rbprintarea-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|rbprintarea">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="rbprintarea-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|rbprintarea">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkEntry" id="edprintarea"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">50</property> - <child internal-child="accessible"> - <object class="AtkObject" id="edprintarea-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|edprintarea">Allows you to modify a defined print range.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="edprintarea"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">50</property> + <child internal-child="accessible"> + <object class="AtkObject" id="edprintarea-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|edprintarea">Allows you to modify a defined print range.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="lbprintarea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="printareasdialog|lbprintarea">- none -</item> - <item translatable="yes" context="printareasdialog|lbprintarea">- entire sheet -</item> - <item translatable="yes" context="printareasdialog|lbprintarea">- user defined -</item> - <item translatable="yes" context="printareasdialog|lbprintarea">- selection -</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="lbprintarea-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|lbprintarea">Allows you to modify a defined print range.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="lbprintarea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="printareasdialog|lbprintarea">- none -</item> + <item translatable="yes" context="printareasdialog|lbprintarea">- entire sheet -</item> + <item translatable="yes" context="printareasdialog|lbprintarea">- user defined -</item> + <item translatable="yes" context="printareasdialog|lbprintarea">- selection -</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="lbprintarea-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|lbprintarea">Allows you to modify a defined print range.</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> @@ -198,77 +191,70 @@ <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="edrepeatrow"> <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="edrepeatrow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">50</property> - <child internal-child="accessible"> - <object class="AtkObject" id="edrepeatrow-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|edrepeatrow">Choose one or more rows to print on every page. In the right text box enter the row reference, for example, "1" or "$1" or "$2:$3".</property> - </object> - </child> + <property name="activates_default">True</property> + <property name="width_chars">50</property> + <child internal-child="accessible"> + <object class="AtkObject" id="edrepeatrow-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|edrepeatrow">Choose one or more rows to print on every page. In the right text box enter the row reference, for example, "1" or "$1" or "$2:$3".</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="GtkButton" id="rbrepeatrow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <child> - <object class="GtkButton" id="rbrepeatrow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="rbrepeatrow-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|rbrepeatrow">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="rbrepeatrow-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|rbrepeatrow">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="lbrepeatrow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="printareasdialog|lbrepeatrow">- none -</item> - <item translatable="yes" context="printareasdialog|lbrepeatrow">- user defined -</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="lbrepeatrow-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|lbrepeatrow">Choose one or more rows to print on every page. In the right text box enter the row reference, for example, "1" or "$1" or "$2:$3".</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="lbrepeatrow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="printareasdialog|lbrepeatrow">- none -</item> + <item translatable="yes" context="printareasdialog|lbrepeatrow">- user defined -</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="lbrepeatrow-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|lbrepeatrow">Choose one or more rows to print on every page. In the right text box enter the row reference, for example, "1" or "$1" or "$2:$3".</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> @@ -297,77 +283,70 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkEntry" id="edrepeatcol"> <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="edrepeatcol"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">50</property> - <child internal-child="accessible"> - <object class="AtkObject" id="edrepeatcol-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|edrepeatcol">Choose one or more columns to print on every page. In the right text box enter the column reference, for example, "A" or "AB" or "$C:$E".</property> - </object> - </child> + <property name="activates_default">True</property> + <property name="width_chars">50</property> + <child internal-child="accessible"> + <object class="AtkObject" id="edrepeatcol-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|edrepeatcol">Choose one or more columns to print on every page. In the right text box enter the column reference, for example, "A" or "AB" or "$C:$E".</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="GtkButton" id="rbrepeatcol"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <child> - <object class="GtkButton" id="rbrepeatcol"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="rbrepeatcol-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|rbrepeatcol">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> - </object> - </child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="rbrepeatcol-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|rbrepeatcol">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="lbrepeatcol"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="printareasdialog|lbrepeatcol">- none -</item> - <item translatable="yes" context="printareasdialog|lbrepeatcol">- user defined -</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="lbrepeatcol-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|lbrepeatcol">Choose one or more columns to print on every page. In the right text box enter the column reference, for example, "A" or "AB" or "$C:$E".</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="lbrepeatcol"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="printareasdialog|lbrepeatcol">- none -</item> + <item translatable="yes" context="printareasdialog|lbrepeatcol">- user defined -</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="lbrepeatcol-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="printareasdialog|extended_tip|lbrepeatcol">Choose one or more columns to print on every page. In the right text box enter the column reference, for example, "A" or "AB" or "$C:$E".</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/printeroptions.ui b/sc/uiconfig/scalc/ui/printeroptions.ui index 7444e676418b..525d563c652c 100644 --- a/sc/uiconfig/scalc/ui/printeroptions.ui +++ b/sc/uiconfig/scalc/ui/printeroptions.ui @@ -15,22 +15,16 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkCheckButton" id="suppressemptypages"> + <property name="label" translatable="yes" context="printeroptions|suppressemptypages">Suppress output of empty 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="suppressemptypages"> - <property name="label" translatable="yes" context="printeroptions|suppressemptypages">Suppress output of empty 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/sc/uiconfig/scalc/ui/randomnumbergenerator.ui b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui index 6a91a14ba7f5..745d80b46f0d 100644 --- a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui +++ b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui @@ -118,66 +118,60 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkLabel" id="cell-range-label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="cell-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="randomnumbergenerator|cell-range-label">Cell range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">cell-range-edit</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="GtkEntry" id="cell-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - <child internal-child="accessible"> - <object class="AtkObject" id="cell-range-edit-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|cell-range-edit">Define the range of cells to fill with random numbers. If you have previously selected a range, it will be displayed here.</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="cell-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="label" translatable="yes" context="randomnumbergenerator|cell-range-label">Cell range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">cell-range-edit</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="GtkEntry" id="cell-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + <child internal-child="accessible"> + <object class="AtkObject" id="cell-range-edit-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|cell-range-edit">Define the range of cells to fill with random numbers. If you have previously selected a range, it will be displayed here.</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">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cell-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> @@ -205,124 +199,118 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="distribution-label"> <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="distribution-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="randomnumbergenerator|distribution-label">Distribution:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">distribution-combo</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="distribution-combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="active">0</property> - <items> - <item id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform</item> - <item id="8" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform Integer</item> - <item id="1" translatable="yes" context="randomnumbergenerator|distribution-liststore">Normal</item> - <item id="2" translatable="yes" context="randomnumbergenerator|distribution-liststore">Cauchy</item> - <item id="3" translatable="yes" context="randomnumbergenerator|distribution-liststore">Bernoulli</item> - <item id="4" translatable="yes" context="randomnumbergenerator|distribution-liststore">Binomial</item> - <item id="5" translatable="yes" context="randomnumbergenerator|distribution-liststore">Chi Squared</item> - <item id="6" translatable="yes" context="randomnumbergenerator|distribution-liststore">Geometric</item> - <item id="7" translatable="yes" context="randomnumbergenerator|distribution-liststore">Negative Binomial</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="distribution-combo-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|distribution-combo">The distribution function for the random number generator.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="parameter1-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="randomnumbergenerator|parameter1-label">...</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">parameter1-spin</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="parameter2-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="randomnumbergenerator|parameter2-label">...</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">parameter2-spin</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="parameter1-spin"> - <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">0,0000</property> - <property name="adjustment">parameter2-adjustment</property> - <property name="digits">4</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="parameter2-spin"> - <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">1,0000</property> - <property name="adjustment">parameter1-adjustment</property> - <property name="digits">4</property> - <property name="value">1</property> + <property name="label" translatable="yes" context="randomnumbergenerator|distribution-label">Distribution:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">distribution-combo</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="distribution-combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="active">0</property> + <items> + <item id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform</item> + <item id="8" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform Integer</item> + <item id="1" translatable="yes" context="randomnumbergenerator|distribution-liststore">Normal</item> + <item id="2" translatable="yes" context="randomnumbergenerator|distribution-liststore">Cauchy</item> + <item id="3" translatable="yes" context="randomnumbergenerator|distribution-liststore">Bernoulli</item> + <item id="4" translatable="yes" context="randomnumbergenerator|distribution-liststore">Binomial</item> + <item id="5" translatable="yes" context="randomnumbergenerator|distribution-liststore">Chi Squared</item> + <item id="6" translatable="yes" context="randomnumbergenerator|distribution-liststore">Geometric</item> + <item id="7" translatable="yes" context="randomnumbergenerator|distribution-liststore">Negative Binomial</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="distribution-combo-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|distribution-combo">The distribution function for the random number generator.</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">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="parameter1-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="randomnumbergenerator|parameter1-label">...</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">parameter1-spin</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="parameter2-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="randomnumbergenerator|parameter2-label">...</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">parameter2-spin</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="parameter1-spin"> + <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">0,0000</property> + <property name="adjustment">parameter2-adjustment</property> + <property name="digits">4</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="parameter2-spin"> + <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">1,0000</property> + <property name="adjustment">parameter1-adjustment</property> + <property name="digits">4</property> + <property name="value">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -350,132 +338,126 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkCheckButton" id="enable-seed-check"> + <property name="label" translatable="yes" context="randomnumbergenerator|enable-seed-check">Enable custom seed</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="enable-seed-check"> - <property name="label" translatable="yes" context="randomnumbergenerator|enable-seed-check">Enable custom seed</property> - <property name="visible">True</property> - <property name="can_focus">True</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="enable-seed-check-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|enable-seed-check">Set the initial value of the random number generator to a known value Seed.</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="GtkLabel" id="seed-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="randomnumbergenerator|seed-label">Seed:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">seed-spin</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="seed-spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="seed-spin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|seed-spin">Value set to initiate the random number generator algorithm. It is used to initialize (seed) the random number generator in order to reproduce the same sequence of pseudorandom numbers. Specify a positive integer number (1, 2, ...) to produce a specific sequence, or leave the field blank if you don't need this particular feature.</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="enable-seed-check-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|enable-seed-check">Set the initial value of the random number generator to a known value Seed.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="enable-rounding-check"> - <property name="label" translatable="yes" context="randomnumbergenerator|enable-rounding-check">Enable rounding</property> - <property name="visible">True</property> - <property name="can_focus">True</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="enable-rounding-check-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|enable-rounding-check">Truncate the number to a given number of Decimal Places.</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="GtkLabel" id="seed-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="randomnumbergenerator|seed-label">Seed:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">seed-spin</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="seed-spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="seed-spin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|seed-spin">Value set to initiate the random number generator algorithm. It is used to initialize (seed) the random number generator in order to reproduce the same sequence of pseudorandom numbers. Specify a positive integer number (1, 2, ...) to produce a specific sequence, or leave the field blank if you don't need this particular feature.</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="decimal-places-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="margin-start">12</property> - <property name="label" translatable="yes" context="randomnumbergenerator|decimal-places-label">Decimal places:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">decimal-places-spin</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="GtkCheckButton" id="enable-rounding-check"> + <property name="label" translatable="yes" context="randomnumbergenerator|enable-rounding-check">Enable rounding</property> + <property name="visible">True</property> + <property name="can_focus">True</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="enable-rounding-check-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|enable-rounding-check">Truncate the number to a given number of Decimal Places.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="decimal-places-spin"> - <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">1</property> - <property name="adjustment">decimal-places-adjustment</property> - <property name="value">1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="decimal-places-spin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|decimal-places-spin">Number of decimal places of the numbers generated.</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="decimal-places-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="margin-start">12</property> + <property name="label" translatable="yes" context="randomnumbergenerator|decimal-places-label">Decimal places:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">decimal-places-spin</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="decimal-places-spin"> + <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">1</property> + <property name="adjustment">decimal-places-adjustment</property> + <property name="value">1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="decimal-places-spin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="randomnumbergenerator|extended_tip|decimal-places-spin">Number of decimal places of the numbers generated.</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/sc/uiconfig/scalc/ui/regressiondialog.ui b/sc/uiconfig/scalc/ui/regressiondialog.ui index f0e542b4df22..154c0bdf5352 100644 --- a/sc/uiconfig/scalc/ui/regressiondialog.ui +++ b/sc/uiconfig/scalc/ui/regressiondialog.ui @@ -85,153 +85,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="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="variable1-range-label"> <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="variable1-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="regressiondialog|variable1-range-label">Independent variable(s) (X) range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">variable1-range-edit</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="variable1-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="variable1-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="variable2-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="regressiondialog|variable2-range-label">Dependent variable (Y) range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">variable2-range-edit</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="variable2-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="variable2-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="withlabels-check"> - <property name="label" translatable="yes" context="regressiondialog|withlabels-check">Both X and Y ranges have labels</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">0</property> - <property name="top_attach">2</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="regressiondialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="GtkEntry" id="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> - </child> + <property name="label" translatable="yes" context="regressiondialog|variable1-range-label">Independent variable(s) (X) range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">variable1-range-edit</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="variable1-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="variable1-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="variable2-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="regressiondialog|variable2-range-label">Dependent variable (Y) range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">variable2-range-edit</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="variable2-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="variable2-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="withlabels-check"> + <property name="label" translatable="yes" context="regressiondialog|withlabels-check">Both X and Y ranges have labels</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">0</property> + <property name="top_attach">2</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="regressiondialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="GtkEntry" id="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> @@ -259,53 +253,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="regressiondialog|groupedby-columns-radio">Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="regressiondialog|groupedby-columns-radio">Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="regressiondialog|groupedby-rows-radio">Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="regressiondialog|groupedby-rows-radio">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -333,72 +321,66 @@ <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="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkRadioButton" id="linear-radio"> + <property name="label" translatable="yes" context="regressiondialog|linear-radio">Linear Regression</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="GtkRadioButton" id="linear-radio"> - <property name="label" translatable="yes" context="regressiondialog|linear-radio">Linear Regression</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="use_underline">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="logarithmic-radio"> - <property name="label" translatable="yes" context="regressiondialog|logarithmic-radio">Logarithmic Regression</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="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">linear-radio</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="power-radio"> - <property name="label" translatable="yes" context="regressiondialog|power-radio">Power Regression</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="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">linear-radio</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="use_underline">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="logarithmic-radio"> + <property name="label" translatable="yes" context="regressiondialog|logarithmic-radio">Logarithmic Regression</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="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">linear-radio</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="power-radio"> + <property name="label" translatable="yes" context="regressiondialog|power-radio">Power Regression</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="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">linear-radio</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -426,77 +408,71 @@ <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="grid5"> <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">12</property> + <property name="margin-start">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="label" translatable="yes" context="regressiondialog|label5">Confidence level</property> - <property name="mnemonic_widget">confidencelevel-spin</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="calcresiduals-check"> - <property name="label" translatable="yes" context="regressiondialog|calcresiduals-check">Calculate residuals</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="active">True</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="GtkSpinButton" id="confidencelevel-spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - <property name="text" context="regressiondialog|confidencelevel-spin">0,95</property> - <property name="adjustment">confidencelevel-adjustment</property> - <property name="digits">2</property> - <property name="numeric">True</property> - <property name="value">0.95</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="nointercept-check"> - <property name="label" translatable="yes" context="regressiondialog|nointercept-check">Force intercept to be zero</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="label" translatable="yes" context="regressiondialog|label5">Confidence level</property> + <property name="mnemonic_widget">confidencelevel-spin</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="calcresiduals-check"> + <property name="label" translatable="yes" context="regressiondialog|calcresiduals-check">Calculate residuals</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="active">True</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="GtkSpinButton" id="confidencelevel-spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + <property name="text" context="regressiondialog|confidencelevel-spin">0,95</property> + <property name="adjustment">confidencelevel-adjustment</property> + <property name="digits">2</property> + <property name="numeric">True</property> + <property name="value">0.95</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="nointercept-check"> + <property name="label" translatable="yes" context="regressiondialog|nointercept-check">Force intercept to be zero</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/retypepassdialog.ui b/sc/uiconfig/scalc/ui/retypepassdialog.ui index 25d2feb4b456..699d9332a514 100644 --- a/sc/uiconfig/scalc/ui/retypepassdialog.ui +++ b/sc/uiconfig/scalc/ui/retypepassdialog.ui @@ -111,43 +111,37 @@ <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="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkLabel" id="docStatusLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="docStatusLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="retypepassdialog|docStatusLabel">Status unknown</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="retypeDocButton"> - <property name="label" translatable="yes" context="retypepassdialog|retypeDocButton">_Re-type</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">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="retypepassdialog|docStatusLabel">Status unknown</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="retypeDocButton"> + <property name="label" translatable="yes" context="retypepassdialog|retypeDocButton">_Re-type</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -177,36 +171,28 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkScrolledWindow" id="scrolledwindow"> <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="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkViewport" id="viewport1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> <child> - <object class="GtkViewport" id="viewport1"> + <object class="GtkBox" id="sheetsBox"> <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="sheetsBox"> - <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> - <placeholder/> - </child> - </object> + <placeholder/> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/retypepassworddialog.ui b/sc/uiconfig/scalc/ui/retypepassworddialog.ui index 258b8eaba205..9c6ed87af325 100644 --- a/sc/uiconfig/scalc/ui/retypepassworddialog.ui +++ b/sc/uiconfig/scalc/ui/retypepassworddialog.ui @@ -100,93 +100,86 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="passwordgrid"> <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="passwordgrid"> + <object class="GtkEntry" id="newpassEntry"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="visibility">False</property> + <property name="activates_default">True</property> + <property name="input_purpose">password</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="confirmpassEntry"> + <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="GtkEntry" id="newpassEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="confirmpassEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> - </object> - <packing> - <property name="left_attach">1</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="retypepassworddialog|label4">Pa_ssword:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">newpassEntry</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="retypepassworddialog|label5">Confi_rm:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">confirmpassEntry</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="mustmatch"> - <property name="label" translatable="yes" context="retypepassworddialog|mustmatch">New password must match the original password</property> - <property name="visible">True</property> - <property name="can_focus">True</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">2</property> - </packing> - </child> + <property name="visibility">False</property> + <property name="activates_default">True</property> + <property name="input_purpose">password</property> + </object> + <packing> + <property name="left_attach">1</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="retypepassworddialog|label4">Pa_ssword:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">newpassEntry</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="retypepassworddialog|label5">Confi_rm:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">confirmpassEntry</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="mustmatch"> + <property name="label" translatable="yes" context="retypepassworddialog|mustmatch">New password must match the original password</property> + <property name="visible">True</property> + <property name="can_focus">True</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">2</property> + </packing> </child> </object> <packing> diff --git a/sc/uiconfig/scalc/ui/samplingdialog.ui b/sc/uiconfig/scalc/ui/samplingdialog.ui index 273752e9f67f..a729df5ef7c0 100644 --- a/sc/uiconfig/scalc/ui/samplingdialog.ui +++ b/sc/uiconfig/scalc/ui/samplingdialog.ui @@ -92,99 +92,93 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="input-range-label"> <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="input-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="samplingdialog|input-range-label">Input range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="input-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="samplingdialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="samplingdialog|input-range-label">Input range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">input-range-edit</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="input-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="input-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="samplingdialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -212,150 +206,144 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> + <child> + <object class="GtkSpinButton" id="sample-size-spin"> + <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">1</property> + <property name="adjustment">sample-size-adjustment</property> + <property name="value">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="label1"> <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="sample-size-spin"> - <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">1</property> - <property name="adjustment">sample-size-adjustment</property> - <property name="value">1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="samplingdialog|label1">Sample size:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">sample-size-spin</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="GtkRadioButton" id="random-method-radio"> - <property name="label" translatable="yes" context="samplingdialog|random-method-radio">Random</property> - <property name="visible">True</property> - <property 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> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="periodic-method-radio"> - <property name="label" translatable="yes" context="samplingdialog|periodic-method-radio">Periodic</property> - <property name="visible">True</property> - <property name="can_focus">True</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">random-method-radio</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="period-spin"> - <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">1</property> - <property name="adjustment">period-adjustment</property> - <property name="value">1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="samplingdialog|label3">Period:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">period-spin</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="GtkCheckButton" id="with-replacement"> - <property name="label" translatable="yes" context="samplingdialog|with-replacement">With replacement</property> - <property name="visible">True</property> - <property name="can_focus">True</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">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="keep-order"> - <property name="label" translatable="yes" context="samplingdialog|keep-order">Keep order</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> + <property name="margin-start">12</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="samplingdialog|label1">Sample size:</property> + <property name="use_underline">True</property> + <property name="justify">center</property> + <property name="mnemonic_widget">sample-size-spin</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="GtkRadioButton" id="random-method-radio"> + <property name="label" translatable="yes" context="samplingdialog|random-method-radio">Random</property> + <property name="visible">True</property> + <property 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> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="periodic-method-radio"> + <property name="label" translatable="yes" context="samplingdialog|periodic-method-radio">Periodic</property> + <property name="visible">True</property> + <property name="can_focus">True</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">random-method-radio</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="period-spin"> + <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">1</property> + <property name="adjustment">period-adjustment</property> + <property name="value">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">12</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="samplingdialog|label3">Period:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">period-spin</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="GtkCheckButton" id="with-replacement"> + <property name="label" translatable="yes" context="samplingdialog|with-replacement">With replacement</property> + <property name="visible">True</property> + <property name="can_focus">True</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">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="keep-order"> + <property name="label" translatable="yes" context="samplingdialog|keep-order">Keep order</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/scenariodialog.ui b/sc/uiconfig/scalc/ui/scenariodialog.ui index 7fa3b2a9bdb4..6e90a6abe836 100644 --- a/sc/uiconfig/scalc/ui/scenariodialog.ui +++ b/sc/uiconfig/scalc/ui/scenariodialog.ui @@ -91,24 +91,16 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkEntry" id="name"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="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="scenariodialog|extended_tip|name">Defines the name for the scenario. Use a clear and unique name so you can easily identify the scenario.</property> - </object> - </child> + <property name="activates_default">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child internal-child="accessible"> + <object class="AtkObject" id="name-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|name">Defines the name for the scenario. Use a clear and unique name so you can easily identify the scenario.</property> </object> </child> </object> @@ -138,37 +130,30 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <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="GtkTextView" id="comment"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkTextView" id="comment"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="accepts_tab">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="comment-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|comment">Specifies additional information about the scenario. This information will be displayed in the Navigator when you click the Scenarios icon and select the desired scenario.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="accepts_tab">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="comment-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|comment">Specifies additional information about the scenario. This information will be displayed in the Navigator when you click the Scenarios icon and select the desired scenario.</property> </object> </child> </object> @@ -201,140 +186,133 @@ <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="hexpand">True</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">6</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="GtkCheckButton" id="copyback"> + <property name="label" translatable="yes" context="scenariodialog|copyback">Copy _back</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkCheckButton" id="copyback"> - <property name="label" translatable="yes" context="scenariodialog|copyback">Copy _back</property> - <property name="visible">True</property> - <property name="can_focus">True</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="copyback-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|copyback">Copies the values of cells that you change into the active scenario. If you do not select this option, the scenario is not changed when you change cell values. The behavior of the Copy back setting depends on the cell protection, the sheet protection, and the Prevent changes settings.</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="copyback-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|copyback">Copies the values of cells that you change into the active scenario. If you do not select this option, the scenario is not changed when you change cell values. The behavior of the Copy back setting depends on the cell protection, the sheet protection, and the Prevent changes settings.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="copysheet"> + <property name="label" translatable="yes" context="scenariodialog|copysheet">Copy _entire sheet</property> + <property name="visible">True</property> + <property name="can_focus">True</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="copysheet-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|copysheet">Copies the entire sheet into an additional scenario sheet.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="preventchanges"> + <property name="label" translatable="yes" context="scenariodialog|preventchanges">_Prevent 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> + <child internal-child="accessible"> + <object class="AtkObject" id="preventchanges-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|preventchanges">Prevents changes to the active scenario. The behavior of the Copy back setting depends on the cell protection, the sheet protection, and the Prevent changes settings.</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="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> <child> - <object class="GtkCheckButton" id="copysheet"> - <property name="label" translatable="yes" context="scenariodialog|copysheet">Copy _entire sheet</property> + <object class="GtkCheckButton" id="showframe"> + <property name="label" translatable="yes" context="scenariodialog|showframe">_Display border</property> <property name="visible">True</property> <property name="can_focus">True</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="bordercolor"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="copysheet-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|copysheet">Copies the entire sheet into an additional scenario sheet.</property> + <object class="AtkObject" id="showframe-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|showframe">Highlights the scenario in your table with a border. The color for the border is specified in the field to the right of this option.</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="preventchanges"> - <property name="label" translatable="yes" context="scenariodialog|preventchanges">_Prevent changes</property> + <object class="GtkMenuButton" id="bordercolor"> + <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="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="preventchanges-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|preventchanges">Prevents changes to the active scenario. The behavior of the Copy back setting depends on the cell protection, the sheet protection, and the Prevent changes settings.</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"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> <child> - <object class="GtkCheckButton" id="showframe"> - <property name="label" translatable="yes" context="scenariodialog|showframe">_Display border</property> - <property name="visible">True</property> - <property name="can_focus">True</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="bordercolor"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="showframe-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|showframe">Highlights the scenario in your table with a border. The color for the border is specified in the field to the right of this option.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkMenuButton" id="bordercolor"> - <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="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - <accessibility> - <relation type="labelled-by" target="showframe"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="bordercolor-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|bordercolor">Highlights the scenario in your table with a border. The color for the border is specified in the field to the right of this option.</property> - </object> - </child> + <accessibility> + <relation type="labelled-by" target="showframe"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="bordercolor-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="scenariodialog|extended_tip|bordercolor">Highlights the scenario in your table with a border. The color for the border is specified in the field to the right of this option.</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">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> </object> </child> diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui b/sc/uiconfig/scalc/ui/scgeneralpage.ui index 4d9a80a40c75..943b41e88625 100644 --- a/sc/uiconfig/scalc/ui/scgeneralpage.ui +++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui @@ -22,79 +22,73 @@ <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">3</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="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <property name="column_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="scgeneralpage|label4">Measurement _unit:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">unitlb</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="scgeneralpage|label5">_Tab stops:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">tabmf</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="tabmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="tabmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tabmf">Defines the tab stops distance.</property> - </object> - </child> + <property name="label" translatable="yes" context="scgeneralpage|label4">Measurement _unit:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">unitlb</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="scgeneralpage|label5">_Tab stops:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">tabmf</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="tabmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="tabmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tabmf">Defines the tab stops distance.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="unitlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="unitlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|unitlb">Defines the unit of measure in spreadsheets.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="unitlb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="unitlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|unitlb">Defines the unit of measure in spreadsheets.</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> @@ -122,71 +116,65 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox"> + <object class="GtkRadioButton" id="alwaysrb"> + <property name="label" translatable="yes" context="scgeneralpage|alwaysrb">_Always (from trusted locations)</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">3</property> - <child> - <object class="GtkRadioButton" id="alwaysrb"> - <property name="label" translatable="yes" context="scgeneralpage|alwaysrb">_Always (from trusted locations)</property> - <property name="visible">True</property> - <property 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="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="requestrb"> - <property name="label" translatable="yes" context="scgeneralpage|requestrb">_On request</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">alwaysrb</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="neverrb"> - <property name="label" translatable="yes" context="scgeneralpage|neverrb">_Never</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">alwaysrb</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="requestrb"> + <property name="label" translatable="yes" context="scgeneralpage|requestrb">_On request</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">alwaysrb</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="neverrb"> + <property name="label" translatable="yes" context="scgeneralpage|neverrb">_Never</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">alwaysrb</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> @@ -215,234 +203,228 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">3</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="grid3"> + <object class="GtkCheckButton" id="editmodecb"> + <property name="label" translatable="yes" context="scgeneralpage|editmodecb">Press Enter to switch to _edit mode</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkCheckButton" id="editmodecb"> - <property name="label" translatable="yes" context="scgeneralpage|editmodecb">Press Enter to switch to _edit mode</property> - <property name="visible">True</property> - <property name="can_focus">True</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="editmodecb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|editmodecb">Allows you to immediately edit the selected cell after pressing the Enter key.</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="GtkCheckButton" id="formatcb"> - <property name="label" translatable="yes" context="scgeneralpage|formatcb">Expand _formatting</property> - <property name="visible">True</property> - <property name="can_focus">True</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="formatcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formatcb">Specifies whether to automatically apply the formatting attributes of the selected cell to the empty adjacent cells.</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="editmodecb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|editmodecb">Allows you to immediately edit the selected cell after pressing the Enter key.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="exprefcb"> - <property name="label" translatable="yes" context="scgeneralpage|exprefcb">Expand _references when new columns/rows are inserted</property> - <property name="visible">True</property> - <property name="can_focus">True</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="exprefcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|exprefcb">Specifies whether to expand references when inserting columns or rows adjacent to the reference range. This is only possible if the reference range, where the column or row is inserted, originally spanned at least two cells in the desired direction.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="alignlb"> - <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="scgeneralpage|alignlb">Down</item> - <item translatable="yes" context="scgeneralpage|alignlb">Right</item> - <item translatable="yes" context="scgeneralpage|alignlb">Up</item> - <item translatable="yes" context="scgeneralpage|alignlb">Left</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="alignlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|alignlb">Determines the direction that the cursor in the spreadsheet will move after you press the Enter key.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="aligncb"> - <property name="label" translatable="yes" context="scgeneralpage|aligncb">Press Enter to _move selection</property> - <property name="visible">True</property> - <property name="can_focus">True</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">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formatcb"> + <property name="label" translatable="yes" context="scgeneralpage|formatcb">Expand _formatting</property> + <property name="visible">True</property> + <property name="can_focus">True</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="formatcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formatcb">Specifies whether to automatically apply the formatting attributes of the selected cell to the empty adjacent cells.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="legacy_cell_selection_cb"> - <property name="label" translatable="yes" context="scgeneralpage|legacy_cell_selection_cb">Position cell reference with selection</property> - <property name="visible">True</property> - <property name="can_focus">True</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="legacy_cell_selection_cb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|legacy_cell_selection_cb">With the option set, expanding a selection (with Ctrl + Shift + Down/Up) jumps to the end of the range in the column that was added as last to the initial selection. When the option is not set, expanding a selection (with Ctrl + Shift + Down/Up) jumps to the end of the range in the column where selecting the cell range was started. The same of course applies when extending a selection on rows, with Ctrl + Shift + Left/Right.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="exprefcb"> + <property name="label" translatable="yes" context="scgeneralpage|exprefcb">Expand _references when new columns/rows are inserted</property> + <property name="visible">True</property> + <property name="can_focus">True</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="exprefcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|exprefcb">Specifies whether to expand references when inserting columns or rows adjacent to the reference range. This is only possible if the reference range, where the column or row is inserted, originally spanned at least two cells in the desired direction.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="replwarncb"> - <property name="label" translatable="yes" context="scgeneralpage|replwarncb">Show overwrite _warning when pasting data</property> - <property name="visible">True</property> - <property name="can_focus">True</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="replwarncb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|replwarncb">Specifies that, when you paste cells from the clipboard to a cell range that is not empty, a warning appears.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="alignlb"> + <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="scgeneralpage|alignlb">Down</item> + <item translatable="yes" context="scgeneralpage|alignlb">Right</item> + <item translatable="yes" context="scgeneralpage|alignlb">Up</item> + <item translatable="yes" context="scgeneralpage|alignlb">Left</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="alignlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|alignlb">Determines the direction that the cursor in the spreadsheet will move after you press the Enter key.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="enter_paste_mode_cb"> - <property name="label" translatable="yes" context="scgeneralpage|enter_paste_mode_cb">Press Enter to paste and clear clipboard</property> - <property name="visible">True</property> - <property name="can_focus">True</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> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="aligncb"> + <property name="label" translatable="yes" context="scgeneralpage|aligncb">Press Enter to _move selection</property> + <property name="visible">True</property> + <property name="can_focus">True</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="legacy_cell_selection_cb"> + <property name="label" translatable="yes" context="scgeneralpage|legacy_cell_selection_cb">Position cell reference with selection</property> + <property name="visible">True</property> + <property name="can_focus">True</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="legacy_cell_selection_cb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|legacy_cell_selection_cb">With the option set, expanding a selection (with Ctrl + Shift + Down/Up) jumps to the end of the range in the column that was added as last to the initial selection. When the option is not set, expanding a selection (with Ctrl + Shift + Down/Up) jumps to the end of the range in the column where selecting the cell range was started. The same of course applies when extending a selection on rows, with Ctrl + Shift + Left/Right.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="textfmtcb"> - <property name="label" translatable="yes" context="scgeneralpage|textfmtcb">Use printer metrics for text formatting</property> - <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> - <child internal-child="accessible"> - <object class="AtkObject" id="textfmtcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|textfmtcb">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="replwarncb"> + <property name="label" translatable="yes" context="scgeneralpage|replwarncb">Show overwrite _warning when pasting data</property> + <property name="visible">True</property> + <property name="can_focus">True</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="replwarncb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|replwarncb">Specifies that, when you paste cells from the clipboard to a cell range that is not empty, a warning appears.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="markhdrcb"> - <property name="label" translatable="yes" context="scgeneralpage|markhdrcb">Highlight sele_ction in column/row headers</property> - <property name="visible">True</property> - <property name="can_focus">True</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="markhdrcb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|markhdrcb">Specifies whether to highlight column and row headers in the selected columns or rows.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="enter_paste_mode_cb"> + <property name="label" translatable="yes" context="scgeneralpage|enter_paste_mode_cb">Press Enter to paste and clear clipboard</property> + <property name="visible">True</property> + <property name="can_focus">True</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">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="textfmtcb"> + <property name="label" translatable="yes" context="scgeneralpage|textfmtcb">Use printer metrics for text formatting</property> + <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> + <child internal-child="accessible"> + <object class="AtkObject" id="textfmtcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|textfmtcb">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="sortrefupdatecb"> - <property name="label" translatable="yes" context="scgeneralpage|sortrefupdatecb">Update references when sorting range of cells</property> - <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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="markhdrcb"> + <property name="label" translatable="yes" context="scgeneralpage|markhdrcb">Highlight sele_ction in column/row headers</property> + <property name="visible">True</property> + <property name="can_focus">True</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="markhdrcb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|markhdrcb">Specifies whether to highlight column and row headers in the selected columns or rows.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="sortrefupdatecb"> + <property name="label" translatable="yes" context="scgeneralpage|sortrefupdatecb">Update references when sorting range of cells</property> + <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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/selectdatasource.ui b/sc/uiconfig/scalc/ui/selectdatasource.ui index 85957b5b939d..204f4276db9e 100644 --- a/sc/uiconfig/scalc/ui/selectdatasource.ui +++ b/sc/uiconfig/scalc/ui/selectdatasource.ui @@ -80,124 +80,117 @@ <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="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="selectdatasource|label2">_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="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="selectdatasource|label4">_Type:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">type</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="database"> <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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="selectdatasource|label2">_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="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="selectdatasource|label4">_Type:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">type</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="database-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|database">Select the database that contains the data source that you want to use.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</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="selectdatasource|extended_tip|database">Select the database that contains the data source 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> - <items> - <item translatable="yes" context="selectdatasource|type">Table</item> - <item translatable="yes" context="selectdatasource|type">Query</item> - <item translatable="yes" context="selectdatasource|type">Sql</item> - <item translatable="yes" context="selectdatasource|type">Sql [Native]</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="type-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|type">Click the source type of for the selected data source.</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> + <items> + <item translatable="yes" context="selectdatasource|type">Table</item> + <item translatable="yes" context="selectdatasource|type">Query</item> + <item translatable="yes" context="selectdatasource|type">Sql</item> + <item translatable="yes" context="selectdatasource|type">Sql [Native]</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="type-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|type">Click the source type of for the selected data source.</property> </object> - <packing> - <property name="left_attach">1</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="label" translatable="yes" context="selectdatasource|label3">Data so_urce:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">datasource</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="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="selectdatasource|label3">Data so_urce:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">datasource</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="datasource"> + <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="GtkComboBoxText" id="datasource"> - <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="datasource-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|datasource">Select the data source that you want to use.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="datasource-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|datasource">Select the data source that you want to use.</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/sc/uiconfig/scalc/ui/selectrange.ui b/sc/uiconfig/scalc/ui/selectrange.ui index 96eb6f216ac6..f510b1ef577e 100644 --- a/sc/uiconfig/scalc/ui/selectrange.ui +++ b/sc/uiconfig/scalc/ui/selectrange.ui @@ -89,51 +89,43 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</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="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="treeview-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectrange|extended_tip|treeview">Lists the available database ranges. To select a database range, click its name, 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="treeview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectrange|extended_tip|treeview">Lists the available database ranges. To select a database range, click its name, and then click OK.</property> + </object> + </child> </object> </child> </object> diff --git a/sc/uiconfig/scalc/ui/selectsource.ui b/sc/uiconfig/scalc/ui/selectsource.ui index 7174debd0e5b..4c681cc2e1bf 100644 --- a/sc/uiconfig/scalc/ui/selectsource.ui +++ b/sc/uiconfig/scalc/ui/selectsource.ui @@ -83,131 +83,125 @@ <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="GtkBox" id="box1"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="box2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkRadioButton" id="namedrange"> - <property name="label" translatable="yes" context="selectsource|namedrange">_Named range:</property> - <property name="visible">True</property> - <property name="can_focus">True</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">selection</property> - <accessibility> - <relation type="label-for" target="rangelb"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="rangelb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <accessibility> - <relation type="labelled-by" target="namedrange"/> - </accessibility> - </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="GtkRadioButton" id="selection"> - <property name="label" translatable="yes" context="selectsource|selection">_Current selection</property> + <object class="GtkRadioButton" id="namedrange"> + <property name="label" translatable="yes" context="selectsource|namedrange">_Named range:</property> <property name="visible">True</property> <property 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="selection-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectsource|extended_tip|selection">Uses the selected cells as the data source for the pivot table.</property> - </object> - </child> + <property name="group">selection</property> + <accessibility> + <relation type="label-for" target="rangelb"/> + </accessibility> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkRadioButton" id="database"> - <property name="label" translatable="yes" context="selectsource|database">_Data source registered in %PRODUCTNAME</property> + <object class="GtkComboBoxText" id="rangelb"> <property name="visible">True</property> - <property name="can_focus">True</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">selection</property> - <child internal-child="accessible"> - <object class="AtkObject" id="database-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectsource|extended_tip|database">Uses a table or query in a database that is registered in %PRODUCTNAME as the data source for the pivot table.</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <accessibility> + <relation type="labelled-by" target="namedrange"/> + </accessibility> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> - <child> - <object class="GtkRadioButton" id="external"> - <property name="label" translatable="yes" context="selectsource|external">_External source/interface</property> - <property name="visible">True</property> - <property name="can_focus">True</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">selection</property> - <child internal-child="accessible"> - <object class="AtkObject" id="external-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selectsource|extended_tip|external">Opens the External Source dialog where you can select the OLAP data source for the pivot table.</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="selection"> + <property name="label" translatable="yes" context="selectsource|selection">_Current selection</property> + <property name="visible">True</property> + <property 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="selection-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectsource|extended_tip|selection">Uses the selected cells as the data source for the pivot table.</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="database"> + <property name="label" translatable="yes" context="selectsource|database">_Data source registered in %PRODUCTNAME</property> + <property name="visible">True</property> + <property name="can_focus">True</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">selection</property> + <child internal-child="accessible"> + <object class="AtkObject" id="database-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectsource|extended_tip|database">Uses a table or query in a database that is registered in %PRODUCTNAME as the data source for the pivot table.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="external"> + <property name="label" translatable="yes" context="selectsource|external">_External source/interface</property> + <property name="visible">True</property> + <property name="can_focus">True</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">selection</property> + <child internal-child="accessible"> + <object class="AtkObject" id="external-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="selectsource|extended_tip|external">Opens the External Source dialog where you can select the OLAP data source for the pivot table.</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/sharedocumentdlg.ui b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui index 8114359e1117..6096465b0fde 100644 --- a/sc/uiconfig/scalc/ui/sharedocumentdlg.ui +++ b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui @@ -118,22 +118,16 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkLabel" id="warning"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkLabel" id="warning"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sharedocumentdlg|warning">Note: Changes to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities.</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> - </child> + <property name="label" translatable="yes" context="sharedocumentdlg|warning">Note: Changes to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities.</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> + <property name="margin-start">12</property> </object> <packing> <property name="expand">False</property> @@ -157,78 +151,70 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="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="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="users"> <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">True</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="users"> - <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">True</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="sharedocumentdlg|name">Name</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="title" translatable="yes" context="sharedocumentdlg|name">Name</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="sharedocumentdlg|accessed">Accessed</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="title" translatable="yes" context="sharedocumentdlg|accessed">Accessed</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer2"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderer2"/> + <attributes> + <attribute name="text">1</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/sc/uiconfig/scalc/ui/sheetprintpage.ui b/sc/uiconfig/scalc/ui/sheetprintpage.ui index 5d913776ccc5..bbee72165833 100644 --- a/sc/uiconfig/scalc/ui/sheetprintpage.ui +++ b/sc/uiconfig/scalc/ui/sheetprintpage.ui @@ -51,201 +51,37 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="homogeneous">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkBox" id="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="homogeneous">True</property> - <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="halign">start</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="radioBTN_TOPDOWN"> - <property name="label" translatable="yes" context="sheetprintpage|radioBTN_TOPDOWN">_Top to bottom, then right</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">radioBTN_LEFTRIGHT</property> - <child internal-child="accessible"> - <object class="AtkObject" id="radioBTN_TOPDOWN-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|radioBTN_TOPDOWN">Prints vertically from the left column to the bottom of the sheet.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="radioBTN_LEFTRIGHT"> - <property name="label" translatable="yes" context="sheetprintpage|radioBTN_LEFTRIGHT">_Left to right, then down</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="relief">none</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="radioBTN_LEFTRIGHT-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|radioBTN_LEFTRIGHT">Prints horizontally from the top row of the sheet to the right column.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkBTN_PAGENO"> - <property name="label" translatable="yes" context="sheetprintpage|checkBTN_PAGENO">First _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="xalign">0</property> - <property name="draw_indicator">True</property> - <accessibility> - <relation type="label-for" target="spinED_PAGENO"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="checkBTN_PAGENO-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_PAGENO">Select this option if you want the first page to start with a number other than 1.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinED_PAGENO"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">5</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentFirstPage</property> - <accessibility> - <relation type="labelled-by" target="checkBTN_PAGENO"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="spinED_PAGENO-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_PAGENO">Enter the number of the first page.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </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> - <object class="GtkImage" id="imageBMP_PAGEDIR"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="margin-start">6</property> - <property name="margin-end">6</property> - <property name="margin-top">6</property> - <property name="margin-bottom">6</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="labelPageOrder"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sheetprintpage|labelPageOrder">Page Order</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="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="halign">start</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="column_homogeneous">True</property> <child> - <object class="GtkCheckButton" id="checkBTN_HEADER"> - <property name="label" translatable="yes" context="sheetprintpage|checkBTN_HEADER">_Column and row headers</property> + <object class="GtkRadioButton" id="radioBTN_TOPDOWN"> + <property name="label" translatable="yes" context="sheetprintpage|radioBTN_TOPDOWN">_Top to bottom, then right</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">radioBTN_LEFTRIGHT</property> <child internal-child="accessible"> - <object class="AtkObject" id="checkBTN_HEADER-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_HEADER">Specifies whether you want the column and row headers to be printed.</property> + <object class="AtkObject" id="radioBTN_TOPDOWN-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|radioBTN_TOPDOWN">Prints vertically from the left column to the bottom of the sheet.</property> </object> </child> </object> @@ -255,18 +91,21 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="checkBTN_GRID"> - <property name="label" translatable="yes" context="sheetprintpage|checkBTN_GRID">_Grid</property> + <object class="GtkRadioButton" id="radioBTN_LEFTRIGHT"> + <property name="label" translatable="yes" context="sheetprintpage|radioBTN_LEFTRIGHT">_Left to right, then down</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="relief">none</property> <property name="use_underline">True</property> <property name="xalign">0</property> - <property name="yalign">0.550000011920929</property> + <property name="active">True</property> <property name="draw_indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="checkBTN_GRID-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_GRID">Prints out the borders of the individual cells as a grid.</property> + <object class="AtkObject" id="radioBTN_LEFTRIGHT-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|radioBTN_LEFTRIGHT">Prints horizontally from the top row of the sheet to the right column.</property> </object> </child> </object> @@ -276,17 +115,20 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="checkBTN_NOTES"> - <property name="label" translatable="yes" context="sheetprintpage|checkBTN_NOTES">_Comments</property> + <object class="GtkCheckButton" id="checkBTN_PAGENO"> + <property name="label" translatable="yes" context="sheetprintpage|checkBTN_PAGENO">First _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="xalign">0</property> <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="spinED_PAGENO"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="checkBTN_NOTES-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_NOTES">Prints the comments defined in your spreadsheet.</property> + <object class="AtkObject" id="checkBTN_PAGENO-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_PAGENO">Select this option if you want the first page to start with a number other than 1.</property> </object> </child> </object> @@ -296,118 +138,264 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="checkBTN_OBJECTS"> - <property name="label" translatable="yes" context="sheetprintpage|checkBTN_OBJECTS">_Objects/Images</property> + <object class="GtkSpinButton" id="spinED_PAGENO"> <property name="visible">True</property> <property name="can_focus">True</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="max_length">5</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentFirstPage</property> + <accessibility> + <relation type="labelled-by" target="checkBTN_PAGENO"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="checkBTN_OBJECTS-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_OBJECTS">Includes all inserted objects (if printable) and graphics with the printed document.</property> + <object class="AtkObject" id="spinED_PAGENO-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_PAGENO">Enter the number of the first page.</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">2</property> </packing> </child> <child> - <object class="GtkCheckButton" id="checkBTN_CHARTS"> - <property name="label" translatable="yes" context="sheetprintpage|checkBTN_CHARTS">Charts</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="checkBTN_CHARTS-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_CHARTS">Prints the charts that have been inserted into your spreadsheet.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> <child> - <object class="GtkCheckButton" id="checkBTN_DRAWINGS"> - <property name="label" translatable="yes" context="sheetprintpage|checkBTN_DRAWINGS">_Drawing 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="checkBTN_DRAWINGS-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_DRAWINGS">Includes all drawing objects in the printed document.</property> - </object> - </child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="imageBMP_PAGEDIR"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="margin-start">6</property> + <property name="margin-end">6</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="stock">gtk-missing-image</property> + </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="labelPageOrder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sheetprintpage|labelPageOrder">Page Order</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <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="grid1"> + <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> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="checkBTN_HEADER"> + <property name="label" translatable="yes" context="sheetprintpage|checkBTN_HEADER">_Column and row headers</property> + <property name="visible">True</property> + <property name="can_focus">True</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="checkBTN_HEADER-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_HEADER">Specifies whether you want the column and row headers to be printed.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="checkBTN_FORMULAS"> - <property name="label" translatable="yes" context="sheetprintpage|checkBTN_FORMULAS">_Formulas</property> - <property name="visible">True</property> - <property name="can_focus">True</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="checkBTN_FORMULAS-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_FORMULAS">Prints the formulas contained in the cells, instead of the results.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkBTN_GRID"> + <property name="label" translatable="yes" context="sheetprintpage|checkBTN_GRID">_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="yalign">0.550000011920929</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="checkBTN_GRID-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_GRID">Prints out the borders of the individual cells as a grid.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="checkBTN_NULLVALS"> - <property name="label" translatable="yes" context="sheetprintpage|checkBTN_NULLVALS">_Zero values</property> - <property name="visible">True</property> - <property name="can_focus">True</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="checkBTN_NULLVALS-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_NULLVALS">Specifies that cells with a zero value are printed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkBTN_NOTES"> + <property name="label" translatable="yes" context="sheetprintpage|checkBTN_NOTES">_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="checkBTN_NOTES-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_NOTES">Prints the comments defined in your spreadsheet.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <placeholder/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkBTN_OBJECTS"> + <property name="label" translatable="yes" context="sheetprintpage|checkBTN_OBJECTS">_Objects/Images</property> + <property name="visible">True</property> + <property name="can_focus">True</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="checkBTN_OBJECTS-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_OBJECTS">Includes all inserted objects (if printable) and graphics with the printed document.</property> + </object> </child> - <child> - <placeholder/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkBTN_CHARTS"> + <property name="label" translatable="yes" context="sheetprintpage|checkBTN_CHARTS">Charts</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="checkBTN_CHARTS-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_CHARTS">Prints the charts that have been inserted into your spreadsheet.</property> + </object> </child> - <child> - <placeholder/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkBTN_DRAWINGS"> + <property name="label" translatable="yes" context="sheetprintpage|checkBTN_DRAWINGS">_Drawing 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="checkBTN_DRAWINGS-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_DRAWINGS">Includes all drawing objects in the printed document.</property> + </object> </child> - <child> - <placeholder/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkBTN_FORMULAS"> + <property name="label" translatable="yes" context="sheetprintpage|checkBTN_FORMULAS">_Formulas</property> + <property name="visible">True</property> + <property name="can_focus">True</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="checkBTN_FORMULAS-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_FORMULAS">Prints the formulas contained in the cells, instead of the results.</property> + </object> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkBTN_NULLVALS"> + <property name="label" translatable="yes" context="sheetprintpage|checkBTN_NULLVALS">_Zero values</property> + <property name="visible">True</property> + <property name="can_focus">True</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="checkBTN_NULLVALS-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|checkBTN_NULLVALS">Specifies that cells with a zero value are printed.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -434,75 +422,46 @@ <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="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="labelScalingMode"> <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="labelScalingMode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sheetprintpage|labelScalingMode">Scaling _mode:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">comboLB_SCALEMODE</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="sheetprintpage|labelScalingMode">Scaling _mode:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">comboLB_SCALEMODE</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="GtkBox" id="box4"> + <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="box4"> + <object class="GtkBox" id="boxSCALEALL"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="boxSCALEALL"> + <object class="GtkLabel" id="labelSF"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="labelSF"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sheetprintpage|labelSF">_Scaling factor:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinED_SCALEALL</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="spinED_SCALEALL"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentScalingFactor</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinED_SCALEALL-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_SCALEALL">Enter a scaling factor. Factors less than 100 reduce the pages, higher factors enlarge the pages.</property> - </object> - </child> - </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="sheetprintpage|labelSF">_Scaling factor:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinED_SCALEALL</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -511,88 +470,15 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="gridWH"> + <object class="GtkSpinButton" id="spinED_SCALEALL"> <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> - <child> - <object class="GtkCheckButton" id="labelWP"> - <property name="label" translatable="yes" context="sheetprintpage|labelWP">_Width in 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> - <accessibility> - <relation type="label-for" target="spinED_SCALEPAGEWIDTH"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="labelHP"> - <property name="label" translatable="yes" context="sheetprintpage|labelHP">_Height in 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> - <accessibility> - <relation type="label-for" target="spinED_SCALEPAGEHEIGHT"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinED_SCALEPAGEWIDTH"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentPage</property> - <accessibility> - <relation type="labelled-by" target="labelWP"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="spinED_SCALEPAGEWIDTH-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_SCALEPAGEWIDTH">Enter the maximum number of pages to be printed horizontally across.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinED_SCALEPAGEHEIGHT"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentPage1</property> - <accessibility> - <relation type="labelled-by" target="labelHP"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="spinED_SCALEPAGEHEIGHT-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_SCALEPAGEHEIGHT">Enter the maximum number of pages to be printed vertically stacked.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentScalingFactor</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinED_SCALEALL-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_SCALEALL">Enter a scaling factor. Factors less than 100 reduce the pages, higher factors enlarge the pages.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> </object> <packing> @@ -601,81 +487,177 @@ <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> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="gridWH"> + <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> <child> - <object class="GtkBox" id="boxNP"> + <object class="GtkCheckButton" id="labelWP"> + <property name="label" translatable="yes" context="sheetprintpage|labelWP">_Width in pages:</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="labelNP"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sheetprintpage|labelNP">N_umber of pages:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinED_SCALEPAGENUM</property> - <property name="xalign">0</property> + <property name="can_focus">True</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="spinED_SCALEPAGEWIDTH"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="labelHP"> + <property name="label" translatable="yes" context="sheetprintpage|labelHP">_Height in 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> + <accessibility> + <relation type="label-for" target="spinED_SCALEPAGEHEIGHT"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinED_SCALEPAGEWIDTH"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentPage</property> + <accessibility> + <relation type="labelled-by" target="labelWP"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="spinED_SCALEPAGEWIDTH-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_SCALEPAGEWIDTH">Enter the maximum number of pages to be printed horizontally across.</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="spinED_SCALEPAGENUM"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentPage2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="spinED_SCALEPAGENUM-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_SCALEPAGENUM">Enter the maximum number of pages to be printed.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinED_SCALEPAGEHEIGHT"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentPage1</property> + <accessibility> + <relation type="labelled-by" target="labelHP"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="spinED_SCALEPAGEHEIGHT-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_SCALEPAGEHEIGHT">Enter the maximum number of pages to be printed vertically stacked.</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="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> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="comboLB_SCALEMODE"> + <object class="GtkBox" id="boxNP"> <property name="visible">True</property> <property name="can_focus">False</property> - <items> - <item translatable="yes" context="sheetprintpage|comboLB_SCALEMODE">Reduce/enlarge printout</item> - <item translatable="yes" context="sheetprintpage|comboLB_SCALEMODE">Fit print range(s) to width/height</item> - <item translatable="yes" context="sheetprintpage|comboLB_SCALEMODE">Fit print range(s) on number of pages</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="comboLB_SCALEMODE-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|comboLB_SCALEMODE">Select a scaling mode from the list box. Appropriate controls will be shown below the list box.</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="labelNP"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sheetprintpage|labelNP">N_umber of pages:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinED_SCALEPAGENUM</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="spinED_SCALEPAGENUM"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentPage2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="spinED_SCALEPAGENUM-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|spinED_SCALEPAGENUM">Enter the maximum number of pages to be printed.</property> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </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">2</property> </packing> </child> - <child> - <placeholder/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="comboLB_SCALEMODE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="sheetprintpage|comboLB_SCALEMODE">Reduce/enlarge printout</item> + <item translatable="yes" context="sheetprintpage|comboLB_SCALEMODE">Fit print range(s) to width/height</item> + <item translatable="yes" context="sheetprintpage|comboLB_SCALEMODE">Fit print range(s) on number of pages</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="comboLB_SCALEMODE-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sheetprintpage|extended_tip|comboLB_SCALEMODE">Select a scaling mode from the list box. Appropriate controls will be shown below the list box.</property> + </object> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/showchangesdialog.ui b/sc/uiconfig/scalc/ui/showchangesdialog.ui index a7bd13ade6b7..65c6695803b5 100644 --- a/sc/uiconfig/scalc/ui/showchangesdialog.ui +++ b/sc/uiconfig/scalc/ui/showchangesdialog.ui @@ -111,72 +111,66 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkCheckButton" id="showaccepted"> + <property name="label" translatable="yes" context="showchangesdialog|showaccepted">Show _accepted changes</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkCheckButton" id="showaccepted"> - <property name="label" translatable="yes" context="showchangesdialog|showaccepted">Show _accepted 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> - <child internal-child="accessible"> - <object class="AtkObject" id="showaccepted-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="showchangesdialog|extended_tip|showaccepted">Shows or hides the changes that were accepted.</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="showaccepted-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="showchangesdialog|extended_tip|showaccepted">Shows or hides the changes that were accepted.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="showrejected"> - <property name="label" translatable="yes" context="showchangesdialog|showrejected">Show _rejected 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> - <child internal-child="accessible"> - <object class="AtkObject" id="showrejected-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="showchangesdialog|extended_tip|showrejected">Shows or hides the changes that were rejected.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="showrejected"> + <property name="label" translatable="yes" context="showchangesdialog|showrejected">Show _rejected 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> + <child internal-child="accessible"> + <object class="AtkObject" id="showrejected-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="showchangesdialog|extended_tip|showrejected">Shows or hides the changes that were rejected.</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> + <object class="GtkBox" id="box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/showsheetdialog.ui b/sc/uiconfig/scalc/ui/showsheetdialog.ui index 3b823ca86a6b..dcda0b4833d0 100644 --- a/sc/uiconfig/scalc/ui/showsheetdialog.ui +++ b/sc/uiconfig/scalc/ui/showsheetdialog.ui @@ -90,42 +90,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="can_focus">True</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="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/sc/uiconfig/scalc/ui/solverdlg.ui b/sc/uiconfig/scalc/ui/solverdlg.ui index 68557a5337ae..3ed38874f42a 100644 --- a/sc/uiconfig/scalc/ui/solverdlg.ui +++ b/sc/uiconfig/scalc/ui/solverdlg.ui @@ -391,464 +391,456 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkScrolledWindow" id="scrollbar"> <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="top_padding">6</property> - <property name="left_padding">12</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">always</property> + <property name="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow" id="scrollbar"> + <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">always</property> - <property name="shadow_type">in</property> <child> - <object class="GtkViewport"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid"> <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="grid"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> <property name="hexpand">True</property> + <property name="border_width">3</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="cellreflabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="solverdlg|cellreflabel">_Cell reference</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> + <property name="width">2</property> + </packing> + </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="oplabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> + <property name="label" translatable="yes" context="solverdlg|oplabel">_Operator</property> + <property name="use_underline">True</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="constraintlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">6</property> + <property name="label" translatable="yes" context="solverdlg|constraintlabel">V_alue</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="ref1edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="border_width">3</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="cellreflabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="solverdlg|cellreflabel">_Cell reference</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> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="oplabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="solverdlg|oplabel">_Operator</property> - <property name="use_underline">True</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="constraintlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">6</property> - <property name="label" translatable="yes" context="solverdlg|constraintlabel">V_alue</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="ref1edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">20</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ref1edit-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref1edit-atkobject">Cell reference</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="ref2edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">20</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ref2edit-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref2edit-atkobject">Cell reference</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="ref3edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">20</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ref3edit-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref3edit-atkobject">Cell reference</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="ref4edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">20</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ref4edit-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref4edit-atkobject">Cell reference</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ref1button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ref2button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ref3button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ref4button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="op1list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="solverdlg|op1list"><=</item> - <item translatable="yes" context="solverdlg|op1list">=</item> - <item translatable="yes" context="solverdlg|op1list">=></item> - <item translatable="yes" context="solverdlg|op1list">Integer</item> - <item translatable="yes" context="solverdlg|op1list">Binary</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="op1list-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op1list-atkobject">Operator</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="op2list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="solverdlg|op2list"><=</item> - <item translatable="yes" context="solverdlg|op2list">=</item> - <item translatable="yes" context="solverdlg|op2list">=></item> - <item translatable="yes" context="solverdlg|op2list">Integer</item> - <item translatable="yes" context="solverdlg|op2list">Binary</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="op2list-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op2list-atkobject">Operator</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="op3list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="solverdlg|op3list"><=</item> - <item translatable="yes" context="solverdlg|op3list">=</item> - <item translatable="yes" context="solverdlg|op3list">=></item> - <item translatable="yes" context="solverdlg|op3list">Integer</item> - <item translatable="yes" context="solverdlg|op3list">Binary</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="op3list-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op3list-atkobject">Operator</property> - </object> - </child> + <property name="activates_default">True</property> + <property name="width_chars">20</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ref1edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref1edit-atkobject">Cell reference</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="op4list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="solverdlg|op4list"><=</item> - <item translatable="yes" context="solverdlg|op4list">=</item> - <item translatable="yes" context="solverdlg|op4list">=></item> - <item translatable="yes" context="solverdlg|op4list">Integer</item> - <item translatable="yes" context="solverdlg|op4list">Binary</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="op4list-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op4list-atkobject">Operator</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="val1edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin-start">6</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">15</property> - <child internal-child="accessible"> - <object class="AtkObject" id="val1edit-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val1edit-atkobject">Value</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="val2edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin-start">6</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">15</property> - <child internal-child="accessible"> - <object class="AtkObject" id="val2edit-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val2edit-atkobject">Value</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="ref2edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">20</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ref2edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref2edit-atkobject">Cell reference</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkEntry" id="val3edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin-start">6</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">15</property> - <child internal-child="accessible"> - <object class="AtkObject" id="val3edit-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val3edit-atkobject">Value</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="ref3edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">20</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ref3edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref3edit-atkobject">Cell reference</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkEntry" id="val4edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin-start">6</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">15</property> - <child internal-child="accessible"> - <object class="AtkObject" id="val4edit-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val4edit-atkobject">Value</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="ref4edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">20</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ref4edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref4edit-atkobject">Cell reference</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkButton" id="val1button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ref1button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ref2button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ref3button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ref4button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="op1list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="solverdlg|op1list"><=</item> + <item translatable="yes" context="solverdlg|op1list">=</item> + <item translatable="yes" context="solverdlg|op1list">=></item> + <item translatable="yes" context="solverdlg|op1list">Integer</item> + <item translatable="yes" context="solverdlg|op1list">Binary</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op1list-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op1list-atkobject">Operator</property> </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkButton" id="val2button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="op2list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="solverdlg|op2list"><=</item> + <item translatable="yes" context="solverdlg|op2list">=</item> + <item translatable="yes" context="solverdlg|op2list">=></item> + <item translatable="yes" context="solverdlg|op2list">Integer</item> + <item translatable="yes" context="solverdlg|op2list">Binary</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op2list-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op2list-atkobject">Operator</property> </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="val3button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="op3list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="solverdlg|op3list"><=</item> + <item translatable="yes" context="solverdlg|op3list">=</item> + <item translatable="yes" context="solverdlg|op3list">=></item> + <item translatable="yes" context="solverdlg|op3list">Integer</item> + <item translatable="yes" context="solverdlg|op3list">Binary</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op3list-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op3list-atkobject">Operator</property> </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkButton" id="val4button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="op4list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="solverdlg|op4list"><=</item> + <item translatable="yes" context="solverdlg|op4list">=</item> + <item translatable="yes" context="solverdlg|op4list">=></item> + <item translatable="yes" context="solverdlg|op4list">Integer</item> + <item translatable="yes" context="solverdlg|op4list">Binary</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op4list-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op4list-atkobject">Operator</property> </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkButton" id="del2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="solverdlg|del2|tooltip_text">Remove</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="val1edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin-start">6</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="val1edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val1edit-atkobject">Value</property> </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="del1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="solverdlg|del1|tooltip_text">Remove</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="val2edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin-start">6</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="val2edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val2edit-atkobject">Value</property> </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkButton" id="del3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="solverdlg|del3|tooltip_text">Remove</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="val3edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin-start">6</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="val3edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val3edit-atkobject">Value</property> </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkButton" id="del4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="solverdlg|del4|tooltip_text">Remove</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="val4edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin-start">6</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="val4edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val4edit-atkobject">Value</property> </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">4</property> - </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left_attach">3</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="val1button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="val2button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="val3button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="val4button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="del2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="solverdlg|del2|tooltip_text">Remove</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="del1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="solverdlg|del1|tooltip_text">Remove</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="del3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="solverdlg|del3|tooltip_text">Remove</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="del4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="solverdlg|del4|tooltip_text">Remove</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">4</property> </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/sortkey.ui b/sc/uiconfig/scalc/ui/sortkey.ui index 488634195d25..a2a3711323ed 100644 --- a/sc/uiconfig/scalc/ui/sortkey.ui +++ b/sc/uiconfig/scalc/ui/sortkey.ui @@ -9,80 +9,74 @@ <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="GtkComboBoxText" id="sortlb"> + <property name="width_request">600</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="GtkComboBoxText" id="sortlb"> - <property name="width_request">600</property> - <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="sortlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortkey|extended_tip|sortlb">Select the column that you want to use as the primary sort key.</property> - </object> - </child> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="sortlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortkey|extended_tip|sortlb">Select the column that you want to use as the primary sort key.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="up"> - <property name="label" translatable="yes" context="sortkey|up">_Ascending</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="up-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortkey|extended_tip|up">Sorts the selection from the lowest value to the highest value. The sorting rules are given by the locale. You can define the sort rules on Data - Sort - Options.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="up"> + <property name="label" translatable="yes" context="sortkey|up">_Ascending</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="up-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortkey|extended_tip|up">Sorts the selection from the lowest value to the highest value. The sorting rules are given by the locale. You can define the sort rules on Data - Sort - Options.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="down"> - <property name="label" translatable="yes" context="sortkey|down">_Descending</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">up</property> - <child internal-child="accessible"> - <object class="AtkObject" id="down-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortkey|extended_tip|down">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="down"> + <property name="label" translatable="yes" context="sortkey|down">_Descending</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">up</property> + <child internal-child="accessible"> + <object class="AtkObject" id="down-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortkey|extended_tip|down">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</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/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui index 7360390b3967..34ca8e0d497e 100644 --- a/sc/uiconfig/scalc/ui/sortoptionspage.ui +++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui @@ -15,326 +15,320 @@ <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="case"> + <property name="label" translatable="yes" context="sortoptionspage|case">Case _sensitive</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="case"> - <property name="label" translatable="yes" context="sortoptionspage|case">Case _sensitive</property> - <property name="visible">True</property> - <property name="can_focus">True</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="case-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|case">Sorts first by uppercase letters and then by lowercase letters. For Asian languages, special handling applies.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="header"> - <property name="label" translatable="yes" context="sortoptionspage|header">Range contains...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="header-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|header">Omits the first row or the first column in the selection from the sort.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="formats"> - <property name="label" translatable="yes" context="sortoptionspage|formats">Include formats</property> - <property name="visible">True</property> - <property name="can_focus">True</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="formats-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|formats">Preserves the current cell formatting.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="naturalsort"> - <property name="label" translatable="yes" context="sortoptionspage|naturalsort">Enable natural sort</property> - <property name="visible">True</property> - <property name="can_focus">True</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="naturalsort-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|naturalsort">Natural sort is a sort algorithm that sorts string-prefixed numbers based on the value of the numerical element in each sorted number, instead of the traditional way of sorting them as ordinary strings.</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="case-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|case">Sorts first by uppercase letters and then by lowercase letters. For Asian languages, special handling applies.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="includenotes"> - <property name="label" translatable="yes" context="sortoptionspage|includenotes">Include boundary column(s) containing only 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">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="header"> + <property name="label" translatable="yes" context="sortoptionspage|header">Range contains...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="header-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|header">Omits the first row or the first column in the selection from the sort.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="includeimages"> - <property name="label" translatable="yes" context="sortoptionspage|includeimages">Include boundary column(s) containing only images</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formats"> + <property name="label" translatable="yes" context="sortoptionspage|formats">Include formats</property> + <property name="visible">True</property> + <property name="can_focus">True</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="formats-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|formats">Preserves the current cell formatting.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="copyresult"> - <property name="label" translatable="yes" context="sortoptionspage|copyresult">Copy sort results to:</property> - <property name="visible">True</property> - <property name="can_focus">True</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="outarealb"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="copyresult-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|copyresult">Copies the sorted list to the cell range that you specify.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="naturalsort"> + <property name="label" translatable="yes" context="sortoptionspage|naturalsort">Enable natural sort</property> + <property name="visible">True</property> + <property name="can_focus">True</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="naturalsort-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|naturalsort">Natural sort is a sort algorithm that sorts string-prefixed numbers based on the value of the numerical element in each sorted number, instead of the traditional way of sorting them as ordinary strings.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="outarealb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <accessibility> - <relation type="labelled-by" target="copyresult"/> - <relation type="label-for" target="outareaed"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="outarealb-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|outarealb-atkobject">Copy sort results to:</property> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|outarealb">Select a named cell range where you want to display the sorted list, or enter a cell range in the input box.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="includenotes"> + <property name="label" translatable="yes" context="sortoptionspage|includenotes">Include boundary column(s) containing only 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> + <child> + <object class="GtkCheckButton" id="includeimages"> + <property name="label" translatable="yes" context="sortoptionspage|includeimages">Include boundary column(s) containing only images</property> + <property name="visible">True</property> + <property name="can_focus">True</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">5</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="copyresult"> + <property name="label" translatable="yes" context="sortoptionspage|copyresult">Copy sort results to:</property> + <property name="visible">True</property> + <property name="can_focus">True</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="outarealb"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="copyresult-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|copyresult">Copies the sorted list to the cell range that you specify.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> </child> - <child> - <object class="GtkEntry" id="outareaed"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <accessibility> - <relation type="labelled-by" target="outarealb"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="outareaed-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|outareaed-atkobject">Copy sort results to:</property> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|outareaed">Enter the cell range where you want to display the sorted list, or select a named range from the list.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="outarealb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">12</property> + <accessibility> + <relation type="labelled-by" target="copyresult"/> + <relation type="label-for" target="outareaed"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="outarealb-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|outarealb-atkobject">Copy sort results to:</property> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|outarealb">Select a named cell range where you want to display the sorted list, or enter a cell range in the input box.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="sortuser"> - <property name="label" translatable="yes" context="sortoptionspage|sortuser">Custom sort order</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <accessibility> - <relation type="label-for" target="sortuserlb"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="sortuser-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|sortuser">Click here and then select the custom sort order that you want.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="outareaed"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <accessibility> + <relation type="labelled-by" target="outarealb"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="outareaed-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|outareaed-atkobject">Copy sort results to:</property> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|outareaed">Enter the cell range where you want to display the sorted list, or select a named range from the list.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="sortuserlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <accessibility> - <relation type="labelled-by" target="sortuser"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="sortuserlb-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|sortuserlb-atkobject">Custom sort order</property> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|sortuserlb">Select the custom sort order that you want to apply. To define a custom sort order, choose Tools - Options - %PRODUCTNAME Calc - Sort Lists .</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="sortuser"> + <property name="label" translatable="yes" context="sortoptionspage|sortuser">Custom sort order</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="sortuserlb"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="sortuser-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|sortuser">Click here and then select the custom sort order that you want.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> - <property name="width">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="sortoptionspage|label6">Language</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">8</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="sortuserlb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">12</property> + <accessibility> + <relation type="labelled-by" target="sortuser"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="sortuserlb-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|sortuserlb-atkobject">Custom sort order</property> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|sortuserlb">Select the custom sort order that you want to apply. To define a custom sort order, choose Tools - Options - %PRODUCTNAME Calc - Sort Lists .</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">10</property> - </packing> </child> - <child> - <object class="GtkLabel" id="algorithmft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="sortoptionspage|algorithmft">Options</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">algorithmlb</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="sortoptionspage|label6">Language</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">10</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="algorithmft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="sortoptionspage|algorithmft">Options</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">algorithmlb</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="algorithmlb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="algorithmlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|algorithmlb">Select a sorting option for the language.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">10</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="algorithmlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="algorithmlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|algorithmlb">Select a sorting option for the language.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">11</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="language"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry"> + <property name="can_focus">True</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">11</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="language"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry"> - <property name="can_focus">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="language-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|language">Select the language for the sorting rules.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="language-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|language">Select the language for the sorting rules.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">11</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">11</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -362,59 +356,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="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="topdown"> + <property name="label" translatable="yes" context="sortoptionspage|topdown">_Top to bottom (sort rows)</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkRadioButton" id="topdown"> - <property name="label" translatable="yes" context="sortoptionspage|topdown">_Top to bottom (sort rows)</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="topdown-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|topdown">Sorts rows by the values in the active columns of the selected range.</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="topdown-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|topdown">Sorts rows by the values in the active columns of the selected range.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="leftright"> - <property name="label" translatable="yes" context="sortoptionspage|leftright">L_eft to right (sort 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> - <property name="group">topdown</property> - <child internal-child="accessible"> - <object class="AtkObject" id="leftright-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|leftright">Sorts columns by the values in the active rows of the selected range.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="leftright"> + <property name="label" translatable="yes" context="sortoptionspage|leftright">L_eft to right (sort 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> + <property name="group">topdown</property> + <child internal-child="accessible"> + <object class="AtkObject" id="leftright-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|leftright">Sorts columns by the values in the active rows of the selected range.</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/sc/uiconfig/scalc/ui/standardfilterdialog.ui b/sc/uiconfig/scalc/ui/standardfilterdialog.ui index a9fd8ec49b35..940f6948fdf0 100644 --- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui +++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui @@ -130,557 +130,549 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkScrolledWindow" id="scrollbar"> <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="top_padding">6</property> - <property name="left_padding">12</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">always</property> + <property name="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow" id="scrollbar"> + <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">always</property> - <property name="shadow_type">in</property> <child> - <object class="GtkViewport"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid"> + <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="border_width">3</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkComboBoxText" id="connect1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="border_width">3</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkComboBoxText" id="connect1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="standardfilterdialog|connect1">AND</item> - <item translatable="yes" context="standardfilterdialog|connect1">OR</item> - </items> - <accessibility> - <relation type="labelled-by" target="label2"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="connect1-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect1-atkobject">Operator 1</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|connect1">For the following arguments, you can choose between the logical operators AND / OR.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="connect2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="standardfilterdialog|connect2">AND</item> - <item translatable="yes" context="standardfilterdialog|connect2">OR</item> - </items> - <accessibility> - <relation type="labelled-by" target="label2"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="connect2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect2-atkobject">Operator 2</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|connect2">For the following arguments, you can choose between the logical operators AND / OR.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="connect3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="standardfilterdialog|connect3">AND</item> - <item translatable="yes" context="standardfilterdialog|connect3">OR</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="connect3-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect3-atkobject">Operator 3</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="connect4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="standardfilterdialog|connect4">AND</item> - <item translatable="yes" context="standardfilterdialog|connect4">OR</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="connect4-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect4-atkobject">Operator 4</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</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="standardfilterdialog|label2">Operator</property> + <items> + <item translatable="yes" context="standardfilterdialog|connect1">AND</item> + <item translatable="yes" context="standardfilterdialog|connect1">OR</item> + </items> + <accessibility> + <relation type="labelled-by" target="label2"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="connect1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect1-atkobject">Operator 1</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|connect1">For the following arguments, you can choose between the logical operators AND / OR.</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="standardfilterdialog|label3">Field name</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="connect2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="standardfilterdialog|connect2">AND</item> + <item translatable="yes" context="standardfilterdialog|connect2">OR</item> + </items> + <accessibility> + <relation type="labelled-by" target="label2"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="connect2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect2-atkobject">Operator 2</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|connect2">For the following arguments, you can choose between the logical operators AND / OR.</property> </object> - <packing> - <property name="left_attach">1</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="standardfilterdialog|label4">Condition</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="connect3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="standardfilterdialog|connect3">AND</item> + <item translatable="yes" context="standardfilterdialog|connect3">OR</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="connect3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect3-atkobject">Operator 3</property> </object> - <packing> - <property name="left_attach">2</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="standardfilterdialog|label5">Value</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="connect4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="standardfilterdialog|connect4">AND</item> + <item translatable="yes" context="standardfilterdialog|connect4">OR</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="connect4-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect4-atkobject">Operator 4</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="field1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <accessibility> - <relation type="labelled-by" target="label3"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="field1-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field1-atkobject">Field Name 1</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|field1">Specifies the field names from the current table to set them in the argument.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</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="standardfilterdialog|label2">Operator</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="standardfilterdialog|label3">Field name</property> + </object> + <packing> + <property name="left_attach">1</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="standardfilterdialog|label4">Condition</property> + </object> + <packing> + <property name="left_attach">2</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="standardfilterdialog|label5">Value</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <accessibility> + <relation type="labelled-by" target="label3"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="field1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field1-atkobject">Field Name 1</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|field1">Specifies the field names from the current table to set them in the argument.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="field2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <accessibility> - <relation type="labelled-by" target="label3"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="field2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field2-atkobject">Field Name 2</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|field2">Specifies the field names from the current table to set them in the argument.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <accessibility> + <relation type="labelled-by" target="label3"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="field2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field2-atkobject">Field Name 2</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|field2">Specifies the field names from the current table to set them in the argument.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="field3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <accessibility> - <relation type="labelled-by" target="label3"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="field3-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field3-atkobject">Field Name 3</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|field3">Specifies the field names from the current table to set them in the argument.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <accessibility> + <relation type="labelled-by" target="label3"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="field3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field3-atkobject">Field Name 3</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|field3">Specifies the field names from the current table to set them in the argument.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="field4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="field4-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field4-atkobject">Field Name 4</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="field4-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field4-atkobject">Field Name 4</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="cond1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item>=</item> - <item><</item> - <item>></item> - <item><=</item> - <item>>=</item> - <item><></item> - <item translatable="yes" context="standardfilterdialog|cond1">Largest</item> - <item translatable="yes" context="standardfilterdialog|cond1">Smallest</item> - <item translatable="yes" context="standardfilterdialog|cond1">Largest %</item> - <item translatable="yes" context="standardfilterdialog|cond1">Smallest %</item> - <item translatable="yes" context="standardfilterdialog|cond1">Contains</item> - <item translatable="yes" context="standardfilterdialog|cond1">Does not contain</item> - <item translatable="yes" context="standardfilterdialog|cond1">Begins with</item> - <item translatable="yes" context="standardfilterdialog|cond1">Does not begin with</item> - <item translatable="yes" context="standardfilterdialog|cond1">Ends with</item> - <item translatable="yes" context="standardfilterdialog|cond1">Does not end with</item> - </items> - <accessibility> - <relation type="labelled-by" target="label4"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="cond1-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond1-atkobject">Condition 1</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|cond1">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item>=</item> + <item><</item> + <item>></item> + <item><=</item> + <item>>=</item> + <item><></item> + <item translatable="yes" context="standardfilterdialog|cond1">Largest</item> + <item translatable="yes" context="standardfilterdialog|cond1">Smallest</item> + <item translatable="yes" context="standardfilterdialog|cond1">Largest %</item> + <item translatable="yes" context="standardfilterdialog|cond1">Smallest %</item> + <item translatable="yes" context="standardfilterdialog|cond1">Contains</item> + <item translatable="yes" context="standardfilterdialog|cond1">Does not contain</item> + <item translatable="yes" context="standardfilterdialog|cond1">Begins with</item> + <item translatable="yes" context="standardfilterdialog|cond1">Does not begin with</item> + <item translatable="yes" context="standardfilterdialog|cond1">Ends with</item> + <item translatable="yes" context="standardfilterdialog|cond1">Does not end with</item> + </items> + <accessibility> + <relation type="labelled-by" target="label4"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cond1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond1-atkobject">Condition 1</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|cond1">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="cond2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item>=</item> - <item><</item> - <item>></item> - <item><=</item> - <item>>=</item> - <item><></item> - <item translatable="yes" context="standardfilterdialog|cond2">Largest</item> - <item translatable="yes" context="standardfilterdialog|cond2">Smallest</item> - <item translatable="yes" context="standardfilterdialog|cond2">Largest %</item> - <item translatable="yes" context="standardfilterdialog|cond2">Smallest %</item> - <item translatable="yes" context="standardfilterdialog|cond2">Contains</item> - <item translatable="yes" context="standardfilterdialog|cond2">Does not contain</item> - <item translatable="yes" context="standardfilterdialog|cond2">Begins with</item> - <item translatable="yes" context="standardfilterdialog|cond2">Does not begin with</item> - <item translatable="yes" context="standardfilterdialog|cond2">Ends with</item> - <item translatable="yes" context="standardfilterdialog|cond2">Does not end with</item> - </items> - <accessibility> - <relation type="labelled-by" target="label4"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="cond2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond2-atkobject">Condition 2</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|cond2">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item>=</item> + <item><</item> + <item>></item> + <item><=</item> + <item>>=</item> + <item><></item> + <item translatable="yes" context="standardfilterdialog|cond2">Largest</item> + <item translatable="yes" context="standardfilterdialog|cond2">Smallest</item> + <item translatable="yes" context="standardfilterdialog|cond2">Largest %</item> + <item translatable="yes" context="standardfilterdialog|cond2">Smallest %</item> + <item translatable="yes" context="standardfilterdialog|cond2">Contains</item> + <item translatable="yes" context="standardfilterdialog|cond2">Does not contain</item> + <item translatable="yes" context="standardfilterdialog|cond2">Begins with</item> + <item translatable="yes" context="standardfilterdialog|cond2">Does not begin with</item> + <item translatable="yes" context="standardfilterdialog|cond2">Ends with</item> + <item translatable="yes" context="standardfilterdialog|cond2">Does not end with</item> + </items> + <accessibility> + <relation type="labelled-by" target="label4"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cond2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond2-atkobject">Condition 2</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|cond2">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="cond3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item>=</item> - <item><</item> - <item>></item> - <item><=</item> - <item>>=</item> - <item><></item> - <item translatable="yes" context="standardfilterdialog|cond3">Largest</item> - <item translatable="yes" context="standardfilterdialog|cond3">Smallest</item> - <item translatable="yes" context="standardfilterdialog|cond3">Largest %</item> - <item translatable="yes" context="standardfilterdialog|cond3">Smallest %</item> - <item translatable="yes" context="standardfilterdialog|cond3">Contains</item> - <item translatable="yes" context="standardfilterdialog|cond3">Does not contain</item> - <item translatable="yes" context="standardfilterdialog|cond3">Begins with</item> - <item translatable="yes" context="standardfilterdialog|cond3">Does not begin with</item> - <item translatable="yes" context="standardfilterdialog|cond3">Ends with</item> - <item translatable="yes" context="standardfilterdialog|cond3">Does not end with</item> - </items> - <accessibility> - <relation type="labelled-by" target="label4"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="cond3-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond3-atkobject">Condition 3</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|cond3">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item>=</item> + <item><</item> + <item>></item> + <item><=</item> + <item>>=</item> + <item><></item> + <item translatable="yes" context="standardfilterdialog|cond3">Largest</item> + <item translatable="yes" context="standardfilterdialog|cond3">Smallest</item> + <item translatable="yes" context="standardfilterdialog|cond3">Largest %</item> + <item translatable="yes" context="standardfilterdialog|cond3">Smallest %</item> + <item translatable="yes" context="standardfilterdialog|cond3">Contains</item> + <item translatable="yes" context="standardfilterdialog|cond3">Does not contain</item> + <item translatable="yes" context="standardfilterdialog|cond3">Begins with</item> + <item translatable="yes" context="standardfilterdialog|cond3">Does not begin with</item> + <item translatable="yes" context="standardfilterdialog|cond3">Ends with</item> + <item translatable="yes" context="standardfilterdialog|cond3">Does not end with</item> + </items> + <accessibility> + <relation type="labelled-by" target="label4"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cond3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond3-atkobject">Condition 3</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|cond3">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="cond4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item>=</item> - <item><</item> - <item>></item> - <item><=</item> - <item>>=</item> - <item><></item> - <item translatable="yes" context="standardfilterdialog|cond4">Largest</item> - <item translatable="yes" context="standardfilterdialog|cond4">Smallest</item> - <item translatable="yes" context="standardfilterdialog|cond4">Largest %</item> - <item translatable="yes" context="standardfilterdialog|cond4">Smallest %</item> - <item translatable="yes" context="standardfilterdialog|cond4">Contains</item> - <item translatable="yes" context="standardfilterdialog|cond4">Does not contain</item> - <item translatable="yes" context="standardfilterdialog|cond4">Begins with</item> - <item translatable="yes" context="standardfilterdialog|cond4">Does not begin with</item> - <item translatable="yes" context="standardfilterdialog|cond4">Ends with</item> - <item translatable="yes" context="standardfilterdialog|cond4">Does not end with</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="cond4-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond4-atkobject">Condition 4</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item>=</item> + <item><</item> + <item>></item> + <item><=</item> + <item>>=</item> + <item><></item> + <item translatable="yes" context="standardfilterdialog|cond4">Largest</item> + <item translatable="yes" context="standardfilterdialog|cond4">Smallest</item> + <item translatable="yes" context="standardfilterdialog|cond4">Largest %</item> + <item translatable="yes" context="standardfilterdialog|cond4">Smallest %</item> + <item translatable="yes" context="standardfilterdialog|cond4">Contains</item> + <item translatable="yes" context="standardfilterdialog|cond4">Does not contain</item> + <item translatable="yes" context="standardfilterdialog|cond4">Begins with</item> + <item translatable="yes" context="standardfilterdialog|cond4">Does not begin with</item> + <item translatable="yes" context="standardfilterdialog|cond4">Ends with</item> + <item translatable="yes" context="standardfilterdialog|cond4">Does not end with</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="cond4-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond4-atkobject">Condition 4</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="val1"> - <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-entry2"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <accessibility> - <relation type="labelled-by" target="label5"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="val1-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val1-atkobject">Value 1</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|val1">Specifies a value to filter the field.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="val1"> + <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-entry2"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="val2"> - <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-entry4"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <accessibility> - <relation type="labelled-by" target="label5"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="val2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val2-atkobject">Value 2</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|val2">Specifies a value to filter the field.</property> - </object> - </child> + <accessibility> + <relation type="labelled-by" target="label5"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="val1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val1-atkobject">Value 1</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|val1">Specifies a value to filter the field.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="val3"> - <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-entry6"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <accessibility> - <relation type="labelled-by" target="label5"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="val3-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val3-atkobject">Value 3</property> - <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|val3">Specifies a value to filter the field.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="val2"> + <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-entry4"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="val4"> - <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-entry8"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="val4-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val4-atkobject">Value 4</property> - </object> - </child> + <accessibility> + <relation type="labelled-by" target="label5"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="val2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val2-atkobject">Value 2</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|val2">Specifies a value to filter the field.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkButton" id="remove1"> - <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="val3"> + <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-entry6"> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove1|tooltip_text">Remove</property> - <property name="margin-end">8</property> - <property name="image">image1</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="GtkButton" id="remove2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove2|tooltip_text">Remove</property> - <property name="margin-end">8</property> - <property name="image">image2</property> + <accessibility> + <relation type="labelled-by" target="label5"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="val3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val3-atkobject">Value 3</property> + <property name="AtkObject::accessible-description" translatable="yes" context="standardfilterdialog|extended_tip|val3">Specifies a value to filter the field.</property> </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkButton" id="remove3"> - <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="val4"> + <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-entry8"> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove3|tooltip_text">Remove</property> - <property name="margin-end">8</property> - <property name="image">image3</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="GtkButton" id="remove4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove4|tooltip_text">Remove</property> - <property name="margin-end">8</property> - <property name="image">image4</property> + <child internal-child="accessible"> + <object class="AtkObject" id="val4-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val4-atkobject">Value 4</property> </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left_attach">3</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove1|tooltip_text">Remove</property> + <property name="margin-end">8</property> + <property name="image">image1</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove2|tooltip_text">Remove</property> + <property name="margin-end">8</property> + <property name="image">image2</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove3|tooltip_text">Remove</property> + <property name="margin-end">8</property> + <property name="image">image3</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove4|tooltip_text">Remove</property> + <property name="margin-end">8</property> + <property name="image">image4</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">4</property> </packing> </child> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/statisticsinfopage.ui b/sc/uiconfig/scalc/ui/statisticsinfopage.ui index cf8853ff9d55..2e3d7604ee8c 100644 --- a/sc/uiconfig/scalc/ui/statisticsinfopage.ui +++ b/sc/uiconfig/scalc/ui/statisticsinfopage.ui @@ -8,125 +8,119 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="statisticsinfopage|label6">Pages:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nopages</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="nopages"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="statisticsinfopage|label5">Cells:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nocells</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="nocells"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</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="halign">end</property> - <property name="label" translatable="yes" context="statisticsinfopage|label2">Sheets:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nosheets</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="nosheets"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="statisticsinfopage|label3">Formula groups:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">noformula</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="noformula"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> + <property name="halign">end</property> + <property name="label" translatable="yes" context="statisticsinfopage|label6">Pages:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nopages</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="nopages"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="statisticsinfopage|label5">Cells:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nocells</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="nocells"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</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="halign">end</property> + <property name="label" translatable="yes" context="statisticsinfopage|label2">Sheets:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nosheets</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="nosheets"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="statisticsinfopage|label3">Formula groups:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">noformula</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="noformula"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui index 26a9dd38c204..672684445d37 100644 --- a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui +++ b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui @@ -16,85 +16,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" 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="GtkCheckButton" id="pagebreak"> + <property name="label" translatable="yes" context="subtotaloptionspage|pagebreak">_Page break between groups</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> - <child> - <object class="GtkCheckButton" id="pagebreak"> - <property name="label" translatable="yes" context="subtotaloptionspage|pagebreak">_Page break between groups</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="pagebreak-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|pagebreak">Inserts a new page after each group of subtotaled data.</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="pagebreak-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|pagebreak">Inserts a new page after each group of subtotaled data.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="case"> - <property name="label" translatable="yes" context="subtotaloptionspage|case">_Case sensitive</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="case-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|case">Recalculates subtotals when you change the case of a data label.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="case"> + <property name="label" translatable="yes" context="subtotaloptionspage|case">_Case sensitive</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="case-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|case">Recalculates subtotals when you change the case of a data label.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="sort"> - <property name="label" translatable="yes" context="subtotaloptionspage|sort">Pre-_sort area according to groups</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="sort-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|sort">Sorts the area that you selected in the Group by box of the Group tabs according to the columns that you selected.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="sort"> + <property name="label" translatable="yes" context="subtotaloptionspage|sort">Pre-_sort area according to groups</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="sort-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|sort">Sorts the area that you selected in the Group by box of the Group tabs according to the columns that you selected.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -124,131 +116,123 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="ascending"> + <property name="label" translatable="yes" context="subtotaloptionspage|ascending">_Ascending</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> - <child> - <object class="GtkRadioButton" id="ascending"> - <property name="label" translatable="yes" context="subtotaloptionspage|ascending">_Ascending</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> - <child internal-child="accessible"> - <object class="AtkObject" id="ascending-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|ascending">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options.</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> + <child internal-child="accessible"> + <object class="AtkObject" id="ascending-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|ascending">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkRadioButton" id="descending"> - <property name="label" translatable="yes" context="subtotaloptionspage|descending">D_escending</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">ascending</property> - <child internal-child="accessible"> - <object class="AtkObject" id="descending-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|descending">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="descending"> + <property name="label" translatable="yes" context="subtotaloptionspage|descending">D_escending</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">ascending</property> + <child internal-child="accessible"> + <object class="AtkObject" id="descending-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|descending">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="formats"> - <property name="label" translatable="yes" context="subtotaloptionspage|formats">I_nclude formats</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="formats-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|formats">Considers formatting attributes when sorting.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="formats"> + <property name="label" translatable="yes" context="subtotaloptionspage|formats">I_nclude formats</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="formats-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|formats">Considers formatting attributes when sorting.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="btnuserdef"> - <property name="label" translatable="yes" context="subtotaloptionspage|btnuserdef">C_ustom sort order</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="lbuserdef"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="btnuserdef-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|btnuserdef">Uses a custom sorting order that you defined in the Options dialog box at %PRODUCTNAME Calc - Sort Lists.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="btnuserdef"> + <property name="label" translatable="yes" context="subtotaloptionspage|btnuserdef">C_ustom sort order</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="lbuserdef"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="btnuserdef-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|btnuserdef">Uses a custom sorting order that you defined in the Options dialog box at %PRODUCTNAME Calc - Sort Lists.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="lbuserdef"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin-start">12</property> - <accessibility> - <relation type="labelled-by" target="btnuserdef"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="lbuserdef-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|lbuserdef">Uses a custom sorting order that you defined in the Options dialog box at %PRODUCTNAME Calc - Sort Lists.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="lbuserdef"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin-start">12</property> + <accessibility> + <relation type="labelled-by" target="btnuserdef"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="lbuserdef-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|lbuserdef">Uses a custom sorting order that you defined in the Options dialog box at %PRODUCTNAME Calc - Sort Lists.</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/sc/uiconfig/scalc/ui/textimportcsv.ui b/sc/uiconfig/scalc/ui/textimportcsv.ui index 7d7dd4aadbf5..e8d87af37bd8 100644 --- a/sc/uiconfig/scalc/ui/textimportcsv.ui +++ b/sc/uiconfig/scalc/ui/textimportcsv.ui @@ -104,26 +104,220 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkLabel" id="textcharset"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="textimportcsv|textcharset">Ch_aracter set:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">charset</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="textlanguage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="textimportcsv|textlanguage">_Language:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">language</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="textfromrow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="textimportcsv|textfromrow">From ro_w:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fromrow</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="charset"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="charset-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|charset">Specifies the character set to be used in the imported file.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="language"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="language-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|language">Determines how the number strings are imported.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="fromrow"> + <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> + <child internal-child="accessible"> + <object class="AtkObject" id="fromrow-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|fromrow">Specifies the row where you want to start the import.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</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="textimportcsv|label1">Import</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</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="box6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkRadioButton" id="tofixedwidth"> + <property name="label" translatable="yes" context="textimportcsv|tofixedwidth">_Fixed width</property> + <property name="visible">True</property> + <property name="can_focus">True</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">toseparatedby</property> + <child internal-child="accessible"> + <object class="AtkObject" id="tofixedwidth-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|tofixedwidth">Separates fixed-width data (equal number of characters) into columns.</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="toseparatedby"> + <property name="label" translatable="yes" context="textimportcsv|toseparatedby">_Separated by</property> + <property name="visible">True</property> + <property 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="toseparatedby-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|toseparatedby">Select the separator used in your data.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <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="row_spacing">6</property> <property name="column_spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkLabel" id="textcharset"> + <object class="GtkCheckButton" id="tab"> + <property name="label" translatable="yes" context="textimportcsv|tab">_Tab</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textimportcsv|textcharset">Ch_aracter set:</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="mnemonic_widget">charset</property> <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="tab-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|tab">Separates data delimited by tabs into columns.</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -131,40 +325,64 @@ </packing> </child> <child> - <object class="GtkLabel" id="textlanguage"> + <object class="GtkCheckButton" id="mergedelimiters"> + <property name="label" translatable="yes" context="textimportcsv|mergedelimiters">Merge _delimiters</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textimportcsv|textlanguage">_Language:</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="use_underline">True</property> - <property name="mnemonic_widget">language</property> <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="mergedelimiters-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|mergedelimiters">Combines consecutive delimiters and removes blank data fields.</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="textfromrow"> + <object class="GtkCheckButton" id="removespace"> + <property name="label" translatable="yes" context="textimportcsv|removespace">Tr_im spaces</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textimportcsv|textfromrow">From ro_w:</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="use_underline">True</property> - <property name="mnemonic_widget">fromrow</property> <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="removespace-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|removespace">Removes starting and trailing spaces from data fields.</property> + </object> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="charset"> + <object class="GtkCheckButton" id="comma"> + <property name="label" translatable="yes" context="textimportcsv|comma">_Comma</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="use_underline">True</property> + <property name="xalign">0</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="textimportcsv|extended_tip|charset">Specifies the character set to be used in the imported file.</property> + <object class="AtkObject" id="comma-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|comma">Separates data delimited by commas into columns.</property> </object> </child> </object> @@ -174,401 +392,163 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="language"> + <object class="GtkCheckButton" id="semicolon"> + <property name="label" translatable="yes" context="textimportcsv|semicolon">S_emicolon</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="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="language-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|language">Determines how the number strings are imported.</property> + <object class="AtkObject" id="semicolon-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|semicolon">Separates data delimited by semicolons into columns.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkSpinButton" id="fromrow"> + <object class="GtkCheckButton" id="space"> + <property name="label" translatable="yes" context="textimportcsv|space">S_pace</property> <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="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="fromrow-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|fromrow">Specifies the row where you want to start the import.</property> + <object class="AtkObject" id="space-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|space">Separates data delimited by spaces into columns.</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left_attach">3</property> + <property name="top_attach">0</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="textimportcsv|label1">Import</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkBox" id="box2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> <child> - <object class="GtkBox" id="box6"> + <!-- 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="homogeneous">True</property> + <property name="column_spacing">12</property> <child> - <object class="GtkRadioButton" id="tofixedwidth"> - <property name="label" translatable="yes" context="textimportcsv|tofixedwidth">_Fixed width</property> + <object class="GtkCheckButton" id="other"> + <property name="label" translatable="yes" context="textimportcsv|other">Othe_r</property> <property name="visible">True</property> <property name="can_focus">True</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">toseparatedby</property> + <accessibility> + <relation type="label-for" target="inputother"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="tofixedwidth-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|tofixedwidth">Separates fixed-width data (equal number of characters) into columns.</property> + <object class="AtkObject" id="other-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|other">Separates data into columns using the custom separator that you specify. Note: The custom separator must also be contained in your data.</property> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkRadioButton" id="toseparatedby"> - <property name="label" translatable="yes" context="textimportcsv|toseparatedby">_Separated by</property> + <object class="GtkEntry" id="inputother"> <property name="visible">True</property> <property 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="hexpand">True</property> + <property name="max_length">10</property> + <property name="activates_default">True</property> + <property name="width_chars">3</property> + <accessibility> + <relation type="labelled-by" target="other"/> + </accessibility> <child internal-child="accessible"> - <object class="AtkObject" id="toseparatedby-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|toseparatedby">Select the separator used in your data.</property> + <object class="AtkObject" id="inputother-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="textimportcsv|inputother-atkobject">Other</property> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|inputother">Separates data into columns using the custom separator that you specify. Note: The custom separator must also be contained in your data.</property> </object> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</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">1</property> + <property name="left_attach">4</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment5"> + <!-- 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="left_padding">12</property> + <property name="column_spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="texttextdelimiter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="textimportcsv|texttextdelimiter">Strin_g delimiter:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">textdelimiter</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="textdelimiter"> <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="tab"> - <property name="label" translatable="yes" context="textimportcsv|tab">_Tab</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="tab-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|tab">Separates data delimited by tabs into columns.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="mergedelimiters"> - <property name="label" translatable="yes" context="textimportcsv|mergedelimiters">Merge _delimiters</property> - <property name="visible">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</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="mergedelimiters-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|mergedelimiters">Combines consecutive delimiters and removes blank data fields.</property> - </object> - </child> + <property name="activates_default">True</property> + <property name="width_chars">1</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="GtkCheckButton" id="removespace"> - <property name="label" translatable="yes" context="textimportcsv|removespace">Tr_im spaces</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="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="removespace-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|removespace">Removes starting and trailing spaces from data fields.</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="GtkCheckButton" id="comma"> - <property name="label" translatable="yes" context="textimportcsv|comma">_Comma</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="comma-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|comma">Separates data delimited by commas into columns.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="semicolon"> - <property name="label" translatable="yes" context="textimportcsv|semicolon">S_emicolon</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="semicolon-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|semicolon">Separates data delimited by semicolons into columns.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="space"> - <property name="label" translatable="yes" context="textimportcsv|space">S_pace</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="space-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|space">Separates data delimited by spaces into columns.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="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="GtkCheckButton" id="other"> - <property name="label" translatable="yes" context="textimportcsv|other">Othe_r</property> - <property name="visible">True</property> - <property name="can_focus">True</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="inputother"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="other-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|other">Separates data into columns using the custom separator that you specify. Note: The custom separator must also be contained in your data.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="inputother"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="max_length">10</property> - <property name="activates_default">True</property> - <property name="width_chars">3</property> - <accessibility> - <relation type="labelled-by" target="other"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="inputother-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="textimportcsv|inputother-atkobject">Other</property> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|inputother">Separates data into columns using the custom separator that you specify. Note: The custom separator must also be contained in your data.</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">4</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="texttextdelimiter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textimportcsv|texttextdelimiter">Strin_g delimiter:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">textdelimiter</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="textdelimiter"> - <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> - <property name="width_chars">1</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="textdelimiter-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|textdelimiter">Select a character to delimit text data. You can also enter a character in the text box.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="textdelimiter-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|textdelimiter">Select a character to delimit text data. You can also enter a character in the text box.</property> </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="left_attach">4</property> + <property name="top_attach">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> @@ -597,82 +577,76 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="spacing">6</property> + <property name="homogeneous">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkCheckButton" id="quotedfieldastext"> + <property name="label" translatable="yes" context="textimportcsv|quotedfieldastext">F_ormat quoted field as text</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkCheckButton" id="quotedfieldastext"> - <property name="label" translatable="yes" context="textimportcsv|quotedfieldastext">F_ormat quoted field as 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.009999999776482582</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="quotedfieldastext-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|quotedfieldastext">When this option is enabled, fields or cells whose values are quoted in their entirety (the first and last characters of the value equal the text delimiter) are imported as text.</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.009999999776482582</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="quotedfieldastext-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|quotedfieldastext">When this option is enabled, fields or cells whose values are quoted in their entirety (the first and last characters of the value equal the text delimiter) are imported as text.</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="detectspecialnumbers"> - <property name="label" translatable="yes" context="textimportcsv|detectspecialnumbers">Detect special _numbers</property> - <property name="visible">True</property> - <property name="can_focus">True</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="detectspecialnumbers-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|detectspecialnumbers">When this option is enabled, Calc will automatically detect all number formats, including special number formats such as dates, time, and scientific notation.</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="detectspecialnumbers"> + <property name="label" translatable="yes" context="textimportcsv|detectspecialnumbers">Detect special _numbers</property> + <property name="visible">True</property> + <property name="can_focus">True</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="detectspecialnumbers-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|detectspecialnumbers">When this option is enabled, Calc will automatically detect all number formats, including special number formats such as dates, time, and scientific notation.</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="skipemptycells"> - <property name="label" translatable="yes" context="textimportcsv|skipemptycells">S_kip empty cells</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="textimportcsv|skipemptycells">If enabled, blank cells in source will not override the target.</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="skipemptycells-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|skipemptycells">When this option is enabled, Calc preserves previous content of cells when pasting empty ones. Otherwise, Calc deletes content of previous cells.</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="skipemptycells"> + <property name="label" translatable="yes" context="textimportcsv|skipemptycells">S_kip empty cells</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="textimportcsv|skipemptycells">If enabled, blank cells in source will not override the target.</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="skipemptycells-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|skipemptycells">When this option is enabled, Calc preserves previous content of cells when pasting empty ones. Otherwise, Calc deletes content of previous cells.</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">2</property> + </packing> </child> </object> </child> @@ -702,52 +676,25 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <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"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="box5"> + <object class="GtkLabel" id="textcolumntype"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="textcolumntype"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textimportcsv|textcolumntype">Column t_ype:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">columntype</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="columntype"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="columntype-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|columntype">Choose a column in the preview window and select the data type to be applied the imported data.</property> - </object> - </child> - </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="textimportcsv|textcolumntype">Column t_ype:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">columntype</property> </object> <packing> <property name="expand">False</property> @@ -756,54 +703,12 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkComboBoxText" id="columntype"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hadjustment">adjustment2</property> - <property name="vadjustment">adjustment3</property> - <property name="hscrollbar_policy">always</property> - <property name="vscrollbar_policy">always</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkViewport" id="viewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkBox" id="box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkDrawingArea" id="csvruler"> - <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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkDrawingArea" id="csvgrid"> - <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> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="columntype-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|columntype">Choose a column in the preview window and select the data type to be applied the imported data.</property> </object> </child> </object> @@ -813,19 +718,82 @@ <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="GtkScrolledWindow" id="scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hadjustment">adjustment2</property> + <property name="vadjustment">adjustment3</property> + <property name="hscrollbar_policy">always</property> + <property name="vscrollbar_policy">always</property> + <property name="shadow_type">in</property> <child> - <object class="GtkLabel" id="textalttitle"> + <object class="GtkViewport" id="viewport"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="textimportcsv|textalttitle">Text to Columns</property> + <child> + <object class="GtkBox" id="box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkDrawingArea" id="csvruler"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkDrawingArea" id="csvgrid"> + <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> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> </object> - <packing> - <property name="expand">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">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="textalttitle"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="textimportcsv|textalttitle">Text to Columns</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/textimportoptions.ui b/sc/uiconfig/scalc/ui/textimportoptions.ui index 0b677d4c5319..a8df598e855e 100644 --- a/sc/uiconfig/scalc/ui/textimportoptions.ui +++ b/sc/uiconfig/scalc/ui/textimportoptions.ui @@ -88,63 +88,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="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="custom"> + <property name="label" translatable="yes" context="textimportoptions|custom">Custom:</property> + <property name="visible">True</property> + <property name="can_focus">True</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">automatic</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="automatic"> + <property name="label" translatable="yes" context="textimportoptions|automatic">Automatic</property> + <property name="visible">True</property> + <property 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> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="lang"> <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="custom"> - <property name="label" translatable="yes" context="textimportoptions|custom">Custom:</property> - <property name="visible">True</property> - <property name="can_focus">True</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">automatic</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="automatic"> - <property name="label" translatable="yes" context="textimportoptions|automatic">Automatic</property> - <property name="visible">True</property> - <property 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> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="lang"> - <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">1</property> - </packing> - </child> + <property name="hexpand">True</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -172,22 +166,16 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkCheckButton" id="convertdata"> + <property name="label" translatable="yes" context="textimportoptions|convertdata">Detect special numbers (such as dates)</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="convertdata"> - <property name="label" translatable="yes" context="textimportoptions|convertdata">Detect special numbers (such as dates)</property> - <property name="visible">True</property> - <property name="can_focus">True</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/sc/uiconfig/scalc/ui/tpviewpage.ui b/sc/uiconfig/scalc/ui/tpviewpage.ui index eb579e64c62b..fa4977541dc4 100644 --- a/sc/uiconfig/scalc/ui/tpviewpage.ui +++ b/sc/uiconfig/scalc/ui/tpviewpage.ui @@ -20,157 +20,151 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkCheckButton" id="formula"> + <property name="label" translatable="yes" context="tpviewpage|formula">_Formulas</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckButton" id="formula"> - <property name="label" translatable="yes" context="tpviewpage|formula">_Formulas</property> - <property name="visible">True</property> - <property name="can_focus">True</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="formula-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formula">Specifies whether to show formulas instead of results in the cells.</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="formula-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formula">Specifies whether to show formulas instead of results in the cells.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="nil"> - <property name="label" translatable="yes" context="tpviewpage|nil">Zero val_ues</property> - <property name="visible">True</property> - <property name="can_focus">True</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="nil-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|nil">Specifies whether to show numbers with the value of 0.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="nil"> + <property name="label" translatable="yes" context="tpviewpage|nil">Zero val_ues</property> + <property name="visible">True</property> + <property name="can_focus">True</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="nil-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|nil">Specifies whether to show numbers with the value of 0.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="annot"> - <property name="label" translatable="yes" context="tpviewpage|annot">_Comment indicator</property> - <property name="visible">True</property> - <property name="can_focus">True</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="annot-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|annot">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under %PRODUCTNAME - General in the Options dialog box.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="annot"> + <property name="label" translatable="yes" context="tpviewpage|annot">_Comment indicator</property> + <property name="visible">True</property> + <property name="can_focus">True</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="annot-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|annot">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under %PRODUCTNAME - General in the Options dialog box.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="value"> - <property name="label" translatable="yes" context="tpviewpage|value">Value h_ighlighting</property> - <property name="visible">True</property> - <property name="can_focus">True</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="value-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|value">Mark the Value highlighting box to show the cell contents in different colors, depending on type. Text cells are formatted in black, formulas in green, number cells in blue, and protected cells are shown with light grey background, no matter how their display is formatted.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="value"> + <property name="label" translatable="yes" context="tpviewpage|value">Value h_ighlighting</property> + <property name="visible">True</property> + <property name="can_focus">True</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="value-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|value">Mark the Value highlighting box to show the cell contents in different colors, depending on type. Text cells are formatted in black, formulas in green, number cells in blue, and protected cells are shown with light grey background, no matter how their display is formatted.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="anchor"> - <property name="label" translatable="yes" context="tpviewpage|anchor">_Anchor</property> - <property name="visible">True</property> - <property name="can_focus">True</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="anchor-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|anchor">Specifies whether the anchor icon is displayed when an inserted object, such as a graphic, is selected.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="anchor"> + <property name="label" translatable="yes" context="tpviewpage|anchor">_Anchor</property> + <property name="visible">True</property> + <property name="can_focus">True</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="anchor-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|anchor">Specifies whether the anchor icon is displayed when an inserted object, such as a graphic, is selected.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="clipmark"> - <property name="label" translatable="yes" context="tpviewpage|clipmark">Te_xt overflow</property> - <property name="visible">True</property> - <property name="can_focus">True</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="clipmark-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|clipmark">If a cell contains text that is wider than the width of the cell, the text is displayed over empty neighboring cells in the same row. If there is no empty neighboring cell, a small triangle at the cell border indicates that the text continues.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="clipmark"> + <property name="label" translatable="yes" context="tpviewpage|clipmark">Te_xt overflow</property> + <property name="visible">True</property> + <property name="can_focus">True</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="clipmark-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|clipmark">If a cell contains text that is wider than the width of the cell, the text is displayed over empty neighboring cells in the same row. If there is no empty neighboring cell, a small triangle at the cell border indicates that the text continues.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="rangefind"> - <property name="label" translatable="yes" context="tpviewpage|rangefind">_Show references in color</property> - <property name="visible">True</property> - <property name="can_focus">True</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="rangefind-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rangefind">Specifies that each reference is highlighted in color in the formula. The cell range is also enclosed by a colored border as soon as the cell containing the reference is selected for editing.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="rangefind"> + <property name="label" translatable="yes" context="tpviewpage|rangefind">_Show references in color</property> + <property name="visible">True</property> + <property name="can_focus">True</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="rangefind-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rangefind">Specifies that each reference is highlighted in color in the formula. The cell range is also enclosed by a colored border as soon as the cell containing the reference is selected for editing.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> </child> </object> </child> @@ -197,133 +191,127 @@ <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="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="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="rowcolheader"> + <property name="label" translatable="yes" context="tpviewpage|rowcolheader">Colu_mn/row headers</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckButton" id="rowcolheader"> - <property name="label" translatable="yes" context="tpviewpage|rowcolheader">Colu_mn/row headers</property> - <property name="visible">True</property> - <property name="can_focus">True</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="rowcolheader-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowcolheader">Specifies whether to display row and column headers.</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="rowcolheader-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowcolheader">Specifies whether to display row and column headers.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="hscroll"> - <property name="label" translatable="yes" context="tpviewpage|hscroll">Hori_zontal scroll bar</property> - <property name="visible">True</property> - <property name="can_focus">True</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="hscroll-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hscroll">Specifies whether to display a horizontal scrollbar at the bottom of the document window.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="hscroll"> + <property name="label" translatable="yes" context="tpviewpage|hscroll">Hori_zontal scroll bar</property> + <property name="visible">True</property> + <property name="can_focus">True</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="hscroll-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hscroll">Specifies whether to display a horizontal scrollbar at the bottom of the document window.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="vscroll"> - <property name="label" translatable="yes" context="tpviewpage|vscroll">_Vertical scroll bar</property> - <property name="visible">True</property> - <property name="can_focus">True</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="vscroll-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|vscroll">Specifies whether to display a vertical scrollbar at the right of the document window.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="vscroll"> + <property name="label" translatable="yes" context="tpviewpage|vscroll">_Vertical scroll bar</property> + <property name="visible">True</property> + <property name="can_focus">True</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="vscroll-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|vscroll">Specifies whether to display a vertical scrollbar at the right of the document window.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="tblreg"> - <property name="label" translatable="yes" context="tpviewpage|tblreg">Sh_eet tabs</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="tblreg-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tblreg">Specifies whether to display the sheet tabs at the bottom of the spreadsheet document.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="outline"> - <property name="label" translatable="yes" context="tpviewpage|outline">_Outline symbols</property> - <property name="visible">True</property> - <property name="can_focus">True</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="extended_tip|outline">If you have defined an outline, the Outline symbols option specifies whether to view the outline symbols at the border of the sheet.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="tblreg"> + <property name="label" translatable="yes" context="tpviewpage|tblreg">Sh_eet tabs</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="tblreg-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tblreg">Specifies whether to display the sheet tabs at the bottom of the spreadsheet document.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="cbSummary"> - <property name="label" translatable="yes" context="tpviewpage|summary">Summary o_n search</property> - <property name="visible">True</property> - <property 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">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="outline"> + <property name="label" translatable="yes" context="tpviewpage|outline">_Outline symbols</property> + <property name="visible">True</property> + <property name="can_focus">True</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="extended_tip|outline">If you have defined an outline, the Outline symbols option specifies whether to view the outline symbols at the border of the sheet.</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">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="cbSummary"> + <property name="label" translatable="yes" context="tpviewpage|summary">Summary o_n search</property> + <property name="visible">True</property> + <property 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">5</property> + </packing> </child> </object> </child> @@ -350,25 +338,19 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkCheckButton" id="synczoom"> + <property name="label" translatable="yes" context="tpviewpage|synczoom">S_ynchronize sheets</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="synczoom"> - <property name="label" translatable="yes" context="tpviewpage|synczoom">S_ynchronize sheets</property> - <property name="visible">True</property> - <property name="can_focus">True</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="synczoom-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|synczoom">If checked, all sheets are shown with the same zoom factor. If not checked, each sheet can have its own zoom factor.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child internal-child="accessible"> + <object class="AtkObject" id="synczoom-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|synczoom">If checked, all sheets are shown with the same zoom factor. If not checked, each sheet can have its own zoom factor.</property> </object> </child> </object> @@ -396,114 +378,64 @@ <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="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">3</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkGrid" id="grid7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">3</property> + <property name="column_spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkMenuButton" id="color"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkMenuButton" id="color"> - <property name="visible">True</property> - <property name="can_focus">False</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="color-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|color">Specifies a color for the grid lines in the current document.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> <child> - <object class="GtkLabel" id="grid_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tpviewpage|grid_label">_Grid lines:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">grid</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkLabel" id="color_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tpviewpage|color_label">_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">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="grid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="tpviewpage|grid">Show</item> - <item translatable="yes" context="tpviewpage|grid">Show on colored cells</item> - <item translatable="yes" context="tpviewpage|grid">Hide</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="grid-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|grid">Specifies when grid lines will be displayed. Default is to display grid lines only on cells that do not have a background color. You can choose to also display grid lines on cells with background color, or to hide them.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="color-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|color">Specifies a color for the grid lines in the current 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">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="grid_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tpviewpage|grid_label">_Grid lines:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">grid</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="GtkCheckButton" id="break"> - <property name="label" translatable="yes" context="tpviewpage|break">_Page breaks</property> + <object class="GtkLabel" id="color_label"> <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="tpviewpage|color_label">_Color:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">color</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="break-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|break">Specifies whether to view the page breaks within a defined print area.</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> @@ -511,26 +443,70 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="guideline"> - <property name="label" translatable="yes" context="tpviewpage|guideline">Helplines _while moving</property> + <object class="GtkComboBoxText" id="grid"> <property name="visible">True</property> - <property name="can_focus">True</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> + <items> + <item translatable="yes" context="tpviewpage|grid">Show</item> + <item translatable="yes" context="tpviewpage|grid">Show on colored cells</item> + <item translatable="yes" context="tpviewpage|grid">Hide</item> + </items> <child internal-child="accessible"> - <object class="AtkObject" id="guideline-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|guideline">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</property> + <object class="AtkObject" id="grid-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|grid">Specifies when grid lines will be displayed. Default is to display grid lines only on cells that do not have a background color. You can choose to also display grid lines on cells with background color, or to hide them.</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> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="break"> + <property name="label" translatable="yes" context="tpviewpage|break">_Page breaks</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="break-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|break">Specifies whether to view the page breaks within a defined print area.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="guideline"> + <property name="label" translatable="yes" context="tpviewpage|guideline">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="guideline-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|guideline">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -557,118 +533,112 @@ <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">3</property> + <property name="column_spacing">3</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="objgrf_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">3</property> - <child> - <object class="GtkLabel" id="objgrf_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tpviewpage|objgrf_label">Ob_jects/Images:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">objgrf</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="diagram_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tpviewpage|diagram_label">Cha_rts:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">diagram</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="draw_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tpviewpage|draw_label">_Drawing objects:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">draw</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="objgrf"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="tpviewpage|objgrf">Show</item> - <item translatable="yes" context="tpviewpage|objgrf">Hide</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="objgrf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|objgrf">Defines if objects and graphics are shown or hidden.</property> - </object> - </child> + <property name="label" translatable="yes" context="tpviewpage|objgrf_label">Ob_jects/Images:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">objgrf</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="diagram_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tpviewpage|diagram_label">Cha_rts:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">diagram</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="draw_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tpviewpage|draw_label">_Drawing objects:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">draw</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="objgrf"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="tpviewpage|objgrf">Show</item> + <item translatable="yes" context="tpviewpage|objgrf">Hide</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="objgrf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|objgrf">Defines if objects and graphics are shown or hidden.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="diagram"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="tpviewpage|diagram">Show</item> - <item translatable="yes" context="tpviewpage|diagram">Hide</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="diagram-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|diagram">Defines if charts in your document are shown or hidden.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="diagram"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="tpviewpage|diagram">Show</item> + <item translatable="yes" context="tpviewpage|diagram">Hide</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="diagram-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|diagram">Defines if charts in your document are shown or hidden.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="draw"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="tpviewpage|draw">Show</item> - <item translatable="yes" context="tpviewpage|draw">Hide</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="draw-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|draw">Defines if drawing objects in your document are shown or hidden.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="draw"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes" context="tpviewpage|draw">Show</item> + <item translatable="yes" context="tpviewpage|draw">Hide</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="draw-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|draw">Defines if drawing objects in your document are shown or hidden.</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/sc/uiconfig/scalc/ui/ttestdialog.ui b/sc/uiconfig/scalc/ui/ttestdialog.ui index d51f2c02774a..61aa3b601fde 100644 --- a/sc/uiconfig/scalc/ui/ttestdialog.ui +++ b/sc/uiconfig/scalc/ui/ttestdialog.ui @@ -78,138 +78,132 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="variable1-range-label"> <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="variable1-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ttestdialog|variable1-range-label">Variable 1 range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">variable1-range-edit</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="variable1-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="variable1-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="variable2-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ttestdialog|variable2-range-label">Variable 2 range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">variable2-range-edit</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="variable2-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="variable2-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ttestdialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="GtkEntry" id="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="ttestdialog|variable1-range-label">Variable 1 range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">variable1-range-edit</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="variable1-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="variable1-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="variable2-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ttestdialog|variable2-range-label">Variable 2 range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">variable2-range-edit</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="variable2-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="variable2-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ttestdialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="GtkEntry" id="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -237,53 +231,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="ttestdialog|groupedby-columns-radio">Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="ttestdialog|groupedby-columns-radio">Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="ttestdialog|groupedby-rows-radio">Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="ttestdialog|groupedby-rows-radio">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/ungroupdialog.ui b/sc/uiconfig/scalc/ui/ungroupdialog.ui index abcf59494753..047db62d1d2b 100644 --- a/sc/uiconfig/scalc/ui/ungroupdialog.ui +++ b/sc/uiconfig/scalc/ui/ungroupdialog.ui @@ -82,53 +82,47 @@ <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="vexpand">True</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="rows"> + <property name="label" translatable="yes" context="ungroupdialog|rows">_Rows</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="rows"> - <property name="label" translatable="yes" context="ungroupdialog|rows">_Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</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="GtkRadioButton" id="cols"> - <property name="label" translatable="yes" context="ungroupdialog|cols">_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> - <property name="group">rows</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="cols"> + <property name="label" translatable="yes" context="ungroupdialog|cols">_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> + <property name="group">rows</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/validationhelptabpage.ui b/sc/uiconfig/scalc/ui/validationhelptabpage.ui index a8124d876219..2bd164a0b143 100644 --- a/sc/uiconfig/scalc/ui/validationhelptabpage.ui +++ b/sc/uiconfig/scalc/ui/validationhelptabpage.ui @@ -42,95 +42,87 @@ <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="title"> <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="title"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="title-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="validationhelptabpage|extended_tip|title">Enter the title that you want to display when the cell or cell range is selected.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="title_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="validationhelptabpage|title_label">_Title:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">title</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="inputhelp_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="validationhelptabpage|inputhelp_label">_Input help:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">inputhelp</property> - <property name="xalign">0</property> - <property name="yalign">0</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="title-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="validationhelptabpage|extended_tip|title">Enter the title that you want to display when the cell or cell range is selected.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="title_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="validationhelptabpage|title_label">_Title:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">title</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="inputhelp_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="validationhelptabpage|inputhelp_label">_Input help:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">inputhelp</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="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="inputhelp"> <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="inputhelp"> - <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="inputhelp-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="validationhelptabpage|extended_tip|inputhelp">Enter the message that you want to display when the cell or cell range is selected.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="inputhelp-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="validationhelptabpage|extended_tip|inputhelp">Enter the message that you want to display when the cell or cell range is selected.</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">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui index 15f8184dbf4a..c8030307feef 100644 --- a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui +++ b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui @@ -94,47 +94,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="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="row_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="grid3"> + <object class="GtkButton" id="selectsource"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="xmlsourcedialog|selectsource|tooltip_text">Browse to set source file.</property> + <property name="image">image1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="sourcefile"> <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="GtkButton" id="selectsource"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="xmlsourcedialog|selectsource|tooltip_text">Browse to set source file.</property> - <property name="image">image1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="sourcefile"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="xmlsourcedialog|sourcefile">- not set -</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="xmlsourcedialog|sourcefile">- not set -</property> + <property name="xalign">0</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -164,118 +158,112 @@ <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="row_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="GtkGrid" id="mapgrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</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="mapgrid"> + <object class="GtkLabel" id="label5"> <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="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="xmlsourcedialog|label5">Mapped cell:</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> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="width_chars">20</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ref"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="xmlsourcedialog|label5">Mapped cell:</property> + <property name="use_underline">True</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> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">20</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkScrolledWindow"> + <object class="GtkButton" id="ref"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <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="GtkTreeView" id="tree"> + <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> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection1"/> + </child> <child> - <object class="GtkTreeView" id="tree"> - <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> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Macro Library List-selection1"/> + <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="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="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/sc/uiconfig/scalc/ui/ztestdialog.ui b/sc/uiconfig/scalc/ui/ztestdialog.ui index 8fb6bc5ca79f..cca44883f069 100644 --- a/sc/uiconfig/scalc/ui/ztestdialog.ui +++ b/sc/uiconfig/scalc/ui/ztestdialog.ui @@ -78,138 +78,132 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="variable1-range-label"> <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="variable1-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ztestdialog|variable1-range-label">Variable 1 range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">variable1-range-edit</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="variable1-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="variable1-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="variable2-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ztestdialog|variable2-range-label">Variable 2 range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">variable2-range-edit</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="variable2-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="variable2-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="output-range-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ztestdialog|output-range-label">Results to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">output-range-edit</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="GtkEntry" id="output-range-edit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="output-range-button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="ztestdialog|variable1-range-label">Variable 1 range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">variable1-range-edit</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="variable1-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="variable1-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="variable2-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ztestdialog|variable2-range-label">Variable 2 range:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">variable2-range-edit</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="variable2-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="variable2-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="output-range-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ztestdialog|output-range-label">Results to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">output-range-edit</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="GtkEntry" id="output-range-edit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="output-range-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -237,53 +231,47 @@ <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="bottom_padding">6</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-end">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes" context="ztestdialog|groupedby-columns-radio">Columns</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="GtkRadioButton" id="groupedby-columns-radio"> - <property name="label" translatable="yes" context="ztestdialog|groupedby-columns-radio">Columns</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="groupedby-rows-radio"> - <property name="label" translatable="yes" context="ztestdialog|groupedby-rows-radio">Rows</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">groupedby-columns-radio</property> - </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">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="groupedby-rows-radio"> + <property name="label" translatable="yes" context="ztestdialog|groupedby-rows-radio">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> |