widgets: PresetDialog: Use Adw.Dialog

rafaelmardojai · Apr 7, 2024 · 531024c · 531024c
1 parent c30f566
commit 531024c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/blanket/main.py b/blanket/main.py
@@ -205,9 +205,7 @@ def on_reset_volumes(self, _action, _param):
 
     def on_add_preset(self, _action, _param):
         dialog = PresetDialog()
-        dialog.set_transient_for(self.window)
-        dialog.set_modal(True)
-        dialog.present()
+        dialog.present(self.window)
 
     def on_remove_sound(self, _action, name: GLib.Variant):
         sound, index = MainPlayer.get().get_by_name(name.get_string())

diff --git a/blanket/widgets/preset_dialog.py b/blanket/widgets/preset_dialog.py
@@ -10,7 +10,7 @@
 
 
 @Gtk.Template(resource_path=f'{RES_PATH}/preset-dialog.ui')
-class PresetDialog(Adw.Window):
+class PresetDialog(Adw.Dialog):
     __gtype_name__ = 'PresetDialog'
 
     headerbar: Adw.HeaderBar = Gtk.Template.Child()  # type: ignore
@@ -71,7 +71,7 @@ def _on_create_preset(self, _button):
         # Clear name entry
         self.name_entry.set_text('')
 
-        self.destroy()
+        self.close()
 
     def _on_rename_preset(self, _button):
         if self.preset:
@@ -82,7 +82,7 @@ def _on_rename_preset(self, _button):
                 self.__invalid_name()
                 return
 
-        self.destroy()
+        self.close()
 
     def __get_name(self):
         name = self.name_entry.get_text()

diff --git a/blanket/widgets/preset_row.py b/blanket/widgets/preset_row.py
@@ -56,8 +56,7 @@ def _on_show_rename(self, _button):
             window = app.get_active_window()  # type: ignore
             if window:
                 dialog = PresetDialog(self.preset)
-                dialog.set_transient_for(window)
-                dialog.present()
+                dialog.present(window)
 
     def _on_delete_preset(self, _button):
         app = Gio.Application.get_default()

diff --git a/data/resources/preset-dialog.blp b/data/resources/preset-dialog.blp
@@ -1,12 +1,9 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $PresetDialog : Adw.Window {
-  default-width: 400;
+template $PresetDialog : Adw.Dialog {
   width-request: 360;
   height-request: 220;
-  modal: true;
-  destroy-with-parent: true;
   focus-widget: name_entry;
 
   Adw.ToolbarView {