solenv/sanitizers/ui/svx.suppr | 10 -
svx/source/tbxctrls/extrusioncontrols.cxx | 52 +++++----
svx/source/tbxctrls/extrusioncontrols.hxx | 17 +--
svx/source/tbxctrls/fontworkgallery.cxx | 55 +++++-----
svx/uiconfig/ui/depthwindow.ui | 115 +++++++++------------
svx/uiconfig/ui/fontworkcharacterspacingcontrol.ui | 109 ++++++++-----------
6 files changed, 173 insertions(+), 185 deletions(-)
New commits:
commit 312a32f6b6c83c5747b617249d794fc87ffd8b9b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Oct 25 21:07:06 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Oct 26 10:07:02 2021 +0200
tdf#145296 use a 'clickable' widget for custom spacing
Change-Id: I7c0b609a074a68dcc7ca4f6a775743e836a6caa7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124165
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index a5c812c03b63..a0071644d09f 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -470,17 +470,17 @@ public:
virtual void statusChanged( const css::frame::FeatureStateEvent& Event )
override;
private:
rtl::Reference<svt::PopupWindowController> mxControl;
- std::unique_ptr<weld::RadioButton> mxVeryTight;
- std::unique_ptr<weld::RadioButton> mxTight;
- std::unique_ptr<weld::RadioButton> mxNormal;
- std::unique_ptr<weld::RadioButton> mxLoose;
- std::unique_ptr<weld::RadioButton> mxVeryLoose;
- std::unique_ptr<weld::RadioButton> mxCustom;
+ std::unique_ptr<weld::ToggleButton> mxVeryTight;
+ std::unique_ptr<weld::ToggleButton> mxTight;
+ std::unique_ptr<weld::ToggleButton> mxNormal;
+ std::unique_ptr<weld::ToggleButton> mxLoose;
+ std::unique_ptr<weld::ToggleButton> mxVeryLoose;
+ std::unique_ptr<weld::ToggleButton> mxCustom;
std::unique_ptr<weld::CheckButton> mxKernPairs;
bool mbSettingValue;
DECL_LINK( KernSelectHdl, weld::Toggleable&, void );
- DECL_LINK( SelectHdl, weld::Toggleable&, void );
+ DECL_LINK( SelectHdl, weld::Button&, void );
void implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool
bEnabled );
void implSetKernCharacterPairs(bool bKernOnOff, bool bEnabled);
@@ -494,21 +494,21 @@ constexpr OUStringLiteral
gsFontworkKernCharacterPairs(u".uno:FontworkKernCharac
FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::PopupWindowController*
pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"svx/ui/fontworkcharacterspacingcontrol.ui", "FontworkCharacterSpacingControl")
, mxControl(pControl)
- , mxVeryTight(m_xBuilder->weld_radio_button("verytight"))
- , mxTight(m_xBuilder->weld_radio_button("tight"))
- , mxNormal(m_xBuilder->weld_radio_button("normal"))
- , mxLoose(m_xBuilder->weld_radio_button("loose"))
- , mxVeryLoose(m_xBuilder->weld_radio_button("veryloose"))
- , mxCustom(m_xBuilder->weld_radio_button("custom"))
+ , mxVeryTight(m_xBuilder->weld_toggle_button("verytight"))
+ , mxTight(m_xBuilder->weld_toggle_button("tight"))
+ , mxNormal(m_xBuilder->weld_toggle_button("normal"))
+ , mxLoose(m_xBuilder->weld_toggle_button("loose"))
+ , mxVeryLoose(m_xBuilder->weld_toggle_button("veryloose"))
+ , mxCustom(m_xBuilder->weld_toggle_button("custom"))
, mxKernPairs(m_xBuilder->weld_check_button("kernpairs"))
, mbSettingValue(false)
{
- mxVeryTight->connect_toggled(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
- mxTight->connect_toggled(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
- mxNormal->connect_toggled(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
- mxLoose->connect_toggled(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
- mxVeryLoose->connect_toggled(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
- mxCustom->connect_toggled(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
+ mxVeryTight->connect_clicked(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
+ mxTight->connect_clicked(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
+ mxNormal->connect_clicked(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
+ mxLoose->connect_clicked(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
+ mxVeryLoose->connect_clicked(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
+ mxCustom->connect_clicked(LINK(this, FontworkCharacterSpacingWindow,
SelectHdl));
mxKernPairs->connect_toggled(LINK(this, FontworkCharacterSpacingWindow,
KernSelectHdl));
@@ -542,7 +542,6 @@ void
FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact
mxNormal->set_active(false);
mxLoose->set_active(false);
mxVeryLoose->set_active(false);
- mxCustom->set_active(true);
switch(nCharacterSpacing)
{
@@ -563,6 +562,12 @@ void
FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact
break;
}
+ mxCustom->set_active(!mxVeryTight->get_active() &&
+ !mxTight->get_active() &&
+ !mxNormal->get_active() &&
+ !mxLoose->get_active() &&
+ !mxVeryLoose->get_active());
+
mbSettingValue = bSettingValue;
}
@@ -619,10 +624,14 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow,
KernSelectHdl, weld::Toggleable&
mxControl->EndPopupMode();
}
-IMPL_LINK(FontworkCharacterSpacingWindow, SelectHdl, weld::Toggleable&,
rButton, void)
+IMPL_LINK(FontworkCharacterSpacingWindow, SelectHdl, weld::Button&, rButton,
void)
{
- if (!rButton.get_active())
- return;
+ mxVeryTight->set_active(&rButton == mxVeryTight.get());
+ mxTight->set_active(&rButton == mxTight.get());
+ mxNormal->set_active(&rButton == mxNormal.get());
+ mxLoose->set_active(&rButton == mxLoose.get());
+ mxVeryLoose->set_active(&rButton == mxVeryLoose.get());
+ mxCustom->set_active(&rButton == mxCustom.get());
if (mbSettingValue)
return;
diff --git a/svx/uiconfig/ui/fontworkcharacterspacingcontrol.ui
b/svx/uiconfig/ui/fontworkcharacterspacingcontrol.ui
index aee1943bb10a..df7f5e19668e 100644
--- a/svx/uiconfig/ui/fontworkcharacterspacingcontrol.ui
+++ b/svx/uiconfig/ui/fontworkcharacterspacingcontrol.ui
@@ -1,121 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkPopover" id="FontworkCharacterSpacingControl">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="border_width">4</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="border-width">4</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=7 -->
<object class="GtkGrid" id="container">
<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">6</property>
+ <property name="row-spacing">6</property>
<child>
- <object class="GtkRadioButton" id="verytight">
+ <object class="GtkToggleButton" id="verytight">
<property name="label" translatable="yes"
context="fontworkcharacterspacingcontrol|RID_SVXSTR_CHARS_SPACING_VERY_TIGHT">_Very
Tight</property>
<property 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="group">normal</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="tight">
+ <object class="GtkToggleButton" id="tight">
<property name="label" translatable="yes"
context="fontworkcharacterspacingcontrol|RID_SVXSTR_CHARS_SPACING_TIGHT">_Tight</property>
<property 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="group">normal</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="normal">
+ <object class="GtkToggleButton" id="normal">
<property name="label" translatable="yes"
context="fontworkcharacterspacingcontrol|RID_SVXSTR_CHARS_SPACING_NORMAL">_Normal</property>
<property 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="active">True</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="loose">
+ <object class="GtkToggleButton" id="loose">
<property name="label" translatable="yes"
context="fontworkcharacterspacingcontrol|RID_SVXSTR_CHARS_SPACING_LOOSE">_Loose</property>
<property 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="group">normal</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="veryloose">
+ <object class="GtkToggleButton" id="veryloose">
<property name="label" translatable="yes"
context="fontworkcharacterspacingcontrol|RID_SVXSTR_CHARS_SPACING_VERY_LOOSE">Very
_Loose</property>
<property 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="group">normal</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="custom">
+ <object class="GtkToggleButton" id="custom">
<property name="label" translatable="yes"
context="fontworkcharacterspacingcontrol|RID_SVXSTR_CHARS_SPACING_CUSTOM">_Custom...</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">normal</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="kernpairs">
<property name="label" translatable="yes"
context="fontworkcharacterspacingcontrol|RID_SVXSTR_CHARS_SPACING_KERN_PAIRS">_Kern
Character Pairs</property>
<property 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">6</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
</packing>
</child>
</object>
commit 592235d64d6f9638a61865712ca385ec58d688c4
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Oct 25 20:39:41 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Oct 26 10:06:49 2021 +0200
tdf#145296 use a 'clickable' widget for custom depth
Change-Id: Ifb64e1bef2a0b216f97fe112115a997973201268
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124164
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 47e7dbc7ef5d..0619e543e8e7 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -14,11 +14,11 @@
svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label16'] orphan-label
svx/uiconfig/ui/crashreportdlg.ui://GtkLabel[@id='ed_pre'] orphan-label
svx/uiconfig/ui/crashreportdlg.ui://GtkTextView[@id='ed_post'] no-labelled-by
svx/uiconfig/ui/crashreportdlg.ui://GtkTextView[@id='ed_bugreport']
no-labelled-by
-svx/uiconfig/ui/depthwindow.ui://GtkRadioButton[@id='depth0'] button-no-label
-svx/uiconfig/ui/depthwindow.ui://GtkRadioButton[@id='depth1'] button-no-label
-svx/uiconfig/ui/depthwindow.ui://GtkRadioButton[@id='depth2'] button-no-label
-svx/uiconfig/ui/depthwindow.ui://GtkRadioButton[@id='depth3'] button-no-label
-svx/uiconfig/ui/depthwindow.ui://GtkRadioButton[@id='depth4'] button-no-label
+svx/uiconfig/ui/depthwindow.ui://GtkToggleButton[@id='depth0'] button-no-label
+svx/uiconfig/ui/depthwindow.ui://GtkToggleButton[@id='depth1'] button-no-label
+svx/uiconfig/ui/depthwindow.ui://GtkToggleButton[@id='depth2'] button-no-label
+svx/uiconfig/ui/depthwindow.ui://GtkToggleButton[@id='depth3'] button-no-label
+svx/uiconfig/ui/depthwindow.ui://GtkToggleButton[@id='depth4'] button-no-label
svx/uiconfig/ui/docking3deffects.ui://GtkButton[@id='corner'] button-no-label
svx/uiconfig/ui/docking3deffects.ui://GtkScale[@id='horiscale'] no-labelled-by
svx/uiconfig/ui/docking3deffects.ui://GtkScale[@id='vertscale'] no-labelled-by
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx
b/svx/source/tbxctrls/extrusioncontrols.cxx
index bed16752433f..5f6544404a67 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -331,24 +331,23 @@ constexpr OUStringLiteral gsMetricUnit(
u".uno:MetricUnit" );
ExtrusionDepthWindow::ExtrusionDepthWindow(svt::PopupWindowController*
pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"svx/ui/depthwindow.ui", "DepthWindow")
, mxControl(pControl)
- , mxDepth0(m_xBuilder->weld_radio_button("depth0"))
- , mxDepth1(m_xBuilder->weld_radio_button("depth1"))
- , mxDepth2(m_xBuilder->weld_radio_button("depth2"))
- , mxDepth3(m_xBuilder->weld_radio_button("depth3"))
- , mxDepth4(m_xBuilder->weld_radio_button("depth4"))
- , mxInfinity(m_xBuilder->weld_radio_button("infinity"))
- , mxCustom(m_xBuilder->weld_radio_button("custom"))
+ , mxDepth0(m_xBuilder->weld_toggle_button("depth0"))
+ , mxDepth1(m_xBuilder->weld_toggle_button("depth1"))
+ , mxDepth2(m_xBuilder->weld_toggle_button("depth2"))
+ , mxDepth3(m_xBuilder->weld_toggle_button("depth3"))
+ , mxDepth4(m_xBuilder->weld_toggle_button("depth4"))
+ , mxInfinity(m_xBuilder->weld_toggle_button("infinity"))
+ , mxCustom(m_xBuilder->weld_toggle_button("custom"))
, meUnit(FieldUnit::NONE)
, mfDepth( -1.0 )
- , mbSettingValue(false)
{
- mxDepth0->connect_toggled(LINK(this, ExtrusionDepthWindow, SelectHdl));
- mxDepth1->connect_toggled(LINK(this, ExtrusionDepthWindow, SelectHdl));
- mxDepth2->connect_toggled(LINK(this, ExtrusionDepthWindow, SelectHdl));
- mxDepth3->connect_toggled(LINK(this, ExtrusionDepthWindow, SelectHdl));
- mxDepth4->connect_toggled(LINK(this, ExtrusionDepthWindow, SelectHdl));
- mxInfinity->connect_toggled(LINK(this, ExtrusionDepthWindow, SelectHdl));
- mxCustom->connect_toggled(LINK(this, ExtrusionDepthWindow, SelectHdl));
+ mxDepth0->connect_clicked(LINK(this, ExtrusionDepthWindow, SelectHdl));
+ mxDepth1->connect_clicked(LINK(this, ExtrusionDepthWindow, SelectHdl));
+ mxDepth2->connect_clicked(LINK(this, ExtrusionDepthWindow, SelectHdl));
+ mxDepth3->connect_clicked(LINK(this, ExtrusionDepthWindow, SelectHdl));
+ mxDepth4->connect_clicked(LINK(this, ExtrusionDepthWindow, SelectHdl));
+ mxInfinity->connect_clicked(LINK(this, ExtrusionDepthWindow, SelectHdl));
+ mxCustom->connect_clicked(LINK(this, ExtrusionDepthWindow, SelectHdl));
AddStatusListener( gsExtrusionDepth );
AddStatusListener( gsMetricUnit );
@@ -363,10 +362,6 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth )
{
mfDepth = fDepth;
- bool bSettingValue = mbSettingValue;
- mbSettingValue = true;
-
- mxCustom->set_active(true);
bool bIsMetric = IsMetric(meUnit);
mxDepth0->set_active(fDepth == (bIsMetric ? aDepthListMM[0] :
aDepthListInch[0]));
mxDepth1->set_active(fDepth == (bIsMetric ? aDepthListMM[1] :
aDepthListInch[1]));
@@ -374,8 +369,12 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth )
mxDepth3->set_active(fDepth == (bIsMetric ? aDepthListMM[3] :
aDepthListInch[3]));
mxDepth4->set_active(fDepth == (bIsMetric ? aDepthListMM[4] :
aDepthListInch[4]));
mxInfinity->set_active(fDepth >= 338666);
-
- mbSettingValue = bSettingValue;
+ mxCustom->set_active(!mxDepth0->get_active() &&
+ !mxDepth1->get_active() &&
+ !mxDepth2->get_active() &&
+ !mxDepth3->get_active() &&
+ !mxDepth4->get_active() &&
+ !mxInfinity->get_active());
}
void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
@@ -443,10 +442,15 @@ void ExtrusionDepthWindow::statusChanged(
}
}
-IMPL_LINK(ExtrusionDepthWindow, SelectHdl, weld::Toggleable&, rButton, void)
+IMPL_LINK(ExtrusionDepthWindow, SelectHdl, weld::Button&, rButton, void)
{
- if (mbSettingValue || !rButton.get_active())
- return;
+ mxDepth0->set_active(&rButton == mxDepth0.get());
+ mxDepth1->set_active(&rButton == mxDepth1.get());
+ mxDepth2->set_active(&rButton == mxDepth2.get());
+ mxDepth3->set_active(&rButton == mxDepth3.get());
+ mxDepth4->set_active(&rButton == mxDepth4.get());
+ mxInfinity->set_active(&rButton == mxInfinity.get());
+ mxCustom->set_active(&rButton == mxCustom.get());
if (mxCustom->get_active())
{
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx
b/svx/source/tbxctrls/extrusioncontrols.hxx
index 0f0f54dbf457..531ae48bbfb7 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -93,19 +93,18 @@ class ExtrusionDepthWindow final : public WeldToolbarPopup
{
private:
rtl::Reference<svt::PopupWindowController> mxControl;
- std::unique_ptr<weld::RadioButton> mxDepth0;
- std::unique_ptr<weld::RadioButton> mxDepth1;
- std::unique_ptr<weld::RadioButton> mxDepth2;
- std::unique_ptr<weld::RadioButton> mxDepth3;
- std::unique_ptr<weld::RadioButton> mxDepth4;
- std::unique_ptr<weld::RadioButton> mxInfinity;
- std::unique_ptr<weld::RadioButton> mxCustom;
+ std::unique_ptr<weld::ToggleButton> mxDepth0;
+ std::unique_ptr<weld::ToggleButton> mxDepth1;
+ std::unique_ptr<weld::ToggleButton> mxDepth2;
+ std::unique_ptr<weld::ToggleButton> mxDepth3;
+ std::unique_ptr<weld::ToggleButton> mxDepth4;
+ std::unique_ptr<weld::ToggleButton> mxInfinity;
+ std::unique_ptr<weld::ToggleButton> mxCustom;
FieldUnit meUnit;
double mfDepth;
- bool mbSettingValue;
- DECL_LINK( SelectHdl, weld::Toggleable&, void );
+ DECL_LINK( SelectHdl, weld::Button&, void );
void implFillStrings( FieldUnit eUnit );
void implSetDepth( double fDepth );
diff --git a/svx/uiconfig/ui/depthwindow.ui b/svx/uiconfig/ui/depthwindow.ui
index a35fc7db1505..930cfbf87449 100644
--- a/svx/uiconfig/ui/depthwindow.ui
+++ b/svx/uiconfig/ui/depthwindow.ui
@@ -1,57 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/extrusion1inch_16.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svx/res/extrusion1inch_16.png</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/extrusion05inch_16.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svx/res/extrusion05inch_16.png</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/extrusion2inch_16.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svx/res/extrusion2inch_16.png</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/extrusion0inch_16.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svx/res/extrusion0inch_16.png</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/extrusion4inch_16.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svx/res/extrusion4inch_16.png</property>
</object>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/extrusioninfinity_16.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svx/res/extrusioninfinity_16.png</property>
</object>
<object class="GtkPopover" id="DepthWindow">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="border_width">4</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="border-width">4</property>
<child>
<object class="GtkBox" id="container">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkRadioButton" id="depth0">
+ <object class="GtkToggleButton" id="depth0">
<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="image">image4</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -60,15 +59,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="depth1">
+ <object class="GtkToggleButton" id="depth1">
<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="image">image2</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">depth0</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -77,15 +74,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="depth2">
+ <object class="GtkToggleButton" id="depth2">
<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="image">image1</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">depth0</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -94,15 +89,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="depth3">
+ <object class="GtkToggleButton" id="depth3">
<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="image">image3</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">depth0</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -111,15 +104,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="depth4">
+ <object class="GtkToggleButton" id="depth4">
<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="image">image5</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">depth0</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -128,16 +119,14 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="infinity">
+ <object class="GtkToggleButton" id="infinity">
<property name="label" translatable="yes"
context="depthwindow|RID_SVXSTR_INFINITY">_Infinity</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="image">image6</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">depth0</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -146,14 +135,12 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="custom">
+ <object class="GtkToggleButton" id="custom">
<property name="label" translatable="yes"
context="depthwindow|RID_SVXSTR_CUSTOM">_Custom...</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">depth0</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
