[nautilus/gtk4-preparation-trunk: 50/50] ui: Take some gtk-builder-simplify changes




commit d5dae9f757c9864e6bce84d57be358187735d6c0
Author: António Fernandes <antoniof gnome org>
Date:   Thu Dec 23 11:18:58 2021 +0000

    ui: Take some gtk-builder-simplify changes
    
    These cleanups are going to make it easier to use gtk4-builder later.

 src/resources/ui/nautilus-batch-rename-dialog.ui   |  69 +++----
 src/resources/ui/nautilus-column-chooser.ui        |  45 -----
 src/resources/ui/nautilus-compress-dialog.ui       |  15 --
 src/resources/ui/nautilus-create-folder-dialog.ui  |   9 -
 .../nautilus-file-properties-change-permissions.ui |  16 --
 src/resources/ui/nautilus-folder-is-empty.ui       |   3 -
 src/resources/ui/nautilus-no-search-results.ui     |   4 -
 src/resources/ui/nautilus-pathbar-context-menu.ui  |   1 -
 src/resources/ui/nautilus-preferences-window.ui    |   8 -
 src/resources/ui/nautilus-progress-info-widget.ui  |   4 -
 src/resources/ui/nautilus-properties-window.ui     | 217 ---------------------
 src/resources/ui/nautilus-rename-file-popover.ui   |   6 -
 src/resources/ui/nautilus-search-popover.ui        |  48 -----
 src/resources/ui/nautilus-starred-is-empty.ui      |   3 -
 src/resources/ui/nautilus-toolbar.ui               |  52 -----
 src/resources/ui/nautilus-trash-is-empty.ui        |   3 -
 src/resources/ui/nautilus-window.ui                |  15 +-
 17 files changed, 24 insertions(+), 494 deletions(-)
---
diff --git a/src/resources/ui/nautilus-batch-rename-dialog.ui 
b/src/resources/ui/nautilus-batch-rename-dialog.ui
index 4f84fb5bf..b10248128 100644
--- a/src/resources/ui/nautilus-batch-rename-dialog.ui
+++ b/src/resources/ui/nautilus-batch-rename-dialog.ui
@@ -128,8 +128,6 @@
             <property name="row-spacing">6</property>
             <property name="column-spacing">6</property>
             <property name="hexpand">True</property>
-            <property name="row-homogeneous">False</property>
-            <property name="column-homogeneous">False</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">horizontal</property>
@@ -146,7 +144,6 @@
                     <property name="label" translatable="yes">Rename _using a template</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="active">True</property>
                     <signal name="toggled" handler="batch_rename_dialog_mode_changed" swapped="yes" />
@@ -157,7 +154,6 @@
                     <property name="label" translatable="yes">Find and replace _text</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="active">True</property>
                     <property name="group">format_mode_button</property>
@@ -168,13 +164,11 @@
               <packing>
                 <property name="left-attach">3</property>
                 <property name="top-attach">0</property>
-                <property name="width">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkStack" id="mode_stack">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="vhomogeneous">False</property>
                 <property name="hhomogeneous">True</property>
                 <property name="transition_type">crossfade</property>
@@ -191,7 +185,6 @@
                     <child>
                       <object class="GtkBox">
                         <property name="orientation">horizontal</property>
-                        <property name="spacing">0</property>
                         <property name="visible">True</property>
                         <property name="halign">center</property>
                         <child>
@@ -215,7 +208,6 @@
                               <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="orientation">horizontal</property>
-                                <property name="spacing">0</property>
                                 <child>
                                   <object class="GtkImage">
                                     <property name="visible">True</property>
@@ -228,16 +220,15 @@
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Add</property>
-                                    <property name="can_focus">False</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
                           </object>
                         </child>
-                            <style>
-                              <class name="linked"/>
-                            </style>
+                        <style>
+                          <class name="linked"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="left-attach">0</property>
@@ -258,7 +249,6 @@
                               <object class="GtkLabel" id="numbering_label">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Automatic Numbering 
Order</property>
-                                <property name="can_focus">False</property>
                               </object>
                             </child>
                             <child>
@@ -276,7 +266,6 @@
                                         <property name="width-request">180</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Original Name 
(Ascending)</property>
-                                        <property name="can_focus">False</property>
                                       </object>
                                     </child>
                                     <child>
@@ -320,43 +309,38 @@
                       <object class="GtkLabel" id="existing_text_label">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Existing Text</property>
-                        <property name="can_focus">False</property>
                         <property name="sensitive">False</property>
                       </object>
-                        <packing>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
-                          <property name="width">1</property>
-                        </packing>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkEntry" id="find_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="width_request">375</property>
-                        <property name="hexpand">False</property>
                         <property name="activates-default">True</property>
                         <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
                         <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
                       </object>
-                        <packing>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
-                          <property name="width">3</property>
-                        </packing>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
+                        <property name="width">3</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="replace_label">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Replace With</property>
-                        <property name="can_focus">False</property>
                         <property name="sensitive">False</property>
                       </object>
-                        <packing>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
-                          <property name="width">1</property>
-                        </packing>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkEntry" id="replace_entry">
@@ -366,11 +350,11 @@
                         <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
                         <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
                       </object>
-                        <packing>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
-                          <property name="width">3</property>
-                        </packing>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
+                        <property name="width">3</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -388,7 +372,6 @@
             <child>
               <object class="GtkScrolledWindow" id="scrolled_window">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
                 <property name="hexpand">False</property>
                 <property name="vexpand">True</property>
                 <property name="shadow_type">in</property>
