Disabling the "Description" field for the moment (as long as it breaks in Config)

po/fr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Todo 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 03:04+0100\n"
+"POT-Creation-Date: 2011-03-10 18:04+0100\n"
 "PO-Revision-Date: 2010-04-23 14:35+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -20,170 +20,170 @@ msgstr ""
 msgid "Usage: todo\n"
 msgstr "Usage: todo\n"
 
-#: ../src/taskedit.c:65
+#: ../src/taskedit.c:69
 msgid "Edit task: "
 msgstr "Modifier la tâche : "
 
-#: ../src/taskedit.c:75
+#: ../src/taskedit.c:79
 msgid "Title:"
 msgstr "Titre:"
 
-#: ../src/taskedit.c:85
+#: ../src/taskedit.c:89
 msgid "Priority:"
 msgstr "Priorité:"
 
-#: ../src/taskedit.c:95
+#: ../src/taskedit.c:100
 msgid "Description:"
 msgstr "Description:"
 
-#: ../src/todo.c:74
+#: ../src/todo.c:77
 msgid "Done"
 msgstr "Effectuée"
 
-#: ../src/todo.c:76
+#: ../src/todo.c:79
 msgid "Title"
 msgstr "Titre"
 
-#: ../src/todo.c:78
+#: ../src/todo.c:81
 msgid "Beginning"
 msgstr "Départ"
 
-#: ../src/todo.c:79
+#: ../src/todo.c:82
 msgid "Completion"
 msgstr "Fin"
 
-#: ../src/todo.c:89
+#: ../src/todo.c:92
 msgid "Unknown"
 msgstr "Inconnue"
 
-#: ../src/todo.c:90
+#: ../src/todo.c:93
 msgid "Low"
 msgstr "Faible"
 
-#: ../src/todo.c:91
+#: ../src/todo.c:94
 msgid "Medium"
 msgstr "Moyenne"
 
-#: ../src/todo.c:92
+#: ../src/todo.c:95
 msgid "High"
 msgstr "Haute"
 
-#: ../src/todo.c:93
+#: ../src/todo.c:96
 msgid "Urgent"
 msgstr "Urgent"
 
-#: ../src/todo.c:109
+#: ../src/todo.c:112
 msgid "_New"
 msgstr "_Nouvelle"
 
-#: ../src/todo.c:111 ../src/todo.c:156
+#: ../src/todo.c:114 ../src/todo.c:159
 msgid "_Edit"
 msgstr "Modifier"
 
-#: ../src/todo.c:114
+#: ../src/todo.c:117
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../src/todo.c:120
+#: ../src/todo.c:123
 msgid "Select _all"
 msgstr "Sélectionner _tout"
 
-#: ../src/todo.c:128
+#: ../src/todo.c:131
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../src/todo.c:130
+#: ../src/todo.c:133
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/todo.c:136
+#: ../src/todo.c:139
 msgid "_All tasks"
 msgstr "_Toutes les tâches"
 
-#: ../src/todo.c:137
+#: ../src/todo.c:140
 msgid "_Completed tasks"
 msgstr "Tâches _complétées"
 
-#: ../src/todo.c:139
+#: ../src/todo.c:142
 msgid "_Remaining tasks"
 msgstr "Tâches _restantes"
 
-#: ../src/todo.c:145
+#: ../src/todo.c:148
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/todo.c:155
+#: ../src/todo.c:158
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/todo.c:157
+#: ../src/todo.c:160
 msgid "_View"
 msgstr "_Vue"
 
-#: ../src/todo.c:158
+#: ../src/todo.c:161
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/todo.c:166 ../src/todo.c:499
+#: ../src/todo.c:169 ../src/todo.c:502
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: ../src/todo.c:167
+#: ../src/todo.c:170
 msgid "Edit task"
 msgstr "Modifier la tâche"
 
-#: ../src/todo.c:170 ../src/todo.c:173
+#: ../src/todo.c:173 ../src/todo.c:176
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: ../src/todo.c:176
+#: ../src/todo.c:179
 msgid "Delete task"
 msgstr "Supprimer la tâche"
 
-#: ../src/todo.c:180
+#: ../src/todo.c:183
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../src/todo.c:226
+#: ../src/todo.c:229
 msgid "Todo"
 msgstr "Todo"
 
