[gnome-calendar/gbsneto/event-editor: 2/14] Move UI files to src/

From: Georges Basile Stavracas Neto <gbsneto src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-calendar/gbsneto/event-editor: 2/14] Move UI files to src/
Date: Thu, 14 Nov 2019 19:21:18 +0000 (UTC)
commit 7a25848000f1efa7dd2f8b981c03c0682ca1dccf
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Nov 12 12:27:21 2019 -0300

    Move UI files to src/
    
    Keep it in sync with what To Do and Settings do.

 data/calendar.gresource.xml                        |  35 -------
 data/meson.build                                   |  29 ------
 data/ui/online-account-row.ui                      |  64 ------------
 data/ui/search-popover.ui                          | 112 ---------------------
 po/POTFILES.in                                     |  32 +++---
 src/calendar.gresource.xml                         |  43 ++++++++
 {data/ui => src/gui}/alarm-row.ui                  |   0
 .../gui/calendar-management}/calendar-row.ui       |   0
 .../gcal-calendar-management-dialog.c              |   2 +-
 .../gcal-calendar-management-dialog.ui             |   0
 src/gui/calendar-management/gcal-calendars-page.c  |   4 +-
 .../gui/calendar-management/gcal-calendars-page.ui |   0
 .../calendar-management/gcal-edit-calendar-page.c  |   2 +-
 .../calendar-management/gcal-edit-calendar-page.ui |   0
 .../calendar-management/gcal-new-calendar-page.c   |   2 +-
 .../calendar-management/gcal-new-calendar-page.ui  |   0
 src/gui/gcal-calendar-popover.c                    |   2 +-
 .../gui/gcal-calendar-popover.ui                   |   0
 src/gui/gcal-date-chooser.c                        |   2 +-
 .../gui/gcal-date-chooser.ui                       |   0
 src/gui/gcal-date-selector.c                       |   2 +-
 .../gui/gcal-date-selector.ui                      |   0
 src/gui/gcal-edit-dialog.c                         |   4 +-
 .../edit-dialog.ui => src/gui/gcal-edit-dialog.ui  |   0
 src/gui/gcal-event-widget.c                        |   2 +-
 .../gui/gcal-event-widget.ui                       |   0
 src/gui/gcal-multi-choice.c                        |   2 +-
 .../gui/gcal-multi-choice.ui                       |   0
 src/gui/gcal-quick-add-popover.c                   |   2 +-
 .../gui/gcal-quick-add-popover.ui                  |   0
 src/gui/gcal-time-selector.c                       |   2 +-
 .../gui/gcal-time-selector.ui                      |   0
 src/gui/gcal-window.c                              |   2 +-
 data/ui/window.ui => src/gui/gcal-window.ui        |   0
 {data/ui => src}/help-overlay.ui                   |   0
 src/meson.build                                    |   3 +-
 {data => src}/theme/Adwaita.css                    |   0
 src/views/gcal-month-cell.c                        |   2 +-
 .../month-cell.ui => src/views/gcal-month-cell.ui  |   0
 src/views/gcal-month-popover.c                     |   2 +-
 .../views/gcal-month-popover.ui                    |   0
 src/views/gcal-month-view.c                        |   2 +-
 .../month-view.ui => src/views/gcal-month-view.ui  |   0
 src/views/gcal-week-header.c                       |   2 +-
 .../views/gcal-week-header.ui                      |   0
 src/views/gcal-week-view.c                         |   2 +-
 .../ui/week-view.ui => src/views/gcal-week-view.ui |   0
 src/views/gcal-year-view.c                         |   2 +-
 .../ui/year-view.ui => src/views/gcal-year-view.ui |   0
 src/weather/gcal-weather-settings.c                |   2 +-
 .../weather/gcal-weather-settings.ui               |   0
 51 files changed, 81 insertions(+), 281 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 8909b530..e699a63b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -84,32 +84,3 @@ configure_file(
 )
 
 shell_search_provider_dbus_interfaces = files('shell-search-provider-dbus-interfaces.xml')
