GNOME.org
 

[nautilus/wip/antoniof/experimental-gtk4-build: 8/55] general: Port from libhandy to libadwaita


commit fb4e1b2d8510b08ba3ae1d29e8c9ca414cbb521e
Author: António Fernandes <antoniof gnome org>
Date:   Fri Dec 17 15:37:47 2021 +0000

    general: Port from libhandy to libadwaita
    
    libhandy is GTK 3-only. libadwaita is not only its functional successor,
    but also the new GNOME platform library, so it makes sense for a core
    GNOME app to depend on it for platform integration.

 meson.build                                        |  2 +-
 src/meson.build                                    |  2 +-
 src/nautilus-application.c                         |  4 +--
 src/nautilus-compress-dialog-controller.c          | 10 +++----
 src/nautilus-preferences-window.c                  | 34 ++++++++++------------
 src/nautilus-properties-window.c                   |  4 +--
 src/nautilus-properties-window.h                   |  4 +--
 src/nautilus-special-location-bar.c                |  4 +--
 src/nautilus-special-location-bar.h                |  3 +-
 src/nautilus-toolbar.c                             |  4 +--
 src/nautilus-toolbar.h                             |  4 +--
 src/nautilus-trash-bar.c                           |  8 ++---
 src/nautilus-trash-bar.h                           |  3 +-
 src/nautilus-window.c                              |  4 +--
 src/nautilus-window.h                              |  4 +--
 src/nautilus-x-content-bar.c                       |  4 +--
 src/nautilus-x-content-bar.h                       |  3 +-
 src/resources/ui/nautilus-compress-dialog.ui       | 10 +++----
 .../ui/nautilus-list-view-column-editor.ui         |  4 +--
 src/resources/ui/nautilus-preferences-window.ui    | 34 +++++++++++-----------
 src/resources/ui/nautilus-properties-window.ui     |  4 +--
 src/resources/ui/nautilus-toolbar.ui               |  4 +--
 src/resources/ui/nautilus-window.ui                |  2 +-
 23 files changed, 80 insertions(+), 79 deletions(-)
---
diff --git a/meson.build b/meson.build
index be468aad2..52ab9a36c 100644
--- a/meson.build
+++ b/meson.build
@@ -108,8 +108,8 @@ glib = dependency('glib-2.0', version: glib_ver)
 gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
 gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.4.0')
 gnome_desktop = dependency('gnome-desktop-4', version: '>= 1.0.0')
-libhandy = dependency('libhandy-1', version: '>= 1.1.90')
 gtk = dependency('gtk4', version: '>= 4.4')
+libadwaita = dependency('libadwaita-1', version: '>= 0.0')
 libportal = []
 libportal_gtk4 = []
 if get_option('libportal')
