From: <si...@us...> - 2008-05-27 21:25:57
|
Revision: 424 http://osmo-pim.svn.sourceforge.net/osmo-pim/?rev=424&view=rev Author: silloz Date: 2008-05-27 14:25:45 -0700 (Tue, 27 May 2008) Log Message: ----------- * Added one option to task item Modified Paths: -------------- trunk/src/gui.h trunk/src/main.c trunk/src/tasks.c trunk/src/tasks.h trunk/src/tasks_items.c Modified: trunk/src/gui.h =================================================================== --- trunk/src/gui.h 2008-05-27 14:31:13 UTC (rev 423) +++ trunk/src/gui.h 2008-05-27 21:25:45 UTC (rev 424) @@ -73,6 +73,7 @@ TA_COLUMN_OFFLINE_IGNORE, TA_COLUMN_REPEAT, TA_COLUMN_REPEAT_DAY, + TA_COLUMN_REPEAT_MONTH_INTERVAL, TA_COLUMN_REPEAT_DAY_INTERVAL, TA_COLUMN_REPEAT_TIME_START, TA_COLUMN_REPEAT_TIME_END, @@ -330,6 +331,7 @@ GtkWidget *rt_end_minute_spinbutton; GtkWidget *rt_interval_hour_spinbutton; GtkWidget *rt_interval_minute_spinbutton; + GSList *notifications; } TASKS; Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-05-27 14:31:13 UTC (rev 423) +++ trunk/src/main.c 2008-05-27 21:25:45 UTC (rev 424) @@ -104,6 +104,7 @@ appGUI->tsk->tasks_panel_status = FALSE; appGUI->tsk->tasks_filter_disabled = FALSE; appGUI->tsk->tasks_list_store = NULL; + appGUI->tsk->notifications = NULL; appGUI->cnt->photo_image = NULL; appGUI->cnt->contacts_uim_widget = NULL; Modified: trunk/src/tasks.c =================================================================== --- trunk/src/tasks.c 2008-05-27 14:31:13 UTC (rev 423) +++ trunk/src/tasks.c 2008-05-27 21:25:45 UTC (rev 424) @@ -394,6 +394,7 @@ TA_COLUMN_COLOR, get_date_color(item->due_date_julian, item->done), TA_COLUMN_ACTIVE, item->active, TA_COLUMN_OFFLINE_IGNORE, item->offline_ignore, TA_COLUMN_REPEAT, item->repeat, TA_COLUMN_REPEAT_DAY, item->repeat_day, + TA_COLUMN_REPEAT_MONTH_INTERVAL, item->repeat_month_interval, TA_COLUMN_REPEAT_DAY_INTERVAL, item->repeat_day_interval, TA_COLUMN_REPEAT_TIME_START, item->repeat_time_start, TA_COLUMN_REPEAT_TIME_END, item->repeat_time_end, @@ -795,7 +796,7 @@ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, - G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); + G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); appGUI->tsk->tasks_filter = gtk_tree_model_filter_new(GTK_TREE_MODEL(appGUI->tsk->tasks_list_store), NULL); gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER(appGUI->tsk->tasks_filter), @@ -967,6 +968,14 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(appGUI->tsk->tasks_list), appGUI->tsk->tasks_columns[TA_COLUMN_REPEAT_DAY]); renderer = gtk_cell_renderer_text_new(); + appGUI->tsk->tasks_columns[TA_COLUMN_REPEAT_MONTH_INTERVAL] = gtk_tree_view_column_new_with_attributes(NULL, + renderer, + "text", TA_COLUMN_REPEAT_MONTH_INTERVAL, + NULL); + gtk_tree_view_column_set_visible (appGUI->tsk->tasks_columns[TA_COLUMN_REPEAT_MONTH_INTERVAL], FALSE); + gtk_tree_view_append_column(GTK_TREE_VIEW(appGUI->tsk->tasks_list), appGUI->tsk->tasks_columns[TA_COLUMN_REPEAT_MONTH_INTERVAL]); + + renderer = gtk_cell_renderer_text_new(); appGUI->tsk->tasks_columns[TA_COLUMN_REPEAT_DAY_INTERVAL] = gtk_tree_view_column_new_with_attributes(NULL, renderer, "text", TA_COLUMN_REPEAT_DAY_INTERVAL, Modified: trunk/src/tasks.h =================================================================== --- trunk/src/tasks.h 2008-05-27 14:31:13 UTC (rev 423) +++ trunk/src/tasks.h 2008-05-27 21:25:45 UTC (rev 424) @@ -45,6 +45,7 @@ gboolean offline_ignore; gboolean repeat; gint repeat_day; + gint repeat_month_interval; gint repeat_day_interval; gint repeat_time_start; gint repeat_time_end; Modified: trunk/src/tasks_items.c =================================================================== --- trunk/src/tasks_items.c 2008-05-27 14:31:13 UTC (rev 423) +++ trunk/src/tasks_items.c 2008-05-27 21:25:45 UTC (rev 424) @@ -84,6 +84,7 @@ TA_COLUMN_OFFLINE_IGNORE, &(item->offline_ignore), TA_COLUMN_REPEAT, &(item->repeat), TA_COLUMN_REPEAT_DAY, &(item->repeat_day), + TA_COLUMN_REPEAT_MONTH_INTERVAL, &(item->repeat_month_interval), TA_COLUMN_REPEAT_DAY_INTERVAL, &(item->repeat_day_interval), TA_COLUMN_REPEAT_TIME_START, &(item->repeat_time_start), TA_COLUMN_REPEAT_TIME_END, &(item->repeat_time_end), @@ -1443,7 +1444,7 @@ if (item == NULL) continue; item->done = FALSE; - item->active = TRUE; + item->active = FALSE; item->offline_ignore = FALSE; item->repeat = FALSE; item->repeat_day = 0; @@ -1704,6 +1705,9 @@ sprintf(temp, "%d", (gint) item->repeat_day); xmlNewChild(note_node, NULL, (const xmlChar *) "repeat_day", (xmlChar *) temp); + sprintf(temp, "%d", (gint) item->repeat_month_interval); + xmlNewChild(note_node, NULL, (const xmlChar *) "repeat_month_interval", (xmlChar *) temp); + sprintf(temp, "%d", (gint) item->repeat_day_interval); xmlNewChild(note_node, NULL, (const xmlChar *) "repeat_day_interval", (xmlChar *) temp); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |