From a74e7179c1227c6af95ca6ea241aaa2b2e28dcf7 Mon Sep 17 00:00:00 2001 From: Alice Mikhaylenko Date: Mon, 15 Apr 2024 18:20:15 +0400 Subject: [PATCH] reminders-section: Port Add Reminder row to AdwButtonRow --- src/gui/event-editor/gcal-reminders-section.c | 19 +++++++++++++++++++ .../event-editor/gcal-reminders-section.ui | 17 +++-------------- src/gui/icons/add-reminder-symbolic.svg | 2 ++ src/gui/icons/icons.gresource.xml | 1 + 4 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 src/gui/icons/add-reminder-symbolic.svg diff --git a/src/gui/event-editor/gcal-reminders-section.c b/src/gui/event-editor/gcal-reminders-section.c index eb7995e7..910ee053 100644 --- a/src/gui/event-editor/gcal-reminders-section.c +++ b/src/gui/event-editor/gcal-reminders-section.c @@ -129,6 +129,17 @@ create_alarm (guint minutes) return alarm; } +static void +update_new_alarm_icon (GcalRemindersSection *self) +{ + GtkListBoxRow *first_row = gtk_list_box_get_row_at_index (self->alarms_listbox, 0); + + if (first_row == GTK_LIST_BOX_ROW (self->new_alarm_row)) + adw_button_row_set_start_icon_name (ADW_BUTTON_ROW (self->new_alarm_row), "add-reminder-symbolic"); + else + adw_button_row_set_start_icon_name (ADW_BUTTON_ROW (self->new_alarm_row), "list-add-symbolic"); +} + static void clear_alarms (GcalRemindersSection *self) { @@ -146,6 +157,8 @@ clear_alarms (GcalRemindersSection *self) child = next; } + + update_new_alarm_icon (self); } static GtkWidget * @@ -207,6 +220,8 @@ setup_alarms (GcalRemindersSection *self) gtk_list_box_append (self->alarms_listbox, row); } + update_new_alarm_icon (self); + GCAL_EXIT; } @@ -278,6 +293,8 @@ on_remove_alarm_cb (GcalAlarmRow *alarm_row, gtk_list_box_remove (self->alarms_listbox, GTK_WIDGET (alarm_row)); + update_new_alarm_icon (self); + GCAL_EXIT; } @@ -312,6 +329,8 @@ on_add_alarm_button_clicked_cb (GtkWidget *button, g_ptr_array_add (self->alarms, alarm); gtk_widget_set_sensitive (button, FALSE); + + update_new_alarm_icon (self); } static void diff --git a/src/gui/event-editor/gcal-reminders-section.ui b/src/gui/event-editor/gcal-reminders-section.ui index 8cc07ca9..c73892f9 100644 --- a/src/gui/event-editor/gcal-reminders-section.ui +++ b/src/gui/event-editor/gcal-reminders-section.ui @@ -13,20 +13,9 @@ - - - - - True - True - 12 - 12 - 12 - 12 - Add a Reminder… - - - + + Add Reminder + add-reminder-symbolic diff --git a/src/gui/icons/add-reminder-symbolic.svg b/src/gui/icons/add-reminder-symbolic.svg new file mode 100644 index 00000000..2d04259e --- /dev/null +++ b/src/gui/icons/add-reminder-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/src/gui/icons/icons.gresource.xml b/src/gui/icons/icons.gresource.xml index 1347cfe7..6d7d459a 100644 --- a/src/gui/icons/icons.gresource.xml +++ b/src/gui/icons/icons.gresource.xml @@ -1,6 +1,7 @@ + add-reminder-symbolic.svg calendar-month-symbolic.svg calendar-week-symbolic.svg calendar-today-symbolic.svg