[nautilus/wip/antoniof/experimental-gtk4-build: 7/52] resources/ui: Update definitions for GTK4




commit b33ae5e97c0efd2106265f4dd8de067bb3fcbeca
Author: António Fernandes <antoniof gnome org>
Date:   Thu Dec 23 13:36:58 2021 +0000

    resources/ui: Update definitions for GTK4
    
    Manually curated from the output of 'gtk4-builder-tool simplify --3to4'
    and further streamlined and validated with 'gtk4-builder-tool validate'.

 src/resources/ui/nautilus-batch-rename-dialog.ui   |  396 ++--
 src/resources/ui/nautilus-column-chooser.ui        |   31 +-
 src/resources/ui/nautilus-compress-dialog.ui       |   30 +-
 src/resources/ui/nautilus-create-folder-dialog.ui  |   18 +-
 src/resources/ui/nautilus-file-conflict-dialog.ui  |   38 +-
 .../nautilus-file-properties-change-permissions.ui |  107 +-
 .../ui/nautilus-files-view-context-menus.ui        |   14 +-
 .../ui/nautilus-files-view-select-items.ui         |   12 +-
 src/resources/ui/nautilus-folder-is-empty.ui       |   21 +-
 .../ui/nautilus-list-view-column-editor.ui         |   12 +-
 src/resources/ui/nautilus-no-search-results.ui     |   34 +-
 ...lus-operations-ui-manager-request-passphrase.ui |   10 +-
 src/resources/ui/nautilus-pathbar-context-menu.ui  |    2 +-
 src/resources/ui/nautilus-preferences-window.ui    |    7 +-
 src/resources/ui/nautilus-progress-info-widget.ui  |   46 +-
 src/resources/ui/nautilus-properties-window.ui     | 1971 ++++++++++----------
 src/resources/ui/nautilus-rename-file-popover.ui   |   23 +-
 src/resources/ui/nautilus-search-popover.ui        |  401 ++--
 src/resources/ui/nautilus-starred-is-empty.ui      |   21 +-
 src/resources/ui/nautilus-toolbar-view-menu.ui     |    4 +-
 src/resources/ui/nautilus-toolbar.ui               |  114 +-
 src/resources/ui/nautilus-trash-is-empty.ui        |   21 +-
 src/resources/ui/nautilus-view-icon-item-ui.ui     |   10 +-
 src/resources/ui/nautilus-window.ui                |   57 +-
 24 files changed, 1555 insertions(+), 1845 deletions(-)
---
diff --git a/src/resources/ui/nautilus-batch-rename-dialog.ui 
b/src/resources/ui/nautilus-batch-rename-dialog.ui
index 328985a97..fd373c676 100644
--- a/src/resources/ui/nautilus-batch-rename-dialog.ui
+++ b/src/resources/ui/nautilus-batch-rename-dialog.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
   <menu id="add_tag_menu">
     <section>
       <attribute name="label" translatable="yes">Automatic Numbers</attribute>
@@ -91,26 +92,21 @@
     </section>
   </menu>
   <template class="NautilusBatchRenameDialog" parent="GtkDialog">
-    <property name="resizable">True</property>
     <property name="modal">True</property>
     <property name="height-request">563</property>
-    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <signal name="response" handler="batch_rename_dialog_on_response"/>
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="label" translatable="yes">_Cancel</property>
-        <property name="visible">True</property>
-        <property name="focusable">True</property>
         <property name="use_underline">True</property>
+        <property name="focusable">True</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="rename_button">
         <property name="label" translatable="yes">_Rename</property>
-        <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="can_default">True</property>
         <style>
           <class name="suggested-action"/>
         </style>
@@ -120,19 +116,16 @@
       <action-widget response="ok" default="true">rename_button</action-widget>
       <action-widget response="cancel">cancel_button</action-widget>
     </action-widgets>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="vbox">
+    <child internal-child="content_area">
+      <object class="GtkBox" id="content_area">
         <child>
           <object class="GtkGrid" id="grid">
-            <property name="visible">True</property>
             <property name="row-spacing">6</property>
             <property name="column-spacing">6</property>
             <property name="hexpand">True</property>
             <child>
               <object class="GtkBox">
-                <property name="orientation">horizontal</property>
                 <property name="spacing">15</property>
-                <property name="visible">True</property>
                 <property name="hexpand">True</property>
                 <property name="halign">center</property>
                 <property name="margin-top">20</property>
@@ -140,304 +133,263 @@
                 <property name="margin-start">20</property>
                 <property name="margin-end">20</property>
                 <child>
-                  <object class="GtkRadioButton" id="format_mode_button">
+                  <object class="GtkCheckButton" id="format_mode_button">
                     <property name="label" translatable="yes">Rename _using a template</property>
-                    <property name="visible">True</property>
-                    <property name="focusable">True</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
                     <signal name="toggled" handler="batch_rename_dialog_mode_changed" swapped="yes" />
                   </object>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="replace_mode_button">
+                  <object class="GtkCheckButton" id="replace_mode_button">
                     <property name="label" translatable="yes">Find and replace _text</property>
-                    <property name="visible">True</property>
-                    <property name="focusable">True</property>
                     <property name="use_underline">True</property>
-                    <property name="active">True</property>
                     <property name="group">format_mode_button</property>
-                    <signal name="toggled" handler="batch_rename_dialog_mode_changed" swapped="yes" />
+                    <signal name="toggled" handler="batch_rename_dialog_mode_changed" swapped="yes"/>
                   </object>
                 </child>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkStack" id="mode_stack">
-                <property name="visible">True</property>
                 <property name="vhomogeneous">False</property>
                 <property name="hhomogeneous">True</property>
                 <property name="transition_type">crossfade</property>
                 <property name="transition_duration">100</property>
                 <child>
-                  <object class="GtkGrid" id="format_stack_child">
-                    <property name="visible">True</property>
-                    <property name="margin-start">40</property>
-                    <property name="margin-end">40</property>
-                    <property name="margin-top">0</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="row-spacing">15</property>
-                    <property name="column-spacing">6</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="orientation">horizontal</property>
-                        <property name="visible">True</property>
-                        <property name="halign">center</property>
-                        <child>
-                          <object class="GtkEntry" id="name_entry">
-                            <property name="visible">True</property>
-                            <property name="focusable">True</property>
-                            <property name="has_focus">True</property>
-                            <property name="width_request">400</property>
-                            <property name="hexpand">True</property>
-                            <property name="activates-default">True</property>
-                            <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
-                            <signal name="insert-text" handler="on_insert_text" swapped="no" />
-                            <signal name="delete-text" handler="on_delete_text" swapped="no" />
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuButton">
-                            <property name="visible">True</property>
-                            <property name="menu_model">add_tag_menu</property>
-                            <child>
-                              <object class="GtkBox">
-                                <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
-                                <child>
-                                  <object class="GtkImage">
-                                    <property name="visible">True</property>
-                                    <property name="icon-name">list-add-symbolic</property>
-                                    <property name="icon-size">1</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Add</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <style>
-                          <class name="linked"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                        <property name="width">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRevealer" id="numbering_revealer">
-                        <property name="visible">True</property>
-                        <property name="halign">center</property>
+                  <object class="GtkStackPage">
+                    <property name="name">format</property>
+                    <property name="title" translatable="yes" comments="Translators: This is a noun, not a 
verb">Format</property>
+                    <property name="child">
+                      <object class="GtkGrid" id="format_stack_child">
+                        <property name="margin-start">40</property>
+                        <property name="margin-end">40</property>
+                        <property name="margin-bottom">10</property>
+                        <property name="row-spacing">15</property>
+                        <property name="column-spacing">6</property>
                         <child>
-                          <object class="GtkBox" id="numbering_box">
-                            <property name="visible">True</property>
-                            <property name="orientation">horizontal</property>
-                            <property name="spacing">10</property>
+                          <object class="GtkBox">
+                            <property name="halign">center</property>
                             <child>
-                              <object class="GtkLabel" id="numbering_label">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Automatic Numbering 
Order</property>
+                              <object class="GtkEntry" id="name_entry">
+                                <property name="focusable">True</property>
+                                <property name="width_request">400</property>
+                                <property name="hexpand">True</property>
+                                <property name="activates-default">True</property>
+                                <signal name="activate" handler="file_names_widget_on_activate" 
swapped="yes"/>
+                                <signal name="insert-text" handler="on_insert_text" swapped="no"/>
+                                <signal name="delete-text" handler="on_delete_text" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkMenuButton">
-                                <property name="visible">True</property>
-                                <property name="menu-model">numbering_order_menu</property>
+                                <property name="menu_model">add_tag_menu</property>
                                 <child>
                                   <object class="GtkBox">
-                                    <property name="visible">True</property>
-                                    <property name="orientation">horizontal</property>
-                                    <property name="spacing">15</property>
                                     <child>
-                                      <object class="GtkLabel" id="numbering_order_label">
-                                        <property name="visible">True</property>
-                                        <property name="width-request">180</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Original Name 
(Ascending)</property>
+                                      <object class="GtkImage">
+                                        <property name="icon-name">list-add-symbolic</property>
+                                        <property name="icon-size">1</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkImage" id="action_icon">
-                                        <property name="visible">True</property>
-                                        <property name="icon-name">pan-down-symbolic</property>
-                                        <property name="icon-size">1</property>
+                                      <object class="GtkLabel">
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Add</property>
                                       </object>
                                     </child>
                                   </object>
                                 </child>
                               </object>
                             </child>
+                            <style>
+                              <class name="linked"/>
+                            </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                              <property name="column-span">5</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkRevealer" id="numbering_revealer">
+                            <property name="halign">center</property>
+                            <property name="child">
+                              <object class="GtkBox" id="numbering_box">
+                                <property name="spacing">10</property>
+                                <child>
+                                  <object class="GtkLabel" id="numbering_label">
+                                    <property name="label" translatable="yes">Automatic Numbering 
Order</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkMenuButton">
+                                    <property name="menu-model">numbering_order_menu</property>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="spacing">15</property>
+                                        <child>
+                                          <object class="GtkLabel" id="numbering_order_label">
+                                            <property name="width-request">180</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Original Name 
(Ascending)</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkImage" id="action_icon">
+                                            <property name="icon-name">pan-down-symbolic</property>
+                                            <property name="icon-size">1</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                              <property name="column-span">5</property>
+                            </layout>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                        <property name="width">5</property>
-                      </packing>
-                    </child>
+                    </property>
                   </object>
-                  <packing>
-                    <property name="name">format</property>
-                    <property name="title" translatable="yes" comments="Translators: This is a noun, not a 
verb">Format</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkGrid" id="replace_stack_child">
-                    <property name="visible">True</property>
-                    <property name="margin-start">40</property>
-                    <property name="margin-end">40</property>
-                    <property name="margin-top">0</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="hexpand">True</property>
-                    <property name="halign">center</property>
-                    <property name="row-spacing">15</property>
-                    <property name="column-spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="existing_text_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Existing Text</property>
-                        <property name="sensitive">False</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="find_entry">
-                        <property name="visible">True</property>
-                        <property name="focusable">True</property>
-                        <property name="width_request">375</property>
-                        <property name="activates-default">True</property>
-                        <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
-                        <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>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="replace_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Replace With</property>
-                        <property name="sensitive">False</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="replace_entry">
-                        <property name="visible">True</property>
-                        <property name="focusable">True</property>
-                        <property name="width_request">375</property>
-                        <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
-                        <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
-                      </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">1</property>
-                        <property name="width">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
+                  <object class="GtkStackPage">
                     <property name="name">replace</property>
                     <property name="title" translatable="yes" context="title">Replace</property>
-                  </packing>
+                    <property name="child">
+                      <object class="GtkGrid" id="replace_stack_child">
+                        <property name="margin-start">40</property>
+                        <property name="margin-end">40</property>
+                        <property name="margin-bottom">10</property>
+                        <property name="hexpand">True</property>
+                        <property name="halign">center</property>
+                        <property name="row-spacing">15</property>
+                        <property name="column-spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="existing_text_label">
+                            <property name="label" translatable="yes">Existing Text</property>
+                            <property name="sensitive">False</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="find_entry">
+                            <property name="focusable">True</property>
+                            <property name="width_request">375</property>
+                            <property name="activates-default">True</property>
+                            <signal name="changed" handler="file_names_widget_entry_on_changed" 
swapped="yes"/>
+                            <signal name="activate" handler="file_names_widget_on_activate" swapped="yes"/>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">0</property>
+                              <property name="column-span">3</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="replace_label">
+                            <property name="label" translatable="yes">Replace With</property>
+                            <property name="sensitive">False</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="replace_entry">
+                            <property name="focusable">True</property>
+                            <property name="width_request">375</property>
+                            <signal name="changed" handler="file_names_widget_entry_on_changed" 
swapped="yes"/>
+                            <signal name="activate" handler="file_names_widget_on_activate" swapped="yes"/>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">1</property>
+                              <property name="column-span">3</property>
+                            </layout>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                  </object>
                 </child>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                  <property name="column-span">8</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-                <property name="width">8</property>