@@ -399,28 +382,24 @@
                 <child>
                   <object class="GtkViewport">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkBox" id="a_box">
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkListBox" id="original_name_listbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="selection_mode">GTK_SELECTION_NONE</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkListBox" id="arrow_listbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="selection_mode">GTK_SELECTION_NONE</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkListBox" id="result_listbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="selection_mode">GTK_SELECTION_NONE</property>
                           </object>
                         </child>
@@ -444,13 +423,9 @@
                 <child>
                   <object class="GtkLabel" id="conflict_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
                   </object>
-                  <packing>
-                    <property name="pack-type">start</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkBox">
@@ -459,7 +434,7 @@
                     <child>
                       <object class="GtkButton" id="conflict_down">
                         <property name="visible">True</property>
-                         <signal name="clicked" handler="select_next_conflict_down" swapped="yes" />
+                        <signal name="clicked" handler="select_next_conflict_down" swapped="yes" />
                         <child>
                           <object class="GtkImage">
                             <property name="visible">True</property>
diff --git a/src/resources/ui/nautilus-column-chooser.ui b/src/resources/ui/nautilus-column-chooser.ui
index 5f44ea8f9..82eb3c22e 100644
--- a/src/resources/ui/nautilus-column-chooser.ui
+++ b/src/resources/ui/nautilus-column-chooser.ui
@@ -21,7 +21,6 @@
     <child>
       <object class="GtkScrolledWindow">
         <property name="visible">True</property>
-        <property name="can-focus">False</property>
         <child>
           <object class="GtkTreeView" id="view">
             <property name="visible">True</property>
@@ -66,109 +65,65 @@
           <class name="frame"/>
         </style>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
     </child>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can-focus">False</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <child>
               <object class="GtkButton" id="move_up_button">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
                 <signal name="clicked" handler="move_up_clicked_callback" swapped="no"/>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="icon-name">go-up-symbolic</property>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="move_down_button">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
                 <signal name="clicked" handler="move_down_clicked_callback" swapped="no"/>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="icon-name">go-down-symbolic</property>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <style>
               <class name="linked"/>
             </style>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <child>
               <object class="GtkButton" id="use_default_button">
                 <property name="label" translatable="yes">Reset to De_fault</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
                 <property name="tooltip-text" translatable="yes">Replace the current List Columns settings 
with the default settings</property>
                 <property name="use-underline">True</property>
                 <signal name="clicked" handler="use_default_clicked_callback" swapped="no"/>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack-type">end</property>
-            <property name="position">1</property>
-          </packing>
         </child>
         <style>
           <class name="inline-toolbar"/>
         </style>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
     </child>
   </template>
 </interface>
diff --git a/src/resources/ui/nautilus-compress-dialog.ui b/src/resources/ui/nautilus-compress-dialog.ui
index 4ba8236e3..050a1360c 100644
--- a/src/resources/ui/nautilus-compress-dialog.ui
+++ b/src/resources/ui/nautilus-compress-dialog.ui
@@ -110,9 +110,6 @@
               <attribute name="weight" value="bold"/>
             </attributes>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox">
@@ -175,9 +172,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="error_revealer">
@@ -190,9 +184,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="passphrase_label">
@@ -200,9 +191,6 @@
             <property name="margin-top">6</property>
             <property name="xalign">0</property>
           </object>
-          <packing>
-            <property name="position">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="passphrase_entry">
@@ -211,9 +199,6 @@
             <property name="visibility">False</property>
             <property name="secondary-icon-name">view-conceal</property>
           </object>
-          <packing>
-            <property name="position">5</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/src/resources/ui/nautilus-create-folder-dialog.ui 
b/src/resources/ui/nautilus-create-folder-dialog.ui
index 75b9aa94d..1f53b7c5c 100644
--- a/src/resources/ui/nautilus-create-folder-dialog.ui
+++ b/src/resources/ui/nautilus-create-folder-dialog.ui
@@ -22,18 +22,12 @@
             <property name="visible">True</property>
             <property name="xalign">0</property>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="name_entry">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
           </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="error_revealer">
@@ -46,9 +40,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/src/resources/ui/nautilus-file-properties-change-permissions.ui 
b/src/resources/ui/nautilus-file-properties-change-permissions.ui
index 820df23f0..fe9c21c29 100644
--- a/src/resources/ui/nautilus-file-properties-change-permissions.ui
+++ b/src/resources/ui/nautilus-file-properties-change-permissions.ui
@@ -23,7 +23,6 @@
     </child>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <style>
           <class name="view"/>
@@ -31,7 +30,6 @@
         <child>
           <object class="GtkGrid" id="change_permissions_grid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="margin-top">6</property>
             <property name="margin-bottom">6</property>
@@ -43,7 +41,6 @@
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Files</property>
                 <style>
                   <class name="dim-label"/>
@@ -57,7 +54,6 @@
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Folders</property>
                 <style>
                   <class name="dim-label"/>
@@ -71,7 +67,6 @@
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Owner</property>
                 <property name="xalign">1</property>
                 <style>
@@ -86,7 +81,6 @@
             <child>
               <object class="GtkComboBox" id="file_owner_combo">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -96,7 +90,6 @@
             <child>
               <object class="GtkComboBox" id="folder_owner_combo">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -106,7 +99,6 @@
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Group</property>
                 <property name="xalign">1</property>
                 <style>
@@ -121,7 +113,6 @@
             <child>
               <object class="GtkComboBox" id="file_group_combo">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -131,7 +122,6 @@
             <child>
               <object class="GtkComboBox" id="folder_group_combo">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -141,7 +131,6 @@
             <child>
               <object class="GtkComboBox" id="file_other_combo">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -151,7 +140,6 @@
             <child>
               <object class="GtkComboBox" id="folder_other_combo">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -161,7 +149,6 @@
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Others</property>
                 <property name="xalign">1</property>
                 <style>
