year-view: connect current_date to window
Update sidebar whenever the current_date is updated. This current_date mechanism is going to be moved completely into GcalWindow.
This commit is contained in:
@@ -1299,6 +1299,9 @@ gcal_window_constructed (GObject *object)
|
|||||||
gcal_search_view_connect (GCAL_SEARCH_VIEW (priv->search_view), priv->manager);
|
gcal_search_view_connect (GCAL_SEARCH_VIEW (priv->search_view), priv->manager);
|
||||||
gcal_search_view_set_time_format (GCAL_SEARCH_VIEW (priv->search_view), use_24h_format);
|
gcal_search_view_set_time_format (GCAL_SEARCH_VIEW (priv->search_view), use_24h_format);
|
||||||
|
|
||||||
|
/* current date hook */
|
||||||
|
gcal_year_view_set_current_date (GCAL_YEAR_VIEW (priv->views[GCAL_WINDOW_VIEW_YEAR]), NULL);
|
||||||
|
|
||||||
/* signals connection/handling */
|
/* signals connection/handling */
|
||||||
/* only GcalView implementations */
|
/* only GcalView implementations */
|
||||||
for (i = 0; i < 4; ++i)
|
for (i = 0; i < 4; ++i)
|
||||||
|
|||||||
+15
-7
@@ -1130,13 +1130,6 @@ gcal_year_view_set_manager (GcalYearView *year_view,
|
|||||||
GcalManager *manager)
|
GcalManager *manager)
|
||||||
{
|
{
|
||||||
year_view->priv->manager = manager;
|
year_view->priv->manager = manager;
|
||||||
|
|
||||||
/* FIXME: move into window */
|
|
||||||
year_view->priv->current_date = g_new0 (icaltimetype, 1);
|
|
||||||
*(year_view->priv->current_date) =
|
|
||||||
icaltime_current_time_with_zone (gcal_manager_get_system_timezone (year_view->priv->manager));
|
|
||||||
*(year_view->priv->current_date) = icaltime_set_timezone (year_view->priv->current_date,
|
|
||||||
gcal_manager_get_system_timezone (year_view->priv->manager));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -1152,3 +1145,18 @@ gcal_year_view_set_use_24h_format (GcalYearView *year_view,
|
|||||||
{
|
{
|
||||||
year_view->priv->use_24h_format = use_24h_format;
|
year_view->priv->use_24h_format = use_24h_format;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
gcal_year_view_set_current_date (GcalYearView *year_view,
|
||||||
|
icaltimetype *current_date)
|
||||||
|
{
|
||||||
|
/* FIXME: move into window */
|
||||||
|
year_view->priv->current_date = g_new0 (icaltimetype, 1);
|
||||||
|
*(year_view->priv->current_date) =
|
||||||
|
icaltime_current_time_with_zone (gcal_manager_get_system_timezone (year_view->priv->manager));
|
||||||
|
*(year_view->priv->current_date) = icaltime_set_timezone (year_view->priv->current_date,
|
||||||
|
gcal_manager_get_system_timezone (year_view->priv->manager));
|
||||||
|
|
||||||
|
/* Launches update */
|
||||||
|
update_sidebar (year_view);
|
||||||
|
}
|
||||||
|
|||||||
@@ -62,6 +62,8 @@ void gcal_year_view_set_first_weekday (GcalYearView *year_view,
|
|||||||
gint nr_day);
|
gint nr_day);
|
||||||
void gcal_year_view_set_use_24h_format (GcalYearView *year_view,
|
void gcal_year_view_set_use_24h_format (GcalYearView *year_view,
|
||||||
gboolean use_24h_format);
|
gboolean use_24h_format);
|
||||||
|
void gcal_year_view_set_current_date (GcalYearView *year_view,
|
||||||
|
icaltimetype *current_date);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user