GNOME.org
 

[nautilus/wip/antoniof/switch-to-gtk4: 3/36] general: GtkWidget:can_focus -> GtkWidget:focusable


commit 385c8ab9b657e461317e2999344fead25cb1fd90
Author: António Fernandes <antoniof gnome org>
Date:   Fri Dec 24 00:04:03 2021 +0000

    general: GtkWidget:can_focus -> GtkWidget:focusable
    
    As per porting guide.
    GtkWidget:can-focus stil exists but has a different meaning now.

 src/nautilus-view-icon-controller.c                |  2 +-
 src/resources/ui/nautilus-batch-rename-dialog.ui   | 12 +++++------
 src/resources/ui/nautilus-compress-dialog.ui       |  6 +++---
 src/resources/ui/nautilus-create-folder-dialog.ui  |  6 +++---
 .../ui/nautilus-files-view-select-items.ui         |  2 +-
 src/resources/ui/nautilus-progress-info-widget.ui  |  4 ++--
 src/resources/ui/nautilus-properties-window.ui     | 24 +++++++++++-----------
 src/resources/ui/nautilus-search-popover.ui        | 24 +++++++++++-----------
 src/resources/ui/nautilus-toolbar.ui               | 18 ++++++++--------
 src/resources/ui/nautilus-window.ui                |  8 ++++----
 10 files changed, 53 insertions(+), 53 deletions(-)
---
diff --git a/src/nautilus-view-icon-controller.c b/src/nautilus-view-icon-controller.c
index f28414767..3e3e8ad20 100644
--- a/src/nautilus-view-icon-controller.c
+++ b/src/nautilus-view-icon-controller.c
@@ -1330,7 +1330,7 @@ create_view_ui (NautilusViewIconController *self)
     GtkFlowBox *flowbox;
 
     widget = gtk_flow_box_new ();
-    gtk_widget_set_can_focus (widget, TRUE);
+    gtk_widget_set_focusable (widget, TRUE);
     gtk_widget_set_valign (widget, GTK_ALIGN_START);
 
     flowbox = GTK_FLOW_BOX (widget);
diff --git a/src/resources/ui/nautilus-batch-rename-dialog.ui 
b/src/resources/ui/nautilus-batch-rename-dialog.ui
index b10248128..328985a97 100644
--- a/src/resources/ui/nautilus-batch-rename-dialog.ui
+++ b/src/resources/ui/nautilus-batch-rename-dialog.ui
@@ -101,7 +101,7 @@
       <object class="GtkButton" id="cancel_button">
         <property name="label" translatable="yes">_Cancel</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="focusable">True</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -143,7 +143,7 @@
                   <object class="GtkRadioButton" id="format_mode_button">
                     <property name="label" translatable="yes">Rename _using a template</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="focusable">True</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
                     <signal name="toggled" handler="batch_rename_dialog_mode_changed" swapped="yes" />
@@ -153,7 +153,7 @@
                   <object class="GtkRadioButton" id="replace_mode_button">
                     <property name="label" translatable="yes">Find and replace _text</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="focusable">True</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
                     <property name="group">format_mode_button</property>
@@ -190,7 +190,7 @@
                         <child>
                           <object class="GtkEntry" id="name_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="focusable">True</property>
                             <property name="has_focus">True</property>
                             <property name="width_request">400</property>
                             <property name="hexpand">True</property>
@@ -319,7 +319,7 @@
                     <child>
                       <object class="GtkEntry" id="find_entry">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="width_request">375</property>
                         <property name="activates-default">True</property>
                         <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
@@ -345,7 +345,7 @@
                     <child>
                       <object class="GtkEntry" id="replace_entry">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="width_request">375</property>
                         <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
                         <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
diff --git a/src/resources/ui/nautilus-compress-dialog.ui b/src/resources/ui/nautilus-compress-dialog.ui
index 7a5ad40df..fd366a4cd 100644
--- a/src/resources/ui/nautilus-compress-dialog.ui
+++ b/src/resources/ui/nautilus-compress-dialog.ui
@@ -118,7 +118,7 @@
             <child>
               <object class="GtkEntry" id="name_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="hexpand">True</property>
                 <property name="width-chars">30</property>
               </object>