@@ -173,9 +160,6 @@
                 <property name="top_attach">3</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
         </child>
       </object>
diff --git a/src/resources/ui/nautilus-folder-is-empty.ui b/src/resources/ui/nautilus-folder-is-empty.ui
index 708dbf231..2ef07674d 100644
--- a/src/resources/ui/nautilus-folder-is-empty.ui
+++ b/src/resources/ui/nautilus-folder-is-empty.ui
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkGrid" id="folder_is_empty">
-    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
     <property name="hexpand">True</property>
@@ -13,7 +12,6 @@
     <child>
       <object class="GtkImage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="pixel_size">128</property>
         <property name="icon_name">folder-symbolic</property>
         <style>
@@ -29,7 +27,6 @@
     <child>
       <object class="GtkLabel">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Folder is Empty</property>
         <style>
           <class name="large-title"/>
diff --git a/src/resources/ui/nautilus-no-search-results.ui b/src/resources/ui/nautilus-no-search-results.ui
index 122d69b55..e36904707 100644
--- a/src/resources/ui/nautilus-no-search-results.ui
+++ b/src/resources/ui/nautilus-no-search-results.ui
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkGrid" id="no_search_results">
-    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
     <property name="hexpand">True</property>
@@ -13,7 +12,6 @@
     <child>
       <object class="GtkImage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="pixel_size">80</property>
         <property name="icon_name">edit-find-symbolic</property>
         <style>
@@ -28,7 +26,6 @@
     <child>
       <object class="GtkLabel">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">No Results Found</property>
         <attributes>
           <attribute name="weight" value="bold"/>
@@ -43,7 +40,6 @@
     <child>
       <object class="GtkLabel">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Try a different search</property>
         <style>
           <class name="dim-label"/>
diff --git a/src/resources/ui/nautilus-pathbar-context-menu.ui 
b/src/resources/ui/nautilus-pathbar-context-menu.ui
index 696921e3c..462bb659b 100644
--- a/src/resources/ui/nautilus-pathbar-context-menu.ui
+++ b/src/resources/ui/nautilus-pathbar-context-menu.ui
@@ -16,4 +16,3 @@
     </item>
   </menu>
 </interface>
-
diff --git a/src/resources/ui/nautilus-preferences-window.ui b/src/resources/ui/nautilus-preferences-window.ui
index aa4467150..04b04d2b9 100644
--- a/src/resources/ui/nautilus-preferences-window.ui
+++ b/src/resources/ui/nautilus-preferences-window.ui
@@ -22,8 +22,6 @@
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkSwitch" id="sort_folders_first_switch">
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
                     <property name="valign">center</property>
                     <property name="visible">True</property>
                   </object>
@@ -40,8 +38,6 @@
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkSwitch" id="use_tree_view_switch">
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
                     <property name="valign">center</property>
                     <property name="visible">True</property>
                   </object>
@@ -74,8 +70,6 @@
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkSwitch" id="show_create_link_switch">
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
                     <property name="valign">center</property>
                     <property name="visible">True</property>
                   </object>
@@ -92,8 +86,6 @@
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkSwitch" id="show_delete_permanently_switch">
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
                     <property name="valign">center</property>
                     <property name="visible">True</property>
                   </object>
diff --git a/src/resources/ui/nautilus-progress-info-widget.ui 
b/src/resources/ui/nautilus-progress-info-widget.ui
index 629d7e796..064f57431 100644
--- a/src/resources/ui/nautilus-progress-info-widget.ui
+++ b/src/resources/ui/nautilus-progress-info-widget.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkImage" id="cancel_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="icon_name">window-close-symbolic</property>
   </object>
   <template class="NautilusProgressInfoWidget" parent="GtkGrid">
@@ -18,7 +17,6 @@
       <object class="GtkLabel" id="status">
         <property name="width_request">300</property>
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="margin_bottom">6</property>
         <property name="hexpand">True</property>
         <property name="label">status</property>
@@ -34,7 +32,6 @@
     <child>
       <object class="GtkProgressBar" id="progress_bar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="valign">center</property>
         <property name="margin_start">2</property>
         <property name="margin_bottom">4</property>
@@ -72,7 +69,6 @@
     <child>
       <object class="GtkLabel" id="details">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label">label</property>
         <property name="wrap">True</property>
         <property name="wrap_mode">word-char</property>
diff --git a/src/resources/ui/nautilus-properties-window.ui b/src/resources/ui/nautilus-properties-window.ui
index 5728d4f3a..b546fdcfe 100644
--- a/src/resources/ui/nautilus-properties-window.ui
+++ b/src/resources/ui/nautilus-properties-window.ui
@@ -9,7 +9,6 @@
     <child>
       <object class="GtkBox" id="content_box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="HdyHeaderBar">
@@ -28,7 +27,6 @@
             <child>
               <object class="GtkBox" id="basic_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin-top">18</property>
                 <property name="margin-bottom">18</property>
                 <property name="margin-start">18</property>
@@ -38,13 +36,11 @@
                 <child>
                   <object class="GtkStack" id="icon_stack">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
                     <child>
                       <object class="GtkImage" id="icon_image">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon-name">image-missing</property>
                       </object>
                       <packing>
@@ -59,37 +55,29 @@
                         <child>
                           <object class="GtkImage" id="icon_button_image">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="icon-name">image-missing</property>
                           </object>
                         </child>
                       </object>
                       <packing>
                         <property name="name">icon_button</property>
