diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 12 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model-memos.c | 5 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model.c | 4 | ||||
| -rw-r--r-- | calendar/gui/e-memo-table.etspec | 6 |
4 files changed, 21 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 7bd1533f75..1e235d4ccb 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,15 @@ +2006-02-16 Johnny Jacob <johnnyjacob@gmail.com> + + ** Fixes #330955 + + * gui/e-memo-table.etspec : Change the column from summary to + description. + * gui/e-cal-model.c : (ecm_duplicate_value) : Dup value for + description also. + (e_cal_model_create_component_with_defaults) : create a memo + component with defaults. + * gui/e-cal-model-memos.c : (ecmm_is_cell_editable). + 2006-04-10 Chenthill Palanisamy <pchenthill@novell.com> Fixes #163039 diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c index ea43f33f7f..f32a12455e 100644 --- a/calendar/gui/e-cal-model-memos.c +++ b/calendar/gui/e-cal-model-memos.c @@ -172,9 +172,8 @@ ecmm_is_cell_editable (ETableModel *etm, int col, int row) g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, FALSE); g_return_val_if_fail (row >= -1 || (row >= 0 && row < e_table_model_row_count (etm)), FALSE); - if(col == E_CAL_MODEL_FIELD_SUMMARY) - retval = FALSE; - else if (col < E_CAL_MODEL_FIELD_LAST) + + if (col < E_CAL_MODEL_FIELD_LAST) retval = E_TABLE_MODEL_CLASS (e_cal_model_memos_parent_class)->is_cell_editable (etm, col, row); return retval; diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index e8cf94e22d..3e7a826bc0 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -780,6 +780,7 @@ ecm_duplicate_value (ETableModel *etm, int col, const void *value) switch (col) { case E_CAL_MODEL_FIELD_CATEGORIES : case E_CAL_MODEL_FIELD_CLASSIFICATION : + case E_CAL_MODEL_FIELD_DESCRIPTION : case E_CAL_MODEL_FIELD_SUMMARY : return g_strdup (value); case E_CAL_MODEL_FIELD_HAS_ALARMS : @@ -1832,6 +1833,9 @@ e_cal_model_create_component_with_defaults (ECalModel *model) case ICAL_VTODO_COMPONENT : comp = cal_comp_task_new_with_defaults (client); break; + case ICAL_VJOURNAL_COMPONENT : + comp = cal_comp_memo_new_with_defaults (client); + break; default: return NULL; } diff --git a/calendar/gui/e-memo-table.etspec b/calendar/gui/e-memo-table.etspec index 06ecc2ce4b..ce2f194399 100644 --- a/calendar/gui/e-memo-table.etspec +++ b/calendar/gui/e-memo-table.etspec @@ -1,11 +1,11 @@ -<ETableSpecification click-to-add="false" _click-to-add-message="Click to add a memo" draw-grid="true"> - <ETableColumn model_col= "8" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="string" priority="10"/> +<ETableSpecification click-to-add="true" _click-to-add-message="Click to add a memo" draw-grid="true"> + <ETableColumn model_col="4" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="stringcase" priority="0"/> <ETableColumn model_col="19" _title="Memo sort" cell="task-sort" compare="memo-sort" priority="-4"/> <ETableColumn model_col="7" pixbuf="icon" _title="Type" expansion="1.0" minimum_width="16" resizable="false" cell="icon" compare="integer" priority="-4"/> <ETableColumn model_col="0" _title="Categories" cell="calstring" compare="string" expansion="1.0" minimum_width="10" resizable="true" priority="-2"/> <ETableState> - <column source="1"/> + <column source="4"/> <column source="0"/> <column source="2"/> <grouping></grouping> |