-
-# Resource data
-gresource = files('calendar.gresource.xml')
-
-resource_data = files(
-  'theme/Adwaita.css',
-  'ui/alarm-row.ui',
-  'ui/calendar-management-dialog.ui',
-  'ui/calendar-row.ui',
-  'ui/calendars-page.ui',
-  'ui/date-chooser.ui',
-  'ui/date-selector.ui',
-  'ui/edit-dialog.ui',
-  'ui/edit-calendar-page.ui',
-  'ui/help-overlay.ui',
-  'ui/month-cell.ui',
-  'ui/month-popover.ui',
-  'ui/month-view.ui',
-  'ui/multi-choice.ui',
-  'ui/new-calendar-page.ui',
-  'ui/quick-add-popover.ui',
-  'ui/search-popover.ui',
-  'ui/time-selector.ui',
-  'ui/weather-settings.ui',
-  'ui/week-header.ui',
-  'ui/week-view.ui',
-  'ui/window.ui',
-  'ui/year-view.ui'
-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ed94d232..1003f6b3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,39 +3,37 @@
 data/appdata/org.gnome.Calendar.appdata.xml.in.in
 data/org.gnome.Calendar.desktop.in.in
 data/org.gnome.calendar.gschema.xml.in
-data/ui/alarm-row.ui
-data/ui/calendar-management-dialog.ui
-data/ui/calendar-popover.ui
-data/ui/calendars-page.ui
-data/ui/edit-calendar-page.ui
-data/ui/edit-dialog.ui
-data/ui/help-overlay.ui
-data/ui/menus.ui
-data/ui/month-popover.ui
-data/ui/month-view.ui
-data/ui/new-calendar-page.ui
-data/ui/quick-add-popover.ui
-data/ui/search-popover.ui
-data/ui/time-selector.ui
-data/ui/weather-settings.ui
-data/ui/window.ui
-data/ui/year-view.ui
 src/main.c
 src/core/gcal-event.c
 src/core/gcal-manager.c
 src/gui/calendar-management/gcal-calendar-management-dialog.c
+src/gui/calendar-management/gcal-calendar-management-dialog.ui
+src/gui/calendar-management/gcal-edit-calendar-page.ui
 src/gui/calendar-management/gcal-calendars-page.c
+src/gui/calendar-management/gcal-calendars-page.ui
 src/gui/calendar-management/gcal-new-calendar-page.c
+src/gui/calendar-management/gcal-new-calendar-page.ui
+src/gui/alarm-row.ui
 src/gui/gcal-application.c
+src/gui/gcal-calendar-popover.ui
 src/gui/gcal-date-selector.c
 src/gui/gcal-edit-dialog.c
+src/gui/gcal-edit-dialog.ui
 src/gui/gcal-event-widget.c
 src/gui/gcal-quick-add-popover.c
+src/gui/gcal-quick-add-popover.ui
 src/gui/gcal-time-selector.c
+src/gui/gcal-time-selector.ui
 src/gui/gcal-window.c
+src/gui/gcal-window.ui
+src/help-overlay.ui
 src/utils/gcal-utils.c
+src/views/gcal-month-popover.ui
 src/views/gcal-month-view.c
+src/views/gcal-month-view.ui
 src/views/gcal-week-grid.c
 src/views/gcal-week-header.c
 src/views/gcal-week-view.c
 src/views/gcal-year-view.c
+src/views/gcal-year-view.ui
+src/weather/gcal-weather-settings.ui
diff --git a/src/calendar.gresource.xml b/src/calendar.gresource.xml
new file mode 100644
index 00000000..e2a6502b
--- /dev/null
+++ b/src/calendar.gresource.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/calendar/ui">
+    <file compressed="true">gui/alarm-row.ui</file>
+    <file compressed="true">gui/gcal-calendar-popover.ui</file>
+    <file compressed="true">gui/gcal-date-chooser.ui</file>
+    <file compressed="true">gui/gcal-date-selector.ui</file>
+    <file compressed="true">gui/gcal-edit-dialog.ui</file>
+    <file compressed="true">gui/gcal-event-widget.ui</file>
+    <file compressed="true">gui/gcal-quick-add-popover.ui</file>
+    <file compressed="true">gui/gcal-multi-choice.ui</file>
+    <file compressed="true">gui/gcal-time-selector.ui</file>
+    <file compressed="true">gui/gcal-window.ui</file>
+
+    <!-- Calendar Management dialog -->
+    <file compressed="true">gui/calendar-management/calendar-row.ui</file>
+    <file compressed="true">gui/calendar-management/gcal-calendar-management-dialog.ui</file>
+    <file compressed="true">gui/calendar-management/gcal-calendars-page.ui</file>
+    <file compressed="true">gui/calendar-management/gcal-edit-calendar-page.ui</file>
+    <file compressed="true">gui/calendar-management/gcal-new-calendar-page.ui</file>
+
+    <!-- Views -->
+    <file compressed="true">views/gcal-month-cell.ui</file>
+    <file compressed="true">views/gcal-month-popover.ui</file>
+    <file compressed="true">views/gcal-month-view.ui</file>
+    <file compressed="true">views/gcal-week-header.ui</file>
+    <file compressed="true">views/gcal-week-view.ui</file>
+    <file compressed="true">views/gcal-year-view.ui</file>
+
+    <!-- Weather -->
+    <file compressed="true">weather/gcal-weather-settings.ui</file>
+  </gresource>
+
+  <!-- Theme -->
+  <gresource prefix="/org/gnome/calendar">
+    <file>theme/Adwaita.css</file>
+  </gresource>
+
+  <!-- GTK -->
+  <gresource prefix="/org/gnome/calendar/gtk">
+    <file compressed="true">help-overlay.ui</file>
+  </gresource>
+</gresources>
diff --git a/data/ui/alarm-row.ui b/src/gui/alarm-row.ui
similarity index 100%
rename from data/ui/alarm-row.ui
rename to src/gui/alarm-row.ui
diff --git a/data/ui/calendar-row.ui b/src/gui/calendar-management/calendar-row.ui
similarity index 100%
rename from data/ui/calendar-row.ui
rename to src/gui/calendar-management/calendar-row.ui
diff --git a/src/gui/calendar-management/gcal-calendar-management-dialog.c 
b/src/gui/calendar-management/gcal-calendar-management-dialog.c
index b151e026..ded20cb1 100644
--- a/src/gui/calendar-management/gcal-calendar-management-dialog.c
+++ b/src/gui/calendar-management/gcal-calendar-management-dialog.c
@@ -274,7 +274,7 @@ gcal_calendar_management_dialog_class_init (GcalCalendarManagementDialogClass *k
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), 
"/org/gnome/calendar/calendar-management-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/calendar-management/gcal-calendar-management-dialog.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, headerbar);
   gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, stack);
