From d67498af074fbe53d8e75402e6919b93accd1e55 Mon Sep 17 00:00:00 2001
From: oscfdezdz <42654671+oscfdezdz@users.noreply.github.com>
Date: Sat, 27 Jan 2024 10:52:51 +0100
Subject: [PATCH] upgrade-assistant: Port AdwWindow to AdwDialog

---
 src/exm-upgrade-assistant.blp | 10 +++++-----
 src/exm-upgrade-assistant.c   |  6 ++----
 src/exm-upgrade-assistant.h   |  2 +-
 src/exm-window.c              |  4 +---
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/exm-upgrade-assistant.blp b/src/exm-upgrade-assistant.blp
index b7a2a4317..6b3dc3740 100644
--- a/src/exm-upgrade-assistant.blp
+++ b/src/exm-upgrade-assistant.blp
@@ -1,12 +1,12 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $ExmUpgradeAssistant : Adw.Window {
-  default-width: 400;
-  default-height: 550;
+template $ExmUpgradeAssistant : Adw.Dialog {
+  content-width: 400;
+  content-height: 600;
   title: _("Upgrade Assistant");
 
-  Adw.ToolbarView {
+  child: Adw.ToolbarView {
 
     [top]
     Adw.HeaderBar {}
@@ -133,5 +133,5 @@ template $ExmUpgradeAssistant : Adw.Window {
         };
       }
     };
-  }
+  };
 }
diff --git a/src/exm-upgrade-assistant.c b/src/exm-upgrade-assistant.c
index e6db3aa5c..b54c3a8cd 100644
--- a/src/exm-upgrade-assistant.c
+++ b/src/exm-upgrade-assistant.c
@@ -28,7 +28,7 @@
 
 struct _ExmUpgradeAssistant
 {
-    AdwWindow parent_instance;
+    AdwDialog parent_instance;
 
     // Auxiliary Classes
     ExmManager *manager;
@@ -66,7 +66,7 @@ struct _ExmUpgradeAssistant
     GtkButton *copy_details;
 };
 
-G_DEFINE_FINAL_TYPE (ExmUpgradeAssistant, exm_upgrade_assistant, ADW_TYPE_WINDOW)
+G_DEFINE_FINAL_TYPE (ExmUpgradeAssistant, exm_upgrade_assistant, ADW_TYPE_DIALOG)
 
 enum {
     PROP_0,
@@ -653,8 +653,6 @@ exm_upgrade_assistant_class_init (ExmUpgradeAssistantClass *klass)
     gtk_widget_class_bind_template_child (widget_class, ExmUpgradeAssistant, progress_bar);
     gtk_widget_class_bind_template_child (widget_class, ExmUpgradeAssistant, summary);
     gtk_widget_class_bind_template_child (widget_class, ExmUpgradeAssistant, copy_details);
-
-    gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
 }
 
 static void
diff --git a/src/exm-upgrade-assistant.h b/src/exm-upgrade-assistant.h
index d0c58ff43..11322d581 100644
--- a/src/exm-upgrade-assistant.h
+++ b/src/exm-upgrade-assistant.h
@@ -28,7 +28,7 @@
  
  #define EXM_TYPE_UPGRADE_ASSISTANT (exm_upgrade_assistant_get_type())
  
- G_DECLARE_FINAL_TYPE (ExmUpgradeAssistant, exm_upgrade_assistant, EXM, UPGRADE_ASSISTANT, AdwWindow)
+ G_DECLARE_FINAL_TYPE (ExmUpgradeAssistant, exm_upgrade_assistant, EXM, UPGRADE_ASSISTANT, AdwDialog)
  
  ExmUpgradeAssistant *exm_upgrade_assistant_new (ExmManager *manager);
 
diff --git a/src/exm-window.c b/src/exm-window.c
index 320896c9a..83f6d07c4 100644
--- a/src/exm-window.c
+++ b/src/exm-window.c
@@ -328,9 +328,7 @@ show_upgrade_assistant (GtkWidget  *widget,
     self = EXM_WINDOW (widget);
 
     ExmUpgradeAssistant *assistant = exm_upgrade_assistant_new (self->manager);
-    gtk_window_set_modal (GTK_WINDOW (assistant), TRUE);
-    gtk_window_set_transient_for (GTK_WINDOW (assistant), GTK_WINDOW (self));
-    gtk_window_present (GTK_WINDOW (assistant));
+    adw_dialog_present (ADW_DIALOG (assistant), widget);
 }
 
 static void