[evolution-patches] colors in tasks

[Rodrigo Moya <rodrigo ximian com>]

Hi

I guess this is a UI change that needs review, so here it is, the patch,
attached, and a screenshot:

http://primates.ximian.com/~rodrigo/shots/tasks-colored.png

for Tuomas to look at it. Does it look ok like this? Doing this, we have
the same look in the event list and in the task list. Overdue tasks have
the assigned overdue color, regardless of which task list they belong
to.

cheers

? TODO
? TODO.port
? alarm-factory.diff
? common/Makefile
? common/Makefile.in
? gui/apps_evolution_calendar-1.5.schemas
? gui/apps_evolution_calendar.schemas
? gui/e-meeting-model.c
? gui/e-meeting-model.h
? gui/dialogs/calendar-setup.gladep
? gui/dialogs/meeting-page.etspec
? gui/dialogs/new-calendar.c
? gui/dialogs/new-calendar.h
? gui/dialogs/new-task-list.c
? gui/dialogs/new-task-list.gladep
? gui/dialogs/new-task-list.h
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2102
diff -u -p -r1.2102 ChangeLog
--- ChangeLog	21 Jan 2004 18:50:17 -0000	1.2102
+++ ChangeLog	22 Jan 2004 13:08:43 -0000
@@ -1,3 +1,11 @@
+2004-01-22  Rodrigo Moya <rodrigo ximian com>
+
+	* gui/e-calendar-table.c (e_calendar_table_init): use the colors from
+	the model as background, not as foreground.
+
+	* gui/e-cal-model-tasks.c (ecmt_get_color_for_component): return the
+	color assigned to each URI if it's not overdue.
+
 2004-01-21  Rodrigo Moya <rodrigo ximian com>
 
 	* gui/e-tasks.c (e_tasks_add_todo_source): check return value
Index: gui/e-cal-model-tasks.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-tasks.c,v
retrieving revision 1.14
diff -u -p -r1.14 e-cal-model-tasks.c
--- gui/e-cal-model-tasks.c	19 Jan 2004 23:11:13 -0000	1.14
+++ gui/e-cal-model-tasks.c	22 Jan 2004 13:08:43 -0000
@@ -959,8 +959,7 @@ ecmt_get_color_for_component (ECalModel 
 		break;
 	}
 
-	return "black";
-	/* return E_CAL_MODEL_CLASS (parent_class)->get_color_for_component (model, comp_data); */
+	return E_CAL_MODEL_CLASS (parent_class)->get_color_for_component (model, comp_data);
 }
 
 static void
Index: gui/e-calendar-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.c,v
retrieving revision 1.110
diff -u -p -r1.110 e-calendar-table.c
--- gui/e-calendar-table.c	18 Jan 2004 04:32:37 -0000	1.110
+++ gui/e-calendar-table.c	22 Jan 2004 13:08:44 -0000
@@ -321,7 +321,7 @@ e_calendar_table_init (ECalendarTable *c
 	g_object_set (G_OBJECT (cell),
 		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
 		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
 		      NULL);
 
 	e_table_extras_add_cell (extras, "calstring", cell);
@@ -334,7 +334,7 @@ e_calendar_table_init (ECalendarTable *c
 	g_object_set (G_OBJECT (cell),
 		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
 		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
 		      NULL);
 
 	popup_cell = e_cell_date_edit_new ();
@@ -357,7 +357,7 @@ e_calendar_table_init (ECalendarTable *c
 	g_object_set (G_OBJECT (cell),
 		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
 		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
 		      "editable", FALSE,
 		      NULL);
 
@@ -379,7 +379,7 @@ e_calendar_table_init (ECalendarTable *c
 	g_object_set (G_OBJECT (cell),
 		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
 		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
 		      "editable", FALSE,
 		      NULL);
 
@@ -402,7 +402,7 @@ e_calendar_table_init (ECalendarTable *c
 	g_object_set (G_OBJECT (cell),
 		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
 		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
 		      NULL);
 
 	popup_cell = e_cell_combo_new ();
@@ -431,7 +431,7 @@ e_calendar_table_init (ECalendarTable *c
 	g_object_set (G_OBJECT (cell),
 		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
 		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
 		      "editable", FALSE,
 		      NULL);
 
@@ -452,7 +452,7 @@ e_calendar_table_init (ECalendarTable *c
 	g_object_set (G_OBJECT (cell),
 		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE,
 		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
 		      "editable", FALSE,
 		      NULL);