diff --git a/src/meson.build b/src/meson.build
index 7b9dc9832..3ced86915 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -263,7 +263,7 @@ nautilus_deps = [
   gmodule,
   gnome_autoar,
   gnome_desktop,
-  libhandy,
+  libadwaita,
   libportal,
   libportal_gtk4,
   nautilus_extension,
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 2eff0c4b0..210c8eb5b 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -33,7 +33,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
-#include <libhandy-1/handy.h>
+#include <libadwaita-1/adwaita.h>
 #include <nautilus-extension.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -1272,7 +1272,7 @@ nautilus_application_startup_common (NautilusApplication *self)
      */
     G_APPLICATION_CLASS (nautilus_application_parent_class)->startup (G_APPLICATION (self));
 
-    hdy_init ();
+    adw_init ();
 
     gtk_window_set_default_icon_name (APPLICATION_ID);
 
diff --git a/src/nautilus-compress-dialog-controller.c b/src/nautilus-compress-dialog-controller.c
index 687cb5558..839b527cb 100644
--- a/src/nautilus-compress-dialog-controller.c
+++ b/src/nautilus-compress-dialog-controller.c
@@ -19,7 +19,7 @@
 
 #include <glib/gi18n.h>
 #include <gnome-autoar/gnome-autoar.h>
-#include <libhandy-1/handy.h>
+#include <libadwaita-1/adwaita.h>
 
 #include <eel/eel-vfs-extensions.h>
 
@@ -240,7 +240,7 @@ update_selected_format (NautilusCompressDialogController *self,
 }
 
 static void
-zip_row_on_activated (HdyActionRow *row,
+zip_row_on_activated (AdwActionRow *row,
                       gpointer      user_data)
 {
     NautilusCompressDialogController *controller;
@@ -253,7 +253,7 @@ zip_row_on_activated (HdyActionRow *row,
 }
 
 static void
-encrypted_zip_row_on_activated (HdyActionRow *row,
+encrypted_zip_row_on_activated (AdwActionRow *row,
                                 gpointer      user_data)
 {
     NautilusCompressDialogController *controller;
@@ -266,7 +266,7 @@ encrypted_zip_row_on_activated (HdyActionRow *row,
 }
 
 static void
-tar_xz_row_on_activated (HdyActionRow *row,
+tar_xz_row_on_activated (AdwActionRow *row,
                          gpointer      user_data)
 {
     NautilusCompressDialogController *controller;
@@ -279,7 +279,7 @@ tar_xz_row_on_activated (HdyActionRow *row,
 }
 
 static void
-seven_zip_row_on_activated (HdyActionRow *row,
+seven_zip_row_on_activated (AdwActionRow *row,
                             gpointer      user_data)
 {
     NautilusCompressDialogController *controller;
diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c
index 996ba559a..b3a701927 100644
--- a/src/nautilus-preferences-window.c
+++ b/src/nautilus-preferences-window.c
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libhandy-1/handy.h>
+#include <libadwaita-1/adwaita.h>
 
 #include <glib/gi18n.h>
 
@@ -74,7 +74,7 @@ static GtkWidget *preferences_window = NULL;
 static void list_store_append_string (GListStore  *list_store,
                                       const gchar *string)
 {
-    g_autoptr (HdyValueObject) obj = hdy_value_object_new_string (string);
+    g_autoptr (GtkStringObject) obj = gtk_string_object_new (string);
     g_list_store_append (list_store, obj);
 }
 
@@ -84,10 +84,10 @@ static void free_column_names_array(GPtrArray *column_names)
     g_ptr_array_free (column_names, TRUE);
 }
 
-static void create_icon_caption_combo_row_items(HdyComboRow *combo_row,
+static void create_icon_caption_combo_row_items(AdwComboRow *combo_row,
                                                 GList       *columns)
 {
-    GListStore *list_store = g_list_store_new (HDY_TYPE_VALUE_OBJECT);
+    GListStore *list_store = g_list_store_new (GTK_TYPE_STRING_OBJECT);
     GList *l;
     GPtrArray *column_names;
 
@@ -120,14 +120,12 @@ static void create_icon_caption_combo_row_items(HdyComboRow *combo_row,
 
         g_free (label);
     }
-    hdy_combo_row_bind_name_model (combo_row, G_LIST_MODEL (list_store),
-                                   (HdyComboRowGetNameFunc) hdy_value_object_dup_string,
-                                   NULL, NULL);
+    adw_combo_row_set_model (combo_row, G_LIST_MODEL (list_store));
     g_object_set_data_full (G_OBJECT (combo_row), "column_names", column_names,
                             (GDestroyNotify) free_column_names_array);
 }
 
-static void icon_captions_changed_callback(HdyComboRow *widget,
+static void icon_captions_changed_callback(AdwComboRow *widget,
                                            GParamSpec  *pspec,
                                            gpointer     user_data)
 {
@@ -148,7 +146,7 @@ static void icon_captions_changed_callback(HdyComboRow *widget,
 
         combo_row = GTK_WIDGET (
             gtk_builder_get_object (builder, icon_captions_components[i]));
-        selected_index = hdy_combo_row_get_selected_index (HDY_COMBO_ROW (combo_row));
+        selected_index = adw_combo_row_get_selected (ADW_COMBO_ROW (combo_row));
 
         column_names = g_object_get_data (G_OBJECT (combo_row), "column_names");
 
@@ -182,7 +180,7 @@ static void update_caption_combo_row(GtkBuilder *builder,
     {
         if (!strcmp (name, g_ptr_array_index (column_names, i)))
         {
-            hdy_combo_row_set_selected_index (HDY_COMBO_ROW (combo_row), i);
+            adw_combo_row_set_selected (ADW_COMBO_ROW (combo_row), i);
             break;
         }
     }
@@ -242,11 +240,11 @@ nautilus_preferences_window_setup_icon_caption_page (GtkBuilder *builder)
         combo_row = GTK_WIDGET (
             gtk_builder_get_object (builder, icon_captions_components[i]));
 
-        create_icon_caption_combo_row_items (HDY_COMBO_ROW (combo_row), columns);
+        create_icon_caption_combo_row_items (ADW_COMBO_ROW (combo_row), columns);
         gtk_widget_set_sensitive (combo_row, writable);
 
         g_signal_connect_data (
-            combo_row, "notify::selected-index", G_CALLBACK (icon_captions_changed_callback),
+            combo_row, "notify::selected", G_CALLBACK (icon_captions_changed_callback),
             g_object_ref (builder), (GClosureNotify) g_object_unref, 0);
     }
 
@@ -302,7 +300,7 @@ static void bind_builder_combo_row(GtkBuilder  *builder,
                                    const char **values)
 {
     g_settings_bind_with_mapping (settings, prefs, gtk_builder_get_object (builder, widget_name),
-                                  "selected-index", G_SETTINGS_BIND_DEFAULT,
+                                  "selected", G_SETTINGS_BIND_DEFAULT,
                                   combo_row_mapping_get, combo_row_mapping_set,
                                   (gpointer) values, NULL);
 }
@@ -311,20 +309,20 @@ static void setup_combo (GtkBuilder  *builder,
                          const char  *widget_name,
                          const char **strings)
 {
-    HdyComboRow *combo_row;
+    AdwComboRow *combo_row;
     GListStore *list_store;
 
-    combo_row = (HdyComboRow *) gtk_builder_get_object (builder, widget_name);
-    g_assert (HDY_IS_COMBO_ROW (combo_row));
+    combo_row = (AdwComboRow *) gtk_builder_get_object (builder, widget_name);
+    g_assert (ADW_IS_COMBO_ROW (combo_row));
 
-    list_store = g_list_store_new (HDY_TYPE_VALUE_OBJECT);
+    list_store = g_list_store_new (GTK_TYPE_STRING_OBJECT);
 
     for (gsize i = 0; strings[i]; i++)
     {
         list_store_append_string (list_store, strings[i]);
     }
 
-    hdy_combo_row_bind_name_model (combo_row, G_LIST_MODEL (list_store), (HdyComboRowGetNameFunc) 
hdy_value_object_dup_string, NULL, NULL);
+    adw_combo_row_set_model (combo_row, G_LIST_MODEL (list_store));
 }
 
 static void nautilus_preferences_window_setup(GtkBuilder *builder,
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 9560094ca..339ad5a34 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -71,7 +71,7 @@ typedef struct
 
 struct _NautilusPropertiesWindow
 {
-    HdyWindow parent_instance;
+    AdwWindow parent_instance;
 
     GList *original_files;
     GList *target_files;
@@ -315,7 +315,7 @@ static void name_field_activate (GtkWidget *name_field,
                                  gpointer   user_data);
 static void setup_pie_widget (NautilusPropertiesWindow *self);
 
-G_DEFINE_TYPE (NautilusPropertiesWindow, nautilus_properties_window, HDY_TYPE_WINDOW);
+G_DEFINE_TYPE (NautilusPropertiesWindow, nautilus_properties_window, ADW_TYPE_WINDOW);
 
 static gboolean
 is_multi_file_window (NautilusPropertiesWindow *self)
diff --git a/src/nautilus-properties-window.h b/src/nautilus-properties-window.h
index 84f8166a9..4b769bd1a 100644
--- a/src/nautilus-properties-window.h
+++ b/src/nautilus-properties-window.h
@@ -24,13 +24,13 @@
 #pragma once
 
 #include <gtk/gtk.h>
-#include <libhandy-1/handy.h>
+#include <libadwaita-1/adwaita.h>
 
 #define NAUTILUS_TYPE_PROPERTIES_WINDOW (nautilus_properties_window_get_type ())
 
 G_DECLARE_FINAL_TYPE (NautilusPropertiesWindow, nautilus_properties_window,
                       NAUTILUS, PROPERTIES_WINDOW,
-                      HdyWindow)
+                      AdwWindow)
 
 typedef void (* NautilusPropertiesWindowCallback) (gpointer    callback_data);
 
diff --git a/src/nautilus-special-location-bar.c b/src/nautilus-special-location-bar.c
index b959346da..4e81ff3b5 100644
--- a/src/nautilus-special-location-bar.c
+++ b/src/nautilus-special-location-bar.c
@@ -27,7 +27,7 @@
 
 struct _NautilusSpecialLocationBar
 {
-    GtkBin parent_instance;
+    AdwBin parent_instance;
 
     GtkWidget *label;
     GtkWidget *learn_more_label;
@@ -40,7 +40,7 @@ enum
     PROP_SPECIAL_LOCATION,
 };
 
-G_DEFINE_TYPE (NautilusSpecialLocationBar, nautilus_special_location_bar, GTK_TYPE_BIN)
+G_DEFINE_TYPE (NautilusSpecialLocationBar, nautilus_special_location_bar, ADW_TYPE_BIN)
 
 static void
 set_special_location (NautilusSpecialLocationBar *bar,
diff --git a/src/nautilus-special-location-bar.h b/src/nautilus-special-location-bar.h
index 3d07c7171..58928d9f8 100644
--- a/src/nautilus-special-location-bar.h
+++ b/src/nautilus-special-location-bar.h
@@ -20,11 +20,12 @@
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
+#include <libadwaita-1/adwaita.h>
 
 G_BEGIN_DECLS
 
 #define NAUTILUS_TYPE_SPECIAL_LOCATION_BAR (nautilus_special_location_bar_get_type ())
-G_DECLARE_FINAL_TYPE (NautilusSpecialLocationBar, nautilus_special_location_bar, NAUTILUS, 
SPECIAL_LOCATION_BAR, GtkBin)
+G_DECLARE_FINAL_TYPE (NautilusSpecialLocationBar, nautilus_special_location_bar, NAUTILUS, 
SPECIAL_LOCATION_BAR, AdwBin)
 
 typedef enum {
        NAUTILUS_SPECIAL_LOCATION_TEMPLATES,
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index 6f2e43af4..e725869fc 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -53,7 +53,7 @@ typedef enum
 
 struct _NautilusToolbar
 {
-    GtkBin parent_instance;
+    AdwBin parent_instance;
 
     NautilusWindow *window;
 
@@ -120,7 +120,7 @@ enum
 
 static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
 
-G_DEFINE_TYPE (NautilusToolbar, nautilus_toolbar, GTK_TYPE_BIN);
+G_DEFINE_TYPE (NautilusToolbar, nautilus_toolbar, ADW_TYPE_BIN);
 
 static void nautilus_toolbar_set_window_slot_real (NautilusToolbar    *self,
                                                    NautilusWindowSlot *slot);
diff --git a/src/nautilus-toolbar.h b/src/nautilus-toolbar.h
index 6f49acee1..e67aeedba 100644
--- a/src/nautilus-toolbar.h
+++ b/src/nautilus-toolbar.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <gtk/gtk.h>
-#include <libhandy-1/handy.h>
+#include <libadwaita-1/adwaita.h>
 
 #include "nautilus-window-slot.h"
 
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 
 #define NAUTILUS_TYPE_TOOLBAR nautilus_toolbar_get_type()
 
-G_DECLARE_FINAL_TYPE (NautilusToolbar, nautilus_toolbar, NAUTILUS, TOOLBAR, GtkBin)
+G_DECLARE_FINAL_TYPE (NautilusToolbar, nautilus_toolbar, NAUTILUS, TOOLBAR, AdwBin)
 
 GtkWidget *nautilus_toolbar_new (void);
 
diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
index 6ce995586..42bdfd69c 100644
--- a/src/nautilus-trash-bar.c
+++ b/src/nautilus-trash-bar.c
@@ -48,13 +48,13 @@ enum
 
 struct _NautilusTrashBar
 {
-    GtkBin parent_instance;
+    AdwBin parent_instance;
 
     NautilusFilesView *view;
     gulong selection_handler_id;
 };
 
-G_DEFINE_TYPE (NautilusTrashBar, nautilus_trash_bar, GTK_TYPE_BIN)
+G_DEFINE_TYPE (NautilusTrashBar, nautilus_trash_bar, ADW_TYPE_BIN)
 
 static void
 selection_changed_cb (NautilusFilesView *view,
@@ -67,7 +67,7 @@ selection_changed_cb (NautilusFilesView *view,
     selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
     count = g_list_length (selection);
 
-    info_bar = gtk_bin_get_child (GTK_BIN (bar));
+    info_bar = adw_bin_get_child (ADW_BIN (bar));
     gtk_info_bar_set_response_sensitive (GTK_INFO_BAR (info_bar),
                                          TRASH_BAR_RESPONSE_RESTORE,
                                          (count > 0));
@@ -129,7 +129,7 @@ nautilus_trash_bar_trash_state_changed (NautilusTrashMonitor *trash_monitor,
 
     bar = NAUTILUS_TRASH_BAR (data);
 
-    info_bar = gtk_bin_get_child (GTK_BIN (bar));
+    info_bar = adw_bin_get_child (ADW_BIN (bar));
     gtk_info_bar_set_response_sensitive (GTK_INFO_BAR (info_bar),
                                          TRASH_BAR_RESPONSE_EMPTY,
                                          !nautilus_trash_monitor_is_empty ());
diff --git a/src/nautilus-trash-bar.h b/src/nautilus-trash-bar.h
index 9fc4ffa50..4f03f2edc 100644
--- a/src/nautilus-trash-bar.h
+++ b/src/nautilus-trash-bar.h
@@ -23,12 +23,13 @@
 #include "nautilus-files-view.h"
 
 #include <gtk/gtk.h>
+#include <libadwaita-1/adwaita.h>
 
 G_BEGIN_DECLS
 
 #define NAUTILUS_TYPE_TRASH_BAR (nautilus_trash_bar_get_type ())
 
-G_DECLARE_FINAL_TYPE (NautilusTrashBar, nautilus_trash_bar, NAUTILUS, TRASH_BAR, GtkBin)
+G_DECLARE_FINAL_TYPE (NautilusTrashBar, nautilus_trash_bar, NAUTILUS, TRASH_BAR, AdwBin)
 
 GtkWidget *nautilus_trash_bar_new (NautilusFilesView *view);
 
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 4389ac283..d82d23099 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -98,7 +98,7 @@ static void nautilus_window_back_or_forward (NautilusWindow *window,
 
 struct _NautilusWindow
 {
-    HdyApplicationWindow parent_instance;
+    AdwApplicationWindow parent_instance;
 
     GtkWidget *notebook;
 
@@ -168,7 +168,7 @@ enum
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (NautilusWindow, nautilus_window, HDY_TYPE_APPLICATION_WINDOW);
+G_DEFINE_TYPE (NautilusWindow, nautilus_window, ADW_TYPE_APPLICATION_WINDOW);
 
 static const GtkPadActionEntry pad_actions[] =
 {
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index af38441f1..72fc5d987 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -27,14 +27,14 @@
 #pragma once
 
 #include <gtk/gtk.h>
-#include <libhandy-1/handy.h>
+#include <libadwaita-1/adwaita.h>
 
 #include "nautilus-types.h"
 
 G_BEGIN_DECLS
 
 #define NAUTILUS_TYPE_WINDOW (nautilus_window_get_type ())
-G_DECLARE_FINAL_TYPE (NautilusWindow, nautilus_window, NAUTILUS, WINDOW, HdyApplicationWindow);
+G_DECLARE_FINAL_TYPE (NautilusWindow, nautilus_window, NAUTILUS, WINDOW, AdwApplicationWindow);
 
 typedef gboolean (* NautilusWindowGoToCallback) (NautilusWindow *window,
                                                  GFile *location,
diff --git a/src/nautilus-x-content-bar.c b/src/nautilus-x-content-bar.c
index 5dfb0371a..85dd0d061 100644
--- a/src/nautilus-x-content-bar.c
+++ b/src/nautilus-x-content-bar.c
@@ -33,7 +33,7 @@
 
 struct _NautilusXContentBar
 {
-    GtkBin parent_instance;
+    AdwBin parent_instance;
     GtkWidget *label;
 
     char **x_content_types;
@@ -189,7 +189,7 @@ nautilus_x_content_bar_set_x_content_types (NautilusXContentBar *bar,
         }
 
         name = g_app_info_get_name (default_app);
-        info_bar = gtk_bin_get_child (GTK_BIN (bar));
+        info_bar = adw_bin_get_child (ADW_BIN (bar));
         button = gtk_info_bar_add_button (GTK_INFO_BAR (info_bar), name, n);
         box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
diff --git a/src/nautilus-x-content-bar.h b/src/nautilus-x-content-bar.h
index af7bcaefe..11f05ec91 100644
--- a/src/nautilus-x-content-bar.h
+++ b/src/nautilus-x-content-bar.h
@@ -24,12 +24,13 @@
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
+#include <libadwaita-1/adwaita.h>
 
 G_BEGIN_DECLS
 
 #define NAUTILUS_TYPE_X_CONTENT_BAR (nautilus_x_content_bar_get_type ())
 
-G_DECLARE_FINAL_TYPE (NautilusXContentBar, nautilus_x_content_bar, NAUTILUS, X_CONTENT_BAR, GtkBin)
+G_DECLARE_FINAL_TYPE (NautilusXContentBar, nautilus_x_content_bar, NAUTILUS, X_CONTENT_BAR, AdwBin)
 
 GtkWidget *nautilus_x_content_bar_new (GMount             *mount,
                                        const char * const *x_content_types);
diff --git a/src/resources/ui/nautilus-compress-dialog.ui b/src/resources/ui/nautilus-compress-dialog.ui
index 050a1360c..7a5ad40df 100644
--- a/src/resources/ui/nautilus-compress-dialog.ui
+++ b/src/resources/ui/nautilus-compress-dialog.ui
@@ -5,14 +5,14 @@
     <property name="position">bottom</property>
     <property name="constrain-to">none</property>
     <child>
-      <object class="HdyPreferencesGroup">
+      <object class="AdwPreferencesGroup">
         <property name="visible">True</property>
         <property name="margin-top">12</property>
         <property name="margin-bottom">12</property>
         <property name="margin-start">12</property>
         <property name="margin-end">12</property>
         <child>
-          <object class="HdyActionRow" id="zip_row">
+          <object class="AdwActionRow" id="zip_row">
             <property name="visible">True</property>
             <property name="activatable">True</property>
             <property name="title" translatable="no">.zip</property>
@@ -28,7 +28,7 @@
           </object>
         </child>
         <child>
-          <object class="HdyActionRow" id="encrypted_zip_row">
+          <object class="AdwActionRow" id="encrypted_zip_row">
             <property name="visible">True</property>
             <property name="activatable">True</property>
             <property name="title" translatable="no">.zip</property>
@@ -47,7 +47,7 @@
           </object>
         </child>
         <child>
-          <object class="HdyActionRow" id="tar_xz_row">
+          <object class="AdwActionRow" id="tar_xz_row">
             <property name="visible">True</property>
             <property name="activatable">True</property>
             <property name="title" translatable="no">.tar.xz</property>
@@ -63,7 +63,7 @@
           </object>
         </child>
         <child>
-          <object class="HdyActionRow" id="seven_zip_row">
+          <object class="AdwActionRow" id="seven_zip_row">
             <property name="visible">True</property>
             <property name="activatable">True</property>
             <property name="title" translatable="no">.7z</property>
diff --git a/src/resources/ui/nautilus-list-view-column-editor.ui 
b/src/resources/ui/nautilus-list-view-column-editor.ui
index be24516da..08e259069 100644
--- a/src/resources/ui/nautilus-list-view-column-editor.ui
+++ b/src/resources/ui/nautilus-list-view-column-editor.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.38.2 -->
 <interface>
-  <object class="HdyWindow" id="window">
+  <object class="AdwWindow" id="window">
     <property name="modal">True</property>
     <property name="type-hint">dialog</property>
     <property name="default-width">300</property>
@@ -11,7 +11,7 @@
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="HdyHeaderBar">
+          <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>
diff --git a/src/resources/ui/nautilus-preferences-window.ui b/src/resources/ui/nautilus-preferences-window.ui
index 04b04d2b9..1d2807903 100644
--- a/src/resources/ui/nautilus-preferences-window.ui
+++ b/src/resources/ui/nautilus-preferences-window.ui
@@ -2,18 +2,18 @@
 <!-- Generated with glade 3.22.0 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
-  <object class="HdyPreferencesWindow" id="preferences_window">
+  <object class="AdwPreferencesWindow" id="preferences_window">
     <property name="search_enabled">False</property>
     <child>
-      <object class="HdyPreferencesPage">
+      <object class="AdwPreferencesPage">
         <property name="title" translatable="yes">General</property>
         <property name="visible">True</property>
         <child>
-          <object class="HdyPreferencesGroup">
+          <object class="AdwPreferencesGroup">
             <property name="title" translatable="yes">General</property>
             <property name="visible">True</property>
             <child>
-              <object class="HdyActionRow">
+              <object class="AdwActionRow">
                 <property name="activatable_widget">sort_folders_first_switch</property>
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes">Sort _Folders Before Files</property>
@@ -29,7 +29,7 @@
               </object>
             </child>
             <child>
-              <object class="HdyActionRow">
+              <object class="AdwActionRow">
                 <property name="activatable_widget">use_tree_view_switch</property>
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes">_Expandable Folders in List View</property>
@@ -45,7 +45,7 @@
               </object>
             </child>
             <child>
-              <object class="HdyComboRow" id="open_action_row">
+              <object class="AdwComboRow" id="open_action_row">
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes">Action to Open Items</property>
                 <property name="title_lines">0</property>
@@ -56,12 +56,12 @@
           </object>
         </child>
         <child>
-          <object class="HdyPreferencesGroup">
+          <object class="AdwPreferencesGroup">
             <property name="title" translatable="yes">Optional Context Menu Actions</property>
             <property name="description" translatable="yes">Show more actions in the menus. Keyboard 
shortcuts can be used even if the actions are not shown.</property>
             <property name="visible">True</property>
             <child>
-              <object class="HdyActionRow">
+              <object class="AdwActionRow">
                 <property name="activatable_widget">show_create_link_switch</property>
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes">Create _Link</property>
@@ -77,7 +77,7 @@
               </object>
             </child>
             <child>
-              <object class="HdyActionRow">
+              <object class="AdwActionRow">
                 <property name="activatable_widget">show_delete_permanently_switch</property>
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes">_Delete Permanently</property>
@@ -95,12 +95,12 @@
           </object>
         </child>
         <child>
-          <object class="HdyPreferencesGroup">
+          <object class="AdwPreferencesGroup">
             <property name="title" translatable="yes">Performance</property>
             <property name="description" translatable="yes">These features may cause slowdowns and excess 
network usage, especially when browsing files outside this computer, such as on a remote server.</property>
             <property name="visible">True</property>
             <child>
-              <object class="HdyComboRow" id="search_recursive_row">
+              <object class="AdwComboRow" id="search_recursive_row">
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes">Search in Subfolders</property>
                 <property name="title_lines">0</property>
@@ -109,7 +109,7 @@
               </object>
             </child>
             <child>
-              <object class="HdyComboRow" id="thumbnails_row">
+              <object class="AdwComboRow" id="thumbnails_row">
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes">Show Thumbnails</property>
                 <property name="title_lines">0</property>
@@ -118,7 +118,7 @@
               </object>
             </child>
             <child>
-              <object class="HdyComboRow" id="count_row">
+              <object class="AdwComboRow" id="count_row">
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes">Count Number of Files in Folders</property>
                 <property name="title_lines">0</property>
@@ -129,12 +129,12 @@
           </object>
         </child>
         <child>
-          <object class="HdyPreferencesGroup">
+          <object class="AdwPreferencesGroup">
             <property name="description" translatable="yes">Add information to be displayed beneath file and 
folder names. More information will appear when zooming closer.</property>
             <property name="title" translatable="yes">Icon View Captions</property>
             <property name="visible">True</property>
             <child>
-              <object class="HdyComboRow" id="captions_0_comborow">
+              <object class="AdwComboRow" id="captions_0_comborow">
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes" context="the n-th position of an icon caption" 
comments="Translators: This is an ordinal number">First</property>
                 <property name="title_lines">0</property>
@@ -143,7 +143,7 @@
               </object>
             </child>
             <child>
-              <object class="HdyComboRow" id="captions_1_comborow">
+              <object class="AdwComboRow" id="captions_1_comborow">
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes" context="the n-th position of an icon caption" 
comments="Translators: This is an ordinal number">Second</property>
                 <property name="title_lines">0</property>
@@ -152,7 +152,7 @@
               </object>
             </child>
             <child>
-              <object class="HdyComboRow" id="captions_2_comborow">
+              <object class="AdwComboRow" id="captions_2_comborow">
                 <property name="subtitle_lines">0</property>
                 <property name="title" translatable="yes" context="the n-th position of an icon caption" 
comments="Translators: This is an ordinal number">Third</property>
                 <property name="title_lines">0</property>
diff --git a/src/resources/ui/nautilus-properties-window.ui b/src/resources/ui/nautilus-properties-window.ui
index b546fdcfe..338d31f1b 100644
--- a/src/resources/ui/nautilus-properties-window.ui
+++ b/src/resources/ui/nautilus-properties-window.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.36.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <template class="NautilusPropertiesWindow" parent="HdyWindow">
+  <template class="NautilusPropertiesWindow" parent="AdwWindow">
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -11,7 +11,7 @@
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="HdyHeaderBar">
+          <object class="AdwHeaderBar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_close_button">True</property>
diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui
index 4fd29b400..4ddc88f11 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -134,10 +134,10 @@
     </child>
     <signal name="notify::visible" handler="on_operations_popover_notify_visible" object="NautilusToolbar" 
swapped="yes"/>
   </object>
-  <template class="NautilusToolbar" parent="GtkBin">
+  <template class="NautilusToolbar" parent="AdwBin">
     <property name="visible">True</property>
     <child>
-      <object class="HdyHeaderBar">
+      <object class="AdwHeaderBar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="show_close_button">True</property>
diff --git a/src/resources/ui/nautilus-window.ui b/src/resources/ui/nautilus-window.ui
index 64b238966..7b807614b 100644
--- a/src/resources/ui/nautilus-window.ui
+++ b/src/resources/ui/nautilus-window.ui
@@ -28,7 +28,7 @@
       </item>
     </section>
   </menu>
-  <template class="NautilusWindow" parent="HdyApplicationWindow">
+  <template class="NautilusWindow" parent="AdwApplicationWindow">
     <property name="show-menubar">False</property>
     <property name="title" translatable="yes">_Files</property>
     <child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]