@@ -206,7 +206,7 @@
       <object class="GtkButton" id="cancel_button">
         <property name="label" translatable="yes">Cancel</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="focusable">True</property>
         <property name="receives_default">True</property>
       </object>
     </child>
@@ -214,7 +214,7 @@
       <object class="GtkButton" id="activate_button">
         <property name="label" translatable="yes">Create</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="focusable">True</property>
         <property name="can_default">True</property>
         <property name="receives_default">True</property>
         <property name="sensitive">False</property>
diff --git a/src/resources/ui/nautilus-create-folder-dialog.ui 
b/src/resources/ui/nautilus-create-folder-dialog.ui
index 1f53b7c5c..e958fe3ed 100644
--- a/src/resources/ui/nautilus-create-folder-dialog.ui
+++ b/src/resources/ui/nautilus-create-folder-dialog.ui
@@ -26,7 +26,7 @@
         <child>
           <object class="GtkEntry" id="name_entry">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="focusable">True</property>
           </object>
         </child>
         <child>
@@ -47,14 +47,14 @@
       <object class="GtkButton" id="cancel_button">
         <property name="label" translatable="yes">Cancel</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="focusable">True</property>
         <property name="receives_default">True</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="ok_button">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="focusable">True</property>
         <property name="can_default">True</property>
         <property name="receives_default">True</property>
         <property name="sensitive">False</property>
diff --git a/src/resources/ui/nautilus-files-view-select-items.ui 
b/src/resources/ui/nautilus-files-view-select-items.ui
index 1d195b609..da8423700 100644
--- a/src/resources/ui/nautilus-files-view-select-items.ui
+++ b/src/resources/ui/nautilus-files-view-select-items.ui
@@ -40,7 +40,7 @@
         <child>
           <object class="GtkEntry" id="pattern_entry">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="focusable">True</property>
             <property name="hexpand">True</property>
             <property name="activates_default">True</property>
           </object>
diff --git a/src/resources/ui/nautilus-progress-info-widget.ui 
b/src/resources/ui/nautilus-progress-info-widget.ui
index 064f57431..7fa9f3dad 100644
--- a/src/resources/ui/nautilus-progress-info-widget.ui
+++ b/src/resources/ui/nautilus-progress-info-widget.ui
@@ -8,7 +8,7 @@
   </object>
   <template class="NautilusProgressInfoWidget" parent="GtkGrid">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="focusable">False</property>
     <property name="margin_start">6</property>
     <property name="margin_end">6</property>
     <property name="margin_top">6</property>
@@ -46,7 +46,7 @@
     <child>
       <object class="GtkButton" id="button">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="focusable">True</property>
         <property name="receives_default">True</property>
         <property name="valign">center</property>
         <property name="margin_start">20</property>
diff --git a/src/resources/ui/nautilus-properties-window.ui b/src/resources/ui/nautilus-properties-window.ui
index 338d31f1b..9ab166854 100644
--- a/src/resources/ui/nautilus-properties-window.ui
+++ b/src/resources/ui/nautilus-properties-window.ui
@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <template class="NautilusPropertiesWindow" parent="AdwWindow">
-    <property name="can_focus">False</property>
+    <property name="focusable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child>
@@ -13,7 +13,7 @@
         <child>
           <object class="AdwHeaderBar">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="focusable">False</property>
             <property name="show_close_button">True</property>
             <property name="title" bind-source="NautilusPropertiesWindow" bind-property="title" 
bind-flags="sync-create"/>
           </object>
@@ -22,7 +22,7 @@
           <object class="GtkNotebook" id="notebook">
             <property name="hexpand">True</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="focusable">True</property>
             <property name="show_border">False</property>
             <child>
               <object class="GtkBox" id="basic_box">
@@ -50,7 +50,7 @@
                     <child>
                       <object class="GtkButton" id="icon_button">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="receives_default">True</property>
                         <child>
                           <object class="GtkImage" id="icon_button_image">
