gtk[3 vs 4]: remove can-focus from GtkToolButton

so tab-cycling inside sidebar panel toolbars works as wanted

It needs to be false for gtk3 and true for gtk4, leaving it unspecified
gets a desired working default.

Change-Id: I34869d5dcffc814f62ec2b717108f90c395a067b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124446
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

9 files changed, 4 insertions, 33 deletions

diff --git a/sfx2/uiconfig/ui/deck.ui b/sfx2/uiconfig/ui/deck.ui
index d3cd98e52981..ca3c96dcfc7f 100644
--- a/sfx2/uiconfig/ui/deck.ui
+++ b/sfx2/uiconfig/ui/deck.ui
@@ -90,7 +90,7 @@
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar">
-            <property name="can-focus">False</property>
+            <property name="can-focus">True</property>
             <property name="no-show-all">True</property>
             <property name="toolbar-style">icons</property>
             <property name="show-arrow">False</property>
@@ -98,7 +98,6 @@
             <child>
               <object class="GtkToolButton" id="button">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes" context="deck|SFX_STR_SIDEBAR_CLOSE_DECK">Close Sidebar Deck</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">window-close-symbolic</property>
diff --git a/sfx2/uiconfig/ui/developmenttool.ui b/sfx2/uiconfig/ui/developmenttool.ui
index 2266a6590921..ae465a56bfb8 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -113,7 +113,6 @@
                     <child>
                       <object class="GtkToggleToolButton" id="dom_current_selection_toggle">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="tooltip-text" translatable="yes" context="developmenttool|dom_current_selection_toggle-tooltip">Current Selection In Document</property>
                         <property name="label" translatable="yes" context="developmenttool|dom_current_selection_toggle">Current Selection</property>
                         <property name="use-underline">True</property>
@@ -126,7 +125,6 @@
                     <child>
                       <object class="GtkToolButton" id="dom_refresh_button">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="tooltip-text" translatable="yes" context="developmenttool|dom_refresh_button-tooltip">Refresh Document Model Tree View</property>
                         <property name="label" translatable="yes" context="developmenttool|dom_refresh_button">Refresh</property>
                         <property name="use-underline">True</property>
@@ -222,7 +220,6 @@
                     <child>
                       <object class="GtkToolButton" id="back">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="tooltip-text" translatable="yes" context="developmenttool|tooltip-back">Back</property>
                         <property name="label" translatable="yes" context="developmenttool|back">Back</property>
                         <property name="use-underline">True</property>
@@ -236,7 +233,6 @@
                     <child>
                       <object class="GtkToolButton" id="inspect">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="tooltip-text" translatable="yes" context="developmenttool|tooltip-inspect">Inspect</property>
                         <property name="label" translatable="yes" context="developmenttool|inspect">Inspect</property>
                         <property name="use-underline">True</property>
@@ -250,7 +246,6 @@
                     <child>
                       <object class="GtkToolButton" id="refresh">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="tooltip-text" translatable="yes" context="developmenttool|tooltip-refresh">Refresh</property>
                         <property name="label" translatable="yes" context="developmenttool|refresh">Refresh</property>
                         <property name="use-underline">True</property>
diff --git a/sfx2/uiconfig/ui/floatingrecord.ui b/sfx2/uiconfig/ui/floatingrecord.ui
index 644e570d3ad7..088dab8e2ba7 100644
--- a/sfx2/uiconfig/ui/floatingrecord.ui
+++ b/sfx2/uiconfig/ui/floatingrecord.ui
@@ -42,7 +42,6 @@
             <child>
               <object class="GtkToolButton" id=".uno:StopRecording">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="use_underline">True</property>
diff --git a/sfx2/uiconfig/ui/helpwindow.ui b/sfx2/uiconfig/ui/helpwindow.ui
index 53f589bb67a4..45378d68efc2 100644
--- a/sfx2/uiconfig/ui/helpwindow.ui
+++ b/sfx2/uiconfig/ui/helpwindow.ui
@@ -46,7 +46,6 @@
                 <child>
                   <object class="GtkToolButton" id="index">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="icon_name">sfx2/res/indexon_small.png</property>
                   </object>
                   <packing>
@@ -67,7 +66,6 @@
                 <child>
                   <object class="GtkToolButton" id="backward">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="helpwindow|backward|tooltip_text">Previous Page</property>
                     <property name="icon_name">res/sc06301.png</property>
                   </object>
@@ -79,7 +77,6 @@
                 <child>
                   <object class="GtkToolButton" id="forward">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="helpwindow|forward|tooltip_text">Next Page</property>
                     <property name="icon_name">res/sc06300.png</property>
                   </object>
@@ -91,7 +88,6 @@
                 <child>
                   <object class="GtkToolButton" id="start">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="helpwindow|start|tooltip_text">First Page</property>
                     <property name="icon_name">res/sc06303.png</property>
                   </object>
@@ -113,7 +109,6 @@
                 <child>
                   <object class="GtkToolButton" id="print">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="helpwindow|print|tooltip_text">Print</property>
                     <property name="icon_name">res/sc05504.png</property>
                   </object>
@@ -125,7 +120,6 @@
                 <child>
                   <object class="GtkToolButton" id="bookmarks">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="helpwindow|bookmarks|tooltip_text">Add to Bookmarks</property>
                     <property name="icon_name">sfx2/res/favourite.png</property>
                   </object>