diff --git a/data/ui/calendar-management-dialog.ui 
b/src/gui/calendar-management/gcal-calendar-management-dialog.ui
similarity index 100%
rename from data/ui/calendar-management-dialog.ui
rename to src/gui/calendar-management/gcal-calendar-management-dialog.ui
diff --git a/src/gui/calendar-management/gcal-calendars-page.c 
b/src/gui/calendar-management/gcal-calendars-page.c
index a3fd1065..960414d7 100644
--- a/src/gui/calendar-management/gcal-calendars-page.c
+++ b/src/gui/calendar-management/gcal-calendars-page.c
@@ -84,7 +84,7 @@ make_calendar_row (GcalCalendarsPage *self,
   manager = gcal_context_get_manager (self->context);
   get_source_parent_name_color (manager, gcal_calendar_get_source (calendar), &parent_name, NULL);
 
-  builder = gtk_builder_new_from_resource ("/org/gnome/calendar/calendar-row.ui");
+  builder = gtk_builder_new_from_resource ("/org/gnome/calendar/ui/gui/calendar-management/calendar-row.ui");
 
   /*
    * Since we're destroying the builder instance before adding
@@ -486,7 +486,7 @@ gcal_calendars_page_class_init (GcalCalendarsPageClass *klass)
 
   g_object_class_override_property (object_class, PROP_CONTEXT, "context");
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/calendars-page.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/calendar-management/gcal-calendars-page.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalCalendarsPage, add_calendar_row);
   gtk_widget_class_bind_template_child (widget_class, GcalCalendarsPage, listbox);
diff --git a/data/ui/calendars-page.ui b/src/gui/calendar-management/gcal-calendars-page.ui
similarity index 100%
rename from data/ui/calendars-page.ui
rename to src/gui/calendar-management/gcal-calendars-page.ui
diff --git a/src/gui/calendar-management/gcal-edit-calendar-page.c 
b/src/gui/calendar-management/gcal-edit-calendar-page.c
index 0f70e56a..97311daa 100644
--- a/src/gui/calendar-management/gcal-edit-calendar-page.c
+++ b/src/gui/calendar-management/gcal-edit-calendar-page.c
@@ -415,7 +415,7 @@ gcal_edit_calendar_page_class_init (GcalEditCalendarPageClass *klass)
 
   g_object_class_override_property (object_class, PROP_CONTEXT, "context");
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/edit-calendar-page.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/calendar-management/gcal-edit-calendar-page.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, account_box);
   gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, account_label);
diff --git a/data/ui/edit-calendar-page.ui b/src/gui/calendar-management/gcal-edit-calendar-page.ui
similarity index 100%
rename from data/ui/edit-calendar-page.ui
rename to src/gui/calendar-management/gcal-edit-calendar-page.ui
diff --git a/src/gui/calendar-management/gcal-new-calendar-page.c 
b/src/gui/calendar-management/gcal-new-calendar-page.c
index b11fb2c5..82af123e 100644
--- a/src/gui/calendar-management/gcal-new-calendar-page.c
+++ b/src/gui/calendar-management/gcal-new-calendar-page.c
@@ -615,7 +615,7 @@ gcal_new_calendar_page_class_init (GcalNewCalendarPageClass *klass)
 
   g_object_class_override_property (object_class, PROP_CONTEXT, "context");
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/new-calendar-page.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/calendar-management/gcal-new-calendar-page.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalNewCalendarPage, add_button);
   gtk_widget_class_bind_template_child (widget_class, GcalNewCalendarPage, calendar_address_entry);
diff --git a/data/ui/new-calendar-page.ui b/src/gui/calendar-management/gcal-new-calendar-page.ui
similarity index 100%
rename from data/ui/new-calendar-page.ui
rename to src/gui/calendar-management/gcal-new-calendar-page.ui
diff --git a/src/gui/gcal-calendar-popover.c b/src/gui/gcal-calendar-popover.c
index 079f0bf7..90a8566c 100644
--- a/src/gui/gcal-calendar-popover.c
+++ b/src/gui/gcal-calendar-popover.c
@@ -352,7 +352,7 @@ gcal_calendar_popover_class_init (GcalCalendarPopoverClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/calendar-popover.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/gcal-calendar-popover.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalCalendarPopover, calendar_listbox);
   gtk_widget_class_bind_template_child (widget_class, GcalCalendarPopover, icon_stack);
diff --git a/data/ui/calendar-popover.ui b/src/gui/gcal-calendar-popover.ui
similarity index 100%
rename from data/ui/calendar-popover.ui
rename to src/gui/gcal-calendar-popover.ui
diff --git a/src/gui/gcal-date-chooser.c b/src/gui/gcal-date-chooser.c
index 9b568cbe..9915feba 100644
--- a/src/gui/gcal-date-chooser.c
+++ b/src/gui/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/date-chooser.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/gcal-date-chooser.ui");
 
   properties[PROP_DATE] = g_param_spec_boxed ("date",
                                               "Date",
diff --git a/data/ui/date-chooser.ui b/src/gui/gcal-date-chooser.ui
similarity index 100%
rename from data/ui/date-chooser.ui
rename to src/gui/gcal-date-chooser.ui
diff --git a/src/gui/gcal-date-selector.c b/src/gui/gcal-date-selector.c
index fbfb66e0..c3aae8b4 100644
--- a/src/gui/gcal-date-selector.c
+++ b/src/gui/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/date-selector.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/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);
diff --git a/data/ui/date-selector.ui b/src/gui/gcal-date-selector.ui
similarity index 100%
rename from data/ui/date-selector.ui
rename to src/gui/gcal-date-selector.ui
diff --git a/src/gui/gcal-edit-dialog.c b/src/gui/gcal-edit-dialog.c
index 2e5246c6..a5881872 100644
--- a/src/gui/gcal-edit-dialog.c
+++ b/src/gui/gcal-edit-dialog.c
@@ -565,7 +565,7 @@ create_row_for_alarm (GcalEvent          *event,
   g_object_set_data (G_OBJECT (row), "event", event);
 
   /* Build the UI */
-  builder = gtk_builder_new_from_resource ("/org/gnome/calendar/alarm-row.ui");
+  builder = gtk_builder_new_from_resource ("/org/gnome/calendar/ui/gui/alarm-row.ui");
 
 #define WID(x) (GTK_WIDGET (gtk_builder_get_object (builder, x)))
 
@@ -1270,7 +1270,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/edit-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/gcal-edit-dialog.ui");
 
   /* Alarms */
   gtk_widget_class_bind_template_child (widget_class, GcalEditDialog, five_minutes_button);
diff --git a/data/ui/edit-dialog.ui b/src/gui/gcal-edit-dialog.ui
similarity index 100%
rename from data/ui/edit-dialog.ui
rename to src/gui/gcal-edit-dialog.ui
diff --git a/src/gui/gcal-event-widget.c b/src/gui/gcal-event-widget.c
index 77992251..93303eec 100644
--- a/src/gui/gcal-event-widget.c
+++ b/src/gui/gcal-event-widget.c
@@ -971,7 +971,7 @@ gcal_event_widget_class_init (GcalEventWidgetClass *klass)
                                      G_TYPE_NONE,
                                      0);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/event-widget.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/gcal-event-widget.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalEventWidget, color_box);
   gtk_widget_class_bind_template_child (widget_class, GcalEventWidget, horizontal_grid);
