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.
This commit is contained in:
committed by
Georges Basile Stavracas Neto
parent
0aa0619e99
commit
303cba1622
@@ -3,5 +3,7 @@
|
|||||||
<gresource prefix="/org/gnome/calendar/ui/common">
|
<gresource prefix="/org/gnome/calendar/ui/common">
|
||||||
<file compressed="true">gcal-calendar-combo-row-item.ui</file>
|
<file compressed="true">gcal-calendar-combo-row-item.ui</file>
|
||||||
<file compressed="true">gcal-calendar-combo-row.ui</file>
|
<file compressed="true">gcal-calendar-combo-row.ui</file>
|
||||||
|
<file compressed="true">gcal-date-chooser.ui</file>
|
||||||
|
<file compressed="true">gcal-date-chooser-day.ui</file>
|
||||||
</gresource>
|
</gresource>
|
||||||
</gresources>
|
</gresources>
|
||||||
|
|||||||
+1
-1
@@ -146,7 +146,7 @@ gcal_date_chooser_day_class_init (GcalDateChooserDayClass *class)
|
|||||||
|
|
||||||
g_object_class_install_properties (object_class, NUM_PROPS, properties);
|
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, dot_revealer);
|
||||||
gtk_widget_class_bind_template_child (widget_class, GcalDateChooserDay, label);
|
gtk_widget_class_bind_template_child (widget_class, GcalDateChooserDay, label);
|
||||||
@@ -903,7 +903,7 @@ gcal_date_chooser_class_init (GcalDateChooserClass *class)
|
|||||||
NULL,
|
NULL,
|
||||||
G_TYPE_NONE, 0);
|
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, combined_choice);
|
||||||
gtk_widget_class_bind_template_child (widget_class, GcalDateChooser, month_choice);
|
gtk_widget_class_bind_template_child (widget_class, GcalDateChooser, month_choice);
|
||||||
@@ -9,4 +9,6 @@ built_sources += gnome.compile_resources(
|
|||||||
sources += files(
|
sources += files(
|
||||||
'gcal-calendar-combo-row-item.c',
|
'gcal-calendar-combo-row-item.c',
|
||||||
'gcal-calendar-combo-row.c',
|
'gcal-calendar-combo-row.c',
|
||||||
|
'gcal-date-chooser.c',
|
||||||
|
'gcal-date-chooser-day.c',
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
<gresources>
|
<gresources>
|
||||||
<gresource prefix="/org/gnome/calendar/ui/event-editor">
|
<gresource prefix="/org/gnome/calendar/ui/event-editor">
|
||||||
<file compressed="true">gcal-alarm-row.ui</file>
|
<file compressed="true">gcal-alarm-row.ui</file>
|
||||||
<file compressed="true">gcal-date-chooser.ui</file>
|
|
||||||
<file compressed="true">gcal-date-chooser-day.ui</file>
|
|
||||||
<file compressed="true">gcal-date-chooser-row.ui</file>
|
<file compressed="true">gcal-date-chooser-row.ui</file>
|
||||||
<file compressed="true">gcal-date-time-chooser.ui</file>
|
<file compressed="true">gcal-date-time-chooser.ui</file>
|
||||||
<file compressed="true">gcal-date-selector.ui</file>
|
<file compressed="true">gcal-date-selector.ui</file>
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ built_sources += gnome.compile_resources(
|
|||||||
|
|
||||||
sources += files(
|
sources += files(
|
||||||
'gcal-alarm-row.c',
|
'gcal-alarm-row.c',
|
||||||
'gcal-date-chooser.c',
|
|
||||||
'gcal-date-chooser-day.c',
|
|
||||||
'gcal-date-chooser-row.c',
|
'gcal-date-chooser-row.c',
|
||||||
'gcal-date-time-chooser.c',
|
'gcal-date-time-chooser.c',
|
||||||
'gcal-date-selector.c',
|
'gcal-date-selector.c',
|
||||||
|
|||||||
Reference in New Issue
Block a user