-              </packing>
             </child>
             <child>
               <object class="GtkScrolledWindow" id="scrolled_window">
-                <property name="visible">True</property>
                 <property name="hexpand">False</property>
                 <property name="vexpand">True</property>
-                <property name="shadow_type">in</property>
                 <property name="max-content-height">250</property>
                 <property name="min-content-height">250</property>
                 <property name="max-content-width">600</property>
                 <property name="min-content-width">600</property>
-                <child>
+                <property name="child">
                   <object class="GtkViewport">
-                    <property name="visible">True</property>
-                    <child>
+                    <property name="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="selection_mode">GTK_SELECTION_NONE</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkListBox" id="arrow_listbox">
-                            <property name="visible">True</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="selection_mode">GTK_SELECTION_NONE</property>
                           </object>
                         </child>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                </child>
+                </property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                  <property name="column-span">8</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-                <property name="width">8</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="conflict_box">
-                <property name="orientation">horizontal</property>
                 <property name="spacing">6</property>
                 <property name="visible">False</property>
                 <property name="margin-start">6</property>
                 <child>
                   <object class="GtkLabel" id="conflict_label">
-                    <property name="visible">True</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkBox">
-                    <property name="orientation">horizontal</property>
-                    <property name="visible">True</property>
                     <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>
                             <property name="icon-name">go-down-symbolic</property>
                             <property name="icon-size">1</property>
                           </object>
@@ -449,11 +401,9 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="conflict_up">
-                        <property name="visible">True</property>
-                        <signal name="clicked" handler="select_next_conflict_up" swapped="yes" />
+                        <signal name="clicked" handler="select_next_conflict_up" swapped="yes"/>
                         <child>
                           <object class="GtkImage">
-                            <property name="visible">True</property>
                             <property name="icon-name">go-up-symbolic</property>
                             <property name="icon-size">1</property>
                           </object>
@@ -464,16 +414,13 @@
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                  </packing>
                 </child>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
+                  <property name="column-span">8</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
-                <property name="width">8</property>
-              </packing>
             </child>
           </object>
         </child>
@@ -481,7 +428,6 @@
     </child>
   </template>
   <object class="GtkImage" id="done_image">
-    <property name="visible">True</property>
     <property name="icon_name">object-select-symbolic</property>
   </object>
 </interface>
diff --git a/src/resources/ui/nautilus-column-chooser.ui b/src/resources/ui/nautilus-column-chooser.ui
index 82eb3c22e..10546a273 100644
--- a/src/resources/ui/nautilus-column-chooser.ui
+++ b/src/resources/ui/nautilus-column-chooser.ui
@@ -1,30 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkListStore" id="store">
     <columns>
-      <!-- column-name COLUMN_VISIBLE -->
       <column type="gboolean"/>
-      <!-- column-name COLUMN_LABEL -->
       <column type="gchararray"/>
-      <!-- column-name COLUMN_NAME -->
       <column type="gchararray"/>
-      <!-- column-name COLUMN_SENSITIVE -->
       <column type="gboolean"/>
     </columns>
   </object>
   <template class="NautilusColumnChooser" parent="GtkBox">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
-        <child>
+        <property name="child">
           <object class="GtkTreeView" id="view">
-            <property name="visible">True</property>
-            <property name="can-focus">True</property>
+            <property name="focusable">True</property>
             <property name="vexpand">True</property>
             <property name="model">store</property>
             <property name="headers-visible">False</property>
@@ -60,7 +51,7 @@
               </object>
             </child>
           </object>
-        </child>
+        </property>
         <style>
           <class name="frame"/>
         </style>
@@ -68,19 +59,15 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</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="focusable">True</property>
                 <signal name="clicked" handler="move_up_clicked_callback" swapped="no"/>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
                     <property name="icon-name">go-up-symbolic</property>
                   </object>
                 </child>
@@ -88,13 +75,11 @@
             </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="focusable">True</property>
                 <signal name="clicked" handler="move_down_clicked_callback" swapped="no"/>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
                     <property name="icon-name">go-down-symbolic</property>
                   </object>
                 </child>
@@ -107,12 +92,10 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</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="focusable">True</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"/>
diff --git a/src/resources/ui/nautilus-compress-dialog.ui b/src/resources/ui/nautilus-compress-dialog.ui
index fd366a4cd..ce2e6760c 100644
--- a/src/resources/ui/nautilus-compress-dialog.ui
+++ b/src/resources/ui/nautilus-compress-dialog.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkPopover" id="extension_popover">
-    <property name="position">bottom</property>
-    <property name="constrain-to">none</property>
     <child>
       <object class="AdwPreferencesGroup">
         <property name="visible">True</property>
@@ -19,7 +17,6 @@
             <property name="subtitle" translatable="yes">Compatible with all operating systems.</property>
             <child>
               <object class="GtkImage" id="zip_checkmark">
-                <property name="visible">True</property>
                 <property name="width-request">16</property>
                 <property name="margin-start">12</property>
                 <property name="margin-end">12</property>
@@ -38,7 +35,6 @@
             </style>
             <child>
               <object class="GtkImage" id="encrypted_zip_checkmark">
-                <property name="visible">True</property>
                 <property name="width-request">16</property>
                 <property name="margin-start">12</property>
                 <property name="margin-end">12</property>
@@ -54,7 +50,6 @@
             <property name="subtitle" translatable="yes">Smaller archives but Linux and Mac only.</property>
             <child>
               <object class="GtkImage" id="tar_xz_checkmark">
-                <property name="visible">True</property>
                 <property name="width-request">16</property>
                 <property name="margin-start">12</property>
                 <property name="margin-end">12</property>
@@ -70,7 +65,6 @@
             <property name="subtitle" translatable="yes">Smaller archives but must be installed on Windows 
and Mac.</property>
             <child>
               <object class="GtkImage" id="seven_zip_checkmark">
-                <property name="visible">True</property>
                 <property name="width-request">16</property>
                 <property name="margin-start">12</property>
                 <property name="margin-end">12</property>
@@ -85,14 +79,12 @@
     <property name="title" translatable="yes">Create Archive</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
     <property name="use-header-bar">1</property>
     <property name="default-width">500</property>
     <property name="default-height">210</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="vbox">
+    <child internal-child="content_area">
+      <object class="GtkBox" id="content_area">
         <property name="orientation">vertical</property>
         <property name="margin-top">30</property>
         <property name="margin-bottom">30</property>
@@ -104,20 +96,17 @@
         <child>
           <object class="GtkLabel" id="name_label">
             <property name="label" translatable="yes">Archive name</property>
-            <property name="visible">True</property>
             <property name="xalign">0</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
           </object>
         </child>
         <child>
           <object class="GtkBox">
-            <property name="orientation">horizontal</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkEntry" id="name_entry">
-                <property name="visible">True</property>
                 <property name="focusable">True</property>
                 <property name="hexpand">True</property>
                 <property name="width-chars">30</property>
@@ -128,7 +117,6 @@
                 <property name="popover">extension_popover</property>
                 <child>
                   <object class="GtkBox">
-                    <property name="orientation">horizontal</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkStack" id="extension_stack">
@@ -175,18 +163,18 @@
         </child>
         <child>
           <object class="GtkRevealer" id="error_revealer">
-            <child>
+            <property name="child">
               <object class="GtkLabel" id="error_label">
                 <property name="margin_top">4</property>
                 <property name="margin_bottom">4</property>
-                <property name="visible">True</property>
                 <property name="xalign">0</property>
               </object>
-            </child>
+            </property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="passphrase_label">
+            <property name="visible">False</property>
             <property name="label" translatable="yes">Password</property>
             <property name="margin-top">6</property>
             <property name="xalign">0</property>
@@ -194,6 +182,7 @@
         </child>
         <child>
           <object class="GtkEntry" id="passphrase_entry">
+            <property name="visible">False</property>
             <property name="placeholder-text" translatable="yes">Enter a password here.</property>
             <property name="input-purpose">password</property>
             <property name="visibility">False</property>
@@ -205,7 +194,6 @@
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="label" translatable="yes">Cancel</property>
-        <property name="visible">True</property>
         <property name="focusable">True</property>
         <property name="receives_default">True</property>
       </object>
@@ -213,9 +201,7 @@
     <child type="action">
       <object class="GtkButton" id="activate_button">
         <property name="label" translatable="yes">Create</property>
-        <property name="visible">True</property>
         <property name="focusable">True</property>
-        <property name="can_default">True</property>
         <property name="receives_default">True</property>
         <property name="sensitive">False</property>
       </object>
diff --git a/src/resources/ui/nautilus-create-folder-dialog.ui 
b/src/resources/ui/nautilus-create-folder-dialog.ui
index e958fe3ed..91f27683c 100644
--- a/src/resources/ui/nautilus-create-folder-dialog.ui
+++ b/src/resources/ui/nautilus-create-folder-dialog.ui
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkDialog" id="create_folder_dialog">
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
     <property name="use-header-bar">1</property>
     <property name="width_request">450</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="vbox">
+    <child internal-child="content_area">
+      <object class="GtkBox" id="content_area">
         <property name="orientation">vertical</property>
         <property name="margin_top">18</property>
         <property name="margin_bottom">12</property>
@@ -19,26 +17,23 @@
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="name_label">
-            <property name="visible">True</property>
             <property name="xalign">0</property>
           </object>
         </child>
         <child>
           <object class="GtkEntry" id="name_entry">
-            <property name="visible">True</property>
             <property name="focusable">True</property>
           </object>
         </child>
         <child>
           <object class="GtkRevealer" id="error_revealer">
-            <child>
+            <property name="child">
               <object class="GtkLabel" id="error_label">
                 <property name="margin_top">4</property>
                 <property name="margin_bottom">4</property>
-                <property name="visible">True</property>
                 <property name="xalign">0</property>
               </object>
-            </child>
+            </property>
           </object>
         </child>
       </object>
@@ -46,16 +41,13 @@
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="label" translatable="yes">Cancel</property>
-        <property name="visible">True</property>
         <property name="focusable">True</property>
         <property name="receives_default">True</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="ok_button">
-        <property name="visible">True</property>
         <property name="focusable">True</property>
-        <property name="can_default">True</property>
         <property name="receives_default">True</property>
         <property name="sensitive">False</property>
       </object>
diff --git a/src/resources/ui/nautilus-file-conflict-dialog.ui 
b/src/resources/ui/nautilus-file-conflict-dialog.ui
index ded27ec72..cfbafb481 100644
--- a/src/resources/ui/nautilus-file-conflict-dialog.ui
+++ b/src/resources/ui/nautilus-file-conflict-dialog.ui
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="NautilusFileConflictDialog" parent="GtkDialog">
     <property name="modal">True</property>
     <property name="resizable">False</property>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="margin-top">18</property>
         <property name="margin-bottom">18</property>
         <property name="margin-start">18</property>
@@ -14,12 +13,10 @@
         <property name="spacing">12</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkLabel" id="primary_label">
-                <property name="visible">True</property>
                 <property name="justify">center</property>
                 <property name="halign">center</property>
                 <property name="max-width-chars">50</property>
@@ -32,7 +29,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="secondary_label">
-                <property name="visible">True</property>
                 <property name="justify">center</property>
                 <property name="halign">center</property>
                 <property name="max-width-chars">50</property>
@@ -42,58 +38,44 @@
             </child>
             <child>
               <object class="GtkBox">
-                <property name="visible">True</property>
                 <property name="halign">start</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkBox">
-                    <property name="visible">True</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="GtkImage" id="dest_image">
-                        <property name="visible">True</property>
-                      </object>
+                      <object class="GtkImage" id="dest_image"/>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="dest_label">
-                        <property name="visible">True</property>
-                      </object>
+                      <object class="GtkLabel" id="dest_label"/>
                     </child>
                   </object>
                 </child>
                 <child>
                   <object class="GtkBox">
-                    <property name="visible">True</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="GtkImage" id="src_image">
-                        <property name="visible">True</property>
-                      </object>
+                      <object class="GtkImage" id="src_image"/>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="src_label">
-                        <property name="visible">True</property>
-                      </object>
+                      <object class="GtkLabel" id="src_label"/>
                     </child>
                   </object>
                 </child>
                 <child>
                   <object class="GtkExpander" id="expander">
