From e393d417efa314b86c160a7eae1dc2c0225e44a4 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Wed, 7 Feb 2024 00:26:05 +0100
Subject: [PATCH 1/8] Port to AdwDialog

---
 meson.build                   |  2 +-
 src/gtr-actions-app.c         |  2 +-
 src/gtr-header-dialog.c       | 14 ++++----------
 src/gtr-header-dialog.h       |  2 +-
 src/gtr-header-dialog.ui      |  2 +-
 src/gtr-preferences-dialog.c  |  8 +++-----
 src/gtr-preferences-dialog.h  |  2 +-
 src/gtr-preferences-dialog.ui |  2 +-
 8 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/meson.build b/meson.build
index 03fe3bae..53c9f874 100644
--- a/meson.build
+++ b/meson.build
@@ -106,7 +106,7 @@ src_dir = join_paths(meson.project_source_root(), 'src')
 
 glib_dep = dependency('glib-2.0', version: '>= 2.71.3')
 gtk_dep = dependency('gtk4', version: '>= 4.12.0')
-libadwaita_dep = dependency('libadwaita-1', version: '>= 1.4.0')
+libadwaita_dep = dependency('libadwaita-1', version: '>= 1.5.alpha')
 libspell_dep = dependency('libspelling-1', required: false)
 
 # if not libspell, we disable it
diff --git a/src/gtr-actions-app.c b/src/gtr-actions-app.c
index 0b27e2d5..e3543ec2 100644
--- a/src/gtr-actions-app.c
+++ b/src/gtr-actions-app.c
@@ -85,7 +85,7 @@ gtr_about_dialog (GtrWindow *window)
   static const gchar comments[] =
     N_("Translation file editing suite for localization of applications and libraries.");
 
-  adw_show_about_window (GTK_WINDOW (window),
+  adw_show_about_dialog (GTK_WIDGET (window),
                          "application-name", _("Translation Editor"),
                          "application-icon", PACKAGE_APPID,
                          "version", get_version (),
diff --git a/src/gtr-header-dialog.c b/src/gtr-header-dialog.c
index ee4a93dd..c02a2388 100644
--- a/src/gtr-header-dialog.c
+++ b/src/gtr-header-dialog.c
@@ -64,10 +64,10 @@ typedef struct
 
 struct _GtrHeaderDialog
 {
-  AdwPreferencesWindow parent_instance;
+  AdwPreferencesDialog parent_instance;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GtrHeaderDialog, gtr_header_dialog, ADW_TYPE_PREFERENCES_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE (GtrHeaderDialog, gtr_header_dialog, ADW_TYPE_PREFERENCES_DIALOG)
 
 static void
 gtr_header_dialog_dispose (GObject * object)
@@ -342,9 +342,7 @@ gtr_header_dialog_init (GtrHeaderDialog * dlg)
 
   priv->settings = g_settings_new ("org.gnome.gtranslator.preferences.files");
 
-  gtk_window_set_title (GTK_WINDOW (dlg), _("Edit Header"));
-  gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE);
-  gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
+  adw_dialog_set_title (ADW_DIALOG (dlg), _("Edit Header"));
 
   gtk_widget_init_template (GTK_WIDGET (dlg));
 
@@ -388,8 +386,6 @@ set_default_values (GtrHeaderDialog * dlg, GtrWindow * window)
   priv->po = gtr_tab_get_po (tab);
   gtr_header_dialog_fill_from_header (GTR_HEADER_DIALOG (dlg));
 
-  gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (window));
-
   /*Connect signals */
   g_signal_connect (priv->take_my_options, "notify::active",
                     G_CALLBACK (take_my_options_checkbutton_toggled), dlg);
@@ -446,7 +442,5 @@ gtr_show_header_dialog (GtrWindow * window)
   dlg = GTK_WIDGET (g_object_new (GTR_TYPE_HEADER_DIALOG, NULL));
   set_default_values (GTR_HEADER_DIALOG (dlg), window);
 
-  gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (window));
-  gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
-  gtk_window_present (GTK_WINDOW (dlg));
+  adw_dialog_present (ADW_DIALOG (dlg), GTK_WIDGET (window));
 }
diff --git a/src/gtr-header-dialog.h b/src/gtr-header-dialog.h
index 88e00332..09329eb6 100644
--- a/src/gtr-header-dialog.h
+++ b/src/gtr-header-dialog.h
@@ -28,7 +28,7 @@
 G_BEGIN_DECLS
 
 #define GTR_TYPE_HEADER_DIALOG (gtr_header_dialog_get_type ())
-G_DECLARE_FINAL_TYPE (GtrHeaderDialog, gtr_header_dialog, GTR, HEADER_DIALOG, AdwPreferencesWindow)
+G_DECLARE_FINAL_TYPE (GtrHeaderDialog, gtr_header_dialog, GTR, HEADER_DIALOG, AdwPreferencesDialog)
 
 /*
  * Public methods
diff --git a/src/gtr-header-dialog.ui b/src/gtr-header-dialog.ui
index e853346e..a48c3a15 100644
--- a/src/gtr-header-dialog.ui
+++ b/src/gtr-header-dialog.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="GtrHeaderDialog" parent="AdwPreferencesWindow">
+  <template class="GtrHeaderDialog" parent="AdwPreferencesDialog">
 
     <!-- first page -->
     <child>
diff --git a/src/gtr-preferences-dialog.c b/src/gtr-preferences-dialog.c
index 3ef5d9d9..9ee69271 100644
--- a/src/gtr-preferences-dialog.c
+++ b/src/gtr-preferences-dialog.c
@@ -82,11 +82,11 @@ typedef struct
 
 struct _GtrPreferencesDialog
 {
-  AdwPreferencesWindow parent_instance;
+  AdwPreferencesDialog parent_instance;
 };
 
 
-G_DEFINE_TYPE_WITH_PRIVATE (GtrPreferencesDialog, gtr_preferences_dialog, ADW_TYPE_PREFERENCES_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE (GtrPreferencesDialog, gtr_preferences_dialog, ADW_TYPE_PREFERENCES_DIALOG)
 
 static void fill_profile_listbox (GtrPreferencesDialog *dlg);
 
@@ -588,7 +588,5 @@ gtr_show_preferences_dialog (GtrWindow * window)
   dlg = GTK_WIDGET (g_object_new (GTR_TYPE_PREFERENCES_DIALOG,
                                    NULL));
 
-  gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (window));
-  gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
-  gtk_window_present (GTK_WINDOW (dlg));
+  adw_dialog_present (ADW_DIALOG (dlg), GTK_WIDGET (window));
 }
diff --git a/src/gtr-preferences-dialog.h b/src/gtr-preferences-dialog.h
index 010c02a1..d4ca344a 100644
--- a/src/gtr-preferences-dialog.h
+++ b/src/gtr-preferences-dialog.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
 
 #define GTR_TYPE_PREFERENCES_DIALOG (gtr_preferences_dialog_get_type ())
 
-G_DECLARE_FINAL_TYPE (GtrPreferencesDialog, gtr_preferences_dialog, GTR, PREFERENCES_DIALOG, AdwPreferencesWindow)
+G_DECLARE_FINAL_TYPE (GtrPreferencesDialog, gtr_preferences_dialog, GTR, PREFERENCES_DIALOG, AdwPreferencesDialog)
 
 /* Public methods */
 GType           gtr_preferences_dialog_get_type         (void)G_GNUC_CONST;
diff --git a/src/gtr-preferences-dialog.ui b/src/gtr-preferences-dialog.ui
index dbd3ebdc..20354a0b 100644
--- a/src/gtr-preferences-dialog.ui
+++ b/src/gtr-preferences-dialog.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
-  <template class="GtrPreferencesDialog" parent="AdwPreferencesWindow">
+  <template class="GtrPreferencesDialog" parent="AdwPreferencesDialog">
     <child>
       <object class="AdwPreferencesPage">
         <property name="icon_name">emblem-documents-symbolic</property>
-- 
GitLab


From ce577121809f1a9a6a6cb871417a877d90bf810f Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Wed, 7 Feb 2024 00:34:30 +0100
Subject: [PATCH 2/8] Port message dialogs to AdwAlertDialogs