-                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="grid_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkGrid" id="basic_grid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="name_title_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">_Name</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">name_field</property>
@@ -106,11 +94,9 @@
                         <child>
                           <object class="GtkStack" id="name_stack">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" id="name_value_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
                                 <property name="selectable">True</property>
                                 <property name="ellipsize">end</property>
@@ -128,7 +114,6 @@
                               </object>
                               <packing>
                                 <property name="name">name_value_entry</property>
-                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
@@ -139,7 +124,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="type_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Type</property>
                             <property name="xalign">1</property>
                             <style>
@@ -153,7 +137,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="type_value_label">
-                            <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="selectable">True</property>
                             <property name="ellipsize">end</property>
@@ -167,7 +150,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="link_target_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Link target</property>
                             <property name="xalign">1</property>
                             <style>
@@ -181,7 +163,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="link_target_value_label">
-                            <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="selectable">True</property>
                             <property name="ellipsize">end</property>
@@ -195,7 +176,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="contents_title_label">
-                            <property name="can_focus">False</property>
                             <property name="valign">start</property>
                             <property name="label" translatable="yes">Contents</property>
                             <property name="xalign">1</property>
@@ -210,7 +190,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="contents_value_label">
-                            <property name="can_focus">False</property>
                             <property name="wrap">True</property>
                             <property name="selectable">True</property>
                             <property name="max_width_chars">24</property>
@@ -223,7 +202,6 @@
                         </child>
                         <child>
                           <object class="GtkSpinner" id="contents_spinner">
-                            <property name="can_focus">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -232,7 +210,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="size_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Size</property>
                             <property name="xalign">1</property>
                             <style>
@@ -246,7 +223,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="size_value_label">
-                            <property name="can_focus">False</property>
                             <property name="selectable">True</property>
                             <property name="max_width_chars">24</property>
                             <property name="xalign">0</property>
@@ -258,7 +234,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="parent_folder_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Parent folder</property>
                             <property name="xalign">1</property>
                             <style>
@@ -272,7 +247,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="parent_folder_value_label">
-                            <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="selectable">True</property>
                             <property name="ellipsize">end</property>
@@ -286,7 +260,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="created_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Created</property>
                             <property name="xalign">1</property>
                             <style>
@@ -300,7 +273,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="created_value_label">
-                            <property name="can_focus">False</property>
                             <property name="selectable">True</property>
                             <property name="max_width_chars">24</property>
                             <property name="xalign">0</property>
@@ -312,7 +284,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="original_folder_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Original folder</property>
                             <property name="xalign">1</property>
                             <style>
@@ -326,7 +297,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="original_folder_value_label">
-                            <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="selectable">True</property>
                             <property name="ellipsize">end</property>
@@ -340,7 +310,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="volume_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Volume</property>
                             <property name="xalign">1</property>
                             <style>
@@ -354,7 +323,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="volume_value_label">
-                            <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="selectable">True</property>
                             <property name="ellipsize">end</property>
@@ -368,7 +336,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="trashed_on_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Trashed on</property>
                             <property name="xalign">1</property>
                             <style>
@@ -382,7 +349,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="trashed_on_value_label">
-                            <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="selectable">True</property>
                             <property name="ellipsize">end</property>
@@ -396,7 +362,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="accessed_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Accessed</property>
                             <property name="xalign">1</property>
                             <style>
@@ -410,7 +375,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="accessed_value_label">
-                            <property name="can_focus">False</property>
                             <property name="selectable">True</property>
                             <property name="max_width_chars">24</property>
                             <property name="xalign">0</property>
@@ -422,7 +386,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="modified_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Modified</property>
                             <property name="xalign">1</property>
                             <style>
@@ -436,7 +399,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="modified_value_label">
-                            <property name="can_focus">False</property>
                             <property name="selectable">True</property>
                             <property name="max_width_chars">24</property>
                             <property name="xalign">0</property>
@@ -448,7 +410,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="free_space_title_label">
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Free space</property>
                             <property name="xalign">1</property>
                             <style>
@@ -462,7 +423,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="free_space_value_label">
-                            <property name="can_focus">False</property>
                             <property name="selectable">True</property>
                             <property name="max_width_chars">24</property>
                             <property name="xalign">0</property>
@@ -474,12 +434,10 @@
                         </child>
                         <child>
                           <object class="GtkBox" id="volume_widget_box">
-                            <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkGrid" id="volume_grid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="hexpand">False</property>
                                 <property name="margin-top">5</property>
                                 <property name="margin-bottom">5</property>
@@ -492,7 +450,6 @@
                                     <property name="width_request">200</property>
                                     <property name="height_request">200</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <style>
                                       <class name="disk-space-display"/>
                                     </style>
@@ -506,7 +463,6 @@
                                 <child>
                                   <object class="GtkLabel" id="spacer_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="vexpand">True</property>
                                   </object>
                                   <packing>
@@ -519,9 +475,7 @@
                                     <property name="width_request">20</property>
                                     <property name="height_request">20</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">end</property>
-                                    <property name="vexpand">False</property>
                                     <style>
                                       <class name="disk-space-display"/>
                                       <class name="used"/>
@@ -537,7 +491,6 @@
                                     <property name="width_request">20</property>
                                     <property name="height_request">20</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">end</property>
                                     <property name="vexpand">False</property>
                                     <style>
@@ -553,9 +506,7 @@
                                 <child>
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">end</property>
-                                    <property name="vexpand">False</property>
                                     <property name="label" translatable="yes">Total capacity</property>
                                     <property name="xalign">1</property>
                                     <style>
@@ -570,9 +521,7 @@
                                 <child>
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">end</property>
-                                    <property name="vexpand">False</property>
                                     <property name="label" translatable="yes">Filesystem type</property>
                                     <property name="xalign">1</property>
                                     <style>
