sw/source/ui/frmdlg/wrap.cxx | 28 +
sw/source/uibase/inc/wrap.hxx | 6
sw/uiconfig/swriter/ui/wrappage.ui | 580 ++++++++++++++++++++++---------------
3 files changed, 382 insertions(+), 232 deletions(-)
New commits:
commit f654af56695197d11c277c424b0dd2b93195add9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri May 21 09:46:20 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri May 21 13:35:30 2021 +0200
move wrap icons outside radiobuttons
not possible in gtk4 to put an image in here anymore AFAICS,
this was always an odd case anyway
Change-Id: Ic9415cd0c91a7f006231d786f2a3a22b8f97af6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115907
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index a09c8475cdcd..bf4029269154 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -72,11 +72,17 @@ SwWrapTabPage::SwWrapTabPage(weld::Container* pPage,
weld::DialogController* pCo
, m_bHtmlMode(false)
, m_bDrawMode(false)
, m_bContourImage(false)
+ , m_xNoWrapImg(m_xBuilder->weld_image("noneimg"))
, m_xNoWrapRB(m_xBuilder->weld_radio_button("none"))
+ , m_xWrapLeftImg(m_xBuilder->weld_image("beforeimg"))
, m_xWrapLeftRB(m_xBuilder->weld_radio_button("before"))
+ , m_xWrapRightImg(m_xBuilder->weld_image("afterimg"))
, m_xWrapRightRB(m_xBuilder->weld_radio_button("after"))
+ , m_xWrapParallelImg(m_xBuilder->weld_image("parallelimg"))
, m_xWrapParallelRB(m_xBuilder->weld_radio_button("parallel"))
+ , m_xWrapThroughImg(m_xBuilder->weld_image("throughimg"))
, m_xWrapThroughRB(m_xBuilder->weld_radio_button("through"))
+ , m_xIdealWrapImg(m_xBuilder->weld_image("optimalimg"))
, m_xIdealWrapRB(m_xBuilder->weld_radio_button("optimal"))
, m_xLeftMarginED(m_xBuilder->weld_metric_spin_button("left",
FieldUnit::CM))
, m_xRightMarginED(m_xBuilder->weld_metric_spin_button("right",
FieldUnit::CM))
@@ -604,23 +610,23 @@ IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl,
weld::ToggleButton&, void)
void SwWrapTabPage::SetImages()
{
- m_xWrapThroughRB->set_from_icon_name(RID_BMP_WRAP_THROUGH);
+ m_xWrapThroughImg->set_from_icon_name(RID_BMP_WRAP_THROUGH);
bool bWrapOutline = !m_xWrapOutlineCB->get_active();
if (bWrapOutline)
{
- m_xNoWrapRB->set_from_icon_name(RID_BMP_WRAP_NONE);
- m_xWrapLeftRB->set_from_icon_name(RID_BMP_WRAP_LEFT);
- m_xWrapRightRB->set_from_icon_name(RID_BMP_WRAP_RIGHT);
- m_xWrapParallelRB->set_from_icon_name(RID_BMP_WRAP_PARALLEL);
- m_xIdealWrapRB->set_from_icon_name(RID_BMP_WRAP_IDEAL);
+ m_xNoWrapImg->set_from_icon_name(RID_BMP_WRAP_NONE);
+ m_xWrapLeftImg->set_from_icon_name(RID_BMP_WRAP_LEFT);
+ m_xWrapRightImg->set_from_icon_name(RID_BMP_WRAP_RIGHT);
+ m_xWrapParallelImg->set_from_icon_name(RID_BMP_WRAP_PARALLEL);
+ m_xIdealWrapImg->set_from_icon_name(RID_BMP_WRAP_IDEAL);
}
else
{
- m_xNoWrapRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_NONE);
- m_xWrapLeftRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_LEFT);
- m_xWrapRightRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_RIGHT);
- m_xWrapParallelRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_PARALLEL);
- m_xIdealWrapRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_IDEAL);
+ m_xNoWrapImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_NONE);
+ m_xWrapLeftImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_LEFT);
+ m_xWrapRightImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_RIGHT);
+ m_xWrapParallelImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_PARALLEL);
+ m_xIdealWrapImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_IDEAL);
}
}
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index 3a69e43ff210..6ea3e192e6f3 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -48,11 +48,17 @@ class SwWrapTabPage: public SfxTabPage
bool m_bContourImage;
// WRAPPING
+ std::unique_ptr<weld::Image> m_xNoWrapImg;
std::unique_ptr<weld::RadioButton> m_xNoWrapRB;
+ std::unique_ptr<weld::Image> m_xWrapLeftImg;
std::unique_ptr<weld::RadioButton> m_xWrapLeftRB;
+ std::unique_ptr<weld::Image> m_xWrapRightImg;
std::unique_ptr<weld::RadioButton> m_xWrapRightRB;
+ std::unique_ptr<weld::Image> m_xWrapParallelImg;
std::unique_ptr<weld::RadioButton> m_xWrapParallelRB;
+ std::unique_ptr<weld::Image> m_xWrapThroughImg;
std::unique_ptr<weld::RadioButton> m_xWrapThroughRB;
+ std::unique_ptr<weld::Image> m_xIdealWrapImg;
std::unique_ptr<weld::RadioButton> m_xIdealWrapRB;
// MARGIN
diff --git a/sw/uiconfig/swriter/ui/wrappage.ui
b/sw/uiconfig/swriter/ui/wrappage.ui
index ed0f31b07279..ede6800d1837 100644
--- a/sw/uiconfig/swriter/ui/wrappage.ui
+++ b/sw/uiconfig/swriter/ui/wrappage.ui
@@ -50,154 +50,292 @@
<property name="row-homogeneous">True</property>
<property name="column-homogeneous">True</property>
<child>
- <object class="GtkRadioButton" id="none">
- <property name="label" translatable="yes"
context="wrappage|none">_Wrap Off</property>
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
+ <property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="use-underline">True</property>
- <property name="image-position">top</property>
- <property name="always-show-image">True</property>
- <property name="active">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="none-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|none">Places the object on a
separate line in the document. The Text in the document appears above and below
the object, but not on the sides of the object.</property>
+ <child>
+ <object class="GtkImage" id="beforeimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="before">
+ <property name="label" translatable="yes"
context="wrappage|before">Be_fore</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="before-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|before">Wraps text on the
left side of the object if there is enough space.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="before">
- <property name="label" translatable="yes"
context="wrappage|before">Be_fore</property>
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
+ <property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="use-underline">True</property>
- <property name="image-position">top</property>
- <property name="always-show-image">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="before-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|before">Wraps text on the
left side of the object if there is enough space.</property>
+ <child>
+ <object class="GtkImage" id="afterimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="after">
+ <property name="label" translatable="yes"
context="wrappage|after">Aft_er</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="after-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|after">Wraps text on the
right side of the object if there is enough space.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left-attach">1</property>
+ <property name="left-attach">2</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="after">
- <property name="label" translatable="yes"
context="wrappage|after">Aft_er</property>
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
+ <property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="use-underline">True</property>
- <property name="image-position">top</property>
- <property name="always-show-image">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="after-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|after">Wraps text on the
right side of the object if there is enough space.</property>
+ <child>
+ <object class="GtkImage" id="parallelimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="parallel">
+ <property name="label" translatable="yes"
context="wrappage|parallel">_Parallel</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="parallel-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|parallel">Wraps text on all
four sides of the border frame of the object.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left-attach">2</property>
- <property name="top-attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="parallel">
- <property name="label" translatable="yes"
context="wrappage|parallel">_Parallel</property>
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
+ <property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="use-underline">True</property>
- <property name="image-position">top</property>
- <property name="always-show-image">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="parallel-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|parallel">Wraps text on all
four sides of the border frame of the object.</property>
+ <child>
+ <object class="GtkImage" id="throughimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="through">
+ <property name="label" translatable="yes"
context="wrappage|through">Thro_ugh</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="through-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|through">Places the object in
front of the text.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="through">
- <property name="label" translatable="yes"
context="wrappage|through">Thro_ugh</property>
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
+ <property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="use-underline">True</property>
- <property name="image-position">top</property>
- <property name="always-show-image">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="through-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|through">Places the object in
front of the text.</property>
+ <child>
+ <object class="GtkImage" id="noneimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="none">
+ <property name="label" translatable="yes"
context="wrappage|none">_Wrap Off</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="use-underline">True</property>
+ <property name="active">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="none-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|none">Places the object on a
separate line in the document. The Text in the document appears above and below
the object, but not on the sides of the object.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="optimal">
- <property name="label" translatable="yes"
context="wrappage|optimal">_Optimal</property>
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
+ <property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="use-underline">True</property>
- <property name="image-position">top</property>
- <property name="always-show-image">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="optimal-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|optimal">Automatically wraps
text to the left, to the right, or on all four sides of the border frame of the
object. If the distance between the object and the page margin is less than 2
cm, the text is not wrapped.</property>
+ <child>
+ <object class="GtkImage" id="optimalimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="optimal">
+ <property name="label" translatable="yes"
context="wrappage|optimal">_Optimal</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="optimal-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|optimal">Automatically wraps
text to the left, to the right, or on all four sides of the border frame of the
object. If the distance between the object and the page margin is less than 2
cm, the text is not wrapped.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
</child>
</object>
<packing>
commit 9ae02c9e5ce44173f042abcf3d644fb65d1d91b9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri May 21 10:06:28 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri May 21 13:35:13 2021 +0200
resave in latest glade
Change-Id: Iaf6a18c236ed83bf92e1fee122fcaa0486328101
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115906
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/uiconfig/swriter/ui/wrappage.ui
b/sw/uiconfig/swriter/ui/wrappage.ui
index 9de988a8de9a..ed0f31b07279 100644
--- a/sw/uiconfig/swriter/ui/wrappage.ui
+++ b/sw/uiconfig/swriter/ui/wrappage.ui
@@ -1,69 +1,69 @@
<?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="upper">99.99</property>
- <property name="step_increment">0.1</property>
- <property name="page_increment">1</property>
+ <property name="step-increment">0.10</property>
+ <property name="page-increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">99.99</property>
- <property name="step_increment">0.1</property>
- <property name="page_increment">1</property>
+ <property name="step-increment">0.10</property>
+ <property name="page-increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="upper">99.99</property>
- <property name="step_increment">0.1</property>
- <property name="page_increment">1</property>
+ <property name="step-increment">0.10</property>
+ <property name="page-increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment4">
<property name="upper">99.99</property>
- <property name="step_increment">0.1</property>
- <property name="page_increment">1</property>
+ <property name="step-increment">0.10</property>
+ <property name="page-increment">1</property>
</object>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="WrapPage">
<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="border_width">6</property>
- <property name="row_spacing">12</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">12</property>
<child>
<object class="GtkFrame" id="backgroundgradientframe">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</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=3 n-rows=2 -->
<object class="GtkGrid" id="grid11">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">18</property>
- <property name="row_homogeneous">True</property>
- <property name="column_homogeneous">True</property>
+ <property name="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">12</property>
+ <property name="column-spacing">18</property>
+ <property name="row-homogeneous">True</property>
+ <property name="column-homogeneous">True</property>
<child>
<object class="GtkRadioButton" id="none">
<property name="label" translatable="yes"
context="wrappage|none">_Wrap Off</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="use_underline">True</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
+ <property name="use-underline">True</property>
+ <property name="image-position">top</property>
+ <property name="always-show-image">True</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="none-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|none">Places the object on a
separate line in the document. The Text in the document appears above and below
the object, but not on the sides of the object.</property>
@@ -71,24 +71,24 @@
</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="before">
<property name="label" translatable="yes"
context="wrappage|before">Be_fore</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="use_underline">True</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="image-position">top</property>
+ <property name="always-show-image">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="before-atkobject">
@@ -97,24 +97,24 @@
</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="GtkRadioButton" id="after">
<property name="label" translatable="yes"
context="wrappage|after">Aft_er</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="use_underline">True</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="image-position">top</property>
+ <property name="always-show-image">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="after-atkobject">
@@ -123,24 +123,24 @@
</child>
</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="GtkRadioButton" id="parallel">
<property name="label" translatable="yes"
context="wrappage|parallel">_Parallel</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="use_underline">True</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="image-position">top</property>
+ <property name="always-show-image">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="parallel-atkobject">
@@ -149,24 +149,24 @@
</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="through">
<property name="label" translatable="yes"
context="wrappage|through">Thro_ugh</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="use_underline">True</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="image-position">top</property>
+ <property name="always-show-image">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="through-atkobject">
@@ -175,24 +175,24 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="optimal">
<property name="label" translatable="yes"
context="wrappage|optimal">_Optimal</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="use_underline">True</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="image-position">top</property>
+ <property name="always-show-image">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="optimal-atkobject">
@@ -201,8 +201,8 @@
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
@@ -210,7 +210,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="wrappage|label1">Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -219,101 +219,101 @@
</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>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="vexpand">True</property>
- <property name="column_spacing">12</property>
- <property name="column_homogeneous">True</property>
+ <property name="column-spacing">12</property>
+ <property name="column-homogeneous">True</property>
<child>
<object class="GtkFrame" id="backgroundgradientframe1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=4 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="wrappage|label4">L_eft:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">left</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">left</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="wrappage|label5">_Right:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">right</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">right</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="wrappage|label6">_Top:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">top</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">top</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="wrappage|label7">_Bottom:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">bottom</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">bottom</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="left">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">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="left-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|left">Enter the amount of
space that you want between the left edge of the object and the text.</property>
@@ -321,18 +321,18 @@
</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="GtkSpinButton" id="right">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
- <property name="truncate-multiline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="right-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|right">Enter the amount of
space that you want between the right edge of the object and the
text.</property>
@@ -340,18 +340,18 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="top">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">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="top-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|top">Enter the amount of
space that you want between the top edge of the object and the text.</property>
@@ -359,18 +359,18 @@
</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="bottom">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
<property name="adjustment">adjustment4</property>
<property name="digits">2</property>
- <property name="truncate-multiline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="bottom-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|bottom">Enter the amount of
space that you want between the bottom edge of the object and the
text.</property>
@@ -378,8 +378,8 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
</object>
@@ -387,7 +387,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="wrappage|label2">Spacing</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -396,36 +396,36 @@
</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="backgroundgradientframe2">
<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="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="grid3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row-spacing">6</property>
<child>
<object class="GtkCheckButton" id="anchoronly">
<property name="label" translatable="yes"
context="wrappage|anchoronly">_First paragraph</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">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>
<child internal-child="accessible">
<object class="AtkObject" id="anchoronly-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|anchoronly">Starts a new
paragraph below the object after you press Enter.</property>
@@ -433,18 +433,18 @@
</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="GtkCheckButton" id="transparent">
<property name="label" translatable="yes"
context="wrappage|transparent">In bac_kground</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">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>
<child internal-child="accessible">
<object class="AtkObject" id="transparent-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|transparent">Moves the
selected object to the background. This option is only available if you
selected the Through wrap type.</property>
@@ -452,18 +452,18 @@
</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="GtkCheckButton" id="outline">
<property name="label" translatable="yes"
context="wrappage|outline">_Contour</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">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>
<child internal-child="accessible">
<object class="AtkObject" id="outline-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|outline">Wraps text around
the shape of the object. This option is not available for the Through wrap
type, or for frames.</property>
@@ -471,18 +471,18 @@
</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="GtkCheckButton" id="outside">
<property name="label" translatable="yes"
context="wrappage|outside">Outside only</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">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>
<child internal-child="accessible">
<object class="AtkObject" id="outside-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="wrappage|extended_tip|outside">Wraps text only
around the contour of the object, but not in open areas within the object
shape.</property>
@@ -490,22 +490,22 @@
</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="GtkCheckButton" id="allowoverlap">
<property name="label" translatable="yes"
context="wrappage|outside">Allow overlap</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
</object>
@@ -513,7 +513,7 @@
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="wrappage|label3">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -522,14 +522,14 @@
</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>
</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">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
