[nautilus/wip/cdavis/use-status-page] files-view: Build from UI template

[António Fernandes <antoniof src gnome org>]

commit 111c9c922e04ac64e9d5053e0cd4143c1c531cca
Author: António Fernandes <antoniof gnome org>
Date:   Sun Jul 17 10:23:47 2022 +0100

    files-view: Build from UI template
    
    We have multiple empty state .ui files, which make little sense now
    that they are so simple, thanks to AdwStatusPage.
    
    So, instead, add a single UI file for the whole view.

 src/nautilus-files-view.c                      | 77 +++++++++-----------------
 src/resources/nautilus.gresource.xml           |  5 +-
 src/resources/ui/nautilus-files-view.ui        | 38 +++++++++++++
 src/resources/ui/nautilus-folder-is-empty.ui   |  8 ---
 src/resources/ui/nautilus-no-search-results.ui |  9 ---
 src/resources/ui/nautilus-starred-is-empty.ui  |  8 ---
 src/resources/ui/nautilus-trash-is-empty.ui    |  8 ---
 7 files changed, 64 insertions(+), 89 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index bffa6d898..4c6720c47 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -248,10 +248,7 @@ typedef struct
     GtkWidget *scrolled_window;
 
     /* Empty states */
-    GtkWidget *folder_is_empty_widget;
-    GtkWidget *trash_is_empty_widget;
-    GtkWidget *no_search_results_widget;
-    GtkWidget *starred_is_empty_widget;
+    GtkWidget *folder_is_empty;
 
     /* Floating bar */
     guint floating_bar_set_status_timeout_id;
@@ -3650,24 +3647,33 @@ real_check_empty_states (NautilusFilesView *view)
     if (!priv->loading &&
         nautilus_files_view_is_empty (view))
     {
+        AdwStatusPage *status_page = ADW_STATUS_PAGE (priv->folder_is_empty);
+
+        visible_child = priv->folder_is_empty;
         uri = g_file_get_uri (priv->location);
 
         if (nautilus_view_is_searching (NAUTILUS_VIEW (view)))
         {
-            visible_child = priv->no_search_results_widget;
+            adw_status_page_set_icon_name (status_page, "edit-find-symbolic");
+            adw_status_page_set_title (status_page, _("No Results Found"));
+            adw_status_page_set_description (status_page, _("Try a different search."));
         }
         else if (eel_uri_is_trash_root (uri))
         {
-            visible_child = priv->trash_is_empty_widget;
+            adw_status_page_set_icon_name (status_page, "user-trash-symbolic");
+            adw_status_page_set_title (status_page, _("Trash is Empty"));
         }
         else if (eel_uri_is_starred (uri))
         {
-            visible_child = priv->starred_is_empty_widget;
+            adw_status_page_set_icon_name (status_page, "starred-symbolic");
+            adw_status_page_set_title (status_page, _("No Starred Files"));
         }
         else
         {
-            visible_child = priv->folder_is_empty_widget;
+            adw_status_page_set_icon_name (status_page, "folder-symbolic");
+            adw_status_page_set_title (status_page, "Folder is Empty");
         }
+
     }
 
     gtk_stack_set_visible_child (GTK_STACK (priv->stack), visible_child);
@@ -9344,6 +9350,15 @@ nautilus_files_view_class_init (NautilusFilesViewClass *klass)
     g_object_class_override_property (oclass, PROP_EXTENSIONS_BACKGROUND_MENU, "extensions-background-menu");
     g_object_class_override_property (oclass, PROP_TEMPLATES_MENU, "templates-menu");
 
+    gtk_widget_class_set_template_from_resource (widget_class,
+                                                 "/org/gnome/nautilus/ui/nautilus-files-view.ui");
+
+    gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, overlay);
+    gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, stack);
+    gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, folder_is_empty);
+    gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, scrolled_window);
+    gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, floating_bar);
+
     /* See also the global accelerators in init() in addition to all the local
      * ones defined below.
      */
@@ -9448,16 +9463,8 @@ nautilus_files_view_init (NautilusFilesView *view)
 
     g_object_unref (builder);
 
-    /* Main widgets */
-    priv->overlay = gtk_overlay_new ();
-    gtk_widget_set_vexpand (priv->overlay, TRUE);
-    gtk_widget_set_hexpand (priv->overlay, TRUE);
-    adw_bin_set_child (ADW_BIN (view), priv->overlay);
-    gtk_widget_show (priv->overlay);
-
-    /* Stack */
-    priv->stack = gtk_stack_new ();
-    gtk_overlay_set_child (GTK_OVERLAY (priv->overlay), priv->stack);
+    g_type_ensure (NAUTILUS_TYPE_FLOATING_BAR);
+    gtk_widget_init_template (GTK_WIDGET (view));
 
     controller = gtk_event_controller_scroll_new (GTK_EVENT_CONTROLLER_SCROLL_VERTICAL |
                                                   GTK_EVENT_CONTROLLER_SCROLL_DISCRETE);