@@ -587,9 +536,7 @@
                                 <child>
                                   <object class="GtkLabel" id="total_capacity_value">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="vexpand">False</property>
                                     <property name="label">0</property>
                                   </object>
                                   <packing>
@@ -600,9 +547,7 @@
                                 <child>
                                   <object class="GtkLabel" id="file_system_value">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="vexpand">False</property>
                                     <property name="label">0</property>
                                   </object>
                                   <packing>
@@ -613,7 +558,6 @@
                                 <child>
                                   <object class="GtkLabel" id="used_value">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">end</property>
                                     <property name="vexpand">False</property>
                                     <property name="label">0</property>
@@ -626,9 +570,7 @@
                                 <child>
                                   <object class="GtkLabel" id="free_value">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">end</property>
-                                    <property name="vexpand">False</property>
                                     <property name="label">0</property>
                                   </object>
                                   <packing>
@@ -639,9 +581,7 @@
                                 <child>
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="vexpand">False</property>
                                     <property name="label" translatable="yes" comments="Refers to the 
capacity of the filesystem">used</property>
                                   </object>
                                   <packing>
@@ -652,9 +592,7 @@
                                 <child>
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="vexpand">False</property>
                                     <property name="label" translatable="yes" comments="Refers to the 
capacity of the filesystem">free</property>
                                   </object>
                                   <packing>
@@ -662,22 +600,7 @@
                                     <property name="top_attach">2</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                           </object>
                           <packing>
@@ -702,11 +625,7 @@
                           <object class="GtkBox" id="spacer_1">
                             <property name="height_request">6</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -716,11 +635,7 @@
                         <child>
                           <object class="GtkBox" id="spacer_2">
                             <property name="height_request">6</property>
-                            <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -730,11 +645,7 @@
                         <child>
                           <object class="GtkBox" id="spacer_3">
                             <property name="height_request">6</property>
-                            <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -742,14 +653,8 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
               <packing>
@@ -759,7 +664,6 @@
             <child type="tab">
               <object class="GtkLabel" id="basic_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Basic</property>
               </object>
               <packing>
@@ -768,7 +672,6 @@
             </child>
             <child>
               <object class="GtkBox" id="permissions_box">
-                <property name="can_focus">False</property>
                 <property name="margin-top">18</property>
                 <property name="margin-bottom">18</property>
                 <property name="margin-start">18</property>
@@ -776,7 +679,6 @@
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkLabel" id="not_the_owner_label">
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">You are not the owner, so you cannot change 
these permissions.</property>
                     <property name="justify">center</property>
                     <property name="wrap">True</property>
@@ -784,35 +686,27 @@
                   </object>
                   <packing>
                     <property name="pack_type">end</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSeparator" id="bottom_prompt_seperator">
-                    <property name="can_focus">False</property>
                     <property name="margin-top">12</property>
                     <property name="margin-bottom">12</property>
                   </object>
                   <packing>
                     <property name="pack_type">end</property>
-                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="permission_indeterminable_label">
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">The permissions of the selected file could not 
be determined.</property>
                     <property name="justify">center</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">40</property>
                   </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkGrid" id="permissions_grid">
-                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <property name="vexpand">True</property>
                     <property name="orientation">vertical</property>
@@ -821,7 +715,6 @@
                     <child>
                       <object class="GtkLabel" id="owner_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Owner</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">owner_combo_box</property>
@@ -838,11 +731,9 @@
                     <child>
                       <object class="GtkStack" id="owner_value_stack">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkComboBox" id="owner_combo_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="halign">start</property>
                           </object>
                           <packing>
@@ -853,14 +744,12 @@
                         <child>
                           <object class="GtkLabel" id="owner_value_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="selectable">True</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="name">label</property>
                             <property name="title">page0</property>
-                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
@@ -871,7 +760,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="owner_access_label">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Access</property>
                         <property name="xalign">1</property>
                         <style>
@@ -885,7 +773,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="owner_folder_access_label">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Folder access</property>
                         <property name="xalign">1</property>
                         <style>
@@ -899,7 +786,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="owner_file_access_label">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">File access</property>
                         <property name="xalign">1</property>
                         <style>
@@ -913,7 +799,6 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="owner_access_combo">
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -922,7 +807,6 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="owner_folder_access_combo">
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -931,7 +815,6 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="owner_file_access_combo">
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -941,7 +824,6 @@
                     <child>
                       <object class="GtkLabel" id="group_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="margin_top">12</property>
                         <property name="label" translatable="yes">_Group</property>
                         <property name="use_underline">True</property>
@@ -959,11 +841,9 @@
                     <child>
                       <object class="GtkStack" id="group_value_stack">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkComboBoxText" id="group_combo_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="halign">start</property>
                             <property name="margin_top">12</property>
                           </object>
@@ -975,7 +855,6 @@
                         <child>
                           <object class="GtkLabel" id="group_value_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
                             <property name="selectable">True</property>
                             <property name="xalign">0</property>
@@ -983,7 +862,6 @@
                           <packing>
                             <property name="name">label</property>
                             <property name="title">page1</property>
-                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
@@ -994,7 +872,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="group_access_label">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Access</property>
                         <property name="xalign">1</property>
                         <style>
@@ -1008,7 +885,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="group_folder_access_label">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Folder access</property>
                         <property name="xalign">1</property>
                         <style>
@@ -1022,7 +898,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="group_file_access_label">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">File access</property>
                         <property name="xalign">1</property>
                         <style>
@@ -1036,7 +911,6 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="group_access_combo">
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1045,7 +919,6 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="group_folder_access_combo">
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1054,7 +927,6 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="group_file_access_combo">
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1064,7 +936,6 @@
                     <child>
                       <object class="GtkLabel" id="others_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="margin_top">12</property>
                         <property name="label" translatable="yes">Others</property>
                         <property name="xalign">1</property>