-                    <property name="visible">True</property>
                     <property name="label" translatable="yes">_Select a new name for the 
destination</property>
                     <property name="use-underline">True</property>
                     <signal name="notify::expanded" handler="on_expanded_notify"/>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
                         <property name="margin-top">6</property>
                         <style>
                           <class name="linked"/>
                         </style>
                         <child>
                           <object class="GtkEntry" id="entry">
-                            <property name="visible">True</property>
                             <property name="activates-default">True</property>
                             <property name="hexpand">True</property>
                             <signal name="changed" handler="entry_text_changed_cb"/>
@@ -101,7 +83,6 @@
                         </child>
                         <child>
                           <object class="GtkButton">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">_Reset</property>
                             <property name="use-underline">True</property>
                             <signal name="clicked" handler="reset_button_clicked_cb"/>
@@ -115,11 +96,9 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="checkbox">
-                <property name="visible">True</property>
                 <signal name="toggled" handler="checkbox_toggled_cb"/>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
                     <property name="label" translatable="yes">Apply this action to all files and 
folders</property>
                     <property name="use-underline">True</property>
                   </object>
@@ -132,7 +111,6 @@
     </child>
     <child type="action">
       <object class="GtkButton" id="cancel_button">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">_Cancel</property>
         <property name="use-underline">True</property>
       </object>
@@ -140,22 +118,18 @@
     <child type="action">
       <object class="GtkButton" id="rename_button">
         <property name="visible">False</property>
-        <property name="can-default">True</property>
         <property name="label" translatable="yes">Re_name</property>
         <property name="use-underline">True</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="replace_button">
-        <property name="visible">True</property>
-        <property name="can-default">True</property>
         <property name="label" translatable="yes">Re_place</property>
         <property name="use-underline">True</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="skip_button">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">_Skip</property>
         <property name="use-underline">True</property>
       </object>
diff --git a/src/resources/ui/nautilus-file-properties-change-permissions.ui 
b/src/resources/ui/nautilus-file-properties-change-permissions.ui
index fe9c21c29..623b7db4a 100644
--- a/src/resources/ui/nautilus-file-properties-change-permissions.ui
+++ b/src/resources/ui/nautilus-file-properties-change-permissions.ui
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkDialog" id="change_permissions_dialog">
     <property name="title" translatable="yes">Change Permissions for Enclosed Files</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
     <property name="use-header-bar">1</property>
     <child type="action">
       <object class="GtkButton" id="cancel">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">_Cancel</property>
         <property name="use_underline">True</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="change">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">C_hange</property>
         <property name="use_underline">True</property>
       </object>
     </child>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
       <object class="GtkBox">
         <property name="orientation">vertical</property>
         <style>
@@ -29,7 +26,6 @@
         </style>
         <child>
           <object class="GtkGrid" id="change_permissions_grid">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <property name="margin-top">6</property>
             <property name="margin-bottom">6</property>
@@ -40,125 +36,114 @@
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">Files</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">Folders</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">Owner</property>
                 <property name="xalign">1</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="file_owner_combo">
-                <property name="visible">True</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="folder_owner_combo">
-                <property name="visible">True</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">Group</property>
                 <property name="xalign">1</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="file_group_combo">
-                <property name="visible">True</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="folder_group_combo">
-                <property name="visible">True</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="file_other_combo">
-                <property name="visible">True</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="folder_other_combo">
-                <property name="visible">True</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">Others</property>
                 <property name="xalign">1</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/src/resources/ui/nautilus-files-view-context-menus.ui 
b/src/resources/ui/nautilus-files-view-context-menus.ui
index a951549ab..299fd8f95 100644
--- a/src/resources/ui/nautilus-files-view-context-menus.ui
+++ b/src/resources/ui/nautilus-files-view-context-menus.ui
@@ -1,5 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
   <menu id="background-menu">
     <item>
       <attribute name="label" translatable="yes">New _Folder</attribute>
@@ -31,8 +32,7 @@
         <attribute name="action">view.select-all</attribute>
       </item>
     </section>
-    <section id="background-extensions-section">
-    </section>
+    <section id="background-extensions-section"/>
     <section>
       <item>
         <attribute name="label" translatable="yes">P_roperties</attribute>
@@ -42,8 +42,7 @@
     </section>
   </menu>
   <menu id="selection-menu">
-    <section id="new-folder-with-selection-section">
-    </section>
+    <section id="new-folder-with-selection-section"/>
     <section id="open-with-application-section">
       <item>
         <attribute name="label" translatable="yes">Open With Other _Application</attribute>
@@ -55,7 +54,7 @@
       <attribute name="label" translatable="yes">_Scripts</attribute>
       <attribute name="action">view.scripts</attribute>
       <attribute name="hidden-when">action-disabled</attribute>
-      <section id="scripts-submenu-section" />
+      <section id="scripts-submenu-section"/>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Open Scripts Folder</attribute>
@@ -217,8 +216,7 @@
         <attribute name="hidden-when">action-disabled</attribute>
       </item>
     </section>
-    <section id="selection-extensions-section">
-    </section>
+    <section id="selection-extensions-section"/>
     <section>
       <item>
         <attribute name="label" translatable="yes">Tags</attribute>
diff --git a/src/resources/ui/nautilus-files-view-select-items.ui 
b/src/resources/ui/nautilus-files-view-select-items.ui
index da8423700..c376cfdca 100644
--- a/src/resources/ui/nautilus-files-view-select-items.ui
+++ b/src/resources/ui/nautilus-files-view-select-items.ui
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkDialog" id="select_items_dialog">
     <property name="title" translatable="yes">Select Items Matching</property>
     <property name="modal">True</property>
     <property name="use-header-bar">1</property>
     <child type="action">
       <object class="GtkButton" id="cancel">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">_Cancel</property>
         <property name="use-underline">True</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="select">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">_Select</property>
         <property name="use-underline">True</property>
-        <property name="can-default">True</property>
       </object>
     </child>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
       <object class="GtkBox">
         <property name="margin-top">18</property>
         <property name="margin-bottom">18</property>
@@ -29,17 +26,15 @@
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="halign">start</property>
             <property name="label" translatable="yes">Pattern</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
           </object>
         </child>
         <child>
           <object class="GtkEntry" id="pattern_entry">
-            <property name="visible">True</property>
             <property name="focusable">True</property>
             <property name="hexpand">True</property>
             <property name="activates_default">True</property>
@@ -47,7 +42,6 @@
         </child>
         <child>
           <object class="GtkLabel" id="example">
-            <property name="visible">True</property>
             <property name="halign">start</property>
           </object>
         </child>
diff --git a/src/resources/ui/nautilus-folder-is-empty.ui b/src/resources/ui/nautilus-folder-is-empty.ui
index 2ef07674d..8417d823e 100644
--- a/src/resources/ui/nautilus-folder-is-empty.ui
+++ b/src/resources/ui/nautilus-folder-is-empty.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkGrid" id="folder_is_empty">
     <property name="halign">center</property>
     <property name="valign">center</property>
@@ -11,31 +10,29 @@
     <property name="visible">False</property>
     <child>
       <object class="GtkImage">
-        <property name="visible">True</property>
         <property name="pixel_size">128</property>
         <property name="icon_name">folder-symbolic</property>
         <style>
           <class name="dim-label"/>
           <class name="nautilus-empty-state-icon"/>
         </style>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">0</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-      </packing>
     </child>
     <child>
       <object class="GtkLabel">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">Folder is Empty</property>
         <style>
           <class name="large-title"/>
         </style>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">1</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-      </packing>
     </child>
   </object>
 </interface>
diff --git a/src/resources/ui/nautilus-list-view-column-editor.ui 
b/src/resources/ui/nautilus-list-view-column-editor.ui
index 08e259069..b71a55772 100644
--- a/src/resources/ui/nautilus-list-view-column-editor.ui
+++ b/src/resources/ui/nautilus-list-view-column-editor.ui
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
 <interface>
+  <requires lib="gtk" version="4.0"/>
   <object class="AdwWindow" id="window">
     <property name="modal">True</property>
-    <property name="type-hint">dialog</property>
     <property name="default-width">300</property>
     <property name="default-height">400</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="AdwHeaderBar">
-            <property name="visible">True</property>
-            <property name="title" bind-source="window" bind-property="title" bind-flags="sync-create"/>
-            <property name="show-close-button">True</property>
-          </object>
+          <object class="AdwHeaderBar"/>
         </child>
         <child>
           <object class="GtkBox" id="box">
-            <property name="visible">True</property>
             <property name="margin-top">12</property>
             <property name="margin-bottom">12</property>
             <property name="margin-start">12</property>
@@ -29,7 +22,6 @@
             <child>
               <object class="GtkLabel">
                 <property name="label" translatable="yes">Choose the order of information to appear in this 
folder:</property>
-                <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="wrap">True</property>
diff --git a/src/resources/ui/nautilus-no-search-results.ui b/src/resources/ui/nautilus-no-search-results.ui
index e36904707..ef3543392 100644
--- a/src/resources/ui/nautilus-no-search-results.ui
+++ b/src/resources/ui/nautilus-no-search-results.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkGrid" id="no_search_results">
     <property name="halign">center</property>
     <property name="valign">center</property>
@@ -11,44 +10,41 @@
     <property name="visible">False</property>
     <child>
       <object class="GtkImage">
-        <property name="visible">True</property>
         <property name="pixel_size">80</property>
         <property name="icon_name">edit-find-symbolic</property>
         <style>
           <class name="dim-label"/>
         </style>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">0</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-      </packing>
     </child>
     <child>
       <object class="GtkLabel">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">No Results Found</property>
         <attributes>
-          <attribute name="weight" value="bold"/>
-          <attribute name="scale" value="1.4399999999999999"/>
+          <attribute name="weight" value="bold"></attribute>
+          <attribute name="scale" value="1.4399999999999999"></attribute>
         </attributes>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">1</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-      </packing>
     </child>
     <child>
       <object class="GtkLabel">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">Try a different search</property>
         <style>
           <class name="dim-label"/>
         </style>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">2</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
-      </packing>
     </child>
     <style>
       <class name="dim-label"/>
diff --git a/src/resources/ui/nautilus-operations-ui-manager-request-passphrase.ui 
b/src/resources/ui/nautilus-operations-ui-manager-request-passphrase.ui
index c66c9cd6c..8c87ed135 100644
--- a/src/resources/ui/nautilus-operations-ui-manager-request-passphrase.ui
+++ b/src/resources/ui/nautilus-operations-ui-manager-request-passphrase.ui
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkDialog" id="request_passphrase_dialog">
     <property name="title" translatable="yes">Password Required</property>
     <property name="modal">True</property>
     <property name="destroy-with-parent">True</property>
     <property name="use-header-bar">1</property>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="margin-top">20</property>
         <property name="margin-bottom">20</property>
         <property name="margin-start">20</property>
         <property name="margin-end">20</property>
         <child>
           <object class="GtkLabel" id="label">
-            <property name="visible">True</property>
             <property name="max-width-chars">60</property>
             <property name="wrap">True</property>
           </object>
         </child>
         <child>
           <object class="GtkEntry" id="entry">
-            <property name="visible">True</property>
             <property name="activates-default">True</property>
             <property name="valign">end</property>
             <property name="vexpand">True</property>
@@ -35,15 +32,12 @@
     </child>
     <child type="action">
       <object class="GtkButton" id="cancel_button">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">_Cancel</property>
         <property name="use-underline">True</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="extract_button">
-        <property name="visible">True</property>
-        <property name="can-default">True</property>
         <property name="label" translatable="yes">Extract</property>
       </object>
     </child>
diff --git a/src/resources/ui/nautilus-pathbar-context-menu.ui 
b/src/resources/ui/nautilus-pathbar-context-menu.ui
index 462bb659b..5abbcce61 100644
--- a/src/resources/ui/nautilus-pathbar-context-menu.ui
+++ b/src/resources/ui/nautilus-pathbar-context-menu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
 <interface>
+  <requires lib="gtk" version="4.0"/>
   <menu id="button-menu">
     <item>
       <attribute name="label" translatable="yes">Open in New _Window</attribute>
diff --git a/src/resources/ui/nautilus-preferences-window.ui b/src/resources/ui/nautilus-preferences-window.ui
index 1d2807903..baf53a569 100644
--- a/src/resources/ui/nautilus-preferences-window.ui
+++ b/src/resources/ui/nautilus-preferences-window.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="AdwPreferencesWindow" id="preferences_window">
     <property name="search_enabled">False</property>
     <child>