-#: ../src/todo.c:237
+#: ../src/todo.c:240
 msgid "View as..."
 msgstr "Vue de..."
 
-#: ../src/todo.c:241
+#: ../src/todo.c:244
 msgid "All tasks"
 msgstr "Toutes les tâches"
 
-#: ../src/todo.c:245
+#: ../src/todo.c:248
 msgid "Completed tasks"
 msgstr "Tâches complétées"
 
-#: ../src/todo.c:249
+#: ../src/todo.c:252
 msgid "Remaining tasks"
 msgstr "Tâches restantes"
 
-#: ../src/todo.c:359
+#: ../src/todo.c:362
 msgid "Priority"
 msgstr "Priorité"
 
-#: ../src/todo.c:452 ../src/todo.c:457
+#: ../src/todo.c:455 ../src/todo.c:460
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/todo.c:552
+#: ../src/todo.c:555
 msgid "Are you sure you want to delete the selected task(s)?"
 msgstr "Voulez-vous vraiment supprimer la sélection?"
 
-#: ../src/todo.c:641
+#: ../src/todo.c:644
 msgid "Time: "
 msgstr "Heure: "
 
-#: ../src/todo.c:650 ../src/todo.c:659
+#: ../src/todo.c:653 ../src/todo.c:662
 msgid ":"
 msgstr ":"
 
-#: ../src/todo.c:1028 ../src/todo.c:1033
+#: ../src/todo.c:1031 ../src/todo.c:1036
 msgid "Question"
 msgstr "Question"

src/callbacks.c

@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2010 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop Todo */
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,10 +21,8 @@
 
 /* callbacks */
 /* on_closex */
-gboolean on_closex(gpointer data)
+gboolean on_closex(void)
 {
-	Todo * todo = data;
-
 	gtk_main_quit();
 	return FALSE;
 }
@@ -34,9 +32,7 @@ gboolean on_closex(gpointer data)
 /* on_file_close */
 void on_file_close(gpointer data)
 {
-	Todo * todo = data;
+	on_closex();
-
-	on_closex(todo);
 }
 
 
@@ -73,7 +69,7 @@ void on_edit_preferences(gpointer data)
 {
 	Todo * todo = data;
 
-	/* FIXME implement */
+	on_preferences(todo);
 }
 
 

src/callbacks.h

@@ -22,7 +22,7 @@
 
 
 /* callbacks */
-gboolean on_closex(gpointer data);
+gboolean on_closex(void);
 
 /* menus */
 /* file menu */

src/taskedit.c

@@ -34,7 +34,9 @@ struct _TaskEdit
 	GtkWidget * window;
 	GtkWidget * title;
 	GtkWidget * priority;
+#if 0 /* XXX disabled for now */
 	GtkWidget * description;
+#endif
 };
 
 
@@ -51,11 +53,13 @@ TaskEdit * taskedit_new(Todo * todo, Task * task)
 	GtkSizeGroup * group;
 	GtkWidget * vbox;
 	GtkWidget * hbox;
-	GtkWidget * scrolled;
 	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;
@@ -91,6 +95,7 @@ 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);
@@ -108,6 +113,7 @@ 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_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 4);
@@ -137,21 +143,25 @@ 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);

src/todo.c

@@ -14,6 +14,9 @@ static char const _license[] =
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n";
+/* TODO:
+ * - handle when the time/date is not set yet
+ * - add a clear/apply button (allocate a temporary object) */
 
 
 
@@ -221,11 +224,11 @@ Todo * todo_new(void)
 	group = gtk_accel_group_new();
 	todo->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_add_accel_group(GTK_WINDOW(todo->window), group);
-	gtk_window_set_default_size(GTK_WINDOW(todo->window), 300, 400);
+	gtk_window_set_default_size(GTK_WINDOW(todo->window), 640, 480);
 	gtk_window_set_icon_name(GTK_WINDOW(todo->window), "todo");
 	gtk_window_set_title(GTK_WINDOW(todo->window), _("Todo"));
 	g_signal_connect_swapped(G_OBJECT(todo->window), "delete-event",
-			G_CALLBACK(on_closex), todo);
+			G_CALLBACK(on_closex), NULL);
 	vbox = gtk_vbox_new(FALSE, 0);
 #ifndef EMBEDDED
 	/* menubar */