diff --git a/data/ui/event-widget.ui b/src/gui/gcal-event-widget.ui
similarity index 100%
rename from data/ui/event-widget.ui
rename to src/gui/gcal-event-widget.ui
diff --git a/src/gui/gcal-multi-choice.c b/src/gui/gcal-multi-choice.c
index 9e3382a9..fca95995 100644
--- a/src/gui/gcal-multi-choice.c
+++ b/src/gui/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/multi-choice.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/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);
diff --git a/data/ui/multi-choice.ui b/src/gui/gcal-multi-choice.ui
similarity index 100%
rename from data/ui/multi-choice.ui
rename to src/gui/gcal-multi-choice.ui
diff --git a/src/gui/gcal-quick-add-popover.c b/src/gui/gcal-quick-add-popover.c
index bffd61a5..42c0a108 100644
--- a/src/gui/gcal-quick-add-popover.c
+++ b/src/gui/gcal-quick-add-popover.c
@@ -901,7 +901,7 @@ gcal_quick_add_popover_class_init (GcalQuickAddPopoverClass *klass)
                                                         GCAL_TYPE_CONTEXT,
                                                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | 
G_PARAM_STATIC_STRINGS));
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/quick-add-popover.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/gui/gcal-quick-add-popover.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalQuickAddPopover, add_button);
   gtk_widget_class_bind_template_child (widget_class, GcalQuickAddPopover, calendars_listbox);