@@ -23,7 +22,6 @@
                 <child>
                   <object class="GtkSwitch" id="sort_folders_first_switch">
                     <property name="valign">center</property>
-                    <property name="visible">True</property>
                   </object>
                 </child>
               </object>
@@ -39,7 +37,6 @@
                 <child>
                   <object class="GtkSwitch" id="use_tree_view_switch">
                     <property name="valign">center</property>
-                    <property name="visible">True</property>
                   </object>
                 </child>
               </object>
@@ -71,7 +68,6 @@
                 <child>
                   <object class="GtkSwitch" id="show_create_link_switch">
                     <property name="valign">center</property>
-                    <property name="visible">True</property>
                   </object>
                 </child>
               </object>
@@ -87,7 +83,6 @@
                 <child>
                   <object class="GtkSwitch" id="show_delete_permanently_switch">
                     <property name="valign">center</property>
-                    <property name="visible">True</property>
                   </object>
                 </child>
               </object>
diff --git a/src/resources/ui/nautilus-progress-info-widget.ui 
b/src/resources/ui/nautilus-progress-info-widget.ui
index 7fa9f3dad..6d78a5fa3 100644
--- a/src/resources/ui/nautilus-progress-info-widget.ui
+++ b/src/resources/ui/nautilus-progress-info-widget.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkImage" id="cancel_image">
-    <property name="visible">True</property>
     <property name="icon_name">window-close-symbolic</property>
   </object>
   <template class="NautilusProgressInfoWidget" parent="GtkGrid">
-    <property name="visible">True</property>
-    <property name="focusable">False</property>
     <property name="margin_start">6</property>
     <property name="margin_end">6</property>
     <property name="margin_top">6</property>
@@ -16,36 +12,33 @@
     <child>
       <object class="GtkLabel" id="status">
         <property name="width_request">300</property>
-        <property name="visible">True</property>
         <property name="margin_bottom">6</property>
         <property name="hexpand">True</property>
         <property name="label">status</property>
         <property name="ellipsize">middle</property>
         <property name="max_width_chars">40</property>
         <property name="xalign">0</property>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">0</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-      </packing>
     </child>
     <child>
       <object class="GtkProgressBar" id="progress_bar">
-        <property name="visible">True</property>
         <property name="valign">center</property>
         <property name="margin_start">2</property>
         <property name="margin_bottom">4</property>
         <property name="hexpand">True</property>
         <property name="pulse_step">0.050000000000000003</property>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">1</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-      </packing>
     </child>
     <child>
       <object class="GtkButton" id="button">
-        <property name="visible">True</property>
         <property name="focusable">True</property>
         <property name="receives_default">True</property>
         <property name="valign">center</property>
@@ -59,16 +52,15 @@
             <property name="icon-name">window-close-symbolic</property>
           </object>
         </child>
+        <layout>
+          <property name="column">1</property>
+          <property name="row">0</property>
+          <property name="row-span">3</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">0</property>
-        <property name="height">3</property>
-      </packing>
     </child>
     <child>
       <object class="GtkLabel" id="details">
-        <property name="visible">True</property>
         <property name="label">label</property>
         <property name="wrap">True</property>
         <property name="wrap_mode">word-char</property>
@@ -78,13 +70,13 @@
           <class name="dim-label"/>
         </style>
         <attributes>
-          <attribute name="font-features" value="tnum"/>
+          <attribute name="font-features" value="tnum"></attribute>
         </attributes>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">2</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
-      </packing>
     </child>
   </template>
 </interface>
diff --git a/src/resources/ui/nautilus-properties-window.ui b/src/resources/ui/nautilus-properties-window.ui
index 9ab166854..d53f40325 100644
--- a/src/resources/ui/nautilus-properties-window.ui
+++ b/src/resources/ui/nautilus-properties-window.ui
@@ -1,1183 +1,1192 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="NautilusPropertiesWindow" parent="AdwWindow">
     <property name="focusable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkBox" id="content_box">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="AdwHeaderBar">
-            <property name="visible">True</property>
-            <property name="focusable">False</property>
-            <property name="show_close_button">True</property>
-            <property name="title" bind-source="NautilusPropertiesWindow" bind-property="title" 
bind-flags="sync-create"/>
-          </object>
+          <object class="AdwHeaderBar"/>
         </child>
         <child>
           <object class="GtkNotebook" id="notebook">
             <property name="hexpand">True</property>
-            <property name="visible">True</property>
             <property name="focusable">True</property>
             <property name="show_border">False</property>
             <child>
-              <object class="GtkBox" id="basic_box">
-                <property name="visible">True</property>
-                <property name="margin-top">18</property>
-                <property name="margin-bottom">18</property>
-                <property name="margin-start">18</property>
-                <property name="margin-end">18</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkStack" id="icon_stack">
-                    <property name="visible">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">start</property>
+              <object class="GtkNotebookPage">
+                <property name="tab_expand">True</property>
+                <property name="child">
+                  <object class="GtkBox" id="basic_box">
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">18</property>
+                    <property name="margin-start">18</property>
+                    <property name="margin-end">18</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">12</property>
                     <child>
-                      <object class="GtkImage" id="icon_image">
-                        <property name="visible">True</property>
-                        <property name="icon-name">image-missing</property>
+                      <object class="GtkStack" id="icon_stack">
+                        <property name="halign">center</property>
+                        <property name="valign">start</property>
+                        <child>
+                          <object class="GtkStackPage">
+                            <property name="name">icon_image</property>
+                            <property name="child">
+                              <object class="GtkImage" id="icon_image">
+                                <property name="icon-name">image-missing</property>
+                              </object>
+                            </property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkStackPage">
+                            <property name="name">icon_button</property>
+                            <property name="child">
+                              <object class="GtkButton" id="icon_button">
+                                <property name="focusable">True</property>
+                                <property name="receives_default">True</property>
+                                <child>
+                                  <object class="GtkImage" id="icon_button_image">
+                                    <property name="icon-name">image-missing</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </property>
+                          </object>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="name">icon_image</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="icon_button">
-                        <property name="visible">True</property>
-                        <property name="focusable">True</property>
-                        <property name="receives_default">True</property>
+                      <object class="GtkBox" id="grid_box">
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkImage" id="icon_button_image">
-                            <property name="visible">True</property>
-                            <property name="icon-name">image-missing</property>
+                          <object class="GtkGrid" id="basic_grid">
+                            <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="label" translatable="yes">_Name</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">name_field</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">0</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStack" id="name_stack">
+                                <child>
+                                  <object class="GtkStackPage">
+                                    <property name="name">name_value_label</property>
+                                    <property name="child">
+                                      <object class="GtkLabel" id="name_value_label">
+                                        <property name="hexpand">True</property>
+                                        <property name="selectable">True</property>
+                                        <property name="ellipsize">end</property>
+                                        <property name="max_width_chars">24</property>
+                                        <property name="xalign">0</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkStackPage">
+                                    <property name="name">name_value_entry</property>
+                                    <property name="child">
+                                      <object class="GtkEntry" id="name_field">
+                                        <property name="focusable">True</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">0</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="type_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Type</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="type_value_label">
+                                <property name="visible">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selectable">True</property>
+                                <property name="ellipsize">end</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="link_target_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Link target</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">2</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="link_target_value_label">
+                                <property name="visible">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selectable">True</property>
+                                <property name="ellipsize">end</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">2</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="contents_title_label">
+                                <property name="visible">False</property>
+                                <property name="valign">start</property>
+                                <property name="label" translatable="yes">Contents</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">3</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="contents_value_label">
+                                <property name="visible">False</property>
+                                <property name="wrap">True</property>
+                                <property name="selectable">True</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">3</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSpinner" id="contents_spinner">
+                                <property name="visible">False</property>
+                                <layout>
+                                  <property name="column">2</property>
+                                  <property name="row">3</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="size_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Size</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">4</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="size_value_label">
+                                <property name="visible">False</property>
+                                <property name="selectable">True</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">4</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="parent_folder_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Parent folder</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">6</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="parent_folder_value_label">
+                                <property name="visible">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selectable">True</property>
+                                <property name="ellipsize">end</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">6</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="created_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Created</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">11</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="created_value_label">
+                                <property name="visible">False</property>
+                                <property name="selectable">True</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">11</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="original_folder_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Original folder</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">12</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="original_folder_value_label">
+                                <property name="visible">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selectable">True</property>
+                                <property name="ellipsize">end</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">12</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="volume_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Volume</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">7</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="volume_value_label">
+                                <property name="visible">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selectable">True</property>
+                                <property name="ellipsize">end</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">7</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="trashed_on_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Trashed on</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">13</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="trashed_on_value_label">
+                                <property name="visible">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selectable">True</property>
+                                <property name="ellipsize">end</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">13</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="accessed_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Accessed</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">9</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="accessed_value_label">
+                                <property name="visible">False</property>
+                                <property name="selectable">True</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">9</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="modified_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Modified</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">10</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="modified_value_label">
+                                <property name="visible">False</property>
+                                <property name="selectable">True</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">10</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="free_space_title_label">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Free space</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">15</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="free_space_value_label">
+                                <property name="visible">False</property>
+                                <property name="selectable">True</property>
+                                <property name="max_width_chars">24</property>
+                                <property name="xalign">0</property>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">15</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="volume_widget_box">
+                                <property name="visible">False</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkGrid" id="volume_grid">
+                                    <property name="hexpand">False</property>
+                                    <property name="margin-top">5</property>
+                                    <property name="margin-bottom">5</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="row_spacing">10</property>
+                                    <property name="column_spacing">10</property>
+                                    <child>
+                                      <object class="GtkDrawingArea" id="pie_chart">
+                                        <property name="width_request">200</property>
+                                        <property name="height_request">200</property>
+                                        <style>
+                                          <class name="disk-space-display"/>
+                                        </style>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
+                                          <property name="row-span">5</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="spacer_label">
+                                        <property name="vexpand">True</property>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">0</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkDrawingArea" id="used_color">
+                                        <property name="width_request">20</property>
+                                        <property name="height_request">20</property>
+                                        <property name="halign">end</property>
+                                        <style>
+                                          <class name="disk-space-display"/>
+                                          <class name="used"/>
+                                        </style>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">1</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkDrawingArea" id="free_color">
+                                        <property name="width_request">20</property>
+                                        <property name="height_request">20</property>
+                                        <property name="halign">end</property>
+                                        <property name="vexpand">False</property>
+                                        <style>
+                                          <class name="disk-space-display"/>
+                                          <class name="free"/>
+                                        </style>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="halign">end</property>
+                                        <property name="label" translatable="yes">Total capacity</property>
+                                        <property name="xalign">1</property>
+                                        <style>
+                                          <class name="dim-label"/>
+                                        </style>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">3</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="halign">end</property>
+                                        <property name="label" translatable="yes">Filesystem type</property>
+                                        <property name="xalign">1</property>
+                                        <style>
+                                          <class name="dim-label"/>
+                                        </style>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">4</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="total_capacity_value">
+                                        <property name="halign">start</property>
+                                        <property name="label">0</property>
+                                        <layout>
+                                          <property name="column">2</property>
+                                          <property name="row">3</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="file_system_value">
+                                        <property name="halign">start</property>
+                                        <property name="label">0</property>
+                                        <layout>
+                                          <property name="column">2</property>
+                                          <property name="row">4</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="used_value">
+                                        <property name="halign">end</property>
+                                        <property name="vexpand">False</property>
+                                        <property name="label">0</property>
+                                        <layout>
+                                          <property name="column">2</property>
+                                          <property name="row">1</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="free_value">
+                                        <property name="halign">end</property>
+                                        <property name="label">0</property>
+                                        <layout>
+                                          <property name="column">2</property>
+                                          <property name="row">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="halign">start</property>
+                                        <property name="label" translatable="yes" comments="Refers to the 
capacity of the filesystem">used</property>
+                                        <layout>
+                                          <property name="column">3</property>
+                                          <property name="row">1</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="halign">start</property>
+                                        <property name="label" translatable="yes" comments="Refers to the 
capacity of the filesystem">free</property>
+                                        <layout>
+                                          <property name="column">3</property>
+                                          <property name="row">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">16</property>
+                                  <property name="column-span">3</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="open_in_disks_button">
+                                <property name="visible">False</property>
+                                <property name="label" translatable="yes">Open in Disks</property>
+                                <property name="focusable">True</property>
+                                <property name="receives_default">True</property>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">17</property>
+                                  <property name="column-span">3</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="spacer_1">
+                                <property name="height_request">6</property>
+                                <property name="orientation">vertical</property>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">5</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="spacer_2">
+                                <property name="visible">False</property>
+                                <property name="height_request">6</property>
+                                <property name="orientation">vertical</property>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">8</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="spacer_3">
+                                <property name="visible">False</property>
+                                <property name="height_request">6</property>
+                                <property name="orientation">vertical</property>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">14</property>
+                                </layout>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="name">icon_button</property>
-                      </packing>
                     </child>
                   </object>