@@ -9465,40 +9472,6 @@ nautilus_files_view_init (NautilusFilesView *view)
     gtk_event_controller_set_propagation_phase (controller, GTK_PHASE_CAPTURE);
     g_signal_connect (controller, "scroll", G_CALLBACK (on_scroll), view);
 
-    /* Scrolled Window */
-    priv->scrolled_window = gtk_scrolled_window_new ();
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window),
-                                    GTK_POLICY_AUTOMATIC,
-                                    GTK_POLICY_AUTOMATIC);
-    gtk_stack_add_child (GTK_STACK (priv->stack), priv->scrolled_window);
-
-    /* Empty states */
-    builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-no-search-results.ui");
-    priv->no_search_results_widget = GTK_WIDGET (gtk_builder_get_object (builder, "no_search_results"));
-    gtk_stack_add_child (GTK_STACK (priv->stack), priv->no_search_results_widget);
-    g_object_unref (builder);
-
-    builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-folder-is-empty.ui");
-    priv->folder_is_empty_widget = GTK_WIDGET (gtk_builder_get_object (builder, "folder_is_empty"));
-    gtk_stack_add_child (GTK_STACK (priv->stack), priv->folder_is_empty_widget);
-    g_object_unref (builder);
-
-    builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-starred-is-empty.ui");
-    priv->starred_is_empty_widget = GTK_WIDGET (gtk_builder_get_object (builder, "starred_is_empty"));
-    gtk_stack_add_child (GTK_STACK (priv->stack), priv->starred_is_empty_widget);
-    g_object_unref (builder);
-
-    builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-trash-is-empty.ui");
-    priv->trash_is_empty_widget = GTK_WIDGET (gtk_builder_get_object (builder, "trash_is_empty"));
-    gtk_stack_add_child (GTK_STACK (priv->stack), priv->trash_is_empty_widget);
-    g_object_unref (builder);
-
-    /* Floating bar */
-    priv->floating_bar = nautilus_floating_bar_new (NULL, NULL, FALSE);
-    gtk_widget_set_halign (priv->floating_bar, GTK_ALIGN_END);
-    gtk_widget_set_valign (priv->floating_bar, GTK_ALIGN_END);
-    gtk_overlay_add_overlay (GTK_OVERLAY (priv->overlay), priv->floating_bar);
-
     g_signal_connect (priv->floating_bar,
                       "stop",
                       G_CALLBACK (floating_bar_stop_cb),
diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml
index fca181a83..0b36a989a 100644
--- a/src/resources/nautilus.gresource.xml
+++ b/src/resources/nautilus.gresource.xml
@@ -14,16 +14,13 @@
     <file>ui/nautilus-files-view-context-menus.ui</file>
     <file>ui/nautilus-progress-info-widget.ui</file>
     <file>ui/nautilus-window.ui</file>
-    <file>ui/nautilus-no-search-results.ui</file>
-    <file>ui/nautilus-folder-is-empty.ui</file>
-    <file>ui/nautilus-trash-is-empty.ui</file>
-    <file>ui/nautilus-starred-is-empty.ui</file>
     <file>gtk/help-overlay.ui</file>
     <file>ui/nautilus-batch-rename-dialog.ui</file>
     <file>ui/nautilus-properties-window.ui</file>
     <file>ui/nautilus-file-properties-change-permissions.ui</file>
     <file>ui/nautilus-file-conflict-dialog.ui</file>
     <file>ui/nautilus-files-view-select-items.ui</file>
+    <file>ui/nautilus-files-view.ui</file>
     <file>ui/nautilus-operations-ui-manager-request-passphrase.ui</file>
     <file>ui/nautilus-grid-cell.ui</file>
     <file>ui/nautilus-name-cell.ui</file>
diff --git a/src/resources/ui/nautilus-files-view.ui b/src/resources/ui/nautilus-files-view.ui
new file mode 100644
index 000000000..3dfb666ac
--- /dev/null
+++ b/src/resources/ui/nautilus-files-view.ui
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="NautilusFilesView" parent="AdwBin">
+    <child>
+      <object class="GtkOverlay" id="overlay">
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <child>
+          <object class="GtkStack" id="stack">
+            <property name="hexpand">True</property>
+            <child>
+              <object class="GtkStackPage">
+                <property name="child">
+                  <object class="AdwStatusPage" id="folder_is_empty"/>
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkStackPage">
+                <property name="child">
+                  <object class="GtkScrolledWindow" id="scrolled_window"/>
+                </property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="overlay">
+          <object class="NautilusFloatingBar" id="floating_bar">
+            <property name="halign">end</property>
+            <property name="valign">end</property>
+            <property name="spacing">8</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>