[nautilus/wip/antoniof/gnome-42: 15/72] Revert "ui: Take some gtk-builder-simplify changes"




commit 979276cad4c5933957de2da7d19005a680227ea4
Author: António Fernandes <antoniof gnome org>
Date:   Fri Feb 11 19:01:31 2022 +0000

    Revert "ui: Take some gtk-builder-simplify changes"
    
    This reverts commit 7063e201d43da373836cef67ee354d0e83ce3153.

 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, 494 insertions(+), 24 deletions(-)
---
diff --git a/src/resources/ui/nautilus-batch-rename-dialog.ui 
b/src/resources/ui/nautilus-batch-rename-dialog.ui
index b10248128..4f84fb5bf 100644
--- a/src/resources/ui/nautilus-batch-rename-dialog.ui
+++ b/src/resources/ui/nautilus-batch-rename-dialog.ui
@@ -128,6 +128,8 @@
             <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>
@@ -144,6 +146,7 @@
                     <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" />
@@ -154,6 +157,7 @@
                     <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>
@@ -164,11 +168,13 @@
               <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>
@@ -185,6 +191,7 @@
                     <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>
@@ -208,6 +215,7 @@
                               <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>
@@ -220,15 +228,16 @@
                                     <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>
@@ -249,6 +258,7 @@
                               <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>
@@ -266,6 +276,7 @@
                                         <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>
@@ -309,38 +320,43 @@
                       <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>
-                      </packing>
+                        <packing>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                          <property name="width">1</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>
-                      </packing>
+                        <packing>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                          <property name="width">1</property>
+                        </packing>
                     </child>
                     <child>
                       <object class="GtkEntry" id="replace_entry">
@@ -350,11 +366,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>
@@ -372,6 +388,7 @@
             <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>
@@ -382,24 +399,28 @@
                 <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>
@@ -423,9 +444,13 @@
                 <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">
@@ -434,7 +459,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 82eb3c22e..5f44ea8f9 100644
--- a/src/resources/ui/nautilus-column-chooser.ui
+++ b/src/resources/ui/nautilus-column-chooser.ui
@@ -21,6 +21,7 @@
     <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>
@@ -65,65 +66,109 @@
           <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 050a1360c..4ba8236e3 100644
--- a/src/resources/ui/nautilus-compress-dialog.ui
+++ b/src/resources/ui/nautilus-compress-dialog.ui
@@ -110,6 +110,9 @@
               <attribute name="weight" value="bold"/>
             </attributes>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkBox">
@@ -172,6 +175,9 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="error_revealer">
@@ -184,6 +190,9 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="passphrase_label">
@@ -191,6 +200,9 @@
             <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">
@@ -199,6 +211,9 @@
             <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 1f53b7c5c..75b9aa94d 100644
--- a/src/resources/ui/nautilus-create-folder-dialog.ui
+++ b/src/resources/ui/nautilus-create-folder-dialog.ui
@@ -22,12 +22,18 @@
             <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">
@@ -40,6 +46,9 @@
               </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 fe9c21c29..820df23f0 100644
--- a/src/resources/ui/nautilus-file-properties-change-permissions.ui
+++ b/src/resources/ui/nautilus-file-properties-change-permissions.ui
@@ -23,6 +23,7 @@
     </child>
     <child internal-child="vbox">
       <object class="GtkBox">
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <style>
           <class name="view"/>
@@ -30,6 +31,7 @@
         <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>
@@ -41,6 +43,7 @@
             <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"/>
@@ -54,6 +57,7 @@
             <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"/>
@@ -67,6 +71,7 @@
             <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>
@@ -81,6 +86,7 @@
             <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>
@@ -90,6 +96,7 @@
             <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>
@@ -99,6 +106,7 @@
             <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>
@@ -113,6 +121,7 @@
             <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>
@@ -122,6 +131,7 @@
             <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>
@@ -131,6 +141,7 @@
             <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>