-                </child>
-                <child>
-                  <object class="GtkBox" id="grid_box">
-                    <property name="visible">True</property>
+                </property>
+                <property name="tab">
+                  <object class="GtkLabel" id="basic_label">
+                    <property name="label" translatable="yes">Basic</property>
+                  </object>
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkNotebookPage">
+                <property name="tab_expand">True</property>
+                <property name="child">
+                  <object class="GtkBox" id="permissions_box">
+                    <property name="visible">False</property>
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">18</property>
+                    <property name="margin-start">18</property>
+                    <property name="margin-end">18</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkGrid" id="basic_grid">
-                        <property name="visible">True</property>
+                      <object class="GtkLabel" id="not_the_owner_label">
+                        <property name="visible">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">1</property>
+                        <property name="max_width_chars">40</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator" id="bottom_prompt_seperator">
+                        <property name="visible">False</property>
+                        <property name="margin-top">12</property>
+                        <property name="margin-bottom">12</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="permission_indeterminable_label">
+                        <property name="visible">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">1</property>
+                        <property name="max_width_chars">40</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkGrid" id="permissions_grid">
+                        <property name="visible">False</property>
+                        <property name="halign">center</property>
+                        <property name="vexpand">True</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="label" translatable="yes">_Name</property>
+                          <object class="GtkLabel" id="owner_label">
+                            <property name="label" translatable="yes">_Owner</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">name_field</property>
+                            <property name="mnemonic_widget">owner_combo_box</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkStack" id="name_stack">
-                            <property name="visible">True</property>
+                          <object class="GtkStack" id="owner_value_stack">
                             <child>
-                              <object class="GtkLabel" id="name_value_label">
-                                <property name="visible">True</property>
-                                <property name="hexpand">True</property>
-                                <property name="selectable">True</property>
-                                <property name="ellipsize">end</property>
-                                <property name="max_width_chars">24</property>
-                                <property name="xalign">0</property>
+                              <object class="GtkStackPage">
+                                <property name="name">combo_box</property>
+                                <property name="title">page0</property>
+                                <property name="child">
+                                  <object class="GtkComboBox" id="owner_combo_box">
+                                    <property name="halign">start</property>
+                                  </object>
+                                </property>
                               </object>
-                              <packing>
-                                <property name="name">name_value_label</property>
-                              </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="name_field">
-                                <property name="visible">True</property>
-                                <property name="focusable">True</property>
+                              <object class="GtkStackPage">
+                                <property name="name">label</property>
+                                <property name="title">page0</property>
+                                <property name="child">
+                                  <object class="GtkLabel" id="owner_value_label">
+                                    <property name="selectable">True</property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                </property>
                               </object>
-                              <packing>
-                                <property name="name">name_value_entry</property>
-                              </packing>
                             </child>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="type_title_label">
-                            <property name="label" translatable="yes">Type</property>
+                          <object class="GtkLabel" id="owner_access_label">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">Access</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="type_value_label">
-                            <property name="hexpand">True</property>
-                            <property name="selectable">True</property>
-                            <property name="ellipsize">end</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="link_target_title_label">
-                            <property name="label" translatable="yes">Link target</property>
+                          <object class="GtkLabel" id="owner_folder_access_label">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">Folder access</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="link_target_value_label">
-                            <property name="hexpand">True</property>
-                            <property name="selectable">True</property>
-                            <property name="ellipsize">end</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="contents_title_label">
-                            <property name="valign">start</property>
-                            <property name="label" translatable="yes">Contents</property>
+                          <object class="GtkLabel" id="owner_file_access_label">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">File access</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">3</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="contents_value_label">
-                            <property name="wrap">True</property>
-                            <property name="selectable">True</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
+                          <object class="GtkComboBox" id="owner_access_combo">
+                            <property name="visible">False</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBox" id="owner_folder_access_combo">
+                            <property name="visible">False</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinner" id="contents_spinner">
+                          <object class="GtkComboBox" id="owner_file_access_combo">
+                            <property name="visible">False</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">3</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">3</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="size_title_label">
-                            <property name="label" translatable="yes">Size</property>
+                          <object class="GtkLabel" id="group_label">
+                            <property name="margin_top">12</property>
+                            <property name="label" translatable="yes">_Group</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">group_combo_box</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">5</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="size_value_label">
-                            <property name="selectable">True</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
+                          <object class="GtkStack" id="group_value_stack">
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">combo_box</property>
+                                <property name="title">page0</property>
+                                <property name="child">
+                                  <object class="GtkComboBoxText" id="group_combo_box">
+                                    <property name="halign">start</property>
+                                    <property name="margin_top">12</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">label</property>
+                                <property name="title">page1</property>
+                                <property name="child">
+                                  <object class="GtkLabel" id="group_value_label">
+                                    <property name="margin_top">12</property>
+                                    <property name="selectable">True</property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">5</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">4</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="parent_folder_title_label">
-                            <property name="label" translatable="yes">Parent folder</property>
+                          <object class="GtkLabel" id="group_access_label">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">Access</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">6</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">6</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="parent_folder_value_label">
-                            <property name="hexpand">True</property>
-                            <property name="selectable">True</property>
-                            <property name="ellipsize">end</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
+                          <object class="GtkLabel" id="group_folder_access_label">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">Folder access</property>
+                            <property name="xalign">1</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">7</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">6</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="created_title_label">
-                            <property name="label" translatable="yes">Created</property>
+                          <object class="GtkLabel" id="group_file_access_label">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">File access</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">8</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">11</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="created_value_label">
-                            <property name="selectable">True</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
+                          <object class="GtkComboBox" id="group_access_combo">
+                            <property name="visible">False</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">6</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">11</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="original_folder_title_label">
-                            <property name="label" translatable="yes">Original folder</property>
-                            <property name="xalign">1</property>
-                            <style>
-                              <class name="dim-label"/>
-                            </style>
+                          <object class="GtkComboBox" id="group_folder_access_combo">
+                            <property name="visible">False</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">7</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">12</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="original_folder_value_label">
-                            <property name="hexpand">True</property>
-                            <property name="selectable">True</property>
-                            <property name="ellipsize">end</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
+                          <object class="GtkComboBox" id="group_file_access_combo">
+                            <property name="visible">False</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">8</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">12</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="volume_title_label">
-                            <property name="label" translatable="yes">Volume</property>
+                          <object class="GtkLabel" id="others_label">
+                            <property name="margin_top">12</property>
+                            <property name="label" translatable="yes">Others</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">10</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">7</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="volume_value_label">
-                            <property name="hexpand">True</property>
-                            <property name="selectable">True</property>
-                            <property name="ellipsize">end</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">7</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="trashed_on_title_label">
-                            <property name="label" translatable="yes">Trashed on</property>
+                          <object class="GtkLabel" id="others_access_label">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">Access</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">11</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">13</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="trashed_on_value_label">
-                            <property name="hexpand">True</property>
-                            <property name="selectable">True</property>
-                            <property name="ellipsize">end</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
+                          <object class="GtkLabel" id="others_folder_access_label">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">Folder access</property>
+                            <property name="xalign">1</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">12</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">13</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="accessed_title_label">
-                            <property name="label" translatable="yes">Accessed</property>
+                          <object class="GtkLabel" id="others_file_access_label">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">File access</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">13</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">9</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="accessed_value_label">
-                            <property name="selectable">True</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
+                          <object class="GtkComboBox" id="others_access_combo">
+                            <property name="visible">False</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">11</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBox" id="others_folder_access_combo">
+                            <property name="visible">False</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">12</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">9</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="modified_title_label">
-                            <property name="label" translatable="yes">Modified</property>
+                          <object class="GtkComboBox" id="others_file_access_combo">
+                            <property name="visible">False</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">13</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="execute_label">
+                            <property name="visible">False</property>
+                            <property name="margin_top">12</property>
+                            <property name="label" translatable="yes">Execute</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">15</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">10</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="modified_value_label">
-                            <property name="selectable">True</property>
-                            <property name="max_width_chars">24</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">10</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="free_space_title_label">
-                            <property name="label" translatable="yes">Free space</property>
+                          <object class="GtkLabel" id="security_context_title_label">
+                            <property name="visible">False</property>
+                            <property name="margin_top">12</property>
+                            <property name="label" translatable="yes">Security context</property>
                             <property name="xalign">1</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">17</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">15</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="free_space_value_label">
+                          <object class="GtkLabel" id="security_context_value_label">
+                            <property name="visible">False</property>
+                            <property name="margin_top">12</property>
                             <property name="selectable">True</property>
                             <property name="max_width_chars">24</property>
                             <property name="xalign">0</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">17</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">15</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="volume_widget_box">
-                            <property name="orientation">vertical</property>
+                          <object class="GtkBox" id="change_permissions_button_box">
+                            <property name="visible">False</property>
+                            <property name="margin_top">12</property>
                             <child>
-                              <object class="GtkGrid" id="volume_grid">
-                                <property name="visible">True</property>
-                                <property name="hexpand">False</property>
-                                <property name="margin-top">5</property>
-                                <property name="margin-bottom">5</property>
-                                <property name="margin-start">5</property>
-                                <property name="margin-end">5</property>
-                                <property name="row_spacing">10</property>
-                                <property name="column_spacing">10</property>
-                                <child>
-                                  <object class="GtkDrawingArea" id="pie_chart">
-                                    <property name="width_request">200</property>
-                                    <property name="height_request">200</property>
-                                    <property name="visible">True</property>
-                                    <style>
-                                      <class name="disk-space-display"/>
-                                    </style>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="height">5</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="spacer_label">
-                                    <property name="visible">True</property>
-                                    <property name="vexpand">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkDrawingArea" id="used_color">
-                                    <property name="width_request">20</property>
-                                    <property name="height_request">20</property>
-                                    <property name="visible">True</property>
-                                    <property name="halign">end</property>
-                                    <style>
-                                      <class name="disk-space-display"/>
-                                      <class name="used"/>
-                                    </style>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkDrawingArea" id="free_color">
-                                    <property name="width_request">20</property>
-                                    <property name="height_request">20</property>
-                                    <property name="visible">True</property>
-                                    <property name="halign">end</property>
-                                    <property name="vexpand">False</property>
-                                    <style>
-                                      <class name="disk-space-display"/>
-                                      <class name="free"/>
-                                    </style>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="halign">end</property>
-                                    <property name="label" translatable="yes">Total capacity</property>
-                                    <property name="xalign">1</property>
-                                    <style>
-                                      <class name="dim-label"/>
-                                    </style>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="halign">end</property>
-                                    <property name="label" translatable="yes">Filesystem type</property>
-                                    <property name="xalign">1</property>
-                                    <style>
-                                      <class name="dim-label"/>
-                                    </style>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">4</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="total_capacity_value">
-                                    <property name="visible">True</property>
-                                    <property name="halign">start</property>
-                                    <property name="label">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="top_attach">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="file_system_value">
-                                    <property name="visible">True</property>
-                                    <property name="halign">start</property>
-                                    <property name="label">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="top_attach">4</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="used_value">
-                                    <property name="visible">True</property>
-                                    <property name="halign">end</property>
-                                    <property name="vexpand">False</property>
-                                    <property name="label">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="free_value">
-                                    <property name="visible">True</property>
-                                    <property name="halign">end</property>
-                                    <property name="label">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="top_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="halign">start</property>
-                                    <property name="label" translatable="yes" comments="Refers to the 
capacity of the filesystem">used</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="halign">start</property>
-                                    <property name="label" translatable="yes" comments="Refers to the 
capacity of the filesystem">free</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="top_attach">2</property>
-                                  </packing>
-                                </child>
+                              <object class="GtkButton" id="change_permissions_button">
+                                <property name="label" translatable="yes">Change Permissions for Enclosed 
Files…</property>
+                                <property name="focusable">True</property>
+                                <property name="receives_default">True</property>
                               </object>
                             </child>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">19</property>
+                              <property name="column-span">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">16</property>
-                            <property name="width">3</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="open_in_disks_button">
-                            <property name="label" translatable="yes">Open in Disks</property>
+                          <object class="GtkCheckButton" id="execute_checkbox">
+                            <property name="visible">False</property>
+                            <property name="label" translatable="yes">Allow _executing file as 
program</property>
+                            <property name="use_underline">True</property>
                             <property name="focusable">True</property>
