diff options
| -rw-r--r-- | calendar/ChangeLog | 11 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 46 |
2 files changed, 38 insertions, 19 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ef3a556cc0..e281860c8d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2004-04-19 JP Rosevear <jpr@ximian.com> + + * gui/gnome-cal.c (set_view): take a range_selected boolean for + internal use + (gnome_calendar_set_view): use above + (display_view): use priv->range_selected, we'll set it correctly + before this + (display_view_cb): only pass focus boolean + (gnome_calendar_on_date_navigator_selection_changed): set the view + so the view menu is accurate + 2004-04-18 JP Rosevear <jpr@ximian.com> Fixes #54021 diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 32d07898a3..561dfd6594 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1421,18 +1421,8 @@ gnome_calendar_get_view (GnomeCalendar *gcal) return priv->current_view_type; } - -/** - * gnome_calendar_set_view: - * @gcal: A calendar. - * @view_type: Type of view to show. - * - * Sets the view that should be shown in a calendar. If @reset_range is true, - * this function will automatically set the number of days or weeks shown in - * the view; otherwise the last configuration will be kept. - **/ -void -gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type) +static void +set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean range_selected) { GnomeCalendarPrivate *priv; const char *view_id; @@ -1468,17 +1458,36 @@ gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type) return; } + priv->range_selected = range_selected; gal_view_instance_set_current_view_id (priv->view_instance, view_id); } + +/** + * gnome_calendar_set_view: + * @gcal: A calendar. + * @view_type: Type of view to show. + * + * Sets the view that should be shown in a calendar. If @reset_range is true, + * this function will automatically set the number of days or weeks shown in + * the view; otherwise the last configuration will be kept. + **/ +void +gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type) +{ + g_return_if_fail (gcal != NULL); + g_return_if_fail (GNOME_IS_CALENDAR (gcal)); + + set_view (gcal, view_type, FALSE); +} + /* Sets the view without changing the selection or updating the date * navigator. If a range of dates isn't selected it will also reset the number * of days/weeks shown to the default (i.e. 1 day for the day view or 5 weeks * for the month view). */ static void -display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, - gboolean range_selected, gboolean grab_focus) +display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean grab_focus) { GnomeCalendarPrivate *priv; gboolean preserve_day; @@ -1489,7 +1498,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, switch (view_type) { case GNOME_CAL_DAY_VIEW: - if (!range_selected) + if (!priv->range_selected) e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), 1); break; @@ -1503,7 +1512,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, break; case GNOME_CAL_MONTH_VIEW: - if (!range_selected) + if (!priv->range_selected) e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view), 5); preserve_day = TRUE; @@ -1518,7 +1527,6 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, } priv->current_view_type = view_type; - priv->range_selected = range_selected; gtk_notebook_set_page (GTK_NOTEBOOK (priv->notebook), (int) view_type); @@ -1564,7 +1572,7 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data) } - display_view (gcal, view_type, FALSE, TRUE); + display_view (gcal, view_type, TRUE); gnome_calendar_update_date_navigator (gcal); gnome_calendar_notify_dates_shown_changed (gcal); } @@ -2474,7 +2482,7 @@ gnome_calendar_on_date_navigator_selection_changed (ECalendarItem *calitem, Gnom /* Make the views display things properly */ update_view_times (gcal, new_time); - display_view (gcal, view_type, TRUE, TRUE); + set_view (gcal, view_type, TRUE); gnome_calendar_notify_dates_shown_changed (gcal); } |