@@ -1079,7 +950,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="others_access_label">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Access</property>
                         <property name="xalign">1</property>
                         <style>
@@ -1093,7 +963,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="others_folder_access_label">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Folder access</property>
                         <property name="xalign">1</property>
                         <style>
@@ -1107,7 +976,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="others_file_access_label">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">File access</property>
                         <property name="xalign">1</property>
                         <style>
@@ -1121,7 +989,6 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="others_access_combo">
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1130,7 +997,6 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="others_folder_access_combo">
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1139,7 +1005,6 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="others_file_access_combo">
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1148,7 +1013,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="execute_label">
-                        <property name="can_focus">False</property>
                         <property name="margin_top">12</property>
                         <property name="label" translatable="yes">Execute</property>
                         <property name="xalign">1</property>
@@ -1163,7 +1027,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="security_context_title_label">
-                        <property name="can_focus">False</property>
                         <property name="margin_top">12</property>
                         <property name="label" translatable="yes">Security context</property>
                         <property name="xalign">1</property>
@@ -1178,7 +1041,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="security_context_value_label">
-                        <property name="can_focus">False</property>
                         <property name="margin_top">12</property>
                         <property name="selectable">True</property>
                         <property name="max_width_chars">24</property>
@@ -1191,7 +1053,6 @@
                     </child>
                     <child>
                       <object class="GtkBox" id="change_permissions_button_box">
-                        <property name="can_focus">False</property>
                         <property name="margin_top">12</property>
                         <child>
                           <object class="GtkButton" id="change_permissions_button">
@@ -1199,9 +1060,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                           </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -1215,7 +1073,6 @@
                         <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="receives_default">False</property>
                         <property name="margin_top">12</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -1224,64 +1081,24 @@
                         <property name="top_attach">15</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
-                  <packing>
-                    <property name="position">4</property>
-                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
                 <property name="tab_expand">True</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="permissions_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Permissions</property>
               </object>
               <packing>
-                <property name="position">1</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="open_with_box">
-                <property name="can_focus">False</property>
                 <property name="margin-top">18</property>
                 <property name="margin-bottom">18</property>
                 <property name="margin-start">18</property>
@@ -1291,34 +1108,22 @@
                 <child>
                   <object class="GtkLabel" id="open_with_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="wrap">True</property>
                     <property name="wrap_mode">word-char</property>
                     <property name="max_width_chars">30</property>
                     <property name="xalign">0</property>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="app_chooser_widget_box">
                     <property name="vexpand">True</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="reset_button">
@@ -1329,9 +1134,6 @@
                         <property name="hexpand">True</property>
                         <property name="halign">start</property>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="forget_button">
@@ -1341,9 +1143,6 @@
                         <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="add_button">
@@ -1353,9 +1152,6 @@
                         <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                       </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="set_as_default_button">
@@ -1364,37 +1160,24 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                       </object>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
                 <property name="tab_expand">True</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Open With</property>
               </object>
               <packing>
-                <property name="position">2</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
             <child type="tab">
-              <placeholder/>
             </child>
           </object>
         </child>
diff --git a/src/resources/ui/nautilus-rename-file-popover.ui 
b/src/resources/ui/nautilus-rename-file-popover.ui
index 1e04e2cdb..253d2fed2 100644
--- a/src/resources/ui/nautilus-rename-file-popover.ui
+++ b/src/resources/ui/nautilus-rename-file-popover.ui
@@ -3,12 +3,10 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkPopover" id="rename_file_popover">
-    <property name="can-focus">False</property>
     <property name="position">bottom</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can-focus">False</property>
         <property name="margin-start">18</property>
         <property name="margin-end">18</property>
         <property name="margin-top">18</property>
@@ -17,7 +15,6 @@
         <child>
           <object class="GtkLabel" id="title_label">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <property name="margin-bottom">12</property>
             <style>
               <class name="title-2"/>
@@ -35,11 +32,9 @@
         <child>
           <object class="GtkRevealer" id="error_revealer">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <child>
               <object class="GtkLabel" id="error_label">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="margin-bottom">12</property>
                 <property name="max-width-chars">0</property>
                 <property name="wrap">True</property>
@@ -54,7 +49,6 @@
             <property name="visible">True</property>
             <property name="sensitive">False</property>
             <property name="can-focus">True</property>
-            <property name="receives-default">False</property>
             <property name="halign">end</property>
             <property name="use-underline">True</property>
             <style>
diff --git a/src/resources/ui/nautilus-search-popover.ui b/src/resources/ui/nautilus-search-popover.ui
index 8557d5391..3ec0da3cf 100644
--- a/src/resources/ui/nautilus-search-popover.ui
+++ b/src/resources/ui/nautilus-search-popover.ui
@@ -7,7 +7,6 @@
     <child>
       <object class="GtkGrid" >
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="margin-top">20</property>
         <property name="margin-bottom">20</property>
         <property name="margin-start">20</property>
@@ -17,7 +16,6 @@
         <child>
           <object class="GtkLabel" id="when_dim_label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">When</property>
             <property name="xalign">0</property>
             <style>
@@ -33,13 +31,11 @@
         <child>
           <object class="GtkStack" id="date_stack">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="transition_type">crossfade</property>
             <property name="transition_duration">250</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="select_date_button">
                     <property name="visible">True</property>
@@ -50,16 +46,12 @@
                     <child>
                       <object class="GtkLabel" id="select_date_button_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Select Dates…</property>
                         <property name="xalign">0</property>
                       </object>
                     </child>
                     <signal name="clicked" handler="select_date_button_clicked" 