diff --git a/data/ui/quick-add-popover.ui b/src/gui/gcal-quick-add-popover.ui
similarity index 100%
rename from data/ui/quick-add-popover.ui
rename to src/gui/gcal-quick-add-popover.ui
diff --git a/src/gui/gcal-time-selector.c b/src/gui/gcal-time-selector.c
index c93c5139..1ce4bef4 100644
--- a/src/gui/gcal-time-selector.c
+++ b/src/gui/gcal-time-selector.c
@@ -247,7 +247,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/time-selector.ui");
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), 
"/org/gnome/calendar/ui/gui/gcal-time-selector.ui");
 
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GcalTimeSelector, time_label);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GcalTimeSelector, hour_adjustment);
diff --git a/data/ui/time-selector.ui b/src/gui/gcal-time-selector.ui
similarity index 100%
rename from data/ui/time-selector.ui
rename to src/gui/gcal-time-selector.ui
diff --git a/src/gui/gcal-window.c b/src/gui/gcal-window.c
index 0f660eea..0ebfab27 100644
--- a/src/gui/gcal-window.c
+++ b/src/gui/gcal-window.c
@@ -1033,7 +1033,7 @@ gcal_window_class_init (GcalWindowClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/window.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-window.ui");
 
   /* widgets */
   gtk_widget_class_bind_template_child (widget_class, GcalWindow, back_button);
diff --git a/data/ui/window.ui b/src/gui/gcal-window.ui
similarity index 100%
rename from data/ui/window.ui
rename to src/gui/gcal-window.ui
diff --git a/data/ui/help-overlay.ui b/src/help-overlay.ui
similarity index 100%
rename from data/ui/help-overlay.ui
rename to src/help-overlay.ui
diff --git a/src/meson.build b/src/meson.build
index 91a06dd3..b71bb89d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -28,12 +28,11 @@ built_sources = gnome.mkenums(
   h_template: enum_types + '.h.template'
 )
 
+gresource = files('calendar.gresource.xml')
 built_sources += gnome.compile_resources(
   'gcal-resources',
          gresource,
-        source_dir: data_dir,
             c_name: 'calendar',
-      dependencies: resource_data,
             export: true
 )
 
diff --git a/data/theme/Adwaita.css b/src/theme/Adwaita.css
similarity index 100%
rename from data/theme/Adwaita.css
rename to src/theme/Adwaita.css
diff --git a/src/views/gcal-month-cell.c b/src/views/gcal-month-cell.c
index c4480328..46c8142b 100644
--- a/src/views/gcal-month-cell.c
+++ b/src/views/gcal-month-cell.c
@@ -427,7 +427,7 @@ gcal_month_cell_class_init (GcalMonthCellClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/month-cell.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/views/gcal-month-cell.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, day_label);
   gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, header_box);
