project: Move GcalEditDialog and friends to src/gui/event-editor/

src/gui/event-editor/event-editor.gresource.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/calendar/ui/event-editor">
+    <file compressed="true">gcal-alarm-row.ui</file>
+    <file compressed="true">gcal-date-chooser.ui</file>
+    <file compressed="true">gcal-date-selector.ui</file>
+    <file compressed="true">gcal-edit-dialog.ui</file>
+    <file compressed="true">gcal-multi-choice.ui</file>
+    <file compressed="true">gcal-time-selector.ui</file>
+  </gresource>
+</gresources>

src/gui/event-editor/gcal-alarm-row.c

@@ -335,7 +335,7 @@ gcal_alarm_row_class_init (GcalAlarmRowClass *klass)
                                         G_TYPE_NONE,
                                         0);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-alarm-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-alarm-row.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalAlarmRow, volume_button);
   gtk_widget_class_bind_template_child (widget_class, GcalAlarmRow, volume_icon);

src/gui/event-editor/gcal-date-chooser.c

@@ -485,7 +485,7 @@ gcal_date_chooser_class_init (GcalDateChooserClass *class)
 
   widget_class->drag_data_received = calendar_drag_data_received;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-date-chooser.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-date-chooser.ui");
 
   properties[PROP_DATE] = g_param_spec_boxed ("date",
                                               "Date",

src/gui/event-editor/gcal-date-selector.c

@@ -214,7 +214,7 @@ gcal_date_selector_class_init (GcalDateSelectorClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-date-selector.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-date-selector.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalDateSelector, date_chooser);
   gtk_widget_class_bind_template_child (widget_class, GcalDateSelector, date_selector_popover);

src/gui/event-editor/gcal-edit-dialog.c

@@ -1314,7 +1314,7 @@ gcal_edit_dialog_class_init (GcalEditDialogClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-edit-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-edit-dialog.ui");
 
   /* Alarms */
   gtk_widget_class_bind_template_child (widget_class, GcalEditDialog, five_minutes_button);

src/gui/event-editor/gcal-multi-choice.c

@@ -426,7 +426,7 @@ gcal_multi_choice_class_init (GcalMultiChoiceClass *class)
                   NULL,
                   G_TYPE_NONE, 0);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-multi-choice.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-multi-choice.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalMultiChoice, down_button);
   gtk_widget_class_bind_template_child (widget_class, GcalMultiChoice, up_button);

src/gui/event-editor/gcal-time-selector.c

@@ -208,7 +208,7 @@ gcal_time_selector_class_init (GcalTimeSelectorClass *klass)
                                                        G_TYPE_DATE_TIME,
                                                        G_PARAM_READWRITE));
 
-  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/calendar/ui/gui/gcal-time-selector.ui");
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/calendar/ui/event-editor/gcal-time-selector.ui");
 
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GcalTimeSelector, hour_adjustment);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GcalTimeSelector, hour_spin);

src/gui/event-editor/meson.build

@@ -0,0 +1,17 @@
+calendar_incs +=  include_directories('.')
+
+built_sources += gnome.compile_resources(
+  'event-editor-resources',
+  'event-editor.gresource.xml',
+  c_name: 'event_editor',
+)
+
+sources += files(
+  'gcal-alarm-row.c',
+  'gcal-date-chooser.c',
+  'gcal-date-chooser-day.c',
+  'gcal-date-selector.c',
+  'gcal-edit-dialog.c',
+  'gcal-multi-choice.c',
+  'gcal-time-selector.c',
+)

src/gui/gui.gresource.xml

@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/calendar/ui/gui">
-    <file compressed="true">gcal-alarm-row.ui</file>
     <file compressed="true">gcal-calendar-popover.ui</file>
-    <file compressed="true">gcal-date-chooser.ui</file>
-    <file compressed="true">gcal-date-selector.ui</file>
-    <file compressed="true">gcal-edit-dialog.ui</file>
     <file compressed="true">gcal-event-widget.ui</file>
     <file compressed="true">gcal-quick-add-popover.ui</file>
-    <file compressed="true">gcal-multi-choice.ui</file>
-    <file compressed="true">gcal-time-selector.ui</file>
     <file compressed="true">gcal-weather-settings.ui</file>
     <file compressed="true">gcal-window.ui</file>
   </gresource>

src/gui/meson.build

@@ -1,4 +1,5 @@
 subdir('calendar-management')
+subdir('event-editor')
 subdir('gtk')
 subdir('views')
 
@@ -11,18 +12,11 @@ built_sources += gnome.compile_resources(
 )
 
 sources += files(
-  'gcal-alarm-row.c',
   'gcal-application.c',
   'gcal-calendar-popover.c',
-  'gcal-date-chooser.c',
-  'gcal-date-chooser-day.c',
-  'gcal-date-selector.c',
-  'gcal-edit-dialog.c',
   'gcal-event-widget.c',
-  'gcal-multi-choice.c',
   'gcal-quick-add-popover.c',
   'gcal-search-button.c',
-  'gcal-time-selector.c',
   'gcal-weather-settings.c',
   'gcal-window.c',
 )