object="NautilusSearchPopover" swapped="no" />
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="clear_date_button">
@@ -70,14 +62,10 @@
                     <child>
                       <object class="GtkImage" id="clear_date_button_image">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_name">edit-clear-symbolic</property>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
                 <style>
                   <class name="linked"/>
@@ -98,7 +86,6 @@
               </object>
               <packing>
                 <property name="name">date-entry</property>
-                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -110,18 +97,15 @@
         </child>
         <child>
           <object class="GtkRevealer" id="around_revealer">
-            <property name="can_focus">False</property>
             <property name="transition_type">slide-down</property>
             <child>
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">8</property>
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="around_dim_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_top">10</property>
                     <property name="label" translatable="yes">Since…</property>
                     <property name="xalign">0</property>
@@ -138,7 +122,6 @@
                 <child>
                   <object class="GtkStack" id="around_stack">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="vhomogeneous">False</property>
                     <property name="transition_type">crossfade</property>
                     <property name="transition_duration">250</property>
@@ -152,11 +135,9 @@
                         <child>
                           <object class="GtkViewport">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkListBox" id="dates_listbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="selection_mode">none</property>
                                 <signal name="row-activated" handler="dates_listbox_row_activated" 
object="NautilusSearchPopover" swapped="no" />
                               </object>
@@ -174,11 +155,9 @@
                         <property name="can_focus">True</property>
                         <property name="valign">start</property>
                         <property name="show_week_numbers">True</property>
-                        <signal name="day_selected" handler="calendar_day_selected" 
object="NautilusSearchPopover" swapped="no" />
                       </object>
                       <packing>
                         <property name="name">date-calendar</property>
-                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
@@ -193,7 +172,6 @@
                     <property name="label" translatable="yes">Last _modified</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="active">True</property>
                     <property name="draw_indicator">True</property>
@@ -209,7 +187,6 @@
                     <property name="label" translatable="yes">Last _used</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">last_modified_button</property>
@@ -225,7 +202,6 @@
                       <property name="label" translatable="yes">Created</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="xalign">0</property>
                       <property name="draw-indicator">True</property>
@@ -249,7 +225,6 @@
         <child>
           <object class="GtkLabel" id="what_dim_label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_top">10</property>
             <property name="label" translatable="yes">What</property>
             <property name="xalign">0</property>
@@ -266,7 +241,6 @@
         <child>
           <object class="GtkStack" id="type_stack">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="vhomogeneous">False</property>
             <property name="transition_type">crossfade</property>
             <property name="transition_duration">250</property>
@@ -280,29 +254,20 @@
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkLabel" id="type_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="label" translatable="yes">Anything</property>
                         <property name="width_chars">30</property>
                         <property name="xalign">0</property>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_name">pan-down-symbolic</property>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
@@ -320,11 +285,9 @@
                 <child>
                   <object class="GtkViewport">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkListBox" id="type_listbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="selection_mode">single</property>
                         <signal name="row-activated" handler="types_listbox_row_activated" 
object="NautilusSearchPopover" swapped="no" />
                       </object>
@@ -334,7 +297,6 @@
               </object>
               <packing>
                 <property name="name">type-list</property>
-                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -346,7 +308,6 @@
         </child>
         <child>
           <object class="GtkLabel" id="search_dim_label">
-            <property name="can_focus">False</property>
             <property name="margin_top">10</property>
             <property name="label" translatable="yes">Search</property>
             <property name="xalign">0</property>
@@ -362,7 +323,6 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="visible">True</property>
             <child>
@@ -370,23 +330,18 @@
                 <property name="label" translatable="yes">Full Text</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</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>
                 <property name="draw_indicator">False</property>
                 <signal name="toggled" handler="search_fts_mode_changed" object="NautilusSearchPopover" 
swapped="no" />
               </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <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="receives_default">False</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>
@@ -394,9 +349,6 @@
                 <property name="active">True</property>
                 <signal name="toggled" handler="search_fts_mode_changed" object="NautilusSearchPopover" 
swapped="no" />
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
             <style>
               <class name="linked"/>
diff --git a/src/resources/ui/nautilus-starred-is-empty.ui b/src/resources/ui/nautilus-starred-is-empty.ui
index 203b515d0..b91ceb30c 100644
--- a/src/resources/ui/nautilus-starred-is-empty.ui
+++ b/src/resources/ui/nautilus-starred-is-empty.ui
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkGrid" id="starred_is_empty">
-    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
     <property name="hexpand">True</property>
@@ -13,7 +12,6 @@
     <child>
       <object class="GtkImage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="pixel_size">128</property>
         <property name="icon_name">starred-symbolic</property>
         <style>
@@ -29,7 +27,6 @@
     <child>
       <object class="GtkLabel">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Starred files will appear here</property>
         <style>
           <class name="large-title"/>
diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui
index c1d12eefe..4fd29b400 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -113,14 +113,12 @@
     <child>
       <object class="GtkScrolledWindow">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="hscrollbar_policy">never</property>
         <property name="max_content_height">270</property>
         <property name="propagate_natural_height">True</property>
         <child>
           <object class="GtkListBox" id="operations_list">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">6</property>
             <property name="margin_end">6</property>
             <property name="margin_top">6</property>
@@ -147,18 +145,14 @@
           <object class="GtkBox" id="header_toolbar">
             <property name="width_request">270</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkStack" id="toolbar_switcher">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="valign">center</property>
-                <property name="hexpand">False</property>
                 <property name="transition_type">crossfade</property>
                 <child>
                   <object class="GtkBox" id="path_bar_container">
-                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                   </object>
                   <packing>
