sw/uiconfig/swriter/ui/frmtypepage.ui | 834 +++++++++++++++-------------------
1 file changed, 383 insertions(+), 451 deletions(-)
New commits:
commit eb807e785b6acda1529b2f58ada2c1e84b38f7f5
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Fri Feb 19 12:54:21 2021 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Sun Feb 21 10:01:04 2021 +0100
Resolves tdf#140511 - UI glitches
Clean-up of nested grids and boxes
Change-Id: Iea2aa3d03210c0bbbf15b3eed546795de972b21b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111209
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui
b/sw/uiconfig/swriter/ui/frmtypepage.ui
index b04c72b94df2..50645550eaa9 100644
--- a/sw/uiconfig/swriter/ui/frmtypepage.ui
+++ b/sw/uiconfig/swriter/ui/frmtypepage.ui
@@ -1,365 +1,286 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">0.05</property>
- <property name="upper">99.99</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="lower">-99.99</property>
- <property name="upper">99.99</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="lower">0.05</property>
- <property name="upper">99.99</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment4">
- <property name="lower">-99.99</property>
- <property name="upper">99.99</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="FrameTypePage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
- <property name="border_width">6</property>
- <property name="row_spacing">18</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">18</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=3 n-rows=1 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">18</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">18</property>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
<property name="valign">start</property>
- <property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=8 -->
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">12</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="row-spacing">12</property>
+ <property name="column-spacing">3</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid5">
+ <object class="GtkBox" id="bxWidth">
<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="can-focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkSpinButton" id="width">
+ <object class="GtkLabel" id="widthft">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="digits">2</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="width-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|width">Enter the width
that you want for the selected object.</property>
- </object>
- </child>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="frmtypepage|widthft">_Width</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="autowidth">
- <property name="label" translatable="yes"
context="frmtypepage|autowidth">AutoSize</property>
+ <object class="GtkLabel" id="autowidthft">
<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="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="autowidth-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|autowidth">Automatically
adjusts the width or height of a frame to match the contents of the frame. If
you want, you can specify a minimum width or minimum height for the
frame.</property>
- </object>
- </child>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="frmtypepage|autowidthft">_Width (at least)</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
+ <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="grid8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <object class="GtkLabel" id="autowidthft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="frmtypepage|autowidthft">_Width (at least)</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">width</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="widthft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="frmtypepage|widthft">_Width</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">width</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="width">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="halign">start</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">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="frmtypepage|extended_tip|width">Enter the width
that you want for the selected object.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="relwidth">
- <property name="label" translatable="yes"
context="frmtypepage|relwidth">Relat_ive to</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="margin-start">12</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <accessibility>
- <relation type="label-for"
target="relwidthrelation"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject"
id="relwidth-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="frmtypepage|extended_tip|relwidth">Calculates the width of the
selected object as a percentage of the width of the page text area.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText"
id="relwidthrelation">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="relwidthrelation-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="frmtypepage|extended_tip|relwidthrelation">Decides what 100% width
means: either text area (excluding margins) or the entire page (including
margins).</property>
- </object>
- </child>
- </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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="relwidth">
+ <property name="label" translatable="yes"
context="frmtypepage|relwidth">Relat_ive to</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="margin-start">12</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="relwidth-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|relwidth">Calculates the
width of the selected object as a percentage of the width of the page text
area.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- </packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid6">
+ <object class="GtkComboBoxText" id="relwidthrelation">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkSpinButton" id="height">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment3</property>
- <property name="digits">2</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="height-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|height">Enter the height
that you want for the selected object.</property>
- </object>
- </child>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="relwidthrelation-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|relwidthrelation">Decides
what 100% width means: either text area (excluding margins) or the entire page
(including margins).</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="autoheight">
- <property name="label" translatable="yes"
context="frmtypepage|autoheight">AutoSize</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="margin-start">12</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="autoheight-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|autoheight">Automatically
adjusts the width or height of a frame to match the contents of the frame. If
you want, you can specify a minimum width or minimum height for the
frame.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="autowidth">
+ <property name="label" translatable="yes"
context="frmtypepage|autowidth">AutoSize</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="margin-start">12</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="autowidth-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|autowidth">Automatically
adjusts the width or height of a frame to match the contents of the frame. If
you want, you can specify a minimum width or minimum height for the
frame.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="bxHeight">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid7">
+ <object class="GtkLabel" id="heightft">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <object class="GtkLabel" id="autoheightft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="frmtypepage|autoheightft">H_eight (at least)</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">height</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="heightft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="frmtypepage|heightft">H_eight</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">height</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="frmtypepage|heightft">H_eight</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkLabel" id="autoheightft">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="relheight">
- <property name="label" translatable="yes"
context="frmtypepage|relheight">Re_lative to</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="margin-start">12</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <accessibility>
- <relation type="label-for"
target="relheightrelation"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject"
id="relheight-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="frmtypepage|extended_tip|relheight">Calculates the height of the
selected object as a percentage of the height of the page text area.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText"
id="relheightrelation">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="relheightrelation-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="frmtypepage|extended_tip|relheightrelation">Decides what 100% height
means: either text area (excluding margins) or the entire page (including
margins).</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="frmtypepage|autoheightft">H_eight (at least)</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="height">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="halign">start</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">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="frmtypepage|extended_tip|height">Enter the height
that you want for the selected object.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="relheight">
+ <property name="label" translatable="yes"
context="frmtypepage|relheight">Re_lative to</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="margin-start">12</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="relheight-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|relheight">Calculates the
height of the selected object as a percentage of the height of the page text
area.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="relheightrelation">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="relheightrelation-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|relheightrelation">Decides
what 100% height means: either text area (excluding margins) or the entire page
(including margins).</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="autoheight">
+ <property name="label" translatable="yes"
context="frmtypepage|autoheight">AutoSize</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="margin-start">12</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="autoheight-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|autoheight">Automatically
adjusts the width or height of a frame to match the contents of the frame. If
you want, you can specify a minimum width or minimum height for the
frame.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="ratio">
<property name="label" translatable="yes"
context="frmtypepage|ratio">_Keep ratio</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="ratio-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|ratio">Maintains the
height and width ratio when you change the width or the height
setting.</property>
@@ -367,18 +288,19 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="origsize">
<property name="label" translatable="yes"
context="frmtypepage|origsize">_Original Size</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="no-show-all">True</property>
<property name="halign">end</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="origsize-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|origsize">Resets the size
settings of the selected object to the original values.</property>
@@ -386,8 +308,9 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
@@ -395,7 +318,7 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="frmtypepage|label2">Size</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -404,59 +327,37 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkDrawingArea" id="preview">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="anchorframe">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
<property name="valign">start</property>
- <property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=5 -->
<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="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="row-spacing">6</property>
<child>
<object class="GtkRadioButton" id="topage">
<property name="label" translatable="yes"
context="frmtypepage|topage">To _page</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="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="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="topage-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|topage">Anchors the
selection to the current page.</property>
@@ -464,18 +365,19 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="topara">
<property name="label" translatable="yes"
context="frmtypepage|topara">To paragrap_h</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
<property name="group">topage</property>
<child internal-child="accessible">
<object class="AtkObject" id="topara-atkobject">
@@ -484,18 +386,19 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="tochar">
<property name="label" translatable="yes"
context="frmtypepage|tochar">To cha_racter</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
<property name="group">topage</property>
<child internal-child="accessible">
<object class="AtkObject" id="tochar-atkobject">
@@ -504,18 +407,19 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="aschar">
<property name="label" translatable="yes"
context="frmtypepage|aschar">_As character</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
<property name="group">topage</property>
<child internal-child="accessible">
<object class="AtkObject" id="aschar-atkobject">
@@ -524,23 +428,24 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="toframe">
<property name="label" translatable="yes"
context="frmtypepage|toframe">To _frame</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
<property name="group">topage</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
</object>
@@ -548,7 +453,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="frmtypepage|label1">Anchor</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -557,95 +462,123 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frmPreview">
+ <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="GtkDrawingArea" id="preview">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-top">6</property>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="lbPreview">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="frmtypepage|lbPreview">Preview</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">2</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <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 -->
+ <!-- n-columns=6 n-rows=4 -->
<object class="GtkGrid" id="grid10">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="horiposft">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="frmtypepage|horiposft">Hori_zontal</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">horipos</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">horipos</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="horibyft">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="frmtypepage|horibyft">b_y</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">byhori</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">byhori</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="vertbyft">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="frmtypepage|vertbyft">by</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">byvert</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">byvert</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="horitoft">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="frmtypepage|horitoft">_to</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">horianchor</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">horianchor</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">4</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">4</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="byhori">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment2</property>
- <property name="digits">2</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
+ <property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="byhori-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|byhori">Enter the amount
of space to leave between the left edge of the selected object and the
reference point that you select in the To box.</property>
@@ -653,14 +586,14 @@
</child>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">3</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="horianchor">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="horianchor-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|horianchor">Select the
reference point for the selected horizontal alignment option.</property>
@@ -668,14 +601,14 @@
</child>
</object>
<packing>
- <property name="left_attach">5</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">5</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="horipos">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="horipos-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|horipos">Select the
horizontal alignment option for the object.</property>
@@ -683,28 +616,28 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="vertposft">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="frmtypepage|vertposft">_Vertical</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">vertpos</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">vertpos</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="vertpos">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="vertpos-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|vertpos">Select the
vertical alignment option for the object.</property>
@@ -712,18 +645,17 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="byvert">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment4</property>
- <property name="digits">2</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
+ <property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="byvert-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|byvert">Enter the amount
of space to leave between the top edge of the selected object and the reference
point that you select in the To box.</property>
@@ -731,28 +663,28 @@
</child>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">3</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="verttoft">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="frmtypepage|verttoft">t_o</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">vertanchor</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">vertanchor</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">4</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">4</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="vertanchor">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="vertanchor-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|vertanchor">Select the
reference point for the selected vertical alignment option.</property>
@@ -760,19 +692,19 @@
</child>
</object>
<packing>
- <property name="left_attach">5</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">5</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="mirror">
<property name="label" translatable="yes"
context="frmtypepage|mirror">_Mirror on even pages</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="margin-start">12</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="mirror-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|mirror">Reverses the
current horizontal alignment settings on even pages.</property>
@@ -780,8 +712,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
<property name="width">6</property>
</packing>
</child>
@@ -789,11 +721,11 @@
<object class="GtkCheckButton" id="followtextflow">
<property name="label" translatable="yes"
context="frmtypepage|followtextflow">Keep inside text boundaries</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="margin-start">12</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="followtextflow-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="frmtypepage|extended_tip|followtextflow">Keeps the
selected object within the layout boundaries of the text that the object is
anchored to. To place the selected object anywhere in your document, do not
select this option.</property>
@@ -801,8 +733,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
<property name="width">6</property>
</packing>
</child>
@@ -811,7 +743,7 @@
<child type="label">
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="frmtypepage|label11">Position</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -820,8 +752,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child internal-child="accessible">
@@ -830,12 +762,12 @@
</object>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
+ <object class="GtkSizeGroup" id="sgSize">
<widgets>
- <widget name="widthft"/>
- <widget name="autowidthft"/>
- <widget name="heightft"/>
- <widget name="autoheightft"/>
+ <widget name="width"/>
+ <widget name="relwidthrelation"/>
+ <widget name="height"/>
+ <widget name="relheightrelation"/>
</widgets>
</object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