---
 src/gtr-actions-file.c              | 51 ++++++++++++++---------------
 src/gtr-close-confirmation-dialog.c | 42 +++++++++---------------
 src/gtr-close-confirmation-dialog.h |  6 ++--
 src/gtr-preferences-dialog.c        | 30 ++++++++---------
 src/gtr-window.c                    | 19 +++++------
 5 files changed, 65 insertions(+), 83 deletions(-)

diff --git a/src/gtr-actions-file.c b/src/gtr-actions-file.c
index 8b5b8cc1..c894bdae 100644
--- a/src/gtr-actions-file.c
+++ b/src/gtr-actions-file.c
@@ -171,7 +171,7 @@ gtr_po_parse_files_from_dialog (GObject *source, GAsyncResult *res, void *user_d
 }
 
 static void
-handle_save_current_dialog_response (AdwMessageDialog *dialog,
+handle_save_current_dialog_response (AdwAlertDialog *dialog,
                                      char *response,
                                      void (*callback)(GtrWindow *))
 {
@@ -184,7 +184,7 @@ handle_save_current_dialog_response (AdwMessageDialog *dialog,
   if (g_strcmp0 ("cancel", response) != 0)
     callback (window);
 
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  adw_dialog_force_close (ADW_DIALOG (dialog));
 }
 
 void
@@ -193,7 +193,7 @@ gtr_want_to_save_current_dialog (GtrWindow * window, void (*callback)(GtrWindow
   GtrTab *tab;
   GtrPo *po;
 
-  GtkWidget *dialog;
+  AdwDialog *dialog;
   g_autoptr (GFile) location = NULL;
   g_autofree gchar *basename = NULL;
 
@@ -202,27 +202,26 @@ gtr_want_to_save_current_dialog (GtrWindow * window, void (*callback)(GtrWindow
   location = gtr_po_get_location (po);
   basename = g_file_get_basename (location);
 
-  dialog = adw_message_dialog_new (GTK_WINDOW (window), _("Unsaved Changes"), NULL);
+  dialog = adw_alert_dialog_new (_("Unsaved Changes"), NULL);
+  adw_alert_dialog_set_body_use_markup (ADW_ALERT_DIALOG (dialog), TRUE);
 
-  adw_message_dialog_set_body_use_markup (ADW_MESSAGE_DIALOG (dialog), TRUE);
+  adw_alert_dialog_format_body (ADW_ALERT_DIALOG (dialog),
+                                _("Do you want to write all the changes done to %s?"),
+                                basename);
 
-  adw_message_dialog_format_body (ADW_MESSAGE_DIALOG (dialog),
-                                  _("Do you want to write all the changes done to %s?"),
-                                  basename);
-
-  adw_message_dialog_add_responses (ADW_MESSAGE_DIALOG (dialog),
-                                    "cancel", _("Cancel"),
-                                    "no", _("Continue Without Saving"),
-                                    "save", _("Save and Open"),
-                                    NULL);
-  adw_message_dialog_set_response_appearance (ADW_MESSAGE_DIALOG (dialog),
+  adw_alert_dialog_add_responses (ADW_ALERT_DIALOG (dialog),
+                                  "cancel", _("Cancel"),
+                                  "no", _("Continue Without Saving"),
+                                  "save", _("Save and Open"),
+                                  NULL);
+  adw_alert_dialog_set_response_appearance (ADW_ALERT_DIALOG (dialog),
     "no", ADW_RESPONSE_DESTRUCTIVE);
-  adw_message_dialog_set_response_appearance (ADW_MESSAGE_DIALOG (dialog),
+  adw_alert_dialog_set_response_appearance (ADW_ALERT_DIALOG (dialog),
     "save", ADW_RESPONSE_SUGGESTED);
-  adw_message_dialog_set_default_response (ADW_MESSAGE_DIALOG (dialog), "save");
+  adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "save");
 
   g_signal_connect (dialog, "response", G_CALLBACK (handle_save_current_dialog_response), callback);
-  gtk_window_present (GTK_WINDOW (dialog));
+  adw_dialog_present (dialog, GTK_WIDGET (window));
 }
 
 /*
@@ -582,7 +581,7 @@ close_confirmation_dialog_response_handler (GtrCloseConfirmationDialog *dlg,
       selected_documents = gtr_close_confirmation_dialog_get_selected_documents (dlg);
       if (selected_documents == NULL)
         {
-          gtk_window_destroy (GTK_WINDOW (dlg));
+          adw_dialog_close (ADW_DIALOG (dlg));
           close_all_tabs (window);
           return;
         }
@@ -594,12 +593,12 @@ close_confirmation_dialog_response_handler (GtrCloseConfirmationDialog *dlg,
     }
   else if (g_strcmp0 (response, "no") == 0)
     {
-      gtk_window_destroy (GTK_WINDOW (dlg));
+      adw_dialog_close (ADW_DIALOG (dlg));
       close_all_tabs (window);
       return;
     }
 
-  gtk_window_destroy (GTK_WINDOW (dlg));
+  adw_dialog_close (ADW_DIALOG (dlg));
 }
 
 void
@@ -610,8 +609,7 @@ gtr_close_tab (GtrTab * tab, GtrWindow * window)
       GtkWidget *dlg;
 
       dlg =
-        gtr_close_confirmation_dialog_new_single (GTK_WINDOW (window),
-                                                  gtr_tab_get_po
+        gtr_close_confirmation_dialog_new_single (gtr_tab_get_po
                                                   (tab), FALSE);
 
       g_signal_connect (dlg,
@@ -619,7 +617,7 @@ gtr_close_tab (GtrTab * tab, GtrWindow * window)
                         G_CALLBACK
                         (close_confirmation_dialog_response_handler), window);
 
-      gtk_window_present (GTK_WINDOW (dlg));
+      adw_dialog_present (ADW_DIALOG (dlg), GTK_WIDGET (window));
     }
   else
     //_gtr_window_close_tab (window, tab);
@@ -679,8 +677,7 @@ close_all_documents (GtrWindow * window, gboolean logout_mode)
     {
       GtkWidget *dlg;
 
-      dlg = gtr_close_confirmation_dialog_new (GTK_WINDOW (window),
-                                               list, logout_mode);
+      dlg = gtr_close_confirmation_dialog_new (list, logout_mode);
 
       g_signal_connect (dlg,
                         "response",
@@ -689,7 +686,7 @@ close_all_documents (GtrWindow * window, gboolean logout_mode)
 
       g_list_free (list);
 
-      gtk_window_present (GTK_WINDOW (dlg));
+      adw_dialog_present (ADW_DIALOG (dlg), GTK_WIDGET (window));
     }
   else
     {
diff --git a/src/gtr-close-confirmation-dialog.c b/src/gtr-close-confirmation-dialog.c
index 5cc7c8e4..7ef58ab2 100644
--- a/src/gtr-close-confirmation-dialog.c
+++ b/src/gtr-close-confirmation-dialog.c
@@ -60,12 +60,12 @@ enum
 
 struct _GtrCloseConfirmationDialog
 {
-  AdwMessageDialog parent;
+  AdwAlertDialog parent;
 };
 
 struct _GtrCloseConfirmationDialogClass
 {
-  AdwMessageDialogClass parent_class;
+  AdwAlertDialogClass parent_class;
 };
 
 typedef struct
@@ -83,7 +83,7 @@ typedef struct
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtrCloseConfirmationDialog,
                             gtr_close_confirmation_dialog,
-                            ADW_TYPE_MESSAGE_DIALOG)
+                            ADW_TYPE_ALERT_DIALOG)
 
 static void set_unsaved_document (GtrCloseConfirmationDialog *dlg,
                                   const GList * list);
@@ -116,30 +116,27 @@ static void
 set_logout_mode (GtrCloseConfirmationDialog * dlg, gboolean logout_mode)
 {
 
-  adw_message_dialog_set_close_response (ADW_MESSAGE_DIALOG (dlg), "cancel");
-  adw_message_dialog_add_responses (
-    ADW_MESSAGE_DIALOG (dlg),
+  adw_alert_dialog_set_close_response (ADW_ALERT_DIALOG (dlg), "cancel");
+  adw_alert_dialog_add_responses (
+    ADW_ALERT_DIALOG (dlg),
     "cancel", _("_Cancel"),
     "no", _("Close _Without Saving"),
     "yes", _("_Save"),
     NULL
   );
 
-  adw_message_dialog_set_response_appearance (ADW_MESSAGE_DIALOG (dlg),
+  adw_alert_dialog_set_response_appearance (ADW_ALERT_DIALOG (dlg),
     "no", ADW_RESPONSE_DESTRUCTIVE);
-  adw_message_dialog_set_response_appearance (ADW_MESSAGE_DIALOG (dlg),
+  adw_alert_dialog_set_response_appearance (ADW_ALERT_DIALOG (dlg),
     "yes", ADW_RESPONSE_SUGGESTED);
-  adw_message_dialog_set_default_response (ADW_MESSAGE_DIALOG (dlg), "yes");
+  adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dlg), "yes");
 }
 
 static void
 gtr_close_confirmation_dialog_init (GtrCloseConfirmationDialog * dlg)
 {
-  gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
-  gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE);
-
   g_signal_connect (dlg, "response", G_CALLBACK (response_cb), NULL);
-  adw_message_dialog_set_body_use_markup (ADW_MESSAGE_DIALOG (dlg), TRUE);
+  adw_alert_dialog_set_body_use_markup (ADW_ALERT_DIALOG (dlg), TRUE);
 }
 
 static void
@@ -249,8 +246,7 @@ GList *gtr_close_confirmation_dialog_get_selected_documents
 }
 
 GtkWidget *
-gtr_close_confirmation_dialog_new (GtkWindow * parent,
-                                   GList * unsaved_documents,
+gtr_close_confirmation_dialog_new (GList * unsaved_documents,
                                    gboolean logout_mode)
 {
   GtkWidget *dlg;
@@ -260,16 +256,11 @@ gtr_close_confirmation_dialog_new (GtkWindow * parent,
                                   "unsaved_documents", unsaved_documents,
                                   "logout_mode", logout_mode, NULL));
   g_return_val_if_fail (dlg != NULL, NULL);
-
-  if (parent != NULL)
-    gtk_window_set_transient_for (GTK_WINDOW (dlg), parent);
-
   return dlg;
 }
 
 GtkWidget *
-gtr_close_confirmation_dialog_new_single (GtkWindow * parent,
-                                          GtrPo * doc, gboolean logout_mode)
+gtr_close_confirmation_dialog_new_single (GtrPo * doc, gboolean logout_mode)
 {
   GtkWidget *dlg;
   GList *unsaved_documents;
@@ -277,8 +268,7 @@ gtr_close_confirmation_dialog_new_single (GtkWindow * parent,
 
   unsaved_documents = g_list_prepend (NULL, doc);
 
-  dlg = gtr_close_confirmation_dialog_new (parent,
-                                           unsaved_documents, logout_mode);
+  dlg = gtr_close_confirmation_dialog_new (unsaved_documents, logout_mode);
 
   g_list_free (unsaved_documents);
 
@@ -301,7 +291,7 @@ build_single_doc_dialog (GtrCloseConfirmationDialog * dlg)
   location = gtr_po_get_location (doc);
   doc_name = g_file_get_basename (location);
 
-  adw_message_dialog_format_body (ADW_MESSAGE_DIALOG (dlg),
+  adw_alert_dialog_format_body (ADW_ALERT_DIALOG (dlg),
     _("Save the changes to document “%s” before closing?"), doc_name);
 }
 
@@ -330,7 +320,7 @@ build_multiple_docs_dialog (GtrCloseConfirmationDialog * dlg)
                         g_list_length (priv->unsaved_documents)),
                        g_list_length (priv->unsaved_documents));
 
-  adw_message_dialog_set_body (ADW_MESSAGE_DIALOG (dlg), str);
+  adw_alert_dialog_set_body (ADW_ALERT_DIALOG (dlg), str);
 }
 
 static void
@@ -345,7 +335,7 @@ set_unsaved_document (GtrCloseConfirmationDialog * dlg, const GList * list)
 
   priv->unsaved_documents = g_list_copy ((GList *) list);
 
-  adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG (dlg), _("Unsaved Changes"));
+  adw_alert_dialog_set_heading (ADW_ALERT_DIALOG (dlg), _("Unsaved Changes"));
   if (GET_MODE (priv) == SINGLE_DOC_MODE)
     {
       build_single_doc_dialog (dlg);
diff --git a/src/gtr-close-confirmation-dialog.h b/src/gtr-close-confirmation-dialog.h
index 44bfb01f..52fd687b 100644
--- a/src/gtr-close-confirmation-dialog.h
+++ b/src/gtr-close-confirmation-dialog.h
@@ -35,10 +35,10 @@
 G_BEGIN_DECLS
 #define GTR_TYPE_CLOSE_CONFIRMATION_DIALOG  (gtr_close_confirmation_dialog_get_type ())
 
-G_DECLARE_FINAL_TYPE (GtrCloseConfirmationDialog, gtr_close_confirmation_dialog, GTR, CLOSE_CONFIRMATION_DIALOG, AdwMessageDialog)
+G_DECLARE_FINAL_TYPE (GtrCloseConfirmationDialog, gtr_close_confirmation_dialog, GTR, CLOSE_CONFIRMATION_DIALOG, AdwAlertDialog)
 
-GtkWidget *gtr_close_confirmation_dialog_new        (GtkWindow * parent, GList * unsaved_documents, gboolean logout_mode);
-GtkWidget *gtr_close_confirmation_dialog_new_single (GtkWindow * parent, GtrPo * doc, gboolean logout_mode);
+GtkWidget *gtr_close_confirmation_dialog_new        (GList * unsaved_documents, gboolean logout_mode);
+GtkWidget *gtr_close_confirmation_dialog_new_single (GtrPo * doc, gboolean logout_mode);
 
 const GList * gtr_close_confirmation_dialog_get_unsaved_documents (GtrCloseConfirmationDialog * dlg);
 GList * gtr_close_confirmation_dialog_get_selected_documents (GtrCloseConfirmationDialog * dlg);
diff --git a/src/gtr-preferences-dialog.c b/src/gtr-preferences-dialog.c
index 9ee69271..25ea0389 100644
--- a/src/gtr-preferences-dialog.c
+++ b/src/gtr-preferences-dialog.c
@@ -334,7 +334,7 @@ on_profile_dialog_response_cb (GtrProfileDialog     *profile_dialog,
     }
 
   g_object_unref (prof_manager);
-  gtk_window_destroy (GTK_WINDOW (profile_dialog));
+  adw_dialog_close (ADW_DIALOG (profile_dialog));
 }
 
 static void
@@ -395,7 +395,7 @@ delete_confirm_dialog_cb (GtkWidget *dialog, char *response, GtrPreferencesDialo
   GtrProfile *profile = priv->editing_profile;
 
   priv->editing_profile = NULL;
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  adw_dialog_close (ADW_DIALOG (dialog));
 
   if (g_strcmp0 (response, "cancel") == 0)
     return;
@@ -428,36 +428,32 @@ delete_button_clicked (GtkWidget            *widget,
     {
       if (active_profile == profile)
         {
-          GtkWidget *dialog = adw_message_dialog_new (
-            GTK_WINDOW (dlg),
+          AdwDialog *dialog = adw_alert_dialog_new (
             _("Impossible to remove the active profile"),
             _("Another profile should be selected as active before")
           );
 
-          adw_message_dialog_add_responses (ADW_MESSAGE_DIALOG (dialog),
-                                            "ok",  _("_Ok"),
-                                            NULL);
+          adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("_Ok"));
+          adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
 
-          g_signal_connect (dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
-          gtk_window_present (GTK_WINDOW (dialog));
+          adw_dialog_present (dialog, GTK_WIDGET (dlg));
         }
       else
         {
-          GtkWidget *dialog = adw_message_dialog_new (
-            GTK_WINDOW (dlg),
+          AdwDialog *dialog = adw_alert_dialog_new (
             _("Are you sure you want to delete this profile?"),
             NULL
           );
 
-          adw_message_dialog_add_responses (ADW_MESSAGE_DIALOG (dialog),
-                                            "cancel",  _("_Cancel"),
-                                            "delete", _("_Delete"),
-                                            NULL);
+          adw_alert_dialog_add_responses (ADW_ALERT_DIALOG (dialog),
+                                          "cancel",  _("_Cancel"),
+                                          "delete", _("_Delete"),
+                                          NULL);
 
           priv->editing_profile = profile;
-          g_signal_connect (GTK_DIALOG (dialog), "response",
+          g_signal_connect (dialog, "response",
                             G_CALLBACK (delete_confirm_dialog_cb), dlg);
-          gtk_window_present (GTK_WINDOW (dialog));
+          adw_dialog_present (dialog, GTK_WIDGET (dlg));
         }
     }
 
diff --git a/src/gtr-window.c b/src/gtr-window.c
index c76d39c2..9bf5d9f1 100644
--- a/src/gtr-window.c
+++ b/src/gtr-window.c
@@ -324,16 +324,15 @@ gtr_window_save_current_tab (GtrWindow *self)
 
   if (error)
     {
-      AdwMessageDialog *dialog;
-      dialog = ADW_MESSAGE_DIALOG (adw_message_dialog_new (
-          GTK_WINDOW (self), _("Could not Save"), NULL));
-      adw_message_dialog_format_body (dialog, "%s", error->message);
-      adw_message_dialog_add_response (dialog, "ok", _("OK"));
-      adw_message_dialog_set_default_response (dialog, "ok");
-      adw_message_dialog_set_close_response (dialog, "ok");
-      adw_message_dialog_choose (
-          dialog, NULL, (GAsyncReadyCallback)adw_message_dialog_choose_finish,
-          NULL);
+      AdwAlertDialog *dialog;
+      dialog = ADW_ALERT_DIALOG (adw_alert_dialog_new (
+          _("Could not Save"), error->message));
+      adw_alert_dialog_add_response (dialog, "ok", _("OK"));
+      adw_alert_dialog_set_default_response (dialog, "ok");
+      adw_alert_dialog_set_close_response (dialog, "ok");
+      adw_alert_dialog_choose (
+          dialog, GTK_WIDGET (self), NULL,
+          (GAsyncReadyCallback)adw_alert_dialog_choose_finish, NULL);
       return;
     }
 
-- 
GitLab


From 3f6875a8b9d1932b31566d8c9d504cc0826bdb14 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Wed, 7 Feb 2024 22:33:15 +0100
Subject: [PATCH 3/8] context: Port notes dialog to AdwDialog

---
 src/gtr-context.c | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/gtr-context.c b/src/gtr-context.c
index c37043c0..3d627cdb 100644
--- a/src/gtr-context.c
+++ b/src/gtr-context.c
@@ -96,13 +96,13 @@ static void showed_message_cb (GtrTab *tab, GtrMsg *msg, GtrContextPanel *panel)
 typedef struct {
   GtrContextPanel *panel;
   GtkTextBuffer   *text_buffer;
-  GtkWidget       *dialog;
+  AdwDialog       *dialog;
 } DialogData;
 
 static void
 dialog_data_free (DialogData *data)
 {
-  gtk_window_destroy (GTK_WINDOW (data->dialog));
+  adw_dialog_close (data->dialog);
 
   g_free (data);
 }
@@ -138,9 +138,9 @@ static void
 setup_notes_edition (GtkWidget *button, GtrContextPanel *panel)
 {
   GtrContextPanelPrivate *priv;
-  GtkWidget *dialog;
+  AdwDialog *dialog;
   GtkWidget *scrolled_window;
-  GtkBox *dialog_area;
+  GtkWidget *toolbar_view;
   GtkWidget *text_view;
 
   GtkWidget *headerbar;
@@ -149,7 +149,6 @@ setup_notes_edition (GtkWidget *button, GtrContextPanel *panel)
 
   GtkTextBuffer *text_buffer = gtk_text_buffer_new (NULL);;
   DialogData *dd;
-  GtkWidget *toplevel = gtk_widget_get_ancestor (GTK_WIDGET (panel), GTK_TYPE_WINDOW);
 
   priv = gtr_context_panel_get_instance_private (panel);
 
@@ -160,14 +159,12 @@ setup_notes_edition (GtkWidget *button, GtrContextPanel *panel)
   gtk_header_bar_pack_start (GTK_HEADER_BAR (headerbar), cancel);
   gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), save);
 
-  dialog = gtk_window_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog), _("Notes"));
-  gtk_window_set_titlebar (GTK_WINDOW (dialog), headerbar);
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-  gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel));
+  dialog = adw_dialog_new ();
+  toolbar_view = adw_toolbar_view_new ();
+  adw_dialog_set_title (dialog, _("Notes"));
+  adw_dialog_set_child (dialog, toolbar_view);
+  adw_toolbar_view_add_top_bar (ADW_TOOLBAR_VIEW (toolbar_view), headerbar);
 
-  dialog_area = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
   text_view = gtk_text_view_new_with_buffer (text_buffer);
 
   gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text_view),10);
@@ -187,15 +184,13 @@ setup_notes_edition (GtkWidget *button, GtrContextPanel *panel)
   gtk_widget_set_margin_bottom (scrolled_window, 6);
 
   gtk_widget_set_vexpand (scrolled_window, TRUE);
-  gtk_box_append (dialog_area, scrolled_window);
-  gtk_window_set_child (GTK_WINDOW (dialog), GTK_WIDGET (dialog_area));
+  adw_toolbar_view_set_content (ADW_TOOLBAR_VIEW (toolbar_view), scrolled_window);
 
   text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
   gtk_text_buffer_set_text (text_buffer, gtr_msg_get_comment (priv->current_msg), -1);
 
-  gtk_widget_set_size_request (dialog, 400, 300);
-  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-  gtk_window_set_deletable (GTK_WINDOW (dialog), FALSE);
+  adw_dialog_set_content_height (dialog, 300);
+  adw_dialog_set_content_width (dialog, 400);
 
   dd = g_new0 (DialogData, 1);
   dd->panel = panel;
@@ -205,7 +200,7 @@ setup_notes_edition (GtkWidget *button, GtrContextPanel *panel)
   g_signal_connect (cancel, "clicked", G_CALLBACK (close_notes), dd);
   g_signal_connect (save, "clicked", G_CALLBACK (save_notes), dd);
 
-  gtk_window_present (GTK_WINDOW (dialog));
+  adw_dialog_present (dialog, GTK_WIDGET (panel));
 }
 
 static void
-- 
GitLab


From 83eddad5f868c0744eb8db44dc8781c6643d5001 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Wed, 7 Feb 2024 22:43:54 +0100
Subject: [PATCH 4/8] translation-memory-dialog: Port to AdwDialog

---
 src/gtr-window.c                                |  5 ++---
 .../gtr-translation-memory-dialog.c             | 17 ++++-------------
 .../gtr-translation-memory-dialog.h             |  5 ++---
 .../gtr-translation-memory-dialog.ui            |  6 ++----
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/gtr-window.c b/src/gtr-window.c
index 9bf5d9f1..a1f9ce71 100644
--- a/src/gtr-window.c
+++ b/src/gtr-window.c
@@ -657,10 +657,9 @@ gtr_window_show_tm_dialog (GtrWindow *window)
   GtrWindowPrivate *priv = gtr_window_get_instance_private(window);
   GtkWidget *dlg;
 
-  dlg = gtr_translation_memory_dialog_new (GTK_WINDOW (window),
-                                           priv->translation_memory);
+  dlg = gtr_translation_memory_dialog_new (priv->translation_memory);
 
-  gtk_window_present (GTK_WINDOW (dlg));
+  adw_dialog_present (ADW_DIALOG (dlg), GTK_WIDGET (window));
 }
 
 GtrTranslationMemory *
diff --git a/src/translation-memory/gtr-translation-memory-dialog.c b/src/translation-memory/gtr-translation-memory-dialog.c
index bfcb4bf2..779a4eb2 100644
--- a/src/translation-memory/gtr-translation-memory-dialog.c
+++ b/src/translation-memory/gtr-translation-memory-dialog.c
@@ -41,11 +41,11 @@ typedef struct
 
 struct _GtrTranslationMemoryDialog
 {
-  AdwWindow parent;
+  AdwDialog parent;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtrTranslationMemoryDialog,
-                            gtr_translation_memory_dialog, ADW_TYPE_WINDOW)
+                            gtr_translation_memory_dialog, ADW_TYPE_DIALOG)
 
 static void
 select_folder_cb (GtkFileDialog *dialog, GAsyncResult *res, gpointer user_data)
@@ -79,7 +79,7 @@ select_directory_activated_cb (GtrTranslationMemoryDialog *dlg)
 
   gtk_file_dialog_select_folder (
     dialog,
-    GTK_WINDOW (dlg),
+    GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (dlg))),
     NULL,
     (GAsyncReadyCallback) (select_folder_cb),
     dlg
@@ -112,9 +112,6 @@ gtr_translation_memory_dialog_class_init (GtrTranslationMemoryDialogClass *klass
   object_class->finalize = gtr_translation_memory_dialog_finalize;
   object_class->dispose = gtr_translation_memory_dialog_dispose;
 
-  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0,
-                                       "window.close", NULL);
-
   gtk_widget_class_set_template_from_resource (
     widget_class,
     "/org/gnome/gtranslator/plugins/translation-memory/ui/gtr-translation-memory-dialog.ui"
@@ -356,8 +353,7 @@ gtr_translation_memory_dialog_init (GtrTranslationMemoryDialog *dlg)
 }
 
 GtkWidget *
-gtr_translation_memory_dialog_new (GtkWindow *window,
-                                   GtrTranslationMemory *translation_memory)
+gtr_translation_memory_dialog_new (GtrTranslationMemory *translation_memory)
 {
   GtrTranslationMemoryDialog *dlg;
   GtrTranslationMemoryDialogPrivate *priv;
@@ -368,10 +364,5 @@ gtr_translation_memory_dialog_new (GtkWindow *window,
   /* FIXME: use a property */
   priv->translation_memory = translation_memory;
 
-  if (window != gtk_window_get_transient_for (GTK_WINDOW (dlg)))
-    {
-      gtk_window_set_transient_for (GTK_WINDOW (dlg), window);
-    }
-
   return GTK_WIDGET (dlg);
 }
diff --git a/src/translation-memory/gtr-translation-memory-dialog.h b/src/translation-memory/gtr-translation-memory-dialog.h
index 65cd8094..46285c8f 100644
--- a/src/translation-memory/gtr-translation-memory-dialog.h
+++ b/src/translation-memory/gtr-translation-memory-dialog.h
@@ -26,9 +26,8 @@ G_BEGIN_DECLS
 #define GTR_TYPE_TRANSLATION_MEMORY_DIALOG             (gtr_translation_memory_dialog_get_type ())
 G_DECLARE_FINAL_TYPE (GtrTranslationMemoryDialog,
                       gtr_translation_memory_dialog, GTR,
-                      TRANSLATION_MEMORY_DIALOG, AdwWindow)
+                      TRANSLATION_MEMORY_DIALOG, AdwDialog)
 
-GtkWidget       *gtr_translation_memory_dialog_new          (GtkWindow *window,
-                                                             GtrTranslationMemory *translation_memory);
+GtkWidget       *gtr_translation_memory_dialog_new          (GtrTranslationMemory *translation_memory);
 
 G_END_DECLS
diff --git a/src/translation-memory/gtr-translation-memory-dialog.ui b/src/translation-memory/gtr-translation-memory-dialog.ui
index 58810b11..912280f0 100644
--- a/src/translation-memory/gtr-translation-memory-dialog.ui
+++ b/src/translation-memory/gtr-translation-memory-dialog.ui
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="GtrTranslationMemoryDialog" parent="AdwWindow">
+  <template class="GtrTranslationMemoryDialog" parent="AdwDialog">
     <property name="width-request">360</property>
     <property name="height-request">294</property>
-    <property name="modal">True</property>
     <property name="title" translatable="yes">Translation Editor Memory Manager</property>
-    <property name="destroy-with-parent">True</property>
-    <property name="content">
+    <property name="child">
       <object class="AdwToolbarView">
         <child type="top">
           <object class="GtkHeaderBar"/>
-- 
GitLab


From 753909bcf9f383643346e796b50085da3e85fbf6 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Wed, 7 Feb 2024 22:44:22 +0100
Subject: [PATCH 5/8] profile-dialog: Port to AdwDialog

---
 src/gtr-preferences-dialog.c |  8 ++++----
 src/gtr-profile-dialog.c     | 17 ++++-------------
 src/gtr-profile-dialog.h     |  5 ++---
 src/gtr-profile-dialog.ui    |  6 ++----
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/gtr-preferences-dialog.c b/src/gtr-preferences-dialog.c
index 25ea0389..c4b6a1f8 100644
--- a/src/gtr-preferences-dialog.c
+++ b/src/gtr-preferences-dialog.c
@@ -342,10 +342,10 @@ add_button_clicked (GtrPreferencesDialog *dlg)
 {
   GtrProfileDialog *profile_dialog;
 
-  profile_dialog = gtr_profile_dialog_new (GTK_WIDGET (dlg), NULL);
+  profile_dialog = gtr_profile_dialog_new (NULL);
   g_signal_connect (profile_dialog, "response",
                     G_CALLBACK (on_profile_dialog_response_cb), dlg);
-  gtk_window_present (GTK_WINDOW (profile_dialog));
+  adw_dialog_present (ADW_DIALOG (profile_dialog), GTK_WIDGET (dlg));
 }
 
 static void
@@ -378,10 +378,10 @@ edit_button_clicked (GtkWidget            *widget,
     {
       priv->editing_profile = profile;
       GtrProfileDialog *profile_dialog;
-      profile_dialog = gtr_profile_dialog_new (GTK_WIDGET (dlg), profile);
+      profile_dialog = gtr_profile_dialog_new (profile);
       g_signal_connect (profile_dialog, "response",
                         G_CALLBACK (on_profile_dialog_response_cb), dlg);
-      gtk_window_present (GTK_WINDOW (profile_dialog));
+      adw_dialog_present (ADW_DIALOG (profile_dialog), GTK_WIDGET (dlg));
     }
 
   g_object_unref (prof_manager);
diff --git a/src/gtr-profile-dialog.c b/src/gtr-profile-dialog.c
index 0bff5a96..6677ae64 100644
--- a/src/gtr-profile-dialog.c
+++ b/src/gtr-profile-dialog.c
@@ -55,11 +55,11 @@ typedef struct
 
 struct _GtrProfileDialog
 {
-  AdwWindow parent_instance;
+  AdwDialog parent_instance;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtrProfileDialog, gtr_profile_dialog,
-                            ADW_TYPE_WINDOW)
+                            ADW_TYPE_DIALOG)
 
 enum
 {
@@ -80,7 +80,7 @@ static void
 on_cancel_button_clicked (GtkButton                  *button,
                           GtrProfileDialog           *dlg)
 {
-  gtk_window_destroy (GTK_WINDOW (dlg));
+  adw_dialog_close (ADW_DIALOG (dlg));
 }
 
 static void
@@ -88,9 +88,6 @@ gtr_profile_dialog_class_init (GtrProfileDialogClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0,
-                                       "window.close", NULL);
-
   gtk_widget_class_set_template_from_resource (widget_class,
                                                "/org/gnome/translator/gtr-profile-dialog.ui");
 
@@ -171,8 +168,7 @@ fill_entries (GtrProfileDialog *dlg, GtrProfile *profile)
 }
 
 GtrProfileDialog *
-gtr_profile_dialog_new (GtkWidget  *parent,
-                        GtrProfile *profile)
+gtr_profile_dialog_new (GtrProfile *profile)
 {
   GtrProfileDialog *dlg;
 
@@ -183,11 +179,6 @@ gtr_profile_dialog_new (GtkWidget  *parent,
       fill_entries (dlg, profile);
     }
 
-  if (GTK_WINDOW (parent) != gtk_window_get_transient_for (GTK_WINDOW (dlg)))
-    {
-      gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (parent));
-    }
-
   return dlg;
 }
 
diff --git a/src/gtr-profile-dialog.h b/src/gtr-profile-dialog.h
index e632a2a2..8009d39b 100644
--- a/src/gtr-profile-dialog.h
+++ b/src/gtr-profile-dialog.h
@@ -35,13 +35,12 @@ G_BEGIN_DECLS
 #define GTR_TYPE_PROFILE_DIALOG (gtr_profile_dialog_get_type ())
 
 G_DECLARE_FINAL_TYPE (GtrProfileDialog, gtr_profile_dialog, GTR,
-                      PROFILE_DIALOG, AdwWindow)
+                      PROFILE_DIALOG, AdwDialog)
 
 /*
  * Public methods
  */
-GtrProfileDialog   *gtr_profile_dialog_new              (GtkWidget  *parent,
-                                                         GtrProfile *profile);
+GtrProfileDialog   *gtr_profile_dialog_new              (GtrProfile *profile);
 GtrProfile         *gtr_profile_dialog_get_profile      (GtrProfileDialog *dlg);
 gboolean            gtr_profile_dialog_get_editing      (GtrProfileDialog *dlg);
 
diff --git a/src/gtr-profile-dialog.ui b/src/gtr-profile-dialog.ui
index fbc7ee78..139c4a15 100644
--- a/src/gtr-profile-dialog.ui
+++ b/src/gtr-profile-dialog.ui
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="GtrProfileDialog" parent="AdwWindow">
+  <template class="GtrProfileDialog" parent="AdwDialog">
     <property name="width-request">360</property>
     <property name="height-request">294</property>
-    <property name="modal">True</property>
-    <property name="destroy-with-parent">True</property>
     <property name="title" translatable="yes">Translation Editor Profile</property>
-    <property name="content">
+    <property name="child">
       <object class="AdwToolbarView">
         <child type="top">
           <object class="GtkHeaderBar" id="titlebar">
-- 
GitLab


From 47c98c007675e45aebe42b6480582f018b2c564f Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Wed, 7 Feb 2024 22:51:55 +0100
Subject: [PATCH 6/8] upload-dialog: Port to AdwDialog

---
 src/gtr-actions-file.c   | 14 +++++++-------
 src/gtr-upload-dialog.c  | 14 +++-----------
 src/gtr-upload-dialog.h  |  2 +-
 src/gtr-upload-dialog.ui | 11 +++++------
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/gtr-actions-file.c b/src/gtr-actions-file.c
index c894bdae..88e8ddf9 100644
--- a/src/gtr-actions-file.c
+++ b/src/gtr-actions-file.c
@@ -49,15 +49,15 @@ static void load_file_list (GtrWindow * window, const GSList * uris);
 static GList * get_modified_documents (GtrWindow * window);
 
 typedef struct {
-  SoupMessage *msg;
-  GtkWidget   *dialog;
+  SoupMessage     *msg;
+  GtrUploadDialog *dialog;
 } UserData;
 
 static void
 user_data_free (UserData *ud)
 {
   g_object_unref (ud->msg);
-  gtk_window_destroy (GTK_WINDOW (ud->dialog));
+  adw_dialog_close (ADW_DIALOG (ud->dialog));
 
   g_free (ud);
 }
@@ -307,8 +307,8 @@ _upload_file_callback (GObject      *object,
   g_autoptr (GtkAlertDialog) dialog = NULL;
   GtrTab *active_tab;
 
-  GtkWidget *upload_dialog = ud->dialog;
-  GtkWidget *window = gtr_upload_dialog_get_parent (GTR_UPLOAD_DIALOG (upload_dialog));
+  GtrUploadDialog *upload_dialog = ud->dialog;
+  GtkWidget *window = gtr_upload_dialog_get_parent (upload_dialog);
   SoupSession *session = SOUP_SESSION (object);
   SoupStatus status_code = soup_message_get_status (ud->msg);
 
@@ -452,7 +452,7 @@ gtr_upload_file (GtkWidget *upload_dialog,
 
   UserData *ud;
   ud = g_new0 (UserData, 1);
-  ud->dialog = upload_dialog;
+  ud->dialog = GTR_UPLOAD_DIALOG (upload_dialog);
   ud->msg = msg;
   soup_session_send_async (session, msg, G_PRIORITY_DEFAULT, NULL, _upload_file_callback, ud);
 }
@@ -471,7 +471,7 @@ gtr_upload_file_dialog (GtrWindow * window)
                    G_CALLBACK (gtr_upload_file),
                    window);
 
-  gtk_window_present (GTK_WINDOW (dialog));
+  adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (window));
 }
 
 /*
diff --git a/src/gtr-upload-dialog.c b/src/gtr-upload-dialog.c
index d8e376a1..2a7f3984 100644
--- a/src/gtr-upload-dialog.c
+++ b/src/gtr-upload-dialog.c
@@ -42,11 +42,11 @@ typedef struct
 
 struct _GtrUploadDialog
 {
-  AdwWindow parent_instance;
+  AdwDialog parent_instance;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtrUploadDialog, gtr_upload_dialog,
-                            ADW_TYPE_WINDOW)
+                            ADW_TYPE_DIALOG)
 
 enum
 {
@@ -67,7 +67,7 @@ static void
 on_cancel_button_clicked (GtkButton                  *button,
                           GtrUploadDialog            *dlg)
 {
-  gtk_window_destroy (GTK_WINDOW (dlg));
+  adw_dialog_close (ADW_DIALOG (dlg));
 }
 
 static void
@@ -76,9 +76,6 @@ gtr_upload_dialog_class_init (GtrUploadDialogClass *klass)
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass),
                                                "/org/gnome/translator/gtr-upload-dialog.ui");
 
-  gtk_widget_class_add_binding_action (
-      GTK_WIDGET_CLASS (klass), GDK_KEY_Escape, 0, "window.close", NULL);
-
   /* Main layout widgets */
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GtrUploadDialog, main_box);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GtrUploadDialog, text_view);
@@ -118,11 +115,6 @@ gtr_upload_dialog_new (GtkWidget  *parent)
   priv = gtr_upload_dialog_get_instance_private (dlg);
   priv->parent = parent;
 
