From 303cba162264191a02a78ad9e9dc7493ad4a9373 Mon Sep 17 00:00:00 2001 From: Titouan Real Date: Fri, 21 Feb 2025 22:06:08 +0100 Subject: [PATCH] gui: Move DateChooser to common DateChooser is used both by the event editor and the main window. Moving it to common for a better file organization. --- src/gui/common/common.gresource.xml | 2 ++ src/gui/{event-editor => common}/gcal-date-chooser-day.c | 2 +- src/gui/{event-editor => common}/gcal-date-chooser-day.h | 0 src/gui/{event-editor => common}/gcal-date-chooser-day.ui | 0 src/gui/{event-editor => common}/gcal-date-chooser.c | 2 +- src/gui/{event-editor => common}/gcal-date-chooser.h | 0 src/gui/{event-editor => common}/gcal-date-chooser.ui | 0 src/gui/common/meson.build | 2 ++ src/gui/event-editor/event-editor.gresource.xml | 2 -- src/gui/event-editor/meson.build | 2 -- 10 files changed, 6 insertions(+), 6 deletions(-) rename src/gui/{event-editor => common}/gcal-date-chooser-day.c (99%) rename src/gui/{event-editor => common}/gcal-date-chooser-day.h (100%) rename src/gui/{event-editor => common}/gcal-date-chooser-day.ui (100%) rename src/gui/{event-editor => common}/gcal-date-chooser.c (99%) rename src/gui/{event-editor => common}/gcal-date-chooser.h (100%) rename src/gui/{event-editor => common}/gcal-date-chooser.ui (100%) diff --git a/src/gui/common/common.gresource.xml b/src/gui/common/common.gresource.xml index 4d64f0a1..bb82289e 100644 --- a/src/gui/common/common.gresource.xml +++ b/src/gui/common/common.gresource.xml @@ -3,5 +3,7 @@ gcal-calendar-combo-row-item.ui gcal-calendar-combo-row.ui + gcal-date-chooser.ui + gcal-date-chooser-day.ui diff --git a/src/gui/event-editor/gcal-date-chooser-day.c b/src/gui/common/gcal-date-chooser-day.c similarity index 99% rename from src/gui/event-editor/gcal-date-chooser-day.c rename to src/gui/common/gcal-date-chooser-day.c index 559daeec..ed4d933e 100644 --- a/src/gui/event-editor/gcal-date-chooser-day.c +++ b/src/gui/common/gcal-date-chooser-day.c @@ -146,7 +146,7 @@ gcal_date_chooser_day_class_init (GcalDateChooserDayClass *class) g_object_class_install_properties (object_class, NUM_PROPS, properties); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-date-chooser-day.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/common/gcal-date-chooser-day.ui"); gtk_widget_class_bind_template_child (widget_class, GcalDateChooserDay, dot_revealer); gtk_widget_class_bind_template_child (widget_class, GcalDateChooserDay, label); diff --git a/src/gui/event-editor/gcal-date-chooser-day.h b/src/gui/common/gcal-date-chooser-day.h similarity index 100% rename from src/gui/event-editor/gcal-date-chooser-day.h rename to src/gui/common/gcal-date-chooser-day.h diff --git a/src/gui/event-editor/gcal-date-chooser-day.ui b/src/gui/common/gcal-date-chooser-day.ui similarity index 100% rename from src/gui/event-editor/gcal-date-chooser-day.ui rename to src/gui/common/gcal-date-chooser-day.ui diff --git a/src/gui/event-editor/gcal-date-chooser.c b/src/gui/common/gcal-date-chooser.c similarity index 99% rename from src/gui/event-editor/gcal-date-chooser.c rename to src/gui/common/gcal-date-chooser.c index 283fe253..e9674fb2 100644 --- a/src/gui/event-editor/gcal-date-chooser.c +++ b/src/gui/common/gcal-date-chooser.c @@ -903,7 +903,7 @@ gcal_date_chooser_class_init (GcalDateChooserClass *class) NULL, G_TYPE_NONE, 0); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-date-chooser.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/common/gcal-date-chooser.ui"); gtk_widget_class_bind_template_child (widget_class, GcalDateChooser, combined_choice); gtk_widget_class_bind_template_child (widget_class, GcalDateChooser, month_choice); diff --git a/src/gui/event-editor/gcal-date-chooser.h b/src/gui/common/gcal-date-chooser.h similarity index 100% rename from src/gui/event-editor/gcal-date-chooser.h rename to src/gui/common/gcal-date-chooser.h diff --git a/src/gui/event-editor/gcal-date-chooser.ui b/src/gui/common/gcal-date-chooser.ui similarity index 100% rename from src/gui/event-editor/gcal-date-chooser.ui rename to src/gui/common/gcal-date-chooser.ui diff --git a/src/gui/common/meson.build b/src/gui/common/meson.build index 510a90e9..33103435 100644 --- a/src/gui/common/meson.build +++ b/src/gui/common/meson.build @@ -9,4 +9,6 @@ built_sources += gnome.compile_resources( sources += files( 'gcal-calendar-combo-row-item.c', 'gcal-calendar-combo-row.c', + 'gcal-date-chooser.c', + 'gcal-date-chooser-day.c', ) diff --git a/src/gui/event-editor/event-editor.gresource.xml b/src/gui/event-editor/event-editor.gresource.xml index 8ff039a7..e32da094 100644 --- a/src/gui/event-editor/event-editor.gresource.xml +++ b/src/gui/event-editor/event-editor.gresource.xml @@ -2,8 +2,6 @@ gcal-alarm-row.ui - gcal-date-chooser.ui - gcal-date-chooser-day.ui gcal-date-chooser-row.ui gcal-date-time-chooser.ui gcal-date-selector.ui diff --git a/src/gui/event-editor/meson.build b/src/gui/event-editor/meson.build index 7e7abb2d..7efca8c2 100644 --- a/src/gui/event-editor/meson.build +++ b/src/gui/event-editor/meson.build @@ -8,8 +8,6 @@ built_sources += gnome.compile_resources( sources += files( 'gcal-alarm-row.c', - 'gcal-date-chooser.c', - 'gcal-date-chooser-day.c', 'gcal-date-chooser-row.c', 'gcal-date-time-chooser.c', 'gcal-date-selector.c',