aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/calendar.c14
-rw-r--r--calendar/gncal-todo.c199
-rw-r--r--calendar/gui/calendar.c14
-rw-r--r--calendar/gui/gncal-todo.c199
5 files changed, 353 insertions, 80 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ecf72c4e81..6e5078a039 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+1998-04-23 Federico Mena Quintero <federico@nuclecu.unam.mx>
+
+ * calendar.c (calendar_save): Actually save the to-do entries.
+
+ * gncal-todo.c (simple_todo_editor): Now you can add and edit
+ to-do entries.
+
1998-04-22 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gncal-full-day.c: Made it use popup_menu().
diff --git a/calendar/calendar.c b/calendar/calendar.c
index f56ff082c8..dc480e3dfd 100644
--- a/calendar/calendar.c
+++ b/calendar/calendar.c
@@ -320,12 +320,24 @@ calendar_save (Calendar *cal, char *fname)
addPropValue (vcal, VCVersionProp, VERSION);
cal->temp = vcal;
- for (l = cal->events; l; l = l->next){
+ /* Events */
+
+ for (l = cal->events; l; l = l->next) {
VObject *obj;
obj = ical_object_to_vobject ((iCalObject *) l->data);
addVObjectProp (vcal, obj);
}
+
+ /* To-do entries */
+
+ for (l = cal->todo; l; l = l->next) {
+ VObject *obj;
+
+ obj = ical_object_to_vobject ((iCalObject *) l->data);
+ addVObjectProp (vcal, obj);
+ }
+
writeVObjectToFile (fname, vcal);
cleanVObject (vcal);
cleanStrTbl ();
diff --git a/calendar/gncal-todo.c b/calendar/gncal-todo.c
index 7b39aef35b..01da675d15 100644
--- a/calendar/gncal-todo.c
+++ b/calendar/gncal-todo.c
@@ -5,8 +5,12 @@
* Author: Federico Mena <quartic@gimp.org>
*/
+#include <config.h>
#include <string.h>
+#include <gnome.h>
#include "gncal-todo.h"
+#include "main.h"
+#include "popup-menu.h"
static void gncal_todo_init (GncalTodo *todo);
@@ -35,26 +39,167 @@ gncal_todo_get_type (void)
}
static void
+ok_button (GtkWidget *widget, GnomeDialog *dialog)
+{
+ iCalObject *ico;
+ GncalTodo *todo;
+ GtkEntry *entry;
+
+ ico = gtk_object_get_user_data (GTK_OBJECT (dialog));
+
+ todo = GNCAL_TODO (gtk_object_get_data (GTK_OBJECT (dialog), "gncal_todo"));
+ entry = GTK_ENTRY (gtk_object_get_data (GTK_OBJECT (dialog), "summary_entry"));
+
+ if (ico->summary)
+ g_free (ico->summary);
+
+ ico->summary = g_strdup (gtk_entry_get_text (entry));
+ ico->user_data = NULL;
+
+ if (ico->new) {
+ gnome_calendar_add_object (todo->calendar, ico);
+ ico->new = FALSE;
+ } else
+ gnome_calendar_object_changed (todo->calendar, ico, CHANGE_ALL); /* ok, summary only... */
+
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+cancel_button (GtkWidget *widget, GnomeDialog *dialog)
+{
+ iCalObject *ico;
+
+ ico = gtk_object_get_user_data (GTK_OBJECT (dialog));
+
+ ico->user_data = NULL;
+
+ if (ico->new)
+ ical_object_destroy (ico);
+
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static gint
+delete_event (GtkWidget *widget, GdkEvent *event, GnomeDialog *dialog)
+{
+ cancel_button (NULL, dialog);
+ return TRUE;
+}
+
+static void
+simple_todo_editor (GncalTodo *todo, iCalObject *ico)
+{
+ GtkWidget *dialog;
+ GtkWidget *hbox;
+ GtkWidget *w;
+ GtkWidget *entry;
+
+ dialog = gnome_dialog_new (ico->new ? _("Create to-do item") : _("Edit to-do item"),
+ GNOME_STOCK_BUTTON_OK,
+ GNOME_STOCK_BUTTON_CANCEL,
+ NULL);
+
+ hbox = gtk_hbox_new (FALSE, 4);
+ gtk_container_border_width (GTK_CONTAINER (hbox), 4);
+ gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ w = gtk_label_new (_("Summary:"));
+ gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
+ gtk_widget_show (w);
+
+ entry = gtk_entry_new ();
+ gtk_entry_set_text (GTK_ENTRY (entry), ico->summary);
+ gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+ gtk_widget_show (entry);
+
+ ico->user_data = dialog;
+
+ gtk_object_set_user_data (GTK_OBJECT (dialog), ico);
+
+ gtk_object_set_data (GTK_OBJECT (dialog), "gncal_todo", todo);
+ gtk_object_set_data (GTK_OBJECT (dialog), "summary_entry", entry);
+
+ gnome_dialog_button_connect (GNOME_DIALOG (dialog), 0, (GtkSignalFunc) ok_button, dialog);
+ gnome_dialog_button_connect (GNOME_DIALOG (dialog), 1, (GtkSignalFunc) cancel_button, dialog);
+ gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
+ (GtkSignalFunc) delete_event,
+ dialog);
+
+ gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
+
+ gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+ gtk_widget_show (dialog);
+ gtk_widget_grab_focus (entry);
+}
+
+static iCalObject *
+get_clist_selected_ico (GtkCList *clist)
+{
+ gint sel;
+
+ if (!clist->selection)
+ return NULL;
+
+ sel = (gint) clist->selection->data;
+
+ return gtk_clist_get_row_data (clist, sel);
+}
+
+static void
add_todo (GncalTodo *todo)
{
- /* FIXME */
+ iCalObject *ico;
+
+ ico = ical_new ("", user_name, "");
+ ico->type = ICAL_TODO;
+ ico->new = TRUE;
+
+ simple_todo_editor (todo, ico);
}
static void
edit_todo (GncalTodo *todo)
{
- /* FIXME */
+ simple_todo_editor (todo, get_clist_selected_ico (todo->clist));
}
static void
delete_todo (GncalTodo *todo)
{
- /* FIXME */
+ gnome_calendar_remove_object (todo->calendar, get_clist_selected_ico (todo->clist));
+}
+
+static void
+add_activated (GtkWidget *widget, GncalTodo *todo)
+{
+ add_todo (todo);
+}
+
+static void
+edit_activated (GtkWidget *widget, GncalTodo *todo)
+{
+ edit_todo (todo);
+}
+
+static void
+delete_activated (GtkWidget *widget, GncalTodo *todo)
+{
+ delete_todo (todo);
}
static void
clist_row_selected (GtkCList *clist, gint row, gint column, GdkEventButton *event, GncalTodo *todo)
{
+ static struct menu_item items[] = {
+ { N_("Add to-do item..."), (GtkSignalFunc) add_activated, NULL, TRUE },
+ { N_("Edit this item..."), (GtkSignalFunc) edit_activated, NULL, TRUE },
+ { N_("Delete this item"), (GtkSignalFunc) delete_activated, NULL, TRUE }
+ };
+
+ int i;
+
if (!event)
return;
@@ -65,7 +210,10 @@ clist_row_selected (GtkCList *clist, gint row, gint column, GdkEventButton *even
break;
case 3:
- /* FIXME: popup menu */
+ for (i = 0; i < (sizeof (items) / sizeof (items[0])); i++)
+ items[i].data = todo;
+
+ popup_menu (items, sizeof (items) / sizeof (items[0]), event);
break;
default:
@@ -74,27 +222,8 @@ clist_row_selected (GtkCList *clist, gint row, gint column, GdkEventButton *even
}
static void
-add_button_clicked (GtkWidget *widget, GncalTodo *todo)
-{
- add_todo (todo);
-}
-
-static void
-edit_button_clicked (GtkWidget *widget, GncalTodo *todo)
-{
- edit_todo (todo);
-}
-
-static void
-delete_button_clicked (GtkWidget *widget, GncalTodo *todo)
-{
- delete_todo (todo);
-}
-
-static void
gncal_todo_init (GncalTodo *todo)
{
- char *titles[] = { _("Done"), _("Pri"), _("Summary") };
GtkWidget *w;
GtkWidget *hbox;
@@ -109,11 +238,9 @@ gncal_todo_init (GncalTodo *todo)
/* Clist */
- w = gtk_clist_new_with_titles (3, titles);
+ w = gtk_clist_new (1);
todo->clist = GTK_CLIST (w);
- gtk_clist_set_column_width (todo->clist, 0, 30); /* eek */
- gtk_clist_set_column_width (todo->clist, 1, 20); /* eek */
gtk_clist_set_policy (todo->clist, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_clist_set_selection_mode (todo->clist, GTK_SELECTION_BROWSE);
@@ -134,7 +261,7 @@ gncal_todo_init (GncalTodo *todo)
w = gtk_button_new_with_label (_("Add..."));
gtk_signal_connect (GTK_OBJECT (w), "clicked",
- (GtkSignalFunc) add_button_clicked,
+ (GtkSignalFunc) add_activated,
todo);
gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
gtk_widget_show (w);
@@ -145,7 +272,7 @@ gncal_todo_init (GncalTodo *todo)
todo->edit_button = w;
gtk_widget_set_sensitive (w, FALSE);
gtk_signal_connect (GTK_OBJECT (w), "clicked",
- (GtkSignalFunc) edit_button_clicked,
+ (GtkSignalFunc) edit_activated,
todo);
gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
gtk_widget_show (w);
@@ -156,7 +283,7 @@ gncal_todo_init (GncalTodo *todo)
todo->delete_button = w;
gtk_widget_set_sensitive (w, FALSE);
gtk_signal_connect (GTK_OBJECT (w), "clicked",
- (GtkSignalFunc) delete_button_clicked,
+ (GtkSignalFunc) delete_activated,
todo);
gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
gtk_widget_show (w);
@@ -182,18 +309,12 @@ static void
insert_in_clist (GncalTodo *todo, iCalObject *ico)
{
int i;
- char buf[20];
- char *text[3] = { NULL, NULL, ico->summary };
+ char *text[1] = { ico->summary };
iCalObject *row_ico;
- if (ico->priority == 0) {
- strcpy (buf, "?"); /* undefined priority */
- text[1] = buf;
-
- i = gtk_clist_append (todo->clist, text);
- } else {
- sprintf (buf, "%d", ico->priority);
- text[1] = buf;
+ if (ico->priority == 0)
+ i = gtk_clist_append (todo->clist, text); /* items with undefined priority go to the end of the list */
+ else {
/* Find proper place in clist to insert object. Objects are sorted by priority. */
diff --git a/calendar/gui/calendar.c b/calendar/gui/calendar.c
index f56ff082c8..dc480e3dfd 100644
--- a/calendar/gui/calendar.c
+++ b/calendar/gui/calendar.c
@@ -320,12 +320,24 @@ calendar_save (Calendar *cal, char *fname)
addPropValue (vcal, VCVersionProp, VERSION);
cal->temp = vcal;
- for (l = cal->events; l; l = l->next){
+ /* Events */
+
+ for (l = cal->events; l; l = l->next) {
VObject *obj;
obj = ical_object_to_vobject ((iCalObject *) l->data);
addVObjectProp (vcal, obj);
}
+
+ /* To-do entries */
+
+ for (l = cal->todo; l; l = l->next) {
+ VObject *obj;
+
+ obj = ical_object_to_vobject ((iCalObject *) l->data);
+ addVObjectProp (vcal, obj);
+ }
+
writeVObjectToFile (fname, vcal);
cleanVObject (vcal);
cleanStrTbl ();
diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c
index 7b39aef35b..01da675d15 100644
--- a/calendar/gui/gncal-todo.c
+++ b/calendar/gui/gncal-todo.c
@@ -5,8 +5,12 @@
* Author: Federico Mena <quartic@gimp.org>
*/
+#include <config.h>
#include <string.h>
+#include <gnome.h>
#include "gncal-todo.h"
+#include "main.h"
+#include "popup-menu.h"
static void gncal_todo_init (GncalTodo *todo);
@@ -35,26 +39,167 @@ gncal_todo_get_type (void)
}
static void
+ok_button (GtkWidget *widget, GnomeDialog *dialog)
+{
+ iCalObject *ico;
+ GncalTodo *todo;
+ GtkEntry *entry;
+
+ ico = gtk_object_get_user_data (GTK_OBJECT (dialog));
+
+ todo = GNCAL_TODO (gtk_object_get_data (GTK_OBJECT (dialog), "gncal_todo"));
+ entry = GTK_ENTRY (gtk_object_get_data (GTK_OBJECT (dialog), "summary_entry"));
+
+ if (ico->summary)
+ g_free (ico->summary);
+
+ ico->summary = g_strdup (gtk_entry_get_text (entry));
+ ico->user_data = NULL;
+
+ if (ico->new) {
+ gnome_calendar_add_object (todo->calendar, ico);
+ ico->new = FALSE;
+ } else
+ gnome_calendar_object_changed (todo->calendar, ico, CHANGE_ALL); /* ok, summary only... */
+
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+cancel_button (GtkWidget *widget, GnomeDialog *dialog)
+{
+ iCalObject *ico;
+
+ ico = gtk_object_get_user_data (GTK_OBJECT (dialog));
+
+ ico->user_data = NULL;
+
+ if (ico->new)
+ ical_object_destroy (ico);
+
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static gint
+delete_event (GtkWidget *widget, GdkEvent *event, GnomeDialog *dialog)
+{
+ cancel_button (NULL, dialog);
+ return TRUE;
+}
+
+static void
+simple_todo_editor (GncalTodo *todo, iCalObject *ico)
+{
+ GtkWidget *dialog;
+ GtkWidget *hbox;
+ GtkWidget *w;
+ GtkWidget *entry;
+
+ dialog = gnome_dialog_new (ico->new ? _("Create to-do item") : _("Edit to-do item"),
+ GNOME_STOCK_BUTTON_OK,
+ GNOME_STOCK_BUTTON_CANCEL,
+ NULL);
+
+ hbox = gtk_hbox_new (FALSE, 4);
+ gtk_container_border_width (GTK_CONTAINER (hbox), 4);
+ gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ w = gtk_label_new (_("Summary:"));
+ gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
+ gtk_widget_show (w);
+
+ entry = gtk_entry_new ();
+ gtk_entry_set_text (GTK_ENTRY (entry), ico->summary);
+ gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+ gtk_widget_show (entry);
+
+ ico->user_data = dialog;
+
+ gtk_object_set_user_data (GTK_OBJECT (dialog), ico);
+
+ gtk_object_set_data (GTK_OBJECT (dialog), "gncal_todo", todo);
+ gtk_object_set_data (GTK_OBJECT (dialog), "summary_entry", entry);
+
+ gnome_dialog_button_connect (GNOME_DIALOG (dialog), 0, (GtkSignalFunc) ok_button, dialog);
+ gnome_dialog_button_connect (GNOME_DIALOG (dialog), 1, (GtkSignalFunc) cancel_button, dialog);
+ gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
+ (GtkSignalFunc) delete_event,
+ dialog);
+
+ gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
+
+ gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+ gtk_widget_show (dialog);
+ gtk_widget_grab_focus (entry);
+}
+
+static iCalObject *
+get_clist_selected_ico (GtkCList *clist)
+{
+ gint sel;
+
+ if (!clist->selection)
+ return NULL;
+
+ sel = (gint) clist->selection->data;
+
+ return gtk_clist_get_row_data (clist, sel);
+}
+
+static void
add_todo (GncalTodo *todo)
{
- /* FIXME */
+ iCalObject *ico;
+
+ ico = ical_new ("", user_name, "");
+ ico->type = ICAL_TODO;
+ ico->new = TRUE;
+
+ simple_todo_editor (todo, ico);
}
static void
edit_todo (GncalTodo *todo)
{
- /* FIXME */
+ simple_todo_editor (todo, get_clist_selected_ico (todo->clist));
}
static void
delete_todo (GncalTodo *todo)
{
- /* FIXME */
+ gnome_calendar_remove_object (todo->calendar, get_clist_selected_ico (todo->clist));
+}
+
+static void
+add_activated (GtkWidget *widget, GncalTodo *todo)
+{
+ add_todo (todo);
+}
+
+static void
+edit_activated (GtkWidget *widget, GncalTodo *todo)
+{
+ edit_todo (todo);
+}
+
+static void
+delete_activated (GtkWidget *widget, GncalTodo *todo)
+{
+ delete_todo (todo);
}
static void
clist_row_selected (GtkCList *clist, gint row, gint column, GdkEventButton *event, GncalTodo *todo)
{
+ static struct menu_item items[] = {
+ { N_("Add to-do item..."), (GtkSignalFunc) add_activated, NULL, TRUE },
+ { N_("Edit this item..."), (GtkSignalFunc) edit_activated, NULL, TRUE },
+ { N_("Delete this item"), (GtkSignalFunc) delete_activated, NULL, TRUE }
+ };
+
+ int i;
+
if (!event)
return;
@@ -65,7 +210,10 @@ clist_row_selected (GtkCList *clist, gint row, gint column, GdkEventButton *even
break;
case 3:
- /* FIXME: popup menu */
+ for (i = 0; i < (sizeof (items) / sizeof (items[0])); i++)
+ items[i].data = todo;
+
+ popup_menu (items, sizeof (items) / sizeof (items[0]), event);
break;
default:
@@ -74,27 +222,8 @@ clist_row_selected (GtkCList *clist, gint row, gint column, GdkEventButton *even
}
static void
-add_button_clicked (GtkWidget *widget, GncalTodo *todo)
-{
- add_todo (todo);
-}
-
-static void
-edit_button_clicked (GtkWidget *widget, GncalTodo *todo)
-{
- edit_todo (todo);
-}
-
-static void
-delete_button_clicked (GtkWidget *widget, GncalTodo *todo)
-{
- delete_todo (todo);
-}
-
-static void
gncal_todo_init (GncalTodo *todo)
{
- char *titles[] = { _("Done"), _("Pri"), _("Summary") };
GtkWidget *w;
GtkWidget *hbox;
@@ -109,11 +238,9 @@ gncal_todo_init (GncalTodo *todo)
/* Clist */
- w = gtk_clist_new_with_titles (3, titles);
+ w = gtk_clist_new (1);
todo->clist = GTK_CLIST (w);
- gtk_clist_set_column_width (todo->clist, 0, 30); /* eek */
- gtk_clist_set_column_width (todo->clist, 1, 20); /* eek */
gtk_clist_set_policy (todo->clist, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_clist_set_selection_mode (todo->clist, GTK_SELECTION_BROWSE);
@@ -134,7 +261,7 @@ gncal_todo_init (GncalTodo *todo)
w = gtk_button_new_with_label (_("Add..."));
gtk_signal_connect (GTK_OBJECT (w), "clicked",
- (GtkSignalFunc) add_button_clicked,
+ (GtkSignalFunc) add_activated,
todo);
gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
gtk_widget_show (w);
@@ -145,7 +272,7 @@ gncal_todo_init (GncalTodo *todo)
todo->edit_button = w;
gtk_widget_set_sensitive (w, FALSE);
gtk_signal_connect (GTK_OBJECT (w), "clicked",
- (GtkSignalFunc) edit_button_clicked,
+ (GtkSignalFunc) edit_activated,
todo);
gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
gtk_widget_show (w);
@@ -156,7 +283,7 @@ gncal_todo_init (GncalTodo *todo)
todo->delete_button = w;
gtk_widget_set_sensitive (w, FALSE);
gtk_signal_connect (GTK_OBJECT (w), "clicked",
- (GtkSignalFunc) delete_button_clicked,
+ (GtkSignalFunc) delete_activated,
todo);
gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
gtk_widget_show (w);
@@ -182,18 +309,12 @@ static void
insert_in_clist (GncalTodo *todo, iCalObject *ico)
{
int i;
- char buf[20];
- char *text[3] = { NULL, NULL, ico->summary };
+ char *text[1] = { ico->summary };
iCalObject *row_ico;
- if (ico->priority == 0) {
- strcpy (buf, "?"); /* undefined priority */
- text[1] = buf;
-
- i = gtk_clist_append (todo->clist, text);
- } else {
- sprintf (buf, "%d", ico->priority);
- text[1] = buf;
+ if (ico->priority == 0)
+ i = gtk_clist_append (todo->clist, text); /* items with undefined priority go to the end of the list */
+ else {
/* Find proper place in clist to insert object. Objects are sorted by priority. */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 08:17:44 +0800