-                            <property name="receives_default">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">17</property>
-                            <property name="width">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="spacer_1">
-                            <property name="height_request">6</property>
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">5</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="spacer_2">
-                            <property name="height_request">6</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">8</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="spacer_3">
-                            <property name="height_request">6</property>
-                            <property name="orientation">vertical</property>
+                            <property name="margin_top">12</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">15</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">14</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
                   </object>
-                </child>
-              </object>
-              <packing>
-                <property name="tab_expand">True</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="basic_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Basic</property>
+                </property>
+                <property name="tab">
+                  <object class="GtkLabel" id="permissions_label">
+                    <property name="label" translatable="yes">Permissions</property>
+                  </object>
+                </property>
               </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkBox" id="permissions_box">
-                <property name="margin-top">18</property>
-                <property name="margin-bottom">18</property>
-                <property name="margin-start">18</property>
-                <property name="margin-end">18</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkLabel" id="not_the_owner_label">
-                    <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>
-                    <property name="max_width_chars">40</property>
-                  </object>
-                  <packing>
-                    <property name="pack_type">end</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="bottom_prompt_seperator">
-                    <property name="margin-top">12</property>
-                    <property name="margin-bottom">12</property>
-                  </object>
-                  <packing>
-                    <property name="pack_type">end</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="permission_indeterminable_label">
-                    <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>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="permissions_grid">
-                    <property name="halign">center</property>
-                    <property name="vexpand">True</property>
+              <object class="GtkNotebookPage">
+                <property name="tab_expand">True</property>
+                <property name="child">
+                  <object class="GtkBox" id="open_with_box">
+                    <property name="visible">False</property>
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">18</property>
+                    <property name="margin-start">18</property>
+                    <property name="margin-end">18</property>
                     <property name="orientation">vertical</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="owner_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Owner</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">owner_combo_box</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkStack" id="owner_value_stack">
-                        <property name="visible">True</property>
-                        <child>
-                          <object class="GtkComboBox" id="owner_combo_box">
-                            <property name="visible">True</property>
-                            <property name="halign">start</property>
-                          </object>
-                          <packing>
-                            <property name="name">combo_box</property>
-                            <property name="title">page0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="owner_value_label">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="name">label</property>
-                            <property name="title">page0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="owner_access_label">
-                        <property name="label" translatable="yes">Access</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="owner_folder_access_label">
-                        <property name="label" translatable="yes">Folder access</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="owner_file_access_label">
-                        <property name="label" translatable="yes">File access</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="owner_access_combo">
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="owner_folder_access_combo">
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkComboBox" id="owner_file_access_combo">
+                      <object class="GtkLabel" id="open_with_label">
+                        <property name="wrap">1</property>
+                        <property name="wrap_mode">word-char</property>
+                        <property name="max_width_chars">30</property>
+                        <property name="xalign">0</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="group_label">
-                        <property name="visible">True</property>
-                        <property name="margin_top">12</property>
-                        <property name="label" translatable="yes">_Group</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">group_combo_box</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
+                      <object class="GtkBox" id="app_chooser_widget_box">
+                        <property name="vexpand">True</property>
+                        <property name="orientation">vertical</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkStack" id="group_value_stack">
-                        <property name="visible">True</property>
+                      <object class="GtkBox">
+                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkComboBoxText" id="group_combo_box">
-                            <property name="visible">True</property>
+                          <object class="GtkButton" id="reset_button">
+                            <property name="label" translatable="yes">Reset</property>
+                            <property name="focusable">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="hexpand">True</property>
                             <property name="halign">start</property>
-                            <property name="margin_top">12</property>
                           </object>
-                          <packing>
-                            <property name="name">combo_box</property>
-                            <property name="title">page0</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="group_value_label">
-                            <property name="visible">True</property>
-                            <property name="margin_top">12</property>
-                            <property name="selectable">True</property>
-                            <property name="xalign">0</property>
+                          <object class="GtkButton" id="forget_button">
+                            <property name="label" translatable="yes">_Forget</property>
+                            <property name="focusable">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_underline">True</property>
                           </object>
-                          <packing>
-                            <property name="name">label</property>
-                            <property name="title">page1</property>
-                          </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="group_access_label">
-                        <property name="label" translatable="yes">Access</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="group_folder_access_label">
-                        <property name="label" translatable="yes">Folder access</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="group_file_access_label">
-                        <property name="label" translatable="yes">File access</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="group_access_combo">
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="group_folder_access_combo">
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="group_file_access_combo">
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="others_label">
-                        <property name="visible">True</property>
-                        <property name="margin_top">12</property>
-                        <property name="label" translatable="yes">Others</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="others_access_label">
-                        <property name="label" translatable="yes">Access</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="others_folder_access_label">
-                        <property name="label" translatable="yes">Folder access</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="others_file_access_label">
-                        <property name="label" translatable="yes">File access</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">13</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="others_access_combo">
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="others_folder_access_combo">
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="others_file_access_combo">
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">13</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="execute_label">
-                        <property name="margin_top">12</property>
-                        <property name="label" translatable="yes">Execute</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">15</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="security_context_title_label">
-                        <property name="margin_top">12</property>
-                        <property name="label" translatable="yes">Security context</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">17</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="security_context_value_label">
-                        <property name="margin_top">12</property>
-                        <property name="selectable">True</property>
-                        <property name="max_width_chars">24</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">17</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="change_permissions_button_box">
-                        <property name="margin_top">12</property>
                         <child>
-                          <object class="GtkButton" id="change_permissions_button">
-                            <property name="label" translatable="yes">Change Permissions for Enclosed 
Files…</property>
+                          <object class="GtkButton" id="add_button">
+                            <property name="label" translatable="yes">_Add</property>
+                            <property name="focusable">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="set_as_default_button">
+                            <property name="label" translatable="yes">Set as default</property>
                             <property name="focusable">True</property>
                             <property name="receives_default">True</property>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">19</property>
-                        <property name="width">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="execute_checkbox">
-                        <property name="label" translatable="yes">Allow _executing file as program</property>
-                        <property name="use_underline">True</property>
-                        <property name="focusable">True</property>
-                        <property name="margin_top">12</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">15</property>
-                      </packing>
                     </child>
                   </object>
-                </child>
-              </object>
-              <packing>
-                <property name="tab_expand">True</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="permissions_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Permissions</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="open_with_box">
-                <property name="margin-top">18</property>
-                <property name="margin-bottom">18</property>
-                <property name="margin-start">18</property>
-                <property name="margin-end">18</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="open_with_label">
-                    <property name="visible">True</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>
-                </child>
-                <child>
-                  <object class="GtkBox" id="app_chooser_widget_box">
-                    <property name="vexpand">True</property>
-                    <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                </property>
+                <property name="tab">
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Open With</property>
                   </object>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkButton" id="reset_button">
-                        <property name="label" translatable="yes">Reset</property>
-                        <property name="visible">True</property>
-                        <property name="focusable">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="halign">start</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="forget_button">
-                        <property name="label" translatable="yes">_Forget</property>
-                        <property name="visible">True</property>
-                        <property name="focusable">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="add_button">
-                        <property name="label" translatable="yes">_Add</property>
-                        <property name="visible">True</property>
-                        <property name="focusable">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="set_as_default_button">
-                        <property name="label" translatable="yes">Set as default</property>
-                        <property name="visible">True</property>
-                        <property name="focusable">True</property>
-                        <property name="receives_default">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="tab_expand">True</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Open With</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child type="tab">
             </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..766433a2c 100644
--- a/src/resources/ui/nautilus-rename-file-popover.ui
+++ b/src/resources/ui/nautilus-rename-file-popover.ui
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkPopover" id="rename_file_popover">
-    <property name="position">bottom</property>
-    <child>
+    <property name="child">
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="margin-start">18</property>
         <property name="margin-end">18</property>
         <property name="margin-top">18</property>
@@ -14,7 +11,6 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="title_label">
-            <property name="visible">True</property>
             <property name="margin-bottom">12</property>
             <style>
               <class name="title-2"/>
@@ -23,32 +19,27 @@
         </child>
         <child>
           <object class="GtkEntry" id="name_entry">
-            <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="can-default">True</property>
+            <property name="focusable">True</property>
             <property name="margin-bottom">12</property>
           </object>
         </child>
         <child>
           <object class="GtkRevealer" id="error_revealer">
-            <property name="visible">True</property>
-            <child>
+            <property name="child">
               <object class="GtkLabel" id="error_label">
-                <property name="visible">True</property>
                 <property name="margin-bottom">12</property>
                 <property name="max-width-chars">0</property>
                 <property name="wrap">True</property>
                 <property name="xalign">0</property>
               </object>
-            </child>
+            </property>
           </object>
         </child>
         <child>
           <object class="GtkButton" id="rename_button">
             <property name="label" translatable="yes">_Rename</property>
-            <property name="visible">True</property>
             <property name="sensitive">False</property>
-            <property name="can-focus">True</property>
+            <property name="focusable">True</property>
             <property name="halign">end</property>
             <property name="use-underline">True</property>
             <style>
@@ -57,6 +48,6 @@
           </object>
         </child>
       </object>
-    </child>
+    </property>
   </object>
 </interface>
diff --git a/src/resources/ui/nautilus-search-popover.ui b/src/resources/ui/nautilus-search-popover.ui
index a202bb8ca..9efaac63e 100644
--- a/src/resources/ui/nautilus-search-popover.ui
+++ b/src/resources/ui/nautilus-search-popover.ui
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="NautilusSearchPopover" parent="GtkPopover">
-    <property name="focusable">False</property>
-    <property name="modal">True</property>
-    <child>
-      <object class="GtkGrid" >
-        <property name="visible">True</property>
+    <property name="child">
+      <object class="GtkGrid">
         <property name="margin-top">20</property>
         <property name="margin-bottom">20</property>
         <property name="margin-start">20</property>
@@ -15,296 +12,272 @@
         <property name="column_spacing">18</property>
         <child>
           <object class="GtkLabel" id="when_dim_label">
-            <property name="visible">True</property>
             <property name="label" translatable="yes">When</property>
             <property name="xalign">0</property>
             <style>
               <class name="dim-label"/>
             </style>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">0</property>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkStack" id="date_stack">
-            <property name="visible">True</property>
             <property name="transition_type">crossfade</property>
             <property name="transition_duration">250</property>
             <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkButton" id="select_date_button">
-                    <property name="visible">True</property>
-                    <property name="focusable">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Select a date</property>
-                    <property name="hexpand">True</property>
+              <object class="GtkStackPage">
+                <property name="name">date-button</property>
+                <property name="child">
+                  <object class="GtkBox">
                     <child>
-                      <object class="GtkLabel" id="select_date_button_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Select Dates…</property>
-                        <property name="xalign">0</property>
+                      <object class="GtkButton" id="select_date_button">
+                        <property name="focusable">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Select a date</property>
+                        <property name="hexpand">True</property>
+                        <child>
+                          <object class="GtkLabel" id="select_date_button_label">
+                            <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>
                     </child>
-                    <signal name="clicked" handler="select_date_button_clicked" 
object="NautilusSearchPopover" swapped="no" />
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" id="clear_date_button">
-                    <property name="focusable">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Clear the currently selected 
date</property>
-                    <signal name="clicked" handler="clear_date_button_clicked" 
object="NautilusSearchPopover" swapped="no" />
                     <child>
-                      <object class="GtkImage" id="clear_date_button_image">
-                        <property name="visible">True</property>
-                        <property name="icon_name">edit-clear-symbolic</property>
+                      <object class="GtkButton" id="clear_date_button">
+                        <property name="visible">False</property>
+                        <property name="focusable">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Clear the currently selected 
date</property>
+                        <signal name="clicked" handler="clear_date_button_clicked" 
object="NautilusSearchPopover" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="clear_date_button_image">
+                            <property name="icon_name">edit-clear-symbolic</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
+                    <style>
+                      <class name="linked"/>
+                    </style>
                   </object>
-                </child>
-                <style>
-                  <class name="linked"/>
-                </style>
+                </property>
               </object>
-              <packing>
-                <property name="name">date-button</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="date_entry">
-                <property name="visible">True</property>
-                <property name="focusable">True</property>
-                <property name="secondary_icon_name">x-office-calendar-symbolic</property>
-                <property name="secondary_icon_tooltip_text" translatable="yes">Show a calendar to select 
the date</property>
-                <signal name="icon-release" handler="toggle_calendar_icon_clicked" 
object="NautilusSearchPopover" swapped="no" />
-                <signal name="activate" handler="date_entry_activate" object="NautilusSearchPopover" 
swapped="no" />
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">date-entry</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkEntry" id="date_entry">
+                    <property name="focusable">True</property>
+                    <property name="secondary_icon_name">x-office-calendar-symbolic</property>
+                    <property name="secondary_icon_tooltip_text" translatable="yes">Show a calendar to 
select the date</property>
+                    <signal name="icon-release" handler="toggle_calendar_icon_clicked" 
object="NautilusSearchPopover" swapped="no"/>
+                    <signal name="activate" handler="date_entry_activate" object="NautilusSearchPopover" 
swapped="no"/>
+                  </object>
+                </property>
+              </object>
             </child>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">1</property>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="around_revealer">
