tdf#145296 better fix to launch dialog when active radiobutton is clicked
this basically reverts
commit 312a32f6b6c83c5747b617249d794fc87ffd8b9b
tdf#145296 use a 'clickable' widget for custom spacing
commit 592235d64d6f9638a61865712ca385ec58d688c4
tdf#145296 use a 'clickable' widget for custom depth
and uses a mouse-release workaround to detect the case of clicking on an
already active radiobutton which gives a result basically
indistinguishable from the pre 7.2 experience
Change-Id: Ic7ac6fa20843466b1d0c77586e25f4aabf814328
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124285
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 0619e54..47e7dbc 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://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/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/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 5f654440..face959 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -331,23 +331,26 @@ 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_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"))
, 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"))
, meUnit(FieldUnit::NONE)
, mfDepth( -1.0 )
, mbSettingValue(false)
, mbCommandDispatched(false)
{
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));
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));
mxCustom->connect_mouse_release(LINK(this, ExtrusionDepthWindow, MouseReleaseHdl));
AddStatusListener( gsExtrusionDepth );
AddStatusListener( gsMetricUnit );
@@ -362,6 +365,10 @@ 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]));
@@ -369,12 +376,8 @@ 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);
mxCustom->set_active(!mxDepth0->get_active() &&
!mxDepth1->get_active() &&
!mxDepth2->get_active() &&
!mxDepth3->get_active() &&
!mxDepth4->get_active() &&
!mxInfinity->get_active());
mbSettingValue = bSettingValue;
}
void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
@@ -442,28 +445,33 @@ void ExtrusionDepthWindow::statusChanged(
}
}
IMPL_LINK(ExtrusionDepthWindow, SelectHdl, weld::Button&, rButton, void)
void ExtrusionDepthWindow::DispatchDepthDialog()
{
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());
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Name = "Depth";
aArgs[0].Value <<= mfDepth;
aArgs[1].Name = "Metric";
aArgs[1].Value <<= static_cast<sal_Int32>( meUnit );
rtl::Reference<svt::PopupWindowController> xControl(mxControl);
xControl->EndPopupMode();
xControl->dispatchCommand(".uno:ExtrusionDepthDialog", aArgs);
mbCommandDispatched = true;
}
IMPL_LINK(ExtrusionDepthWindow, SelectHdl, weld::Toggleable&, rButton, void)
{
if (mbSettingValue || !rButton.get_active())
return;
// see MouseReleaseHdl for mbCommandDispatched check, there's no guarantee
// this toggle will happen before that mouse release though it does in
// practice for vcl and gtk
if (mbCommandDispatched)
return;
if (mxCustom->get_active())
{
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Name = "Depth";
aArgs[0].Value <<= mfDepth;
aArgs[1].Name = "Metric";
aArgs[1].Value <<= static_cast<sal_Int32>( meUnit );
rtl::Reference<svt::PopupWindowController> xControl(mxControl);
xControl->EndPopupMode();
xControl->dispatchCommand(".uno:ExtrusionDepthDialog", aArgs);
}
DispatchDepthDialog();
else
{
double fDepth;
@@ -494,12 +502,31 @@ IMPL_LINK(ExtrusionDepthWindow, SelectHdl, weld::Button&, rButton, void)
aArgs[0].Value <<= fDepth;
mxControl->dispatchCommand( gsExtrusionDepth, aArgs );
mbCommandDispatched = true;
implSetDepth( fDepth );
mxControl->EndPopupMode();
}
}
IMPL_LINK_NOARG(ExtrusionDepthWindow, MouseReleaseHdl, const MouseEvent&, bool)
{
/*
tdf#145296 if the "custom" radiobutton was presented preselected as
toggled on and the user clicked on it then there's no toggled signal sent
because the item was already toggled on and didn't change state.
So if that happens launch the custom spacing dialog explicitly here on
mouse release.
*/
if (mxCustom->get_active() && !mbCommandDispatched)
{
DispatchDepthDialog();
return true;
}
return false;
}
// ExtrusionDirectionControl
ExtrusionDepthController::ExtrusionDepthController(
const Reference< XComponentContext >& rxContext
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 531ae48..7e00434 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -93,22 +93,27 @@ class ExtrusionDepthWindow final : public WeldToolbarPopup
{
private:
rtl::Reference<svt::PopupWindowController> mxControl;
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;
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;
FieldUnit meUnit;
double mfDepth;
bool mbSettingValue;
bool mbCommandDispatched;
DECL_LINK( SelectHdl, weld::Button&, void );
DECL_LINK( SelectHdl, weld::Toggleable&, void );
DECL_LINK( MouseReleaseHdl, const MouseEvent&, bool );
void implFillStrings( FieldUnit eUnit );
void implSetDepth( double fDepth );
void DispatchDepthDialog();
public:
ExtrusionDepthWindow(svt::PopupWindowController* pControl, weld::Widget* pParentWindow);
virtual void GrabFocus() override;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 754209a..7bfec4b 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -470,21 +470,24 @@ public:
virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override;
private:
rtl::Reference<svt::PopupWindowController> mxControl;
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::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::CheckButton> mxKernPairs;
sal_Int32 mnCharacterSpacing;
bool mbSettingValue;
bool mbCommandDispatched;
DECL_LINK( KernSelectHdl, weld::Toggleable&, void );
DECL_LINK( SelectHdl, weld::Button&, void );
DECL_LINK( SelectHdl, weld::Toggleable&, void );
DECL_LINK( MouseReleaseHdl, const MouseEvent&, bool );
void implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
void implSetKernCharacterPairs(bool bKernOnOff, bool bEnabled);
void DispatchSpacingDialog();
};
}
@@ -495,22 +498,24 @@ 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_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"))
, 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"))
, mxKernPairs(m_xBuilder->weld_check_button("kernpairs"))
, mnCharacterSpacing(0)
, mbSettingValue(false)
, mbCommandDispatched(false)
{
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));
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));
mxCustom->connect_mouse_release(LINK(this, FontworkCharacterSpacingWindow, MouseReleaseHdl));
mxKernPairs->connect_toggled(LINK(this, FontworkCharacterSpacingWindow, KernSelectHdl));
@@ -544,6 +549,7 @@ void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact
mxNormal->set_active(false);
mxLoose->set_active(false);
mxVeryLoose->set_active(false);
mxCustom->set_active(true);
switch(nCharacterSpacing)
{
@@ -564,12 +570,6 @@ 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());
mnCharacterSpacing = nCharacterSpacing;
mbSettingValue = bSettingValue;
@@ -622,34 +622,41 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, KernSelectHdl, weld::Toggleable&
aArgs[0].Value <<= bKernOnOff;
mxControl->dispatchCommand( gsFontworkKernCharacterPairs, aArgs );
mbCommandDispatched = true;
implSetKernCharacterPairs(bKernOnOff, true);
mxControl->EndPopupMode();
}
IMPL_LINK(FontworkCharacterSpacingWindow, SelectHdl, weld::Button&, rButton, void)
void FontworkCharacterSpacingWindow::DispatchSpacingDialog()
{
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());
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = OUString(gsFontworkCharacterSpacing).copy(5);
aArgs[0].Value <<= mnCharacterSpacing;
rtl::Reference<svt::PopupWindowController> xControl(mxControl);
xControl->EndPopupMode();
xControl->dispatchCommand(".uno:FontworkCharacterSpacingDialog", aArgs);
mbCommandDispatched = true;
}
IMPL_LINK(FontworkCharacterSpacingWindow, SelectHdl, weld::Toggleable&, rButton, void)
{
if (!rButton.get_active())
return;
if (mbSettingValue)
return;
if (mxCustom->get_active())
{
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = OUString(gsFontworkCharacterSpacing).copy(5);
aArgs[0].Value <<= mnCharacterSpacing;
// see MouseReleaseHdl for mbCommandDispatched check, there's no guarantee
// this toggle will happen before that mouse release though it does in
// practice for vcl and gtk
if (mbCommandDispatched)
return;
rtl::Reference<svt::PopupWindowController> xControl(mxControl);
xControl->EndPopupMode();
xControl->dispatchCommand(".uno:FontworkCharacterSpacingDialog", aArgs);
}
if (mxCustom->get_active())
DispatchSpacingDialog();
else
{
sal_Int32 nCharacterSpacing;
@@ -669,6 +676,7 @@ IMPL_LINK(FontworkCharacterSpacingWindow, SelectHdl, weld::Button&, rButton, voi
aArgs[0].Value <<= nCharacterSpacing;
mxControl->dispatchCommand( gsFontworkCharacterSpacing, aArgs );
mbCommandDispatched = true;
implSetCharacterSpacing( nCharacterSpacing, true );
}
@@ -676,6 +684,24 @@ IMPL_LINK(FontworkCharacterSpacingWindow, SelectHdl, weld::Button&, rButton, voi
mxControl->EndPopupMode();
}
IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, MouseReleaseHdl, const MouseEvent&, bool)
{
/*
tdf#145296 if the "custom" radiobutton was presented preselected as
toggled on and the user clicked on it then there's no toggled signal sent
because the item was already toggled on and didn't change state.
So if that happens launch the custom spacing dialog explicitly here on
mouse release.
*/
if (mxCustom->get_active() && !mbCommandDispatched)
{
DispatchSpacingDialog();
return true;
}
return false;
}
namespace {
class FontworkCharacterSpacingControl : public svt::PopupWindowController
diff --git a/svx/uiconfig/ui/depthwindow.ui b/svx/uiconfig/ui/depthwindow.ui
index 930cfbf..289e504 100644
--- a/svx/uiconfig/ui/depthwindow.ui
+++ b/svx/uiconfig/ui/depthwindow.ui
@@ -43,7 +43,7 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkToggleButton" id="depth0">
<object class="GtkRadioButton" id="depth0">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -51,6 +51,7 @@
<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>
@@ -59,13 +60,15 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="depth1">
<object class="GtkRadioButton" id="depth1">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="image">image2</property>
<property name="use-underline">True</property>
<property name="always-show-image">True</property>
<property name="draw-indicator">True</property>
<property name="group">depth0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -74,13 +77,15 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="depth2">
<object class="GtkRadioButton" id="depth2">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="image">image1</property>
<property name="use-underline">True</property>
<property name="always-show-image">True</property>
<property name="draw-indicator">True</property>
<property name="group">depth0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -89,13 +94,15 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="depth3">
<object class="GtkRadioButton" id="depth3">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="image">image3</property>
<property name="use-underline">True</property>
<property name="always-show-image">True</property>
<property name="draw-indicator">True</property>
<property name="group">depth0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -104,13 +111,15 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="depth4">
<object class="GtkRadioButton" id="depth4">
<property name="visible">True</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>
</object>
<packing>
<property name="expand">False</property>
@@ -119,7 +128,7 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="infinity">
<object class="GtkRadioButton" 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>
@@ -127,6 +136,8 @@
<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>
</object>
<packing>
<property name="expand">False</property>
@@ -135,12 +146,14 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="custom">
<object class="GtkRadioButton" 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>
</object>
<packing>
<property name="expand">False</property>
diff --git a/svx/uiconfig/ui/fontworkcharacterspacingcontrol.ui b/svx/uiconfig/ui/fontworkcharacterspacingcontrol.ui
index 5d8b00b..4c3b10f 100644
--- a/svx/uiconfig/ui/fontworkcharacterspacingcontrol.ui
+++ b/svx/uiconfig/ui/fontworkcharacterspacingcontrol.ui
@@ -2,42 +2,6 @@
<!-- 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/symphony/spacing_very_tight.png</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">svx/res/symphony/spacing_tight.png</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">svx/res/symphony/spacing_normal.png</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">svx/res/symphony/spacing_loose.png</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">svx/res/symphony/spacing_very_loose.png</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">svx/res/symphony/last_custom_common.png</property>
<property name="icon_size">1</property>
</object>
<object class="GtkPopover" id="FontworkCharacterSpacingControl">
<property name="can-focus">False</property>
<property name="no-show-all">True</property>
@@ -51,14 +15,14 @@
<property name="vexpand">True</property>
<property name="row-spacing">6</property>
<child>
<object class="GtkToggleButton" id="verytight">
<object class="GtkRadioButton" 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="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">normal</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -66,14 +30,14 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="tight">
<object class="GtkRadioButton" 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="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">normal</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -81,15 +45,14 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="normal">
<object class="GtkRadioButton" 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="image">image3</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="left-attach">0</property>
@@ -97,14 +60,14 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="loose">
<object class="GtkRadioButton" 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="image">image4</property>
<property name="use-underline">True</property>
<property name="always-show-image">True</property>
<property name="draw-indicator">True</property>
<property name="group">normal</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -112,14 +75,14 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="veryloose">
<object class="GtkRadioButton" 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="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">normal</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -127,14 +90,14 @@
</packing>
</child>
<child>
<object class="GtkToggleButton" id="custom">
<object class="GtkRadioButton" 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="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">normal</property>
</object>
<packing>
<property name="left-attach">0</property>
