Move UI files to src/
Keep it in sync with what To Do and Settings do.
This commit is contained in:
Georges Basile Stavracas Neto
@@ -1,35 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<gresources>
|
||||
<gresource prefix="/org/gnome/calendar">
|
||||
<file alias="alarm-row.ui" compressed="true">ui/alarm-row.ui</file>
|
||||
<file alias="calendar-management-dialog.ui" compressed="true">ui/calendar-management-dialog.ui</file>
|
||||
<file alias="calendar-popover.ui" compressed="true">ui/calendar-popover.ui</file>
|
||||
<file alias="calendar-row.ui" compressed="true">ui/calendar-row.ui</file>
|
||||
<file alias="calendars-page.ui" compressed="true">ui/calendars-page.ui</file>
|
||||
<file alias="date-chooser.ui" compressed="true">ui/date-chooser.ui</file>
|
||||
<file alias="date-selector.ui" compressed="true">ui/date-selector.ui</file>
|
||||
<file alias="edit-calendar-page.ui" compressed="true">ui/edit-calendar-page.ui</file>
|
||||
<file alias="edit-dialog.ui" compressed="true">ui/edit-dialog.ui</file>
|
||||
<file alias="event-widget.ui" compressed="true">ui/event-widget.ui</file>
|
||||
<file alias="month-cell.ui" compressed="true">ui/month-cell.ui</file>
|
||||
<file alias="month-popover.ui" compressed="true">ui/month-popover.ui</file>
|
||||
<file alias="month-view.ui" compressed="true">ui/month-view.ui</file>
|
||||
<file alias="multi-choice.ui" compressed="true">ui/multi-choice.ui</file>
|
||||
<file alias="new-calendar-page.ui" compressed="true">ui/new-calendar-page.ui</file>
|
||||
<file alias="online-account-row.ui" compressed="true">ui/online-account-row.ui</file>
|
||||
<file alias="quick-add-popover.ui" compressed="true">ui/quick-add-popover.ui</file>
|
||||
<file alias="search-popover.ui" compressed="true">ui/search-popover.ui</file>
|
||||
<file alias="time-selector.ui" compressed="true">ui/time-selector.ui</file>
|
||||
<file alias="weather-settings.ui" compressed="true">ui/weather-settings.ui</file>
|
||||
<file alias="week-header.ui" compressed="true">ui/week-header.ui</file>
|
||||
<file alias="week-view.ui" compressed="true">ui/week-view.ui</file>
|
||||
<file alias="window.ui" compressed="true">ui/window.ui</file>
|
||||
<file alias="year-view.ui" compressed="true">ui/year-view.ui</file>
|
||||
|
||||
<file>theme/Adwaita.css</file>
|
||||
</gresource>
|
||||
|
||||
<gresource prefix="/org/gnome/calendar/gtk">
|
||||
<file alias="help-overlay.ui" compressed="true">ui/help-overlay.ui</file>
|
||||
</gresource>
|
||||
</gresources>
|
||||
@@ -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'
|
||||
)
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Generated with glade 3.18.1 -->
|
||||
<interface>
|
||||
<requires lib="gtk+" version="3.16"/>
|
||||
<object class="GtkListBoxRow" id="row">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="selectable">False</property>
|
||||
<child>
|
||||
<object class="GtkGrid" id="grid">
|
||||
<property name="visible">True</property>
|
||||
<property name="margin_end">18</property>
|
||||
<property name="border_width">6</property>
|
||||
<property name="column_spacing">12</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="icon">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixel_size">22</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="height">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="account_provider_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="xalign">0</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="account_name_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<style>
|
||||
<class name="dim-label"/>
|
||||
</style>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="on_off_label">
|
||||
<property name="visible">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="height">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</interface>
|
||||
@@ -1,112 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Generated with glade 3.18.1 -->
|
||||
<interface>
|
||||
<requires lib="gtk+" version="3.16"/>
|
||||
<template class="GcalSearchPopover" parent="GtkPopover">
|
||||
<property name="width_request">600</property>
|
||||
<property name="height_request">300</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="border_width">12</property>
|
||||
<property name="modal">False</property>
|
||||
<child>
|
||||
<object class="GtkStack" id="stack">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="transition_type">crossfade</property>
|
||||
<child>
|
||||
<object class="GtkScrolledWindow" id="scrolled_window">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="vexpand">True</property>
|
||||
<property name="shadow_type">in</property>
|
||||
<child>
|
||||
<object class="GtkViewport" id="viewport">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="shadow_type">none</property>
|
||||
<child>
|
||||
<object class="GtkListBox" id="listbox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="selection_mode">none</property>
|
||||
<signal name="row-activated" handler="open_event" object="GcalSearchPopover" swapped="no"/>
|
||||
</object>
|
||||
</child>
|
||||
<style>
|
||||
<class name="search-viewport"/>
|
||||
</style>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="name">results</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="box">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="vexpand">True</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<property name="spacing">12</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="image">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="pixel_size">72</property>
|
||||
<property name="icon_name">edit-find-symbolic</property>
|
||||
<style>
|
||||
<class name="dim-label"/>
|
||||
</style>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="title_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">No results found</property>
|
||||
<attributes>
|
||||
<attribute name="weight" value="bold"/>
|
||||
<attribute name="scale" value="1.44"/>
|
||||
</attributes>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="subtitle_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">Try a different search</property>
|
||||
<style>
|
||||
<class name="dim-label"/>
|
||||
</style>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="name">no_results</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</template>
|
||||
</interface>
|
||||
+15
-17
@@ -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
|
||||
|
||||
@@ -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>
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
+1
-2
@@ -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
|
||||
)
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user