-            <property name="transition_type">slide-down</property>
-            <child>
+            <property name="child">
               <object class="GtkGrid">
-                <property name="visible">True</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="margin_top">10</property>
                     <property name="label" translatable="yes">Since…</property>
                     <property name="xalign">0</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">0</property>
+                      <property name="column-span">2</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">2</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkStack" id="around_stack">
-                    <property name="visible">True</property>
                     <property name="vhomogeneous">False</property>
                     <property name="transition_type">crossfade</property>
                     <property name="transition_duration">250</property>
                     <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="height_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="focusable">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkViewport">
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkListBox" id="dates_listbox">
-                                <property name="visible">True</property>
-                                <property name="selection_mode">none</property>
-                                <signal name="row-activated" handler="dates_listbox_row_activated" 
object="NautilusSearchPopover" swapped="no" />
+                      <object class="GtkStackPage">
+                        <property name="name">date-list</property>
+                        <property name="child">
+                          <object class="GtkScrolledWindow">
+                            <property name="height_request">200</property>
+                            <property name="focusable">True</property>
+                            <property name="hexpand">True</property>
+                            <property name="child">
+                              <object class="GtkViewport">
+                                <property name="child">
+                                  <object class="GtkListBox" id="dates_listbox">
+                                    <property name="selection_mode">none</property>
+                                    <signal name="row-activated" handler="dates_listbox_row_activated" 
object="NautilusSearchPopover" swapped="no"/>
+                                  </object>
+                                </property>
                               </object>
-                            </child>
+                            </property>
                           </object>
-                        </child>
+                        </property>
                       </object>
-                      <packing>
-                        <property name="name">date-list</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkCalendar" id="calendar">
-                        <property name="visible">True</property>
-                        <property name="focusable">True</property>
-                        <property name="valign">start</property>
-                        <property name="show_week_numbers">True</property>
-                      </object>
-                      <packing>
+                      <object class="GtkStackPage">
                         <property name="name">date-calendar</property>
-                      </packing>
+                        <property name="child">
+                          <object class="GtkCalendar" id="calendar">
+                            <property name="focusable">True</property>
+                            <property name="valign">start</property>
+                            <property name="show_week_numbers">True</property>
+                          </object>
+                        </property>
+                      </object>
                     </child>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">1</property>
+                      <property name="column-span">2</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">2</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="last_modified_button">
+                  <object class="GtkCheckButton" id="last_modified_button">
                     <property name="label" translatable="yes">Last _modified</property>
-                    <property name="visible">True</property>
-                    <property name="focusable">True</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                    <signal name="toggled" handler="search_time_type_changed" object="NautilusSearchPopover" 
swapped="no" />
+                    <signal name="toggled" handler="search_time_type_changed" object="NautilusSearchPopover" 
swapped="no"/>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">2</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="last_used_button">
+                  <object class="GtkCheckButton" id="last_used_button">
                     <property name="label" translatable="yes">Last _used</property>
-                    <property name="visible">True</property>
-                    <property name="focusable">True</property>
                     <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
                     <property name="group">last_modified_button</property>
-                    <signal name="toggled" handler="search_time_type_changed" object="NautilusSearchPopover" 
swapped="no" />
+                    <signal name="toggled" handler="search_time_type_changed" object="NautilusSearchPopover" 
swapped="no"/>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">3</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                  </packing>
                 </child>
-                 <child>
-                    <object class="GtkRadioButton" id="created_button">
-                      <property name="label" translatable="yes">Created</property>
-                      <property name="visible">True</property>
-                      <property name="can-focus">True</property>
-                      <property name="use-underline">True</property>
-                      <property name="xalign">0</property>
-                      <property name="draw-indicator">True</property>
-                      <property name="group">last_modified_button</property>
-                      <signal name="toggled" handler="search_time_type_changed" 
object="NautilusSearchPopover" swapped="no"/>
-                    </object>
-                     <packing>
-                      <property name="left-attach">0</property>
-                      <property name="top-attach">4</property>
-                    </packing>
+                <child>
+                  <object class="GtkCheckButton" id="created_button">
+                    <property name="label" translatable="yes">Created</property>
+                    <property name="use-underline">True</property>
+                    <property name="group">last_modified_button</property>
+                    <signal name="toggled" handler="search_time_type_changed" object="NautilusSearchPopover" 
swapped="no"/>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">4</property>
+                    </layout>
+                  </object>
                 </child>
               </object>
-            </child>
+            </property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">2</property>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="what_dim_label">
-            <property name="visible">True</property>
             <property name="margin_top">10</property>
             <property name="label" translatable="yes">What</property>
             <property name="xalign">0</property>
             <style>
               <class name="dim-label"/>
             </style>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">3</property>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkStack" id="type_stack">
-            <property name="visible">True</property>
             <property name="vhomogeneous">False</property>
             <property name="transition_type">crossfade</property>
             <property name="transition_duration">250</property>
             <child>
-              <object class="GtkButton" id="select_type_button">
-                <property name="visible">True</property>
-                <property name="focusable">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Which file types will be searched</property>
-                <signal name="clicked" handler="select_type_button_clicked" object="NautilusSearchPopover" 
swapped="no" />
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" id="type_label">
-                        <property name="visible">True</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>
-                    </child>
+              <object class="GtkStackPage">
+                <property name="name">type-button</property>
+                <property name="child">
+                  <object class="GtkButton" id="select_type_button">
+                    <property name="focusable">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Which file types will be 
searched</property>
+                    <signal name="clicked" handler="select_type_button_clicked" 
object="NautilusSearchPopover" swapped="no"/>
                     <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="icon_name">pan-down-symbolic</property>
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkLabel" id="type_label">
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Anything</property>
+                            <property name="width_chars">30</property>
+                            <property name="xalign">0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="icon_name">pan-down-symbolic</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">type-button</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow">
-                <property name="height_request">250</property>
-                <property name="visible">True</property>
-                <property name="focusable">True</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkViewport">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkListBox" id="type_listbox">
-                        <property name="visible">True</property>
-                        <property name="selection_mode">single</property>
-                        <signal name="row-activated" handler="types_listbox_row_activated" 
object="NautilusSearchPopover" swapped="no" />
+              <object class="GtkStackPage">
+                <property name="name">type-list</property>
+                <property name="child">
+                  <object class="GtkScrolledWindow">
+                    <property name="height_request">250</property>
+                    <property name="focusable">True</property>
+                    <property name="child">
+                      <object class="GtkViewport">
+                        <property name="child">
+                          <object class="GtkListBox" id="type_listbox">
+                            <signal name="row-activated" handler="types_listbox_row_activated" 
object="NautilusSearchPopover" swapped="no"/>
+                          </object>
+                        </property>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">type-list</property>
-              </packing>
             </child>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">4</property>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="search_dim_label">
@@ -314,54 +287,47 @@
             <style>
               <class name="dim-label"/>
             </style>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">5</property>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox">
             <property name="hexpand">True</property>
-            <property name="visible">True</property>
             <child>
-              <object class="GtkRadioButton" id="full_text_search_button">
+              <object class="GtkToggleButton" id="full_text_search_button">
                 <property name="label" translatable="yes">Full Text</property>
-                <property name="visible">True</property>
-                <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Search on the file content and 
name</property>
                 <property name="hexpand">True</property>
                 <property name="active">True</property>
-                <property name="draw_indicator">False</property>
                 <signal name="toggled" handler="search_fts_mode_changed" object="NautilusSearchPopover" 
swapped="no" />
               </object>
             </child>
             <child>
-              <object class="GtkRadioButton" id="filename_search_button">
+              <object class="GtkToggleButton" id="filename_search_button">
                 <property name="label" translatable="yes">File Name</property>
-                <property name="visible">True</property>
-                <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Search only on the file name</property>
                 <property name="hexpand">True</property>
-                <property name="draw_indicator">False</property>
                 <property name="group">full_text_search_button</property>
                 <property name="active">True</property>
-                <signal name="toggled" handler="search_fts_mode_changed" object="NautilusSearchPopover" 
swapped="no" />
+                <signal name="toggled" handler="search_fts_mode_changed" object="NautilusSearchPopover" 
swapped="no"/>
               </object>
             </child>
             <style>
               <class name="linked"/>
             </style>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">6</property>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-            <property name="width">2</property>
-          </packing>
         </child>
       </object>
-    </child>
+    </property>
   </template>
   <object class="GtkSizeGroup">
     <property name="mode">vertical</property>
@@ -373,7 +339,6 @@
     </widgets>
   </object>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="search_dim_label"/>
       <widget name="when_dim_label"/>
diff --git a/src/resources/ui/nautilus-starred-is-empty.ui b/src/resources/ui/nautilus-starred-is-empty.ui
index b91ceb30c..8747fcbb3 100644
--- a/src/resources/ui/nautilus-starred-is-empty.ui
+++ b/src/resources/ui/nautilus-starred-is-empty.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkGrid" id="starred_is_empty">
     <property name="halign">center</property>
     <property name="valign">center</property>
@@ -11,31 +10,29 @@
     <property name="visible">False</property>
     <child>
       <object class="GtkImage">
-        <property name="visible">True</property>
         <property name="pixel_size">128</property>
         <property name="icon_name">starred-symbolic</property>
         <style>
           <class name="dim-label"/>
           <class name="nautilus-empty-state-icon"/>
         </style>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">0</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-      </packing>
     </child>
     <child>
       <object class="GtkLabel">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">Starred files will appear here</property>
         <style>
           <class name="large-title"/>
         </style>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">1</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-      </packing>
     </child>
   </object>
 </interface>
diff --git a/src/resources/ui/nautilus-toolbar-view-menu.ui b/src/resources/ui/nautilus-toolbar-view-menu.ui
index 265aec606..46404b82d 100644
--- a/src/resources/ui/nautilus-toolbar-view-menu.ui
+++ b/src/resources/ui/nautilus-toolbar-view-menu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
+  <requires lib="gtk" version="4.0"/>
   <menu id="zoom_section">
     <item>
       <attribute name="label" translatable="yes">Zoom out</attribute>
@@ -8,8 +8,6 @@
       <attribute name="verb-icon">zoom-out-symbolic</attribute>
     </item>
     <item>
-      <!-- This label is a placeholder. The view is going to replace it with a
-           percentage, like this:   [ - | 100% | + ]                       -->
       <attribute name="label" translatable="yes">Reset zoom</attribute>
       <attribute name="action">view.zoom-standard</attribute>
     </item>
diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui
index d88baf10e..b3687f32c 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -1,33 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
-  <object class="GtkPopover" id="back_menu">
-    <property name="position">bottom</property>
-    <property name="relative-to">back_button</property>
-  </object>
-  <object class="GtkPopover" id="forward_menu">
-    <property name="position">bottom</property>
-    <property name="relative-to">forward_button</property>
-  </object>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkPopover" id="back_menu"/>
+  <object class="GtkPopover" id="forward_menu"/>
   <menu id="view_menu">
     <section>
       <attribute name="display-hint">horizontal-buttons</attribute>
-      <!--
-           Zoom section.
-
-           The toolbar code assumes this is the first item of this menu model.
-           Its contents is provided by the view.
-      -->
     </section>
     <section>
       <attribute name="label" translatable="yes" context="menu item" comments="Translators: a menu item in a 
group of sorting options in a toolbar menu, with criterions such as &quot;A-Z&quot; or &quot;Last 
Modified&quot;.">Sort</attribute>
-      <!--
-           Sort section.
-
-           The toolbar code assumes this is the second item of this menu model.
-           Its contents is provided by the view.
-      -->
     </section>
     <section>
       <item>
@@ -67,9 +48,6 @@
       </item>
     </section>
     <section id="undo_redo_section">
-      <!-- Note: This section is often recreated by undo_manager_changed() to
-           change the labels of the actions. If you change anything here,
-           remember to change in the code as well. -->
       <item>
         <attribute name="label" translatable="yes">_Undo</attribute>
         <attribute name="action">win.undo</attribute>
@@ -109,16 +87,13 @@
     </section>
   </menu>
   <object class="GtkPopover" id="operations_popover">
