From adba504c23874aa85a3ab8e72c9c8dd49aed79ec Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 16 Mar 2004 22:21:01 +0000 Subject: new dialog for allowing the user to select a source. 2004-03-16 Rodrigo Moya * gui/dialogs/select-source-dialog.[ch]: new dialog for allowing the user to select a source. * gui/dialogs/copy-source-dialog.c (copy_source_dialog): use the select_source_dialog function to ask user for the source to use. (source_selected_cb): removed unneeded function. * gui/dialogs/Makefile.am: added new files. svn path=/trunk/; revision=25093 --- calendar/gui/dialogs/copy-source-dialog.c | 78 ++++--------------------------- 1 file changed, 9 insertions(+), 69 deletions(-) (limited to 'calendar/gui/dialogs/copy-source-dialog.c') diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index 936ed6e66a..11768525c3 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -18,43 +18,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include #include -#include #include -#include #include "copy-source-dialog.h" +#include "select-source-dialog.h" #include "common/authentication.h" typedef struct { - GtkWidget *dialog; - GtkWidget *selector; - ESourceList *source_list; - GConfClient *conf_client; ESource *orig_source; ECalSourceType obj_type; ESource *selected_source; } CopySourceDialogData; -static void -source_selected_cb (ESourceOptionMenu *menu, ESource *selected_source, gpointer user_data) -{ - CopySourceDialogData *csdd = user_data; - - csdd->selected_source = selected_source; - if (selected_source) { - if (selected_source != csdd->orig_source) - gtk_dialog_set_response_sensitive (GTK_DIALOG (csdd->dialog), GTK_RESPONSE_OK, TRUE); - else { - gtk_dialog_set_response_sensitive (GTK_DIALOG (csdd->dialog), GTK_RESPONSE_OK, FALSE); - csdd->selected_source = NULL; - } - } else - gtk_dialog_set_response_sensitive (GTK_DIALOG (csdd->dialog), GTK_RESPONSE_OK, FALSE); -} - static void show_error (GtkWindow *parent, const char *msg) { @@ -80,7 +55,7 @@ copy_source (CopySourceDialogData *csdd) /* open the source */ source_client = auth_new_cal_from_source (csdd->orig_source, csdd->obj_type); if (!e_cal_open (source_client, TRUE, NULL)) { - show_error (GTK_WINDOW (csdd->dialog), _("Could not open source")); + show_error (NULL, _("Could not open source")); g_object_unref (source_client); return FALSE; } @@ -88,7 +63,7 @@ copy_source (CopySourceDialogData *csdd) /* open the destination */ dest_client = auth_new_cal_from_source (csdd->selected_source, csdd->obj_type); if (!e_cal_open (dest_client, FALSE, NULL)) { - show_error (GTK_WINDOW (csdd->dialog), _("Could not open destination")); + show_error (NULL, _("Could not open destination")); g_object_unref (dest_client); g_object_unref (source_client); return FALSE; @@ -97,7 +72,7 @@ copy_source (CopySourceDialogData *csdd) /* check if the destination is read only */ e_cal_is_read_only (dest_client, &read_only, NULL); if (read_only) { - show_error (GTK_WINDOW (csdd->dialog), _("Destination is read only")); + show_error (NULL, _("Destination is read only")); } else { if (e_cal_get_object_list (source_client, "#t", &obj_list, NULL)) { GList *l; @@ -138,55 +113,20 @@ copy_source_dialog (GtkWindow *parent, ESource *source, ECalSourceType obj_type) { CopySourceDialogData csdd; gboolean result = FALSE; - const char *gconf_key; - GtkWidget *label; - gchar *label_text; g_return_val_if_fail (E_IS_SOURCE (source), FALSE); - if (obj_type == E_CAL_SOURCE_TYPE_EVENT) - gconf_key = "/apps/evolution/calendar/sources"; - else if (obj_type == E_CAL_SOURCE_TYPE_TODO) - gconf_key = "/apps/evolution/tasks/sources"; - else - return FALSE; - csdd.orig_source = source; csdd.selected_source = NULL; csdd.obj_type = obj_type; - /* create the dialog */ - csdd.dialog = gtk_dialog_new_with_buttons (_("Copy"), parent, 0, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_response_sensitive (GTK_DIALOG (csdd.dialog), GTK_RESPONSE_OK, FALSE); - - label_text = g_strdup_printf (_("Select destination %s"), - obj_type == E_CAL_SOURCE_TYPE_EVENT ? - _("calendar") : _("task list")); - label = gtk_label_new (label_text); - g_free (label_text); - - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (csdd.dialog)->vbox), label, FALSE, FALSE, 6); - - csdd.conf_client = gconf_client_get_default (); - csdd.source_list = e_source_list_new_for_gconf (csdd.conf_client, gconf_key); - csdd.selector = e_source_option_menu_new (csdd.source_list); - g_signal_connect (G_OBJECT (csdd.selector), "source_selected", - G_CALLBACK (source_selected_cb), &csdd); - gtk_widget_show (csdd.selector); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (csdd.dialog)->vbox), csdd.selector, FALSE, FALSE, 6); - - if (gtk_dialog_run (GTK_DIALOG (csdd.dialog)) == GTK_RESPONSE_OK) { + csdd.selected_source = select_source_dialog (parent, obj_type); + if (csdd.selected_source) { result = copy_source (&csdd); - } - /* free memory */ - g_object_unref (csdd.conf_client); - g_object_unref (csdd.source_list); - gtk_widget_destroy (csdd.dialog); + /* free memory */ + g_object_unref (csdd.selected_source); + } return result; } -- cgit v1.2.3