@@ -137,7 +131,6 @@
                 <child>
                   <object class="GtkToolButton" id="searchdialog">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="helpwindow|searchdialog|tooltip_text">Find on this Page</property>
                     <property name="icon_name">sfx2/res/sc05961.png</property>
                   </object>
diff --git a/sfx2/uiconfig/ui/infobar.ui b/sfx2/uiconfig/ui/infobar.ui
index ae48bf3250c0..40b13488d856 100644
--- a/sfx2/uiconfig/ui/infobar.ui
+++ b/sfx2/uiconfig/ui/infobar.ui
@@ -62,7 +62,6 @@
                         <child>
                           <object class="GtkToolButton" id="close">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="tooltip_text" translatable="yes" context="infobar|close|tooltip_text">Close Infobar</property>
                             <property name="icon_name">window-close-symbolic</property>
                           </object>
diff --git a/sfx2/uiconfig/ui/panel.ui b/sfx2/uiconfig/ui/panel.ui
index 52f044467963..981a2f2d6017 100644
--- a/sfx2/uiconfig/ui/panel.ui
+++ b/sfx2/uiconfig/ui/panel.ui
@@ -62,7 +62,7 @@
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar">
-            <property name="can-focus">False</property>
+            <property name="can-focus">True</property>
             <property name="no-show-all">True</property>
             <property name="toolbar-style">icons</property>
             <property name="show-arrow">False</property>
@@ -70,7 +70,6 @@
             <child>
               <object class="GtkToolButton" id="button">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
                 <property name="tooltip-text" translatable="yes" context="panel|SFX_STR_SIDEBAR_MORE_OPTIONS">More Options</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">sfx2/res/symphony/morebutton.png</property>
diff --git a/sfx2/uiconfig/ui/tabbarcontents.ui b/sfx2/uiconfig/ui/tabbarcontents.ui
index d1fe113122b4..933d55f51949 100644
--- a/sfx2/uiconfig/ui/tabbarcontents.ui
+++ b/sfx2/uiconfig/ui/tabbarcontents.ui
@@ -122,7 +122,6 @@
                     <child>
                       <object class="GtkToggleToolButton" id="toggle">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="use-underline">True</property>
                         <property name="icon-name">sfx2/res/symphony/sidebar-property-large.png</property>
                       </object>
diff --git a/sfx2/uiconfig/ui/tabbutton.ui b/sfx2/uiconfig/ui/tabbutton.ui
index c7cc2228d1a3..02f74893f73e 100644
--- a/sfx2/uiconfig/ui/tabbutton.ui
+++ b/sfx2/uiconfig/ui/tabbutton.ui
@@ -13,7 +13,6 @@
     <child>
       <object class="GtkToggleToolButton" id="toggle">
         <property name="visible">True</property>
-        <property name="can-focus">False</property>
         <property name="use-underline">True</property>
       </object>
       <packing>
diff --git a/sfx2/uiconfig/ui/templatepanel.ui b/sfx2/uiconfig/ui/templatepanel.ui
index 0f8b19f3625c..f4e8d98b2b43 100644
--- a/sfx2/uiconfig/ui/templatepanel.ui
+++ b/sfx2/uiconfig/ui/templatepanel.ui
@@ -40,13 +40,12 @@
             <child>
               <object class="GtkToolbar" id="left">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="toolbar_style">text</property>
                 <property name="show_arrow">False</property>
                 <property name="icon_size">2</property>
                 <child>
                   <object class="GtkToggleToolButton" id="2">
-                    <property name="can_focus">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -56,7 +55,6 @@
                 </child>
                 <child>
                   <object class="GtkToggleToolButton" id="1">
-                    <property name="can_focus">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -66,7 +64,6 @@
                 </child>
                 <child>
                   <object class="GtkToggleToolButton" id="3">
-                    <property name="can_focus">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -76,7 +73,6 @@
                 </child>
                 <child>
                   <object class="GtkToggleToolButton" id="4">
-                    <property name="can_focus">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -86,7 +82,6 @@
                 </child>
                 <child>
                   <object class="GtkToggleToolButton" id="5">
-                    <property name="can_focus">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -96,7 +91,6 @@
                 </child>
                 <child>
                   <object class="GtkToggleToolButton" id="6">
-                    <property name="can_focus">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -106,7 +100,6 @@
                 </child>
                 <child>
                   <object class="GtkToggleToolButton" id="65535">
-                    <property name="can_focus">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -124,14 +117,13 @@
             <child>
               <object class="GtkToolbar" id="right">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="toolbar_style">icons</property>
                 <property name="show_arrow">False</property>
                 <property name="icon_size">2</property>
                 <child>
                   <object class="GtkToggleToolButton" id="watercan">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="templatepanel|STR_STYLE_FILL_FORMAT_MODE">Fill Format Mode</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">res/sc05554.png</property>
@@ -144,7 +136,6 @@
                 <child>
                   <object class="GtkToolButton" id="new">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="templatepanel|STR_STYLE_NEW_STYLE_FROM_SELECTION">New Style from Selection</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">res/sc05555.png</property>
@@ -156,7 +147,6 @@
                 </child>
                 <child>
                   <object class="GtkMenuToolButton" id="newmenu">
-                    <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="tooltip_text" translatable="yes" context="templatepanel|STR_STYLE_NEW_STYLE_ACTION">Styles actions</property>
                     <property name="use_underline">True</property>
@@ -170,7 +160,6 @@
                 <child>
                   <object class="GtkToolButton" id="update">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="templatepanel|STR_STYLE_UPDATE_STYLE">Update Style</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">res/sc05556.png</property>