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>

2 files changed, 37 insertions, 61 deletions

diff --git a/svx/uiconfig/ui/depthwindow.ui b/svx/uiconfig/ui/depthwindow.ui
index 930cfbf87449..289e504ae5be 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 5d8b00b32ad3..4c3b10f81291 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>