-  if (GTK_WINDOW (parent) != gtk_window_get_transient_for (GTK_WINDOW (dlg)))
-    {
-      gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (parent));
-    }
-
   return dlg;
 }
 
diff --git a/src/gtr-upload-dialog.h b/src/gtr-upload-dialog.h
index 0f5e17e0..bfbbabe3 100644
--- a/src/gtr-upload-dialog.h
+++ b/src/gtr-upload-dialog.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 #define GTR_TYPE_UPLOAD_DIALOG          (gtr_upload_dialog_get_type ())
 
 G_DECLARE_FINAL_TYPE (GtrUploadDialog, gtr_upload_dialog, GTR, UPLOAD_DIALOG,
-                      AdwWindow)
+                      AdwDialog)
 
 /*
  * Public methods
diff --git a/src/gtr-upload-dialog.ui b/src/gtr-upload-dialog.ui
index f51651ad..edb7e113 100644
--- a/src/gtr-upload-dialog.ui
+++ b/src/gtr-upload-dialog.ui
@@ -2,15 +2,14 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
-  <template class="GtrUploadDialog" parent="AdwWindow">
-    <property name="modal">True</property>
-    <property name="destroy-with-parent">True</property>
+  <template class="GtrUploadDialog" parent="AdwDialog">
     <property name="title" translatable="yes">Upload to Damned Lies</property>
-    <property name="deletable">False</property>
-    <property name="content">
+    <property name="child">
       <object class="AdwToolbarView">
         <child type="top">
-          <object class="GtkHeaderBar" id="titlebar">
+          <object class="AdwHeaderBar" id="titlebar">
+            <property name="show-end-title-buttons">False</property>
+            <property name="show-start-title-buttons">False</property>
             <child type="start">
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes">Cancel</property>
-- 
GitLab


From cbe4f270c6fc203c627734a6f3b7a03a082637cc Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Wed, 7 Feb 2024 22:54:18 +0100
Subject: [PATCH 7/8] actions: Remove unused cb

---
 src/gtr-actions-search.c | 21 ---------------------
 src/gtr-actions.h        |  4 ----
 2 files changed, 25 deletions(-)

diff --git a/src/gtr-actions-search.c b/src/gtr-actions-search.c
index c5efc8dd..78cc5088 100644
--- a/src/gtr-actions-search.c
+++ b/src/gtr-actions-search.c
@@ -504,24 +504,3 @@ do_replace_all (GtrSearchBar *searchbar, GtrWindow * window)
   restore_last_searched_data (searchbar, tab);
   gtr_tab_find_replace (tab, FALSE);
 }
-
-void
-search_bar_response_cb (GtrSearchBar *dialog,
-                        gint         response_id,
-                        GtrWindow    *window)
-{
-  switch (response_id)
-    {
-    case GTR_SEARCH_BAR_FIND_RESPONSE:
-      do_find (dialog, window, FALSE);
-      break;
-    case GTR_SEARCH_BAR_REPLACE_RESPONSE:
-      do_replace (dialog, window);
-      break;
-    case GTR_SEARCH_BAR_REPLACE_ALL_RESPONSE:
-      do_replace_all (dialog, window);
-      break;
-    default:
-      gtk_window_destroy (GTK_WINDOW (dialog));
-    }
-}
diff --git a/src/gtr-actions.h b/src/gtr-actions.h
index 636b9d24..f073aeed 100644
--- a/src/gtr-actions.h
+++ b/src/gtr-actions.h
@@ -146,10 +146,6 @@ void do_replace (GtrSearchBar * dialog,
 void do_replace_all (GtrSearchBar * dialog,
                      GtrWindow * window);
 
-void search_bar_response_cb (GtrSearchBar * dialog,
-                             gint response_id,
-                             GtrWindow    * window);
-
 /*Documents*/
 //void gtr_actions_documents_next_document (GtrWindow * window);
 