@@ -110,7 +110,7 @@
                             <child>
                               <object class="GtkEntry" id="name_field">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="focusable">True</property>
                               </object>
                               <packing>
                                 <property name="name">name_value_entry</property>
@@ -612,7 +612,7 @@
                         <child>
                           <object class="GtkButton" id="open_in_disks_button">
                             <property name="label" translatable="yes">Open in Disks</property>
-                            <property name="can_focus">True</property>
+                            <property name="focusable">True</property>
                             <property name="receives_default">True</property>
                           </object>
                           <packing>
@@ -1057,7 +1057,7 @@
                         <child>
                           <object class="GtkButton" id="change_permissions_button">
                             <property name="label" translatable="yes">Change Permissions for Enclosed 
Files…</property>
-                            <property name="can_focus">True</property>
+                            <property name="focusable">True</property>
                             <property name="receives_default">True</property>
                           </object>
                         </child>
@@ -1072,7 +1072,7 @@
                       <object class="GtkCheckButton" id="execute_checkbox">
                         <property name="label" translatable="yes">Allow _executing file as program</property>
                         <property name="use_underline">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="margin_top">12</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -1129,7 +1129,7 @@
                       <object class="GtkButton" id="reset_button">
                         <property name="label" translatable="yes">Reset</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="receives_default">True</property>
                         <property name="hexpand">True</property>
                         <property name="halign">start</property>
@@ -1139,7 +1139,7 @@
                       <object class="GtkButton" id="forget_button">
                         <property name="label" translatable="yes">_Forget</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -1148,7 +1148,7 @@
                       <object class="GtkButton" id="add_button">
                         <property name="label" translatable="yes">_Add</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -1157,7 +1157,7 @@
                       <object class="GtkButton" id="set_as_default_button">
                         <property name="label" translatable="yes">Set as default</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="receives_default">True</property>
                       </object>
                     </child>
diff --git a/src/resources/ui/nautilus-search-popover.ui b/src/resources/ui/nautilus-search-popover.ui
index 3ec0da3cf..a202bb8ca 100644
--- a/src/resources/ui/nautilus-search-popover.ui
+++ b/src/resources/ui/nautilus-search-popover.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <template class="NautilusSearchPopover" parent="GtkPopover">
-    <property name="can_focus">False</property>
+    <property name="focusable">False</property>
     <property name="modal">True</property>
     <child>
       <object class="GtkGrid" >
@@ -39,7 +39,7 @@
                 <child>
                   <object class="GtkButton" id="select_date_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="focusable">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Select a date</property>
                     <property name="hexpand">True</property>
@@ -55,7 +55,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="clear_date_button">
-                    <property name="can_focus">True</property>
+                    <property name="focusable">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Clear the currently selected 
date</property>
                     <signal name="clicked" handler="clear_date_button_clicked" 
object="NautilusSearchPopover" swapped="no" />
@@ -78,7 +78,7 @@
             <child>
               <object class="GtkEntry" id="date_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="secondary_icon_name">x-office-calendar-symbolic</property>
                 <property name="secondary_icon_tooltip_text" translatable="yes">Show a calendar to select 
the date</property>
                 <signal name="icon-release" handler="toggle_calendar_icon_clicked" 
object="NautilusSearchPopover" swapped="no" />
@@ -129,7 +129,7 @@
                       <object class="GtkScrolledWindow">
                         <property name="height_request">200</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="hexpand">True</property>
                         <property name="shadow_type">in</property>
                         <child>
@@ -152,7 +152,7 @@
                     <child>
                       <object class="GtkCalendar" id="calendar">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="focusable">True</property>
                         <property name="valign">start</property>
                         <property name="show_week_numbers">True</property>
                       </object>
@@ -171,7 +171,7 @@
                   <object class="GtkRadioButton" id="last_modified_button">
                     <property name="label" translatable="yes">Last _modified</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="focusable">True</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
@@ -186,7 +186,7 @@
                   <object class="GtkRadioButton" id="last_used_button">
                     <property name="label" translatable="yes">Last _used</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="focusable">True</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">last_modified_button</property>
