Restore the description widget when editing tasks

This commit is contained in:
Pierre Pronchery 2015-04-20 23:53:51 +02:00
parent 431e235bbe
commit a650e7297d

View File

@ -34,9 +34,7 @@ struct _TaskEdit
GtkWidget * window;
GtkWidget * title;
GtkWidget * priority;
#if 0 /* XXX disabled for now */
GtkWidget * description;
#endif
};
@ -56,10 +54,8 @@ TaskEdit * taskedit_new(Todo * todo, Task * task)
GtkWidget * widget;
GtkWidget * entry;
GtkWidget * bbox;
#if 0 /* XXX disabled for now */
GtkWidget * scrolled;
char const * description;
#endif
if((taskedit = malloc(sizeof(*taskedit))) == NULL)
return NULL;
@ -99,7 +95,6 @@ TaskEdit * taskedit_new(Todo * todo, Task * task)
gtk_entry_set_text(GTK_ENTRY(entry), task_get_priority(task));
gtk_box_pack_start(GTK_BOX(hbox), taskedit->priority, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
#if 0 /* XXX disabled for now */
/* description */
widget = gtk_label_new(_("Description:"));
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
@ -117,7 +112,6 @@ TaskEdit * taskedit_new(Todo * todo, Task * task)
description, -1);
gtk_container_add(GTK_CONTAINER(scrolled), taskedit->description);
gtk_box_pack_start(GTK_BOX(vbox), scrolled, TRUE, TRUE, 0);
#endif
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 4);
@ -147,25 +141,21 @@ static void _on_taskedit_ok(gpointer data)
{
TaskEdit * taskedit = data;
GtkWidget * entry;
#if 0 /* XXX disabled for now */
GtkTextBuffer * tbuf;
GtkTextIter start;
GtkTextIter end;
gchar * description;
#endif
task_set_title(taskedit->task, gtk_entry_get_text(GTK_ENTRY(
taskedit->title)));
entry = gtk_bin_get_child(GTK_BIN(taskedit->priority));
task_set_priority(taskedit->task, gtk_entry_get_text(GTK_ENTRY(entry)));
#if 0 /* XXX disabled for now */
tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(taskedit->description));
gtk_text_buffer_get_start_iter(tbuf, &start);
gtk_text_buffer_get_end_iter(tbuf, &end);
description = gtk_text_buffer_get_text(tbuf, &start, &end, FALSE);
task_set_description(taskedit->task, description);
g_free(description);
#endif
task_save(taskedit->task);
todo_task_reload_all(taskedit->todo); /* XXX violent solution */
_on_taskedit_cancel(taskedit);