@@ -140,6 +151,7 @@
             <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>
@@ -149,6 +161,7 @@
             <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>
@@ -160,6 +173,9 @@
                 <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 2ef07674d..708dbf231 100644
--- a/src/resources/ui/nautilus-folder-is-empty.ui
+++ b/src/resources/ui/nautilus-folder-is-empty.ui
@@ -3,6 +3,7 @@
 <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>
@@ -12,6 +13,7 @@
     <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>
@@ -27,6 +29,7 @@
     <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 e36904707..122d69b55 100644
--- a/src/resources/ui/nautilus-no-search-results.ui
+++ b/src/resources/ui/nautilus-no-search-results.ui
@@ -3,6 +3,7 @@
 <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>
@@ -12,6 +13,7 @@
     <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>
@@ -26,6 +28,7 @@
     <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"/>
@@ -40,6 +43,7 @@
     <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 462bb659b..696921e3c 100644
--- a/src/resources/ui/nautilus-pathbar-context-menu.ui
+++ b/src/resources/ui/nautilus-pathbar-context-menu.ui
@@ -16,3 +16,4 @@
     </item>
   </menu>
 </interface>
+
diff --git a/src/resources/ui/nautilus-preferences-window.ui b/src/resources/ui/nautilus-preferences-window.ui
index 04b04d2b9..aa4467150 100644
--- a/src/resources/ui/nautilus-preferences-window.ui
+++ b/src/resources/ui/nautilus-preferences-window.ui
@@ -22,6 +22,8 @@
                 <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>
@@ -38,6 +40,8 @@
                 <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>
@@ -70,6 +74,8 @@
                 <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>
@@ -86,6 +92,8 @@
                 <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 064f57431..629d7e796 100644
--- a/src/resources/ui/nautilus-progress-info-widget.ui
+++ b/src/resources/ui/nautilus-progress-info-widget.ui
@@ -4,6 +4,7 @@
   <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">
@@ -17,6 +18,7 @@
       <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>
@@ -32,6 +34,7 @@
     <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>
@@ -69,6 +72,7 @@
     <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 b546fdcfe..5728d4f3a 100644
--- a/src/resources/ui/nautilus-properties-window.ui
+++ b/src/resources/ui/nautilus-properties-window.ui
@@ -9,6 +9,7 @@
     <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">
@@ -27,6 +28,7 @@
             <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>
@@ -36,11 +38,13 @@
                 <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>
@@ -55,29 +59,37 @@
                         <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>
@@ -94,9 +106,11 @@
                         <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>
@@ -114,6 +128,7 @@
                               </object>
                               <packing>
                                 <property name="name">name_value_entry</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
@@ -124,6 +139,7 @@
                         </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>
@@ -137,6 +153,7 @@
                         </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>
@@ -150,6 +167,7 @@
                         </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>
@@ -163,6 +181,7 @@
                         </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>
@@ -176,6 +195,7 @@
                         </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>
@@ -190,6 +210,7 @@
                         </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>
@@ -202,6 +223,7 @@
                         </child>
                         <child>
                           <object class="GtkSpinner" id="contents_spinner">
+                            <property name="can_focus">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -210,6 +232,7 @@
                         </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>
@@ -223,6 +246,7 @@
                         </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>
@@ -234,6 +258,7 @@
                         </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>
@@ -247,6 +272,7 @@
                         </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>
@@ -260,6 +286,7 @@
                         </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>
@@ -273,6 +300,7 @@
                         </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>
@@ -284,6 +312,7 @@
                         </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>
@@ -297,6 +326,7 @@
                         </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>
@@ -310,6 +340,7 @@
                         </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>
@@ -323,6 +354,7 @@
                         </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>
@@ -336,6 +368,7 @@
                         </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>
@@ -349,6 +382,7 @@
                         </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>
@@ -362,6 +396,7 @@
                         </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>
@@ -375,6 +410,7 @@
                         </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>
@@ -386,6 +422,7 @@
                         </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>