@@ -167,25 +161,21 @@
                 </child>
                 <child>
                   <object class="GtkBox" id="location_entry_container">
-                    <property name="can_focus">False</property>
                     <style>
                       <class name="linked"/>
                     </style>
                   </object>
                   <packing>
                     <property name="name">location</property>
-                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="search_container">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                   </object>
                   <packing>
                     <property name="name">search</property>
-                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
@@ -194,7 +184,6 @@
               <object class="GtkToggleButton" id="search_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Search</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
@@ -202,7 +191,6 @@
                 <child>
                   <object class="GtkImage" id="search_icon">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="icon_name">edit-find-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -211,21 +199,16 @@
                   <class name="image-button"/>
                 </style>
               </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="navigation_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="back_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Go back</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
@@ -233,7 +216,6 @@
                 <child>
                   <object class="GtkImage" id="back_icon">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="icon_name">go-previous-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -242,15 +224,11 @@
                   <class name="image-button"/>
                 </style>
               </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="forward_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Go forward</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
@@ -258,7 +236,6 @@
                 <child>
                   <object class="GtkImage" id="forward_icon">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="icon_name">go-next-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -267,9 +244,6 @@
                   <class name="image-button"/>
                 </style>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
             <style>
               <class name="linked"/>
@@ -280,19 +254,16 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">72</property>
             <child>
               <object class="GtkRevealer" id="operations_revealer">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="transition_type">slide-right</property>
                 <child>
                   <object class="GtkMenuButton" id="operations_button">
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Show operations</property>
                     <property name="margin_end">6</property>
                     <property name="popover">operations_popover</property>
@@ -301,7 +272,6 @@
                         <property name="width_request">16</property>
                         <property name="height_request">16</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
                         <signal name="draw" handler="on_operations_icon_draw" object="NautilusToolbar" 
swapped="no"/>
@@ -313,14 +283,10 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="margin_end">6</property>
@@ -328,13 +294,11 @@
                   <object class="GtkButton" id="view_toggle_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Toggle view</property>
                     <property name="action_name">slot.files-view-mode-toggle</property>
                     <child>
                       <object class="GtkImage" id="view_toggle_icon">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_size">1</property>
                       </object>
                     </child>
@@ -342,9 +306,6 @@
                       <class name="image-button"/>
                     </style>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="view_button">
@@ -358,7 +319,6 @@
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_name">pan-down-symbolic</property>
                       </object>
                     </child>
@@ -366,30 +326,22 @@
                       <class name="disclosure-button"/>
                     </style>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
                 <style>
                   <class name="linked"/>
                 </style>
               </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkMenuButton" id="app_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="menu-model">app_menu</property>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="icon_name">open-menu-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -398,14 +350,10 @@
                   <class name="image-button"/>
                 </style>
               </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
             </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
-            <property name="position">3</property>
           </packing>
         </child>
       </object>
diff --git a/src/resources/ui/nautilus-trash-is-empty.ui b/src/resources/ui/nautilus-trash-is-empty.ui
index d41b93e6a..bbc387aea 100644
--- a/src/resources/ui/nautilus-trash-is-empty.ui
+++ b/src/resources/ui/nautilus-trash-is-empty.ui
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkGrid" id="trash_is_empty">
-    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
     <property name="hexpand">True</property>
@@ -13,7 +12,6 @@
     <child>
       <object class="GtkImage">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="pixel_size">128</property>
         <property name="icon_name">user-trash-symbolic</property>
         <style>
@@ -29,7 +27,6 @@
     <child>
       <object class="GtkLabel">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Trash is Empty</property>
         <style>
           <class name="large-title"/>
diff --git a/src/resources/ui/nautilus-window.ui b/src/resources/ui/nautilus-window.ui
index c9f2b4eff..64b238966 100644
--- a/src/resources/ui/nautilus-window.ui
+++ b/src/resources/ui/nautilus-window.ui
@@ -45,13 +45,12 @@
             <property name="hexpand">True</property>
             <child>
               <object class="GtkBox" id="sidebar">
-                <property name="visible">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
               </object>
               <packing>
-               <property name="resize">False</property>
-               <property name="shrink">False</property>
+                <property name="resize">False</property>
+                <property name="shrink">False</property>
               </packing>
             </child>
             <child>
@@ -67,24 +66,20 @@
                 <child type="overlay">
                   <object class="GtkRevealer" id="in_app_notification_undo">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
                     <property name="transition_duration">100</property>
                     <child>
                       <object class="GtkFrame">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkBox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="margin_start">12</property>
                             <property name="margin_end">4</property>
                             <child>
                               <object class="GtkLabel" id="in_app_notification_undo_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="max_width_chars">50</property>
                                 <property name="ellipsize">middle</property>
                                 <property name="margin_end">30</property>
@@ -112,7 +107,6 @@
                                 <child>
                                   <object class="GtkImage">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="icon_name">window-close-symbolic</property>
                                     <property name="icon_size">2</property>
                                   </object>
@@ -135,24 +129,20 @@
                 <child type="overlay">
                   <object class="GtkRevealer" id="notification_operation">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
                     <property name="transition_duration">100</property>
                     <child>
                       <object class="GtkFrame">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkBox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="margin_start">12</property>
                             <property name="margin_end">4</property>
                             <child>
                               <object class="GtkLabel" id="notification_operation_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="max_width_chars">50</property>
                                 <property name="ellipsize">middle</property>
                                 <property name="margin_end">30</property>
@@ -181,7 +171,6 @@
                                 <child>
                                   <object class="GtkImage">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="icon_name">window-close-symbolic</property>
                                     <property name="icon_size">2</property>
                                   </object>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]