@@ -247,7 +247,7 @@
             <child>
               <object class="GtkButton" id="select_type_button">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="receives_default">True</property>
                 <property name="tooltip_text" translatable="yes">Which file types will be searched</property>
                 <signal name="clicked" handler="select_type_button_clicked" object="NautilusSearchPopover" 
swapped="no" />
@@ -280,7 +280,7 @@
               <object class="GtkScrolledWindow">
                 <property name="height_request">250</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkViewport">
@@ -329,7 +329,7 @@
               <object class="GtkRadioButton" id="full_text_search_button">
                 <property name="label" translatable="yes">Full Text</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Search on the file content and 
name</property>
                 <property name="hexpand">True</property>
                 <property name="active">True</property>
@@ -341,7 +341,7 @@
               <object class="GtkRadioButton" id="filename_search_button">
                 <property name="label" translatable="yes">File Name</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Search only on the file name</property>
                 <property name="hexpand">True</property>
                 <property name="draw_indicator">False</property>
diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui
index 4ddc88f11..d88baf10e 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -109,7 +109,7 @@
     </section>
   </menu>
   <object class="GtkPopover" id="operations_popover">
-    <property name="can_focus">False</property>
+    <property name="focusable">False</property>
     <child>
       <object class="GtkScrolledWindow">
         <property name="visible">True</property>
@@ -139,7 +139,7 @@
     <child>
       <object class="AdwHeaderBar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="focusable">False</property>
         <property name="show_close_button">True</property>
         <child type="title">
           <object class="GtkBox" id="header_toolbar">
@@ -183,7 +183,7 @@
             <child>
               <object class="GtkToggleButton" id="search_button">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Search</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
@@ -208,7 +208,7 @@
             <child>
               <object class="GtkButton" id="back_button">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Go back</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
@@ -228,7 +228,7 @@
             <child>
               <object class="GtkButton" id="forward_button">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Go forward</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
@@ -263,7 +263,7 @@
                 <property name="transition_type">slide-right</property>
                 <child>
                   <object class="GtkMenuButton" id="operations_button">
-                    <property name="can_focus">True</property>
+                    <property name="focusable">True</property>
                     <property name="tooltip_text" translatable="yes">Show operations</property>
                     <property name="margin_end">6</property>
                     <property name="popover">operations_popover</property>
@@ -293,7 +293,7 @@
                 <child>
                   <object class="GtkButton" id="view_toggle_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="focusable">True</property>
                     <property name="tooltip_text" translatable="yes">Toggle view</property>
                     <property name="action_name">slot.files-view-mode-toggle</property>
                     <child>
@@ -310,7 +310,7 @@
                 <child>
                   <object class="GtkMenuButton" id="view_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="focusable">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes" comments="“View” is a noun">View 
options</property>
                     <property name="halign">start</property>
@@ -335,7 +335,7 @@
             <child>
               <object class="GtkMenuButton" id="app_button">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">True</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="menu-model">app_menu</property>
diff --git a/src/resources/ui/nautilus-window.ui b/src/resources/ui/nautilus-window.ui
index 75bcbd868..cf93098b7 100644
--- a/src/resources/ui/nautilus-window.ui
+++ b/src/resources/ui/nautilus-window.ui
@@ -89,7 +89,7 @@
                               <object class="GtkButton" id="in_app_notification_undo_undo_button">
                                 <property name="label" translatable="yes">Undo</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="focusable">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="no_show_all">True</property>
                                 <property name="margin_end">6</property>
@@ -101,7 +101,7 @@
                             <child>
                               <object class="GtkButton" id="in_app_notification_undo_close_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="focusable">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="focus_on_click">False</property>
                                 <child>
@@ -151,7 +151,7 @@
                             <child>
                               <object class="GtkButton" id="notification_operation_open">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="focusable">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="no_show_all">True</property>
                                 <property name="margin_end">6</property>
@@ -164,7 +164,7 @@
                             <child>
                               <object class="GtkButton" id="notification_operation_close">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="focusable">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="focus_on_click">False</property>
                                 <signal name="clicked" handler="on_notification_operation_close_clicked" 
object="NautilusWindow" swapped="no"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]