gui: Move CalendarComboRow to common
CalendarComboRow is used both by the event editor and the importer. Moving it to common for a better file organization.
This commit is contained in:
committed by
Georges Basile Stavracas Neto
parent
97791dbb99
commit
0aa0619e99
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<gresources>
|
||||
<gresource prefix="/org/gnome/calendar/ui/common">
|
||||
<file compressed="true">gcal-calendar-combo-row-item.ui</file>
|
||||
<file compressed="true">gcal-calendar-combo-row.ui</file>
|
||||
</gresource>
|
||||
</gresources>
|
||||
+1
-1
@@ -168,7 +168,7 @@ gcal_calendar_combo_row_item_class_init (GcalCalendarComboRowItemClass *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-calendar-combo-row-item.ui");
|
||||
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/common/gcal-calendar-combo-row-item.ui");
|
||||
|
||||
gtk_widget_class_bind_template_child (widget_class, GcalCalendarComboRowItem, color_image);
|
||||
gtk_widget_class_bind_template_child (widget_class, GcalCalendarComboRowItem, visibility_image);
|
||||
@@ -190,7 +190,7 @@ gcal_calendar_combo_row_class_init (GcalCalendarComboRowClass *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-calendar-combo-row.ui");
|
||||
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/common/gcal-calendar-combo-row.ui");
|
||||
|
||||
gtk_widget_class_bind_template_callback (widget_class, calendar_item_setup_cb);
|
||||
gtk_widget_class_bind_template_callback (widget_class, calendar_item_bind_cb);
|
||||
@@ -0,0 +1,12 @@
|
||||
calendar_incs += include_directories('.')
|
||||
|
||||
built_sources += gnome.compile_resources(
|
||||
'common-resources',
|
||||
'common.gresource.xml',
|
||||
c_name: 'common',
|
||||
)
|
||||
|
||||
sources += files(
|
||||
'gcal-calendar-combo-row-item.c',
|
||||
'gcal-calendar-combo-row.c',
|
||||
)
|
||||
@@ -2,8 +2,6 @@
|
||||
<gresources>
|
||||
<gresource prefix="/org/gnome/calendar/ui/gui">
|
||||
<file compressed="true">gcal-calendar-button.ui</file>
|
||||
<file compressed="true">gcal-calendar-combo-row.ui</file>
|
||||
<file compressed="true">gcal-calendar-combo-row-item.ui</file>
|
||||
<file compressed="true">gcal-event-popover.ui</file>
|
||||
<file compressed="true">gcal-event-widget.ui</file>
|
||||
<file compressed="true">gcal-meeting-row.ui</file>
|
||||
|
||||
+1
-2
@@ -1,4 +1,5 @@
|
||||
subdir('calendar-management')
|
||||
subdir('common')
|
||||
subdir('event-editor')
|
||||
subdir('gtk')
|
||||
subdir('icons')
|
||||
@@ -16,8 +17,6 @@ built_sources += gnome.compile_resources(
|
||||
sources += files(
|
||||
'gcal-application.c',
|
||||
'gcal-calendar-button.c',
|
||||
'gcal-calendar-combo-row.c',
|
||||
'gcal-calendar-combo-row-item.c',
|
||||
'gcal-drop-overlay.c',
|
||||
'gcal-event-popover.c',
|
||||
'gcal-event-widget.c',
|
||||
|
||||
Reference in New Issue
Block a user