diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-29 20:25:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-01 17:06:26 +0100 |
| commit | 12ae14a20c7f2e62887ac768b7f031d0be4a574b (patch) | |
| tree | e8197c3b23fc920b2e1367cc8e5e7e1a1a1f1cb4 /sd/uiconfig/sdraw | |
| parent | ef1d69949c3e9108a7f3857bdf22e11820eff79a (diff) | |
drop deprecated GtkAlignment, move left/top-padding into child margin-start/top
for sd
Change-Id: I9bc9bffb93db2244320ee505fcecec9e9223fb76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108523
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/uiconfig/sdraw')
| -rw-r--r-- | sd/uiconfig/sdraw/ui/copydlg.ui | 455 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/crossfadedialog.ui | 148 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/dlgsnap.ui | 262 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/drawprinteroptions.ui | 336 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/insertlayer.ui | 74 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/paranumberingtab.ui | 104 |
6 files changed, 648 insertions, 731 deletions
diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui index 9c216cf4b03d..7b59136d6ea1 100644 --- a/sd/uiconfig/sdraw/ui/copydlg.ui +++ b/sd/uiconfig/sdraw/ui/copydlg.ui @@ -201,118 +201,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="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">3</property> + <property name="column_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="copydlg|label5">_X axis:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">x</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="copydlg|label6">_Y axis:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">y</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="copydlg|label7">_Angle:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">angle</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="x"> + <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="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="copydlg|label5">_X axis:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">x</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="copydlg|label6">_Y axis:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">y</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="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="copydlg|label7">_Angle:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">angle</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="x"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="x-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|x">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object to the right and negative values shift the duplicate object to the left.</property> - </object> - </child> + <property name="activates_default">True</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="x-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|x">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object to the right and negative values shift the duplicate object to the left.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="y"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="y-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|y">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object down and negative values shift the duplicate object up.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="y"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="y-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|y">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object down and negative values shift the duplicate object up.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="angle"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="angle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|angle">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="angle"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="angle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|angle">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction.</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> @@ -341,85 +334,78 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">3</property> + <property name="column_spacing">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="GtkLabel" id="label8"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="copydlg|label8">_Width:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">width</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="copydlg|label9">_Height:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">height</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="width"> + <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="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="copydlg|label8">_Width:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="copydlg|label9">_Height:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">height</property> - <property name="xalign">0</property> + <property name="activates_default">True</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="width-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|width">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="width"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="width-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|width">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="height"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="height-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|height">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="height"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="height-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|height">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</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> @@ -448,95 +434,88 @@ <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">3</property> + <property name="column_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="copydlg|label10">_Start:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">start</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="grid3"> + <object class="GtkLabel" id="endlabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="copydlg|endlabel">_End:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">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="GtkMenuButton" id="start"> + <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="hexpand">True</property> - <property name="row_spacing">3</property> - <property name="column_spacing">6</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="copydlg|label10">_Start:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">start</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="endlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="copydlg|endlabel">_End:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">end</property> - <property name="xalign">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="start-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|start">Choose a color for the selected object.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="end"> + <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="hexpand">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> <child> - <object class="GtkMenuButton" id="start"> - <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="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="start-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|start">Choose a color for the selected object.</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="end"> - <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="hexpand">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="end-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|end">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="end-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="copydlg|extended_tip|end">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy.</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/sd/uiconfig/sdraw/ui/crossfadedialog.ui b/sd/uiconfig/sdraw/ui/crossfadedialog.ui index 3ecc131c46dc..6b01c173d87e 100644 --- a/sd/uiconfig/sdraw/ui/crossfadedialog.ui +++ b/sd/uiconfig/sdraw/ui/crossfadedialog.ui @@ -87,94 +87,88 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="hexpand">True</property> + <property name="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="GtkCheckButton" id="orientation"> + <property name="label" translatable="yes" context="crossfadedialog|orientation">Same orientation</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="GtkCheckButton" id="orientation"> - <property name="label" translatable="yes" context="crossfadedialog|orientation">Same orientation</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="orientation-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="crossfadedialog|extended_tip|orientation">Applies a smooth transition between the selected objects.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="attributes"> - <property name="label" translatable="yes" context="crossfadedialog|attributes">Cross-fade attributes</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="attributes-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="crossfadedialog|extended_tip|attributes">Applies cross-fading to the line and fill properties of the selected objects.</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="orientation-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="crossfadedialog|extended_tip|orientation">Applies a smooth transition between the selected objects.</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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="crossfadedialog|label2">Increments:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">increments</property> - <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="attributes"> + <property name="label" translatable="yes" context="crossfadedialog|attributes">Cross-fade attributes</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="attributes-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="crossfadedialog|extended_tip|attributes">Applies cross-fading to the line and fill properties of the selected objects.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkSpinButton" id="increments"> - <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="increments-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="crossfadedialog|extended_tip|increments">Enter the number of shapes you want between the two selected objects.</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="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="crossfadedialog|label2">Increments:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">increments</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="increments"> + <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="increments-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="crossfadedialog|extended_tip|increments">Enter the number of shapes you want between the two selected objects.</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/sd/uiconfig/sdraw/ui/dlgsnap.ui b/sd/uiconfig/sdraw/ui/dlgsnap.ui index 7852cc4cfcb2..b2933b22bae0 100644 --- a/sd/uiconfig/sdraw/ui/dlgsnap.ui +++ b/sd/uiconfig/sdraw/ui/dlgsnap.ui @@ -119,79 +119,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">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="GtkSpinButton" id="x"> <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="x"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="x-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|x">Enter the amount of space you want between the snap point or line and the left edge of the page.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="y"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="y-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|y">Enter the amount of space you want between the snap point or line and the top edge of the page.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="x-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|x">Enter the amount of space you want between the snap point or line and the left edge of the page.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkLabel" id="xlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="dlgsnap|xlabel">_X:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">x</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="ylabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="dlgsnap|ylabel">_Y:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">y</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="y"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="digits">2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="y-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|y">Enter the amount of space you want between the snap point or line and the top edge of the page.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="xlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="dlgsnap|xlabel">_X:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">x</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="ylabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="dlgsnap|ylabel">_Y:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">y</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> @@ -219,90 +213,84 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkRadioButton" id="point"> + <property name="label" translatable="yes" context="dlgsnap|point">_Point</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> - <object class="GtkRadioButton" id="point"> - <property name="label" translatable="yes" context="dlgsnap|point">_Point</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="image">image1</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="point-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|point">Inserts a snap point.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="point-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|point">Inserts a snap point.</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="vert"> - <property name="label" translatable="yes" context="dlgsnap|vert">_Vertical</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="image">image2</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">point</property> - <child internal-child="accessible"> - <object class="AtkObject" id="vert-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|vert">Inserts a vertical snap line.</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="vert"> + <property name="label" translatable="yes" context="dlgsnap|vert">_Vertical</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">image2</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">point</property> + <child internal-child="accessible"> + <object class="AtkObject" id="vert-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|vert">Inserts a vertical snap line.</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="horz"> - <property name="label" translatable="yes" context="dlgsnap|horz">Hori_zontal</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="image">image3</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> - <property name="draw_indicator">True</property> - <property name="group">point</property> - <child internal-child="accessible"> - <object class="AtkObject" id="horz-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|horz">Inserts a horizontal snap line.</property> - </object> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="horz"> + <property name="label" translatable="yes" context="dlgsnap|horz">Hori_zontal</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">image3</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">point</property> + <child internal-child="accessible"> + <object class="AtkObject" id="horz-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlgsnap|extended_tip|horz">Inserts a horizontal snap line.</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/sd/uiconfig/sdraw/ui/drawprinteroptions.ui b/sd/uiconfig/sdraw/ui/drawprinteroptions.ui index e27f1bfee407..c561aca96e34 100644 --- a/sd/uiconfig/sdraw/ui/drawprinteroptions.ui +++ b/sd/uiconfig/sdraw/ui/drawprinteroptions.ui @@ -16,50 +16,44 @@ <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="printname"> + <property name="label" translatable="yes" context="drawprinteroptions|printname">Page name</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="printname"> - <property name="label" translatable="yes" context="drawprinteroptions|printname">Page name</property> - <property name="visible">True</property> - <property name="can_focus">True</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="printdatetime"> - <property name="label" translatable="yes" context="drawprinteroptions|printdatetime">Date and 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> - </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="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="printdatetime"> + <property name="label" translatable="yes" context="drawprinteroptions|printdatetime">Date and 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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -87,71 +81,65 @@ <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="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="GtkRadioButton" id="originalcolors"> + <property name="label" translatable="yes" context="drawprinteroptions|originalcolors">Original colors</property> + <property name="visible">True</property> + <property 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="grayscale"> + <property name="label" translatable="yes" context="drawprinteroptions|grayscale">Grayscale</property> + <property name="visible">True</property> + <property 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">originalcolors</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <child> - <object class="GtkBox" id="box1"> + <object class="GtkRadioButton" id="blackandwhite"> + <property name="label" translatable="yes" context="drawprinteroptions|blackandwhite">Black & white</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="originalcolors"> - <property name="label" translatable="yes" context="drawprinteroptions|originalcolors">Original colors</property> - <property name="visible">True</property> - <property 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="grayscale"> - <property name="label" translatable="yes" context="drawprinteroptions|grayscale">Grayscale</property> - <property name="visible">True</property> - <property 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">originalcolors</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="blackandwhite"> - <property name="label" translatable="yes" context="drawprinteroptions|blackandwhite">Black & white</property> - <property name="visible">True</property> - <property 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">originalcolors</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> + <property name="group">originalcolors</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> @@ -179,89 +167,83 @@ <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="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkRadioButton" id="originalsize"> + <property name="label" translatable="yes" context="drawprinteroptions|originalsize">Original size</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="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="fittoprintable"> + <property name="label" translatable="yes" context="drawprinteroptions|fittoprintable">Fit to printable page</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">originalsize</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="distributeonmultiple"> + <property name="label" translatable="yes" context="drawprinteroptions|distributeonmultiple">Distribute on multiple sheets of paper</property> + <property name="visible">True</property> + <property 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">originalsize</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> - <object class="GtkBox" id="box3"> + <object class="GtkRadioButton" id="tilesheet"> + <property name="label" translatable="yes" context="drawprinteroptions|tilesheet">Tile sheet of paper with repeated pages</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="originalsize"> - <property name="label" translatable="yes" context="drawprinteroptions|originalsize">Original size</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="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="fittoprintable"> - <property name="label" translatable="yes" context="drawprinteroptions|fittoprintable">Fit to printable page</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">originalsize</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="distributeonmultiple"> - <property name="label" translatable="yes" context="drawprinteroptions|distributeonmultiple">Distribute on multiple sheets of paper</property> - <property name="visible">True</property> - <property 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">originalsize</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="tilesheet"> - <property name="label" translatable="yes" context="drawprinteroptions|tilesheet">Tile sheet of paper with repeated 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="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">originalsize</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</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> + <property name="group">originalsize</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child> diff --git a/sd/uiconfig/sdraw/ui/insertlayer.ui b/sd/uiconfig/sdraw/ui/insertlayer.ui index d468d4e3edab..60462351d451 100644 --- a/sd/uiconfig/sdraw/ui/insertlayer.ui +++ b/sd/uiconfig/sdraw/ui/insertlayer.ui @@ -87,22 +87,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="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="activates_default">True</property> - <property name="width_chars">54</property> - <child internal-child="accessible"> - <object class="AtkObject" id="name-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertlayer|extended_tip|name">Enter a name for the new layer.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">54</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="insertlayer|extended_tip|name">Enter a name for the new layer.</property> </object> </child> </object> @@ -132,22 +126,16 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkEntry" id="title"> <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="title"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="width_chars">54</property> - <child internal-child="accessible"> - <object class="AtkObject" id="title-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertlayer|extended_tip|title">Enter the title of the layer.</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">54</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child internal-child="accessible"> + <object class="AtkObject" id="title-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertlayer|extended_tip|title">Enter the title of the layer.</property> </object> </child> </object> @@ -179,31 +167,23 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="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="scrolledwindow1"> + <object class="GtkTextView" id="textview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="textview-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="insertlayer|extended_tip|textview">Enter a description of the layer.</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="textview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="insertlayer|extended_tip|textview">Enter a description of the layer.</property> </object> </child> </object> diff --git a/sd/uiconfig/sdraw/ui/paranumberingtab.ui b/sd/uiconfig/sdraw/ui/paranumberingtab.ui index e43a062a9776..f5b46ca6ee7c 100644 --- a/sd/uiconfig/sdraw/ui/paranumberingtab.ui +++ b/sd/uiconfig/sdraw/ui/paranumberingtab.ui @@ -14,67 +14,61 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkCheckButton" id="checkbuttonCB_NEW_START"> + <property name="label" translatable="yes" context="paranumberingtab|checkbuttonCB_NEW_START">R_estart at this paragraph</property> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="inconsistent">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="GtkSpinButton" id="spinbuttonNF_NEW_START"> + <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkCheckButton" id="checkbuttonCB_NEW_START"> - <property name="label" translatable="yes" context="paranumberingtab|checkbuttonCB_NEW_START">R_estart at this paragraph</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="inconsistent">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="GtkSpinButton" id="spinbuttonNF_NEW_START"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="adjustment">adjustment1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbuttonCB_NUMBER_NEW_START"> - <property name="label" translatable="yes" context="paranumberingtab|checkbuttonCB_NUMBER_NEW_START">S_tart with:</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</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> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkbuttonCB_NUMBER_NEW_START"> + <property name="label" translatable="yes" context="paranumberingtab|checkbuttonCB_NUMBER_NEW_START">S_tart with:</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</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> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> |