diff options
author | Thouis R. Jones <thouis@csail.mit.edu> | 2005-05-13 19:08:28 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2005-05-13 19:08:28 +0800 |
commit | 51490d54078a67793ab48584a4f672d0ae3d3bd4 (patch) | |
tree | b448ad9371d92e8edbe0126f60cdf01cb77571a5 /calendar/gui/calendar-config.c | |
parent | 8b3b58503dca17206fd530fc4828fdd51faa08a3 (diff) | |
download | gsoc2013-evolution-51490d54078a67793ab48584a4f672d0ae3d3bd4.tar gsoc2013-evolution-51490d54078a67793ab48584a4f672d0ae3d3bd4.tar.gz gsoc2013-evolution-51490d54078a67793ab48584a4f672d0ae3d3bd4.tar.bz2 gsoc2013-evolution-51490d54078a67793ab48584a4f672d0ae3d3bd4.tar.lz gsoc2013-evolution-51490d54078a67793ab48584a4f672d0ae3d3bd4.tar.xz gsoc2013-evolution-51490d54078a67793ab48584a4f672d0ae3d3bd4.tar.zst gsoc2013-evolution-51490d54078a67793ab48584a4f672d0ae3d3bd4.zip |
Fixes #272301
2005-05-13 Thouis R. Jones <thouis@csail.mit.edu>
Fixes #272301
* gui/apps_evolution_calendar.schemas.in.in:
* gui/calendar-config-keys.h:
* gui/calendar-config.c: (calendar_config_get_marcus_bains,
calendar_config_add_notification_marcus_bains):
* gui/calendar-config.h:
* gui/e-day-view-config.c: (set_marcus_bains,
marcus_bains_changed_cb, e_day_view_config_set_view):
* gui/e-day-view-main-item.c: (e_day_view_main_item_draw):
* gui/e-day-view-time-item.c: (e_day_view_time_item_draw):
* gui/e-day-view.c: (e_day_view_init, e_day_view_set_colors,
e_day_view_get_show_marcus_bains, e_day_view_set_marcus_bains,
e_day_view_update_marcus_bains):
* gui/e-day-view.h:
* gui/gnome-cal.c: (update_marcus_bains_line_cb, setup_widgets,
gnome_calendar_destroy): Added Marcus Bains Line to main item
view and time bar.
svn path=/trunk/; revision=29351
Diffstat (limited to 'calendar/gui/calendar-config.c')
-rw-r--r-- | calendar/gui/calendar-config.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index c31bdca261..cab9ee58ff 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -444,6 +444,34 @@ calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpo return id; } +/* Whether we show the Marcus Bains Line (current time), and in what colors. */ +void +calendar_config_get_marcus_bains (gboolean *show_line, const char **dayview_color, const char **timebar_color) +{ + static char *dcolor = NULL, *tcolor = NULL; + + if (dcolor) + g_free (dcolor); + if (tcolor) + g_free (tcolor); + + dcolor = gconf_client_get_string (config, CALENDAR_CONFIG_MARCUS_BAINS_COLOR_DAYVIEW, NULL); + tcolor = gconf_client_get_string (config, CALENDAR_CONFIG_MARCUS_BAINS_COLOR_TIMEBAR, NULL); + + *show_line = gconf_client_get_bool (config, CALENDAR_CONFIG_MARCUS_BAINS_LINE, NULL); + *dayview_color = dcolor; + *timebar_color = tcolor; +} + + +void +calendar_config_add_notification_marcus_bains (GConfClientNotifyFunc func, gpointer data, gint *not_show, gint *not_dcolor, gint *not_tcolor) +{ + *not_show = gconf_client_notify_add (config, CALENDAR_CONFIG_MARCUS_BAINS_LINE, func, data, NULL, NULL); + *not_dcolor = gconf_client_notify_add (config, CALENDAR_CONFIG_MARCUS_BAINS_COLOR_DAYVIEW, func, data, NULL, NULL); + *not_tcolor = gconf_client_notify_add (config, CALENDAR_CONFIG_MARCUS_BAINS_COLOR_TIMEBAR, func, data, NULL, NULL); +} + /* Whether we show week numbers in the Date Navigator. */ gboolean calendar_config_get_dnav_show_week_no (void) |