From f8bb752e44d08b9975931fa7edb6d49da95df96f Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 24 Nov 2003 10:13:24 +0000 Subject: new files containing the implementation of the 'New Task List' dialog. 2003-11-24 Rodrigo Moya * gui/dialogs/new-task-list.glade: * gui/dialogs/new-task-list.[ch]: new files containing the implementation of the 'New Task List' dialog. * gui/dialogs/Makefile.am: added new files. * gui/dialogs/new-calendar.c (new_calendar_dialog): use G_STRLOC for g_warning messages. * gui/tasks-component.c (new_task_list_cb): implemented. svn path=/trunk/; revision=23478 --- calendar/ChangeLog | 13 +++ calendar/gui/dialogs/Makefile.am | 3 + calendar/gui/dialogs/new-calendar.c | 4 +- calendar/gui/dialogs/new-task-list.c | 145 +++++++++++++++++++++++ calendar/gui/dialogs/new-task-list.glade | 193 +++++++++++++++++++++++++++++++ calendar/gui/dialogs/new-task-list.h | 28 +++++ calendar/gui/tasks-component.c | 2 + 7 files changed, 385 insertions(+), 3 deletions(-) create mode 100644 calendar/gui/dialogs/new-task-list.c create mode 100644 calendar/gui/dialogs/new-task-list.glade create mode 100644 calendar/gui/dialogs/new-task-list.h diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a580641a17..b0de5f4a00 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,16 @@ +2003-11-24 Rodrigo Moya + + * gui/dialogs/new-task-list.glade: + * gui/dialogs/new-task-list.[ch]: new files containing the + implementation of the 'New Task List' dialog. + + * gui/dialogs/Makefile.am: added new files. + + * gui/dialogs/new-calendar.c (new_calendar_dialog): use G_STRLOC + for g_warning messages. + + * gui/tasks-component.c (new_task_list_cb): implemented. + 2003-11-24 Rodrigo Moya * gui/dialogs/copy-source-dialog.c (copy_source_dialog): actually diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index bd81bb4229..7e3b76fd97 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -63,6 +63,8 @@ libcal_dialogs_la_SOURCES = \ meeting-page.h \ new-calendar.c \ new-calendar.h \ + new-task-list.c \ + new-task-list.h \ recurrence-page.c \ recurrence-page.h \ recur-comp.c \ @@ -88,6 +90,7 @@ glade_DATA = \ event-page.glade \ meeting-page.glade \ new-calendar.glade \ + new-task-list.glade \ recurrence-page.glade \ schedule-page.glade \ task-details-page.glade \ diff --git a/calendar/gui/dialogs/new-calendar.c b/calendar/gui/dialogs/new-calendar.c index 4010339a2a..5cbbd99516 100644 --- a/calendar/gui/dialogs/new-calendar.c +++ b/calendar/gui/dialogs/new-calendar.c @@ -201,7 +201,7 @@ new_calendar_dialog (GtkWindow *parent) /* load the Glade file */ xml = glade_xml_new (EVOLUTION_GLADEDIR "/new-calendar.glade", "new-calendar-dialog", NULL); if (!xml) { - g_warning ("new_calendar_dialog(): cannot load Glade file"); + g_warning (G_STRLOC ": cannot load Glade file"); return FALSE; } @@ -262,8 +262,6 @@ new_calendar_dialog (GtkWindow *parent) g_object_unref (gconf_client); g_object_unref (source_list); gtk_widget_destroy (dialog); - - /* free memory */ g_object_unref (xml); return result; diff --git a/calendar/gui/dialogs/new-task-list.c b/calendar/gui/dialogs/new-task-list.c new file mode 100644 index 0000000000..e77d35d4ad --- /dev/null +++ b/calendar/gui/dialogs/new-task-list.c @@ -0,0 +1,145 @@ +/* Evolution calendar - New task list dialog + * + * Copyright (C) 2003 Novell, Inc. + * + * Author: Rodrigo Moya + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "new-task-list.h" + +static gboolean +create_new_source_with_group (GtkWindow *parent, + ESourceGroup *group, + const char *source_name) +{ + ESource *source; + char *new_dir; + + if (e_source_group_peek_source_by_name (group, source_name)) { + e_notice (parent, GTK_MESSAGE_ERROR, + _("Source with name '%s' already exists in the selected group"), + source_name); + return FALSE; + } + + new_dir = g_build_filename (e_source_group_peek_base_uri (group), + source_name, NULL); + if (e_mkdir_hier (new_dir, 0700)) { + g_free (new_dir); + e_notice (parent, GTK_MESSAGE_ERROR, + _("Could not create directory for new task list")); + return FALSE; + } + + source = e_source_new (source_name, source_name); + g_free (new_dir); + + e_source_group_add_source (group, source, -1); + return TRUE; +} + +/** + * new_task_list_dialog + * + * Displays a dialog that allows the user to create a new task list. + */ +gboolean +new_task_list_dialog (GtkWindow *parent) +{ + GtkWidget *dialog, *task_group, *task_name; + GladeXML *xml; + ESourceList *source_list; + GConfClient *gconf_client; + GSList *groups, *sl; + gboolean result = FALSE, retry = TRUE; + + /* load the Glade file */ + xml = glade_xml_new (EVOLUTION_GLADEDIR "/new-task-list.glade", "new-task-list-dialog", NULL); + if (!xml) { + g_warning (G_STRLOC ": cannot load Glade file"); + return FALSE; + } + + dialog = glade_xml_get_widget (xml, "new-task-list-dialog"); + task_group = glade_xml_get_widget (xml, "task-list-group"); + task_name = glade_xml_get_widget (xml, "task-list-name"); + + /* set up widgets */ + gconf_client = gconf_client_get_default (); + source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/tasks/sources"); + + groups = e_source_list_peek_groups (source_list); + for (sl = groups; sl != NULL; sl = sl->next) { + GtkWidget *menu_item, *menu; + ESourceGroup *group = sl->data; + + menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (task_group)); + if (!GTK_IS_MENU (menu)) { + menu = gtk_menu_new (); + gtk_option_menu_set_menu (GTK_OPTION_MENU (task_group), menu); + gtk_widget_show (menu); + } + + menu_item = gtk_menu_item_new_with_label (e_source_group_peek_name (group)); + gtk_widget_show (menu_item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + } + + if (groups) + gtk_option_menu_set_history (GTK_OPTION_MENU (task_group), 0); + + /* run the dialog */ + do { + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { + const char *name; + + name = gtk_entry_get_text (GTK_ENTRY (task_name)); + sl = g_slist_nth (groups, gtk_option_menu_get_history (GTK_OPTION_MENU (task_group))); + if (sl) { + if (create_new_source_with_group (GTK_WINDOW (dialog), + sl->data, + name)) + retry = FALSE; + } else { + e_notice (dialog, GTK_MESSAGE_ERROR, + _("A group must be selected")); + continue; + } + } else + retry = FALSE; /* user pressed Cancel */ + } while (retry); + + /* free memory */ + g_object_unref (gconf_client); + g_object_unref (source_list); + gtk_widget_destroy (dialog); + g_object_unref (xml); + + return result; +} diff --git a/calendar/gui/dialogs/new-task-list.glade b/calendar/gui/dialogs/new-task-list.glade new file mode 100644 index 0000000000..ffc38582c8 --- /dev/null +++ b/calendar/gui/dialogs/new-task-list.glade @@ -0,0 +1,193 @@ + + + + + + + + 12 + True + Add New Task List + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + False + False + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + 3 + 3 + False + 6 + 6 + + + + True + Task List Group + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 1 + 2 + 6 + fill + + + + + + + True + True + -1 + + + 2 + 3 + 1 + 2 + 6 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 3 + 2 + 3 + 6 + + + + + + + True + <b>Task List Options</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 3 + 0 + 1 + 6 + + + + + + + True + Task List Name + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 2 + 3 + 6 + fill + + + + + + 4 + True + True + + + + + + + diff --git a/calendar/gui/dialogs/new-task-list.h b/calendar/gui/dialogs/new-task-list.h new file mode 100644 index 0000000000..3f529f39ad --- /dev/null +++ b/calendar/gui/dialogs/new-task-list.h @@ -0,0 +1,28 @@ +/* Evolution calendar - New task list dialog + * + * Copyright (C) 2003 Novell, Inc. + * + * Author: Rodrigo Moya + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef NEW_TASK_LIST_H +#define NEW_TASK_LIST_H + +#include + +gboolean new_task_list_dialog (GtkWindow *parent); + +#endif diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 5946bd2cfe..0045c66848 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -41,6 +41,7 @@ #include "calendar-config.h" #include "dialogs/comp-editor.h" #include "dialogs/copy-source-dialog.h" +#include "dialogs/new-task-list.h" #include "dialogs/task-editor.h" #include "widgets/misc/e-source-selector.h" @@ -351,6 +352,7 @@ delete_task_list_cb (GtkWidget *widget, TasksComponent *comp) static void new_task_list_cb (GtkWidget *widget, TasksComponent *component) { + new_task_list_dialog (GTK_WINDOW (gtk_widget_get_toplevel (widget))); } static void -- cgit v1.2.3