Today: we can now configure the colors for the monthly items, courtesy of

Today:  we can now configure the colors for the monthly items, courtesy of
the canvas and GnomeColorPicker.  Look at the preferences dialog, it is
kind of nice.  There are still some bugs to be fixed, nothing major.

1998-09-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* prop.c (create_colors_page): We can now configure the colors of
	the monthly calendars!  Wheeeeee!  There are still some nits to be
	fixed, which are listed in the TODO file.
	(build_color_spec): New function to build color specifications.
	(parse_color_spec): New function to parse color specifications.

	* mark.c: Modified all functions to use the configured colors.
	* goto.c: Likewise.

	* main.c (colors_changed): New function that notifies all
	calendars that colors have changed.

	* gnome-cal.c (gnome_calendar_colors_changed): New function that
	notifies all the views that the colors have changed.

	* month-view.c (month_view_colors_changed): New function that
	notifies the month view that colors have changed.

	* year-view.c (year_view_colors_changed): New function that
	notifies the year view that colors have changed.

	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
	outline and day box colors.

	* gnome-month-item.c (gnome_month_item_set_arg): Added
	outline_color, outline_color_gdk, day_box_color, and
	day_box_color_gdk arguments to month items.  These are convenient
	to quickly set the colors of the month item.
	(gnome_month_item_get_arg): Likewise.

	* main.[ch]: Added a global array of structures for color preferences.

svn path=/trunk/; revision=360

1 files changed, 20 insertions, 24 deletions

diff --git a/calendar/gui/mark.c b/calendar/gui/mark.c
index b1c6df8fa3..6aab8b1b74 100644
--- a/calendar/gui/mark.c
+++ b/calendar/gui/mark.c
@@ -6,6 +6,8 @@
  */
 
 #include <config.h>
+#include "gnome-cal.h"
+#include "main.h"
 #include "mark.h"
 #include "timeutil.h"
 
@@ -34,14 +36,7 @@ mark_event_in_month (GnomeMonthItem *mitem, time_t start, time_t end)
 
 		item = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + day_index);
 		gnome_canvas_item_set (item,
-				       "fill_color", "tan",
-				       NULL);
-
-		/* Mark the day label */
-
-		item = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_LABEL + day_index);
-		gnome_canvas_item_set (item,
-				       "fill_color", "black",
+				       "fill_color", color_spec_from_prop (COLOR_PROP_MARK_DAY_BG),
 				       NULL);
 
 		/* Next day */
@@ -65,7 +60,7 @@ mark_current_day (GnomeMonthItem *mitem)
 		day_index = gnome_month_item_day2index (mitem, tm->tm_mday);
 		item = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_LABEL + day_index);
 		gnome_canvas_item_set (item,
-				       "fill_color", "blue",
+				       "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG),
 				       NULL);
 	}
 }
@@ -98,25 +93,26 @@ mark_month_item (GnomeMonthItem *mitem, Calendar *cal)
 void
 unmark_month_item (GnomeMonthItem *mitem)
 {
-	int i;
-	GnomeCanvasItem *item;
-
 	g_return_if_fail (mitem != NULL);
 	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
 
-	for (i = 0; i < 42; i++) {
-		/* Box */
+	/* We have to do this in several calls to gnome_canvas_item_set(), as color_spec_from_prop()
+	 * returns a pointer to a static string -- and we need several values.
+	 */
 
-		item = gnome_month_item_num2child (GNOME_MONTH_ITEM (mitem), GNOME_MONTH_ITEM_DAY_BOX + i);
-		gnome_canvas_item_set (item,
-				       "fill_color", "#d6d6d6d6d6d6",
-				       NULL);
+	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
+			       "heading_color", color_spec_from_prop (COLOR_PROP_HEADING_COLOR),
+			       NULL);
 
-		/* Label */
+	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
+			       "outline_color", color_spec_from_prop (COLOR_PROP_OUTLINE_COLOR),
+			       NULL);
 
-		item = gnome_month_item_num2child (GNOME_MONTH_ITEM (mitem), GNOME_MONTH_ITEM_DAY_LABEL + i);
-		gnome_canvas_item_set (item,
-				       "fill_color", "black",
-				       NULL);
-	}
+	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
+			       "day_box_color", color_spec_from_prop (COLOR_PROP_EMPTY_DAY_BG),
+			       NULL);
+
+	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
+			       "day_color", color_spec_from_prop (COLOR_PROP_DAY_FG),
+			       NULL);
 }