diff --git a/data/ui/month-cell.ui b/src/views/gcal-month-cell.ui
similarity index 100%
rename from data/ui/month-cell.ui
rename to src/views/gcal-month-cell.ui
diff --git a/src/views/gcal-month-popover.c b/src/views/gcal-month-popover.c
index 711bc835..dc9b3184 100644
--- a/src/views/gcal-month-popover.c
+++ b/src/views/gcal-month-popover.c
@@ -721,7 +721,7 @@ gcal_month_popover_class_init (GcalMonthPopoverClass *klass)
                                            1,
                                            GCAL_TYPE_EVENT_WIDGET);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/month-popover.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/views/gcal-month-popover.ui");
 
   gtk_widget_class_bind_template_callback (widget_class, close_button_clicked_cb);
   gtk_widget_class_bind_template_callback (widget_class, new_event_button_clicked_cb);
diff --git a/data/ui/month-popover.ui b/src/views/gcal-month-popover.ui
similarity index 100%
rename from data/ui/month-popover.ui
rename to src/views/gcal-month-popover.ui
diff --git a/src/views/gcal-month-view.c b/src/views/gcal-month-view.c
index 459173c2..3e8986c5 100644
--- a/src/views/gcal-month-view.c
+++ b/src/views/gcal-month-view.c
@@ -2288,7 +2288,7 @@ gcal_month_view_class_init (GcalMonthViewClass *klass)
   g_object_class_override_property (object_class, PROP_DATE, "active-date");
   g_object_class_override_property (object_class, PROP_CONTEXT, "context");
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/month-view.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/views/gcal-month-view.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalMonthView, label_0);
   gtk_widget_class_bind_template_child (widget_class, GcalMonthView, label_1);
