diff options
| author | Rodrigo Moya <rodrigo@ximian.com> | 2004-01-25 05:29:13 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2004-01-25 05:29:13 +0800 |
| commit | d4e79bae46785f6486c5304738a908300aa626a5 (patch) | |
| tree | 58acb6b81c2ba65a2e84f518e9f614afe4ec12b5 /calendar | |
| parent | 07a59cbb9e5cc5977fa03cdd976f959d834be824 (diff) | |
| download | gsoc2013-evolution-d4e79bae46785f6486c5304738a908300aa626a5.tar gsoc2013-evolution-d4e79bae46785f6486c5304738a908300aa626a5.tar.gz gsoc2013-evolution-d4e79bae46785f6486c5304738a908300aa626a5.tar.bz2 gsoc2013-evolution-d4e79bae46785f6486c5304738a908300aa626a5.tar.lz gsoc2013-evolution-d4e79bae46785f6486c5304738a908300aa626a5.tar.xz gsoc2013-evolution-d4e79bae46785f6486c5304738a908300aa626a5.tar.zst gsoc2013-evolution-d4e79bae46785f6486c5304738a908300aa626a5.zip | |
use the colors from the model as background, not as foreground.
2004-01-24 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.
svn path=/trunk/; revision=24413
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model-tasks.c | 3 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-table.c | 14 |
3 files changed, 16 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index fbc2cde5e2..631af9fbfd 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2004-01-24 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-24 JP Rosevear <jpr@ximian.com> * gui/tasks-component.c (setup_create_ecal): listen for the diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index edfb5d8b3d..99c337905f 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -959,8 +959,7 @@ ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) 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 diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index eff99818ad..72e3311a4f 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -321,7 +321,7 @@ e_calendar_table_init (ECalendarTable *cal_table) 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 *cal_table) 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 *cal_table) 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 *cal_table) 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 *cal_table) 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 *cal_table) 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 *cal_table) 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); |