-- 
GitLab


From 7447eafd361e6d5aa25a0458fc11ba2500c721a3 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Thu, 8 Feb 2024 00:09:16 +0100
Subject: [PATCH 8/8] Port GtkAlertDialogs to AdwAlertDialog

---
 src/codeview/gtr-viewer.c |  9 ++---
 src/gtr-actions-file.c    | 45 ++++++++++++++-----------
 src/gtr-dl-teams.c        | 70 +++++++++++++++++++++++++--------------
 src/gtr-tab.c             |  8 +++--
 src/gtr-window.c          |  7 ++--
 5 files changed, 84 insertions(+), 55 deletions(-)

diff --git a/src/codeview/gtr-viewer.c b/src/codeview/gtr-viewer.c
index 69e1f739..0e06f0dc 100644
--- a/src/codeview/gtr-viewer.c
+++ b/src/codeview/gtr-viewer.c
@@ -171,7 +171,7 @@ gtr_viewer_class_init (GtrViewerClass *klass)
 static void
 error_dialog (GtkWindow *parent, const gchar *msg, ...)
 {
-  g_autoptr (GtkAlertDialog) dialog = NULL;
+  AdwDialog *dialog;
   va_list ap;
   g_autofree char *tmp = NULL;
 
@@ -179,9 +179,10 @@ error_dialog (GtkWindow *parent, const gchar *msg, ...)
   tmp = g_strdup_vprintf (msg, ap);
   va_end (ap);
 
-  dialog = gtk_alert_dialog_new ("%s", tmp);
-
-  gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (parent));
+  dialog = adw_alert_dialog_new (NULL, tmp);
+  adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+  adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+  adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (parent));
 }
 
 static gboolean