diff --git a/data/ui/month-view.ui b/src/views/gcal-month-view.ui
similarity index 100%
rename from data/ui/month-view.ui
rename to src/views/gcal-month-view.ui
diff --git a/src/views/gcal-week-header.c b/src/views/gcal-week-header.c
index a0d0820f..ad531401 100644
--- a/src/views/gcal-week-header.c
+++ b/src/views/gcal-week-header.c
@@ -1651,7 +1651,7 @@ gcal_week_header_class_init (GcalWeekHeaderClass *kclass)
                                            1,
                                            GCAL_TYPE_EVENT_WIDGET);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/week-header.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/views/gcal-week-header.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, expand_button);
   gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, expand_button_box);
diff --git a/data/ui/week-header.ui b/src/views/gcal-week-header.ui
similarity index 100%
rename from data/ui/week-header.ui
rename to src/views/gcal-week-header.ui
diff --git a/src/views/gcal-week-view.c b/src/views/gcal-week-view.c
index 16928a30..d26a8a95 100644
--- a/src/views/gcal-week-view.c
+++ b/src/views/gcal-week-view.c
@@ -632,7 +632,7 @@ gcal_week_view_class_init (GcalWeekViewClass *klass)
   g_object_class_override_property (object_class, PROP_DATE, "active-date");
   g_object_class_override_property (object_class, PROP_CONTEXT, "context");
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/week-view.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/views/gcal-week-view.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalWeekView, header);
   gtk_widget_class_bind_template_child (widget_class, GcalWeekView, hours_bar);
diff --git a/data/ui/week-view.ui b/src/views/gcal-week-view.ui
similarity index 100%
rename from data/ui/week-view.ui
rename to src/views/gcal-week-view.ui
diff --git a/src/views/gcal-year-view.c b/src/views/gcal-year-view.c
index d32bc0d8..0a264f94 100644
--- a/src/views/gcal-year-view.c
+++ b/src/views/gcal-year-view.c
@@ -2063,7 +2063,7 @@ gcal_year_view_class_init (GcalYearViewClass *klass)
                                                          FALSE,
                                                          G_PARAM_READWRITE));
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/year-view.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/views/gcal-year-view.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalYearView, navigator);
   gtk_widget_class_bind_template_child (widget_class, GcalYearView, sidebar);
diff --git a/data/ui/year-view.ui b/src/views/gcal-year-view.ui
similarity index 100%
rename from data/ui/year-view.ui
rename to src/views/gcal-year-view.ui
diff --git a/src/weather/gcal-weather-settings.c b/src/weather/gcal-weather-settings.c
index 6d122bfd..fec4e7f8 100644
--- a/src/weather/gcal-weather-settings.c
+++ b/src/weather/gcal-weather-settings.c
@@ -344,7 +344,7 @@ gcal_weather_settings_class_init (GcalWeatherSettingsClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/weather-settings.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/calendar/ui/weather/gcal-weather-settings.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalWeatherSettings, show_weather_switch);
   gtk_widget_class_bind_template_child (widget_class, GcalWeatherSettings, weather_auto_location_switch);
diff --git a/data/ui/weather-settings.ui b/src/weather/gcal-weather-settings.ui
similarity index 100%
rename from data/ui/weather-settings.ui
rename to src/weather/gcal-weather-settings.ui
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]