call calendar_config_write_on_exit() to write out some special config

2000-10-11  Damon Chaplin  <damon@helixcode.com>

	* gui/main.c (main): call calendar_config_write_on_exit() to write
	out some special config settings (as the mail component does).

	* gui/calendar-commands.c (properties_cmd): changed to use the new
	preferences dialog.
	(update_all_config_settings): new function to iterate over all the
	calendars and update the config settings.

	* gui/dialogs/cal-prefs-dialog.glade: preferences dialog.

	* gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences
	dialog.

	* gui/calendar-config.[hc]: new files to handle loading/saving config
	settings.

	* cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set,
	plus minor changes.

	* cal-util/test-recur.c: updated.

	* gui/e-day-view-time-item.c:
	* gui/popup-menu.c: update to #include <gal/widgets/e-gui-utils.h>

	* gui/component-factory.c (owner_set_cb): called calendar_config_init.
	(owner_set_cb):
	(owner_unset_cb): updated the prototypes.

	* gui/main.c (main): added call to calendar_config_write_on_exit().

	* gui/component-factory.h:
	* gui/component-factory.c (owner_set_cb): added global evolution_dir
	just like the mail component, so we know we to store config stuff.

svn path=/trunk/; revision=5856

1 files changed, 15 insertions, 1 deletions

diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 49720456f3..219f61d10f 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -29,8 +29,9 @@
 
 #include <config.h>
 #include <gnome.h>
+#include <gal/widgets/e-gui-utils.h>
 #include "e-day-view-time-item.h"
-#include "../../e-util/e-gui-utils.h"
+#include "calendar-config.h"
 
 
 /* The spacing between items in the time column. GRID_X_PAD is the space down
@@ -261,6 +262,12 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 	}
 
 	hour = day_view->first_hour_shown;
+	if (day_view->use_24_hour_format) {
+		if (hour == 0 || hour == 12)
+			hour = 12;
+		else
+			hour %= 12;
+	}
 	hour_y = large_font->ascent + 2; /* FIXME */
 	minute = day_view->first_minute_shown;
 	min_y = small_font->ascent + 2; /* FIXME */
@@ -316,6 +323,12 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 		minute += day_view->mins_per_row;
 		if (minute >= 60) {
 			hour++;
+			if (day_view->use_24_hour_format) {
+				if (hour == 0 || hour == 12)
+					hour = 12;
+				else
+					hour %= 12;
+			}
 			minute -= 60;
 		}
 	}
@@ -428,6 +441,7 @@ e_day_view_time_item_on_set_divisions (GtkWidget *item,
 	divisions = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (item),
 							  "divisions"));
 	e_day_view_set_mins_per_row (day_view, divisions);
+	calendar_config_set_time_divisions (divisions);
 }