@@ -399,6 +436,7 @@
                         </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>
@@ -410,6 +448,7 @@
                         </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>
@@ -423,6 +462,7 @@
                         </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>
@@ -434,10 +474,12 @@
                         </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>
@@ -450,6 +492,7 @@
                                     <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>
@@ -463,6 +506,7 @@
                                 <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>
@@ -475,7 +519,9 @@
                                     <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"/>
@@ -491,6 +537,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>
@@ -506,7 +553,9 @@
                                 <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>
@@ -521,7 +570,9 @@
                                 <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>
@@ -536,7 +587,9 @@
                                 <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>
@@ -547,7 +600,9 @@
                                 <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>
@@ -558,6 +613,7 @@
                                 <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>
@@ -570,7 +626,9 @@
                                 <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>
@@ -581,7 +639,9 @@
                                 <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>
@@ -592,7 +652,9 @@
                                 <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>
@@ -600,7 +662,22 @@
                                     <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>
@@ -625,7 +702,11 @@
                           <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>
@@ -635,7 +716,11 @@
                         <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>
@@ -645,7 +730,11 @@
                         <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>
@@ -653,8 +742,14 @@
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -664,6 +759,7 @@
             <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>
@@ -672,6 +768,7 @@
             </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>
@@ -679,6 +776,7 @@
                 <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>
@@ -686,27 +784,35 @@
                   </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>
@@ -715,6 +821,7 @@
                     <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>
@@ -731,9 +838,11 @@
                     <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>
@@ -744,12 +853,14 @@
                         <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>
@@ -760,6 +871,7 @@
                     </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>
@@ -773,6 +885,7 @@
                     </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>
@@ -786,6 +899,7 @@
                     </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>
@@ -799,6 +913,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="owner_access_combo">
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -807,6 +922,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="owner_folder_access_combo">
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -815,6 +931,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="owner_file_access_combo">
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -824,6 +941,7 @@
                     <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>
@@ -841,9 +959,11 @@
                     <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>
@@ -855,6 +975,7 @@
                         <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>
@@ -862,6 +983,7 @@
                           <packing>
                             <property name="name">label</property>
                             <property name="title">page1</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
@@ -872,6 +994,7 @@
                     </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>
@@ -885,6 +1008,7 @@
                     </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>
@@ -898,6 +1022,7 @@
                     </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>
@@ -911,6 +1036,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="group_access_combo">
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -919,6 +1045,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="group_folder_access_combo">
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -927,6 +1054,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="group_file_access_combo">
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -936,6 +1064,7 @@
                     <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>
@@ -950,6 +1079,7 @@
                     </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>
@@ -963,6 +1093,7 @@
                     </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>
@@ -976,6 +1107,7 @@
                     </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>
@@ -989,6 +1121,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="others_access_combo">
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -997,6 +1130,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="others_folder_access_combo">
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1005,6 +1139,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBox" id="others_file_access_combo">
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1013,6 +1148,7 @@
                     </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>
@@ -1027,6 +1163,7 @@
                     </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>
@@ -1041,6 +1178,7 @@
                     </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>
@@ -1053,6 +1191,7 @@
                     </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">
@@ -1060,6 +1199,9 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                           </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -1073,6 +1215,7 @@
                         <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>
@@ -1081,24 +1224,64 @@
                         <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>
@@ -1108,22 +1291,34 @@
                 <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">
@@ -1134,6 +1329,9 @@
                         <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">
@@ -1143,6 +1341,9 @@
                         <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">
@@ -1152,6 +1353,9 @@
                         <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">
@@ -1160,24 +1364,37 @@
                         <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 253d2fed2..1e04e2cdb 100644
--- a/src/resources/ui/nautilus-rename-file-popover.ui
+++ b/src/resources/ui/nautilus-rename-file-popover.ui
@@ -3,10 +3,12 @@
 <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>
@@ -15,6 +17,7 @@
         <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"/>