-    <property name="focusable">False</property>
-    <child>
+    <property name="child">
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
         <property name="hscrollbar_policy">never</property>
         <property name="max_content_height">270</property>
         <property name="propagate_natural_height">True</property>
-        <child>
+        <property name="child">
           <object class="GtkListBox" id="operations_list">
-            <property name="visible">True</property>
             <property name="margin_start">6</property>
             <property name="margin_end">6</property>
             <property name="margin_top">6</property>
@@ -129,60 +104,59 @@
               <class name="operations-list"/>
             </style>
           </object>
-        </child>
+        </property>
       </object>
-    </child>
+    </property>
     <signal name="notify::visible" handler="on_operations_popover_notify_visible" object="NautilusToolbar" 
swapped="yes"/>
   </object>
   <template class="NautilusToolbar" parent="AdwBin">
-    <property name="visible">True</property>
     <child>
       <object class="AdwHeaderBar">
-        <property name="visible">True</property>
         <property name="focusable">False</property>
-        <property name="show_close_button">True</property>
         <child type="title">
           <object class="GtkBox" id="header_toolbar">
             <property name="width_request">270</property>
-            <property name="visible">True</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkStack" id="toolbar_switcher">
-                <property name="visible">True</property>
                 <property name="valign">center</property>
                 <property name="transition_type">crossfade</property>
                 <child>
-                  <object class="GtkBox" id="path_bar_container">
-                    <property name="valign">center</property>
-                  </object>
-                  <packing>
+                  <object class="GtkStackPage">
                     <property name="name">pathbar</property>
-                  </packing>
+                    <property name="child">
+                      <object class="GtkBox" id="path_bar_container">
+                        <property name="valign">center</property>
+                      </object>
+                    </property>
+                  </object>
                 </child>
                 <child>
-                  <object class="GtkBox" id="location_entry_container">
-                    <style>
-                      <class name="linked"/>
-                    </style>
-                  </object>
-                  <packing>
+                  <object class="GtkStackPage">
                     <property name="name">location</property>
-                  </packing>
+                    <property name="child">
+                      <object class="GtkBox" id="location_entry_container">
+                        <style>
+                          <class name="linked"/>
+                        </style>
+                      </object>
+                    </property>
+                  </object>
                 </child>
                 <child>
-                  <object class="GtkBox" id="search_container">
-                    <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
+                  <object class="GtkStackPage">
                     <property name="name">search</property>
-                  </packing>
+                    <property name="child">
+                      <object class="GtkBox" id="search_container">
+                        <property name="orientation">vertical</property>
+                      </object>
+                    </property>
+                  </object>
                 </child>
               </object>
             </child>
             <child>
               <object class="GtkToggleButton" id="search_button">
-                <property name="visible">True</property>
                 <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Search</property>
                 <property name="halign">center</property>
@@ -190,7 +164,6 @@
                 <property name="action_name">slot.search-visible</property>
                 <child>
                   <object class="GtkImage" id="search_icon">
-                    <property name="visible">True</property>
                     <property name="icon_name">edit-find-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -202,12 +175,10 @@
             </child>
           </object>
         </child>
-        <child>
+        <child type="start">
           <object class="GtkBox" id="navigation_box">
-            <property name="visible">True</property>
             <child>
               <object class="GtkButton" id="back_button">
-                <property name="visible">True</property>
                 <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Go back</property>
                 <property name="halign">center</property>
@@ -215,7 +186,6 @@
                 <property name="action_name">win.back</property>
                 <child>
                   <object class="GtkImage" id="back_icon">
-                    <property name="visible">True</property>
                     <property name="icon_name">go-previous-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -227,7 +197,6 @@
             </child>
             <child>
               <object class="GtkButton" id="forward_button">
-                <property name="visible">True</property>
                 <property name="focusable">True</property>
                 <property name="tooltip_text" translatable="yes">Go forward</property>
                 <property name="halign">center</property>
@@ -235,7 +204,6 @@
                 <property name="action_name">win.forward</property>
                 <child>
                   <object class="GtkImage" id="forward_icon">
-                    <property name="visible">True</property>
                     <property name="icon_name">go-next-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -251,17 +219,15 @@
             </style>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="margin_start">72</property>
             <child>
               <object class="GtkRevealer" id="operations_revealer">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="transition_type">slide-right</property>
-                <child>
+                <property name="child">
                   <object class="GtkMenuButton" id="operations_button">
                     <property name="focusable">True</property>
                     <property name="tooltip_text" translatable="yes">Show operations</property>
@@ -271,7 +237,6 @@
                       <object class="GtkDrawingArea" id="operations_icon">
                         <property name="width_request">16</property>
                         <property name="height_request">16</property>
-                        <property name="visible">True</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
                         <signal name="draw" handler="on_operations_icon_draw" object="NautilusToolbar" 
swapped="no"/>
@@ -281,24 +246,21 @@
                       <class name="button"/>
                     </style>
                   </object>
-                </child>
+                </property>
               </object>
             </child>
             <child>
               <object class="GtkBox">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="margin_end">6</property>
                 <child>
                   <object class="GtkButton" id="view_toggle_button">
-                    <property name="visible">True</property>
                     <property name="focusable">True</property>
                     <property name="tooltip_text" translatable="yes">Toggle view</property>
                     <property name="action_name">slot.files-view-mode-toggle</property>
                     <child>
                       <object class="GtkImage" id="view_toggle_icon">
-                        <property name="visible">True</property>
                         <property name="icon_size">1</property>
                       </object>
                     </child>
@@ -309,16 +271,13 @@
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="view_button">
-                    <property name="visible">True</property>
                     <property name="focusable">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes" comments="“View” is a noun">View 
options</property>
                     <property name="halign">start</property>
-                    <property name="action_name">win.view-menu</property>
                     <property name="menu-model">view_menu</property>
                     <child>
                       <object class="GtkImage">
-                        <property name="visible">True</property>
                         <property name="icon_name">pan-down-symbolic</property>
                       </object>
                     </child>
@@ -334,14 +293,12 @@
             </child>
             <child>
               <object class="GtkMenuButton" id="app_button">
-                <property name="visible">True</property>
                 <property name="focusable">True</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="icon_name">open-menu-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -352,9 +309,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/src/resources/ui/nautilus-trash-is-empty.ui b/src/resources/ui/nautilus-trash-is-empty.ui
index bbc387aea..1818fba55 100644
--- a/src/resources/ui/nautilus-trash-is-empty.ui
+++ b/src/resources/ui/nautilus-trash-is-empty.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkGrid" id="trash_is_empty">
     <property name="halign">center</property>
     <property name="valign">center</property>
@@ -11,31 +10,29 @@
     <property name="visible">False</property>
     <child>
       <object class="GtkImage">
-        <property name="visible">True</property>
         <property name="pixel_size">128</property>
         <property name="icon_name">user-trash-symbolic</property>
         <style>
           <class name="dim-label"/>
           <class name="nautilus-empty-state-icon"/>
         </style>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">0</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-      </packing>
     </child>
     <child>
       <object class="GtkLabel">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">Trash is Empty</property>
         <style>
           <class name="large-title"/>
         </style>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">1</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-      </packing>
     </child>
   </object>
 </interface>
diff --git a/src/resources/ui/nautilus-view-icon-item-ui.ui b/src/resources/ui/nautilus-view-icon-item-ui.ui
index 6e6121f0b..fa1fe25e1 100644
--- a/src/resources/ui/nautilus-view-icon-item-ui.ui
+++ b/src/resources/ui/nautilus-view-icon-item-ui.ui
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="NautilusViewIconItemUi" parent="GtkFlowBoxChild">
     <property name="halign">center</property>
     <property name="valign">start</property>
-    <child>
+    <property name="child">
       <object class="GtkBox">
         <property name="orientation">vertical</property>
         <property name="halign">center</property>
@@ -42,7 +42,7 @@
                 <property name="wrap">True</property>
                 <property name="wrap-mode">word-char</property>
                 <attributes>
-                  <attribute name="insert-hyphens" value="false"/>
+                  <attribute name="insert-hyphens" value="false"></attribute>
                 </attributes>
               </object>
             </child>
@@ -91,6 +91,6 @@
           </object>
         </child>
       </object>
-    </child>
+    </property>
   </template>
 </interface>
diff --git a/src/resources/ui/nautilus-window.ui b/src/resources/ui/nautilus-window.ui
index 9ce3db268..e0fca161b 100644
--- a/src/resources/ui/nautilus-window.ui
+++ b/src/resources/ui/nautilus-window.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <object class="GtkPopover" id="tab_menu">
-    <property name="position">bottom</property>
-    <property name="relative-to">notebook</property>
-  </object>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkPopover" id="tab_menu"/>
   <menu id="tab_menu_model">
     <section>
       <item>
@@ -33,53 +31,45 @@
     <property name="title" translatable="yes">_Files</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="NautilusToolbar" id="toolbar"/>
         </child>
         <child>
           <object class="GtkPaned" id="content_paned">
-            <property name="visible">True</property>
+            <property name="shrink-end-child">False</property>
+            <property name="shrink-start-child">False</property>
+            <property name="resize-start-child">False</property>
             <property name="vexpand">True</property>
             <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>
-              </packing>
             </child>
             <child>
               <object class="GtkOverlay" id="main_view">
-                <property name="visible">True</property>
-                <child>
+                <property name="child">
                   <object class="GtkNotebook" id="notebook">
-                    <property name="visible">True</property>
                     <property name="show-tabs">False</property>
                     <property name="show-border">False</property>
                   </object>
-                </child>
+                </property>
                 <child type="overlay">
                   <object class="GtkRevealer" id="in_app_notification_undo">
-                    <property name="visible">True</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
                     <property name="transition_duration">100</property>
-                    <child>
+                    <property name="child">
                       <object class="GtkFrame">
-                        <property name="visible">True</property>
-                        <child>
+                        <property name="child">
                           <object class="GtkBox">
-                            <property name="visible">True</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="max_width_chars">50</property>
                                 <property name="ellipsize">middle</property>
                                 <property name="margin_end">30</property>
@@ -88,10 +78,8 @@
                             <child>
                               <object class="GtkButton" id="in_app_notification_undo_undo_button">
                                 <property name="label" translatable="yes">Undo</property>
-                                <property name="visible">True</property>
                                 <property name="focusable">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="no_show_all">True</property>
                                 <property name="margin_end">6</property>
                                 <style>
                                   <class name="text-button"/>
@@ -100,13 +88,11 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="in_app_notification_undo_close_button">
-                                <property name="visible">True</property>
                                 <property name="focusable">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="focus_on_click">False</property>
                                 <child>
                                   <object class="GtkImage">
-                                    <property name="visible">True</property>
                                     <property name="icon_name">window-close-symbolic</property>
                                     <property name="icon_size">2</property>
                                   </object>
@@ -118,31 +104,27 @@
                               </object>
                             </child>
                           </object>
-                        </child>
+                        </property>
                         <style>
                           <class name="app-notification"/>
                         </style>
                       </object>
-                    </child>
+                    </property>
                   </object>
                 </child>
                 <child type="overlay">
                   <object class="GtkRevealer" id="notification_operation">
-                    <property name="visible">True</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
                     <property name="transition_duration">100</property>
-                    <child>
+                    <property name="child">
                       <object class="GtkFrame">
-                        <property name="visible">True</property>
-                        <child>
+                        <property name="child">
                           <object class="GtkBox">
-                            <property name="visible">True</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="max_width_chars">50</property>
                                 <property name="ellipsize">middle</property>
                                 <property name="margin_end">30</property>
@@ -150,10 +132,8 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="notification_operation_open">
-                                <property name="visible">True</property>
                                 <property name="focusable">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="no_show_all">True</property>
                                 <property name="margin_end">6</property>
                                 <signal name="clicked" handler="on_notification_operation_open_clicked" 
object="NautilusWindow" swapped="no"/>
                                 <style>
@@ -163,14 +143,12 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="notification_operation_close">
-                                <property name="visible">True</property>
                                 <property name="focusable">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="focus_on_click">False</property>
                                 <signal name="clicked" handler="on_notification_operation_close_clicked" 
object="NautilusWindow" swapped="no"/>
                                 <child>
                                   <object class="GtkImage">
-                                    <property name="visible">True</property>
                                     <property name="icon_name">window-close-symbolic</property>
                                     <property name="icon_size">2</property>
                                   </object>
@@ -182,18 +160,15 @@
                               </object>
                             </child>
                           </object>
-                        </child>
+                        </property>
                         <style>
                           <class name="app-notification"/>
                         </style>
                       </object>
-                    </child>
+                    </property>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="shrink">False</property>
-              </packing>
             </child>
           </object>
         </child>


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