From 6a27049c93743687cfccfc1778ed24b2e777c971 Mon Sep 17 00:00:00 2001
From: Alice Mikhaylenko <alicem@gnome.org>
Date: Mon, 15 Apr 2024 18:20:31 +0400
Subject: [PATCH] event-editor-dialog: Port Delete Event button to AdwButtonRow

---
 src/gui/event-editor/gcal-event-editor-dialog.c  | 12 ++++++------
 src/gui/event-editor/gcal-event-editor-dialog.ui | 13 ++++---------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/gui/event-editor/gcal-event-editor-dialog.c b/src/gui/event-editor/gcal-event-editor-dialog.c
index 2f1f081e..12fd9ed9 100644
--- a/src/gui/event-editor/gcal-event-editor-dialog.c
+++ b/src/gui/event-editor/gcal-event-editor-dialog.c
@@ -52,7 +52,7 @@ struct _GcalEventEditorDialog
 
   GtkListBox             *calendars_listbox;
   GtkWidget              *cancel_button;
-  GtkWidget              *delete_button;
+  GtkWidget              *delete_group;
   GtkWidget              *done_button;
   GtkWidget              *lock;
   GcalEventEditorSection *notes_section;
@@ -332,8 +332,8 @@ on_ask_recurrence_response_delete_cb (GcalEvent             *event,
 }
 
 static void
-on_delete_button_clicked_cb (GtkButton             *button,
-                             GcalEventEditorDialog *self)
+on_delete_row_activated_cb (AdwButtonRow          *button,
+                            GcalEventEditorDialog *self)
 {
   GcalRecurrenceModType mod = GCAL_RECURRENCE_MOD_THIS_ONLY;
 
@@ -657,7 +657,7 @@ gcal_event_editor_dialog_class_init (GcalEventEditorDialogClass *klass)
 
   gtk_widget_class_bind_template_child (widget_class, GcalEventEditorDialog, calendars_listbox);
   gtk_widget_class_bind_template_child (widget_class, GcalEventEditorDialog, cancel_button);
-  gtk_widget_class_bind_template_child (widget_class, GcalEventEditorDialog, delete_button);
+  gtk_widget_class_bind_template_child (widget_class, GcalEventEditorDialog, delete_group);
   gtk_widget_class_bind_template_child (widget_class, GcalEventEditorDialog, done_button);
   gtk_widget_class_bind_template_child (widget_class, GcalEventEditorDialog, lock);
   gtk_widget_class_bind_template_child (widget_class, GcalEventEditorDialog, notes_section);
@@ -673,7 +673,7 @@ gcal_event_editor_dialog_class_init (GcalEventEditorDialogClass *klass)
 
   /* callbacks */
   gtk_widget_class_bind_template_callback (widget_class, on_cancel_button_clicked_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_delete_button_clicked_cb);
+  gtk_widget_class_bind_template_callback (widget_class, on_delete_row_activated_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_done_button_clicked_cb);
 }
 
@@ -785,7 +785,7 @@ gcal_event_editor_dialog_set_event (GcalEventEditorDialog *self,
   set_writable (self, !gcal_calendar_is_read_only (calendar));
 
   self->event_is_new = new_event;
-  gtk_widget_set_visible (self->delete_button, !new_event);
+  gtk_widget_set_visible (self->delete_group, !new_event);
 
   if (!self->writable)
     gtk_widget_grab_focus (self->done_button);
diff --git a/src/gui/event-editor/gcal-event-editor-dialog.ui b/src/gui/event-editor/gcal-event-editor-dialog.ui
index 475b424f..cb4c2a48 100644
--- a/src/gui/event-editor/gcal-event-editor-dialog.ui
+++ b/src/gui/event-editor/gcal-event-editor-dialog.ui
@@ -166,17 +166,12 @@
 
             <!-- Delete Button -->
             <child>
-              <object class="AdwPreferencesGroup">
+              <object class="AdwPreferencesGroup" id="delete_group">
                 <child>
-                  <object class="GtkButton" id="delete_button">
-                    <property name="halign">end</property>
-                    <signal name="clicked" handler="on_delete_button_clicked_cb" object="GcalEventEditorDialog" swapped="no"/>
+                  <object class="AdwButtonRow">
+                    <signal name="activated" handler="on_delete_row_activated_cb" object="GcalEventEditorDialog" swapped="no"/>
                     <property name="sensitive" bind-source="GcalEventEditorDialog" bind-property="writable" bind-flags="default" />
-                    <child>
-                      <object class="GtkLabel" id="delete_label">
-                        <property name="label" translatable="yes">Delete Event</property>
-                      </object>
-                    </child>
+                    <property name="title" translatable="yes">Delete Event</property>
                     <style>
                       <class name="destructive-action"/>
                     </style>