@@ -32,9 +35,11 @@
         <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>
@@ -49,6 +54,7 @@
             <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 3ec0da3cf..8557d5391 100644
--- a/src/resources/ui/nautilus-search-popover.ui
+++ b/src/resources/ui/nautilus-search-popover.ui
@@ -7,6 +7,7 @@
     <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>
@@ -16,6 +17,7 @@
         <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>
@@ -31,11 +33,13 @@
         <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>
@@ -46,12 +50,16 @@
                     <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">
@@ -62,10 +70,14 @@
                     <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"/>
@@ -86,6 +98,7 @@
               </object>
               <packing>
                 <property name="name">date-entry</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -97,15 +110,18 @@
         </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>
@@ -122,6 +138,7 @@
                 <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>
@@ -135,9 +152,11 @@
                         <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>
@@ -155,9 +174,11 @@
                         <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>
@@ -172,6 +193,7 @@
                     <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>
@@ -187,6 +209,7 @@
                     <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>
@@ -202,6 +225,7 @@
                       <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>
@@ -225,6 +249,7 @@
         <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>
@@ -241,6 +266,7 @@
         <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>
@@ -254,20 +280,29 @@
                 <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>
@@ -285,9 +320,11 @@
                 <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>
@@ -297,6 +334,7 @@
               </object>
               <packing>
                 <property name="name">type-list</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -308,6 +346,7 @@
         </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>
@@ -323,6 +362,7 @@
         </child>
         <child>
           <object class="GtkBox">
+            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="visible">True</property>
             <child>
@@ -330,18 +370,23 @@
                 <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>
@@ -349,6 +394,9 @@
                 <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 b91ceb30c..203b515d0 100644
--- a/src/resources/ui/nautilus-starred-is-empty.ui
+++ b/src/resources/ui/nautilus-starred-is-empty.ui
@@ -3,6 +3,7 @@
 <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>
@@ -12,6 +13,7 @@
     <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>
@@ -27,6 +29,7 @@
     <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 4fd29b400..c1d12eefe 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -113,12 +113,14 @@
     <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>
@@ -145,14 +147,18 @@
           <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>
@@ -161,21 +167,25 @@
                 </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>
@@ -184,6 +194,7 @@
               <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>
@@ -191,6 +202,7 @@
                 <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>
@@ -199,16 +211,21 @@
                   <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>
@@ -216,6 +233,7 @@
                 <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>
@@ -224,11 +242,15 @@
                   <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>
@@ -236,6 +258,7 @@
                 <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>
@@ -244,6 +267,9 @@
                   <class name="image-button"/>
                 </style>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <style>
               <class name="linked"/>
@@ -254,16 +280,19 @@
         <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>
@@ -272,6 +301,7 @@
                         <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"/>
@@ -283,10 +313,14 @@
                   </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>
@@ -294,11 +328,13 @@
                   <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>
@@ -306,6 +342,9 @@
                       <class name="image-button"/>
                     </style>
                   </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="view_button">
@@ -319,6 +358,7 @@
                     <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>
@@ -326,22 +366,30 @@
                       <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>
@@ -350,10 +398,14 @@
                   <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 bbc387aea..d41b93e6a 100644
--- a/src/resources/ui/nautilus-trash-is-empty.ui
+++ b/src/resources/ui/nautilus-trash-is-empty.ui
@@ -3,6 +3,7 @@
 <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>
@@ -12,6 +13,7 @@
     <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>
@@ -27,6 +29,7 @@
     <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 2b905dbee..c890158bc 100644
--- a/src/resources/ui/nautilus-window.ui
+++ b/src/resources/ui/nautilus-window.ui
@@ -45,12 +45,13 @@
             <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>
@@ -66,20 +67,24 @@
                 <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>
@@ -107,6 +112,7 @@
                                 <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>
@@ -129,20 +135,24 @@
                 <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>
@@ -171,6 +181,7 @@
                                 <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]