diff --git a/src/gtr-actions-file.c b/src/gtr-actions-file.c
index 88e8ddf9..90877e43 100644
--- a/src/gtr-actions-file.c
+++ b/src/gtr-actions-file.c
@@ -281,10 +281,10 @@ save_dialog_response_cb (GObject *source, GAsyncResult *res, void *user_data)
 
       if (error)
         {
-          g_autoptr (GtkAlertDialog) dialog = NULL;
-          dialog = gtk_alert_dialog_new ("%s", error->message);
-          gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog),
-                                 GTK_WINDOW (window));
+          AdwDialog *dialog = adw_alert_dialog_new (NULL, error->message);
+          adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+          adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+          adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (window));
           return;
         }
 
@@ -304,7 +304,7 @@ _upload_file_callback (GObject      *object,
 {
   UserData *ud = user_data;
   g_autoptr(GInputStream) stream = NULL;
-  g_autoptr (GtkAlertDialog) dialog = NULL;
+  AdwDialog *dialog = NULL;
   GtrTab *active_tab;
 
   GtrUploadDialog *upload_dialog = ud->dialog;
@@ -322,7 +322,7 @@ _upload_file_callback (GObject      *object,
     {
       if (status_code == SOUP_STATUS_FORBIDDEN)
         {
-          dialog = gtk_alert_dialog_new (_("This file has already been uploaded"));
+          dialog = adw_alert_dialog_new (_("This file has already been uploaded"), NULL);
           gtr_tab_enable_upload (active_tab, FALSE);
           goto end;
         }
@@ -334,9 +334,10 @@ _upload_file_callback (GObject      *object,
       else
         message = g_strdup (soup_status_get_phrase (status_code));
 
-      dialog = gtk_alert_dialog_new (
+      dialog = adw_alert_dialog_new (_("Couldn't upload the file"), NULL);
+      adw_alert_dialog_format_body_markup (ADW_ALERT_DIALOG (dialog),
         _(
-          "An error occurred while uploading the file: %s\n"
+          "%s\n"
           "Maybe you've not configured your <i>l10n.gnome.org</i> "
           "<b>token</b> correctly in your profile or you don't have "
           "permissions to upload this module."
@@ -345,11 +346,13 @@ _upload_file_callback (GObject      *object,
       goto end;
     }
 
-  dialog = gtk_alert_dialog_new (_("The file has been uploaded!"));
+  dialog = adw_alert_dialog_new (_("The file has been uploaded!"), NULL);
+  adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+  adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
   gtr_tab_enable_upload (active_tab, FALSE);
 
 end:
-  gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (window));
+  adw_dialog_present (dialog, GTK_WIDGET (window));
 
   user_data_free (ud);
 }
@@ -517,9 +520,10 @@ load_file_list (GtrWindow * window, const GSList * locations)
    */
   if (error != NULL)
     {
-      g_autoptr (GtkAlertDialog) dialog
-          = gtk_alert_dialog_new ("%s", error->message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (window));
+      AdwDialog *dialog = adw_alert_dialog_new (NULL, error->message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (dialog, GTK_WIDGET (window));
     }
 
   g_slist_free ((GSList *) locations_to_load);
@@ -559,9 +563,10 @@ save_and_close_all_documents (GList * unsaved_documents, GtrWindow * window)
 
   if(error)
     {
-      g_autoptr (GtkAlertDialog) dialog;
-      dialog = gtk_alert_dialog_new ("%s", error->message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (window));
+      AdwDialog *dialog = adw_alert_dialog_new (NULL, error->message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (window));
       return;
     }
 
@@ -726,10 +731,10 @@ _gtr_actions_file_save_all (GtrWindow * window)
 
       if (error)
         {
-          g_autoptr (GtkAlertDialog) dialog = NULL;
-          dialog = gtk_alert_dialog_new ("%s", error->message);
-          gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog),
-                                 GTK_WINDOW (window));
+          AdwDialog *dialog = adw_alert_dialog_new (NULL, error->message);
+          adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+          adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+          adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (window));
 
           return;
         }
diff --git a/src/gtr-dl-teams.c b/src/gtr-dl-teams.c
index 318ca5f2..83809134 100644
--- a/src/gtr-dl-teams.c
+++ b/src/gtr-dl-teams.c
@@ -146,15 +146,17 @@ gtr_dl_teams_parse_teams_json (GObject *object,
   GtrDlTeams *widget = GTR_DL_TEAMS (user_data);
   GtrDlTeamsPrivate *priv = gtr_dl_teams_get_instance_private (widget);
 
-  g_autoptr (GtkAlertDialog) dialog = NULL;
+  AdwDialog *dialog;
 
   /* Parse JSON */
   stream = soup_session_send_finish (SOUP_SESSION (object), result, &error);
 
   if (error)
     {
-      dialog = gtk_alert_dialog_new ("%s", error->message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (priv->main_window));
+      dialog = adw_alert_dialog_new (NULL, error->message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (priv->main_window));
       return;
     }
 
@@ -202,7 +204,7 @@ gtr_dl_teams_load_module_details_json (GtkWidget  *widget,
   JsonObject *object;
   JsonNode *branchesNode;
   JsonNode *domainsNode;
-  g_autoptr (GtkAlertDialog) dialog = NULL;
+  AdwDialog *dialog;
   SoupStatus status_code;
   g_autoptr(GInputStream) stream = NULL;
 
@@ -244,8 +246,10 @@ gtr_dl_teams_load_module_details_json (GtkWidget  *widget,
           message = g_strdup (soup_message_get_reason_phrase (msg));
         }
 
-      dialog = gtk_alert_dialog_new (_("Error loading module info: %s"), message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (priv->main_window));
+      dialog = adw_alert_dialog_new (_("Error loading module info"), message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (dialog, GTK_WIDGET (priv->main_window));
       return;
     }
 
@@ -322,14 +326,16 @@ gtr_dl_teams_parse_modules_json (GObject *object,
   GtrDlTeams *widget = GTR_DL_TEAMS (user_data);
   GtrDlTeamsPrivate *priv = gtr_dl_teams_get_instance_private (widget);
 
-  g_autoptr (GtkAlertDialog) dialog = NULL;
+  AdwDialog *dialog;
 
   /* Parse JSON */
   stream = soup_session_send_finish (SOUP_SESSION (object), result, &error);
   if (error)
     {
-      dialog = gtk_alert_dialog_new ("%s", error->message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (priv->main_window));
+      dialog = adw_alert_dialog_new (NULL, error->message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (priv->main_window));
       return;
     }
 
@@ -400,7 +406,7 @@ gtr_dl_teams_get_file_info (GtrDlTeams *self)
   JsonObject *stats_object;
   const char *format;
   char *markup;
-  g_autoptr (GtkAlertDialog) dialog = NULL;
+  AdwDialog *dialog;
   SoupStatus status_code;
   g_autoptr(GInputStream) stream = NULL;
 
@@ -434,8 +440,10 @@ gtr_dl_teams_get_file_info (GtrDlTeams *self)
           message = g_strdup (soup_message_get_reason_phrase (msg));
         }
 
-      dialog = gtk_alert_dialog_new (_("Error loading file info: %s"), message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (priv->main_window));
+      dialog = adw_alert_dialog_new (_("Error loading file info"), message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (dialog, GTK_WIDGET (priv->main_window));
       return;
     }
 
@@ -509,7 +517,7 @@ gtr_dl_teams_load_po_file (GtkButton *button, GtrDlTeams *self)
   g_autoptr (GFile) tmp_file = NULL;
   GFileIOStream *iostream = NULL;
   GOutputStream *output = NULL;
-  GtkAlertDialog *dialog;
+  AdwDialog *dialog;
   gboolean ret = FALSE;
   int file_index = 0;
   const char *dest_dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD);
@@ -557,8 +565,10 @@ gtr_dl_teams_load_po_file (GtkButton *button, GtrDlTeams *self)
           message = g_strdup (soup_message_get_reason_phrase (msg));
         }
 
-      dialog = gtk_alert_dialog_new (_("Error loading file: %s"), message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (priv->main_window));
+      dialog = adw_alert_dialog_new (_("Error loading file"), message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (dialog, GTK_WIDGET (priv->main_window));
       return;
     }
 
@@ -566,8 +576,11 @@ gtr_dl_teams_load_po_file (GtkButton *button, GtrDlTeams *self)
 
   if (error != NULL)
     {
-      dialog = gtk_alert_dialog_new (_("Error creating tmp file: %s"), error->message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (priv->main_window));
+      dialog = adw_alert_dialog_new (_("Error creating tmp file"),
+                                     error->message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (dialog, GTK_WIDGET (priv->main_window));
       g_error_free (error);
       return;
     }
@@ -577,8 +590,10 @@ gtr_dl_teams_load_po_file (GtkButton *button, GtrDlTeams *self)
 
   if (error != NULL)
     {
-      dialog = gtk_alert_dialog_new (_("Error writing stream: %s"), error->message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (priv->main_window));
+      dialog = adw_alert_dialog_new (_("Error writing stream"), error->message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (dialog, GTK_WIDGET (priv->main_window));
       g_error_free (error);
       return;
     }
@@ -607,8 +622,10 @@ gtr_dl_teams_load_po_file (GtkButton *button, GtrDlTeams *self)
 
   if (error != NULL)
     {
-      dialog = gtk_alert_dialog_new (_("Error creating tmp file: %s"), error->message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (priv->main_window));
+      dialog = adw_alert_dialog_new (_("Error creating tmp file"), error->message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (dialog, GTK_WIDGET (priv->main_window));
       g_error_free (error);
       return;
     }
@@ -636,7 +653,7 @@ gtr_dl_teams_reserve_for_translation (GtkWidget *button, GtrDlTeams *self)
   GtrDlTeamsPrivate *priv = gtr_dl_teams_get_instance_private (self);
   GtrProfileManager *pmanager = NULL;
   GtrProfile *profile = NULL;
-  g_autoptr (GtkAlertDialog) dialog = NULL;
+  AdwDialog *dialog;
   const char *auth_token = NULL;
   SoupStatus status_code;
   g_autoptr (GError) error = NULL;
@@ -674,15 +691,18 @@ gtr_dl_teams_reserve_for_translation (GtkWidget *button, GtrDlTeams *self)
     else
       message = g_strdup (soup_message_get_reason_phrase (msg));
 
-    dialog = gtk_alert_dialog_new (
+    dialog = adw_alert_dialog_new (_("Could not reserve module"), NULL);
+    adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+    adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+    adw_alert_dialog_format_body (ADW_ALERT_DIALOG (dialog),
       _(
-        "An error occurred while reserving this module: %s\n"
+        "%s\n"
         "Maybe you've not configured your l10n.gnome.org "
         "token correctly in your profile or you don't have "
         "permissions to reserve this module."
       ),
       message);
-    gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (priv->main_window));
+    adw_dialog_present (dialog, GTK_WIDGET (priv->main_window));
     return FALSE;
   }
 
diff --git a/src/gtr-tab.c b/src/gtr-tab.c
index 34a992e0..a4a87f4a 100644
--- a/src/gtr-tab.c
+++ b/src/gtr-tab.c
@@ -341,11 +341,13 @@ gtr_tab_edition_finished (GtrTab * tab, GtrMsg * msg)
 
   if (message_error != NULL)
     {
-      g_autoptr (GtkAlertDialog) dialog = gtk_alert_dialog_new (_("There is an error in the message:"));
+      AdwDialog *dialog = adw_alert_dialog_new (
+        _("There is an error in the message"), message_error);
 
       gtr_tab_block_movement (tab);
-      gtk_alert_dialog_set_detail (GTK_ALERT_DIALOG (dialog), message_error);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), gtr_tab_get_window (tab));
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (dialog, GTK_WIDGET (tab));
       g_free (message_error);
     }
   else
diff --git a/src/gtr-window.c b/src/gtr-window.c
index a1f9ce71..ace53701 100644
--- a/src/gtr-window.c
+++ b/src/gtr-window.c
@@ -155,9 +155,10 @@ drag_data_received_cb (GtkDropTarget * drop_target,
   gtr_open (g_value_get_object (value), window, &error);
   if (error != NULL)
     {
-      g_autoptr (GtkAlertDialog) dialog = NULL;
-      dialog = gtk_alert_dialog_new ("%s", error->message);
-      gtk_alert_dialog_show (GTK_ALERT_DIALOG (dialog), GTK_WINDOW (window));
+      AdwDialog *dialog = adw_alert_dialog_new (NULL, error->message);
+      adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "ok", _("OK"));
+      adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "ok");
+      adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (window));
     }
   return TRUE;
 }
-- 
GitLab