diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-11-11 01:14:07 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-11-11 07:18:11 +0800 |
commit | 3dfdf087fc7657905fc7804b59414ecd3d74028e (patch) | |
tree | 45a5bb547ca73ebaea9c3276860f93df6d417006 /calendar | |
parent | f70ecb0406903e0fdc09bbf1c9a3367c7ba55ec2 (diff) | |
download | gsoc2013-evolution-3dfdf087fc7657905fc7804b59414ecd3d74028e.tar gsoc2013-evolution-3dfdf087fc7657905fc7804b59414ecd3d74028e.tar.gz gsoc2013-evolution-3dfdf087fc7657905fc7804b59414ecd3d74028e.tar.bz2 gsoc2013-evolution-3dfdf087fc7657905fc7804b59414ecd3d74028e.tar.lz gsoc2013-evolution-3dfdf087fc7657905fc7804b59414ecd3d74028e.tar.xz gsoc2013-evolution-3dfdf087fc7657905fc7804b59414ecd3d74028e.tar.zst gsoc2013-evolution-3dfdf087fc7657905fc7804b59414ecd3d74028e.zip |
Kill more redundant save dialogs and related utilities.
Diffstat (limited to 'calendar')
-rw-r--r-- | calendar/gui/dialogs/Makefile.am | 3 | ||||
-rw-r--r-- | calendar/gui/dialogs/cal-attachment-select-file.c | 162 | ||||
-rw-r--r-- | calendar/gui/dialogs/cal-attachment-select-file.h | 36 | ||||
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 1 |
4 files changed, 0 insertions, 202 deletions
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index fb745fd9dc..d09c906b13 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -24,7 +24,6 @@ ecalendarinclude_HEADERS = \ comp-editor.h \ alarm-dialog.h \ alarm-list-dialog.h \ - cal-attachment-select-file.h \ cal-prefs-dialog.h \ calendar-setup.h \ cancel-comp.h \ @@ -59,8 +58,6 @@ libcal_dialogs_la_SOURCES = \ alarm-dialog.h \ alarm-list-dialog.c \ alarm-list-dialog.h \ - cal-attachment-select-file.c \ - cal-attachment-select-file.h \ cal-prefs-dialog.c \ cal-prefs-dialog.h \ calendar-setup.c \ diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c deleted file mode 100644 index b303a763ce..0000000000 --- a/calendar/gui/dialogs/cal-attachment-select-file.c +++ /dev/null @@ -1,162 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Harish Krishnaswamy <kharish@novell.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -/* Much of this file has been shamelessly copied from the mail attachment - * handling code, including the fixmes. Modifications/Additions that are - * specific to the calendar component have been flagged by some comments - * fwiw */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <gtk/gtk.h> - -#include <glib/gi18n.h> - -#include "cal-attachment-select-file.h" - -enum { - SELECTOR_MODE_MULTI = (1 << 0), - SELECTOR_MODE_SAVE = (1 << 1) -}; - -static GtkWidget* -run_selector(CompEditor *editor, const gchar *title, guint32 flags, gboolean *showinline_p) -{ - GtkWidget *selection; - GtkWidget *showinline = NULL; - gchar *path; - - path = g_object_get_data ((GObject *) editor, "attach_path"); - - if (flags & SELECTOR_MODE_SAVE) - selection = gtk_file_chooser_dialog_new (title, - NULL, - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); - else - selection = gtk_file_chooser_dialog_new (title, - NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_OK, - NULL); - - gtk_dialog_set_default_response (GTK_DIALOG (selection), GTK_RESPONSE_OK); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (selection), FALSE); - - if ((flags & SELECTOR_MODE_SAVE) == 0) - gtk_file_chooser_set_select_multiple ((GtkFileChooser *) selection, (flags & SELECTOR_MODE_MULTI)); - - /* restore last path used */ - if (!path) - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), g_get_home_dir ()); - else - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), path); - - if (showinline_p) { - showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment")); - gtk_widget_show (showinline); - gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (selection), showinline); - } - - gtk_window_set_transient_for ((GtkWindow *) selection, (GtkWindow *) editor); - gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor"); - gtk_window_set_modal ((GtkWindow *) selection, TRUE); - - gtk_window_set_icon_name (GTK_WINDOW (selection), "mail-message-new"); - - if (gtk_dialog_run ((GtkDialog *) selection) == GTK_RESPONSE_OK) { - if (showinline_p) - *showinline_p = gtk_toggle_button_get_active ((GtkToggleButton *) showinline); - - path = g_path_get_dirname (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection))); - - g_object_set_data_full ((GObject *) editor, "attach_path", g_strdup_printf ("%s/", path), g_free); - g_free (path); - } else { - gtk_widget_destroy (selection); - selection = NULL; - } - - return selection; -} - -/** - * comp_editor_select_file: - * @editor: a editor - * @title: the title for the file selection dialog box - * @save_mode: whether the file selection box should be shown in save mode or not - * - * This pops up a file selection dialog box with the given title - * and allows the user to select a file. - * - * Return value: the selected filename, or %NULL if the user - * cancelled. - **/ -gchar * -comp_editor_select_file (CompEditor *editor, const gchar *title, gboolean save_mode) -{ - guint32 flags = save_mode ? SELECTOR_MODE_SAVE : SELECTOR_MODE_MULTI; - GtkWidget *selection; - gchar *name = NULL; - - selection = run_selector (editor, title, flags, NULL); - if (selection) { - name = g_strdup (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection))); - gtk_widget_destroy (selection); - } - - return name; -} - -GPtrArray * -comp_editor_select_file_attachments (CompEditor *editor, gboolean *showinline_p) -{ - GtkWidget *selection; - GPtrArray *list = NULL; - - selection = run_selector (editor, _("Attach file(s)"), SELECTOR_MODE_MULTI, showinline_p); - - if (selection) { - GSList *l, *n; - - if ((l = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (selection)))) { - list = g_ptr_array_new (); - - while (l) { - n = l->next; - g_ptr_array_add (list, l->data); - g_slist_free_1 (l); - l = n; - } - } - - gtk_widget_destroy (selection); - } - - return list; -} - diff --git a/calendar/gui/dialogs/cal-attachment-select-file.h b/calendar/gui/dialogs/cal-attachment-select-file.h deleted file mode 100644 index b69a741007..0000000000 --- a/calendar/gui/dialogs/cal-attachment-select-file.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Harish K <kharish@novell.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef E_MSG_COMPOSER_SELECT_FILE_H -#define E_MSG_COMPOSER_SELECT_FILE_H - -#include "comp-editor.h" - -gchar *comp_editor_select_file (CompEditor *editor, - const gchar *title, - gboolean save_mode); - -GPtrArray *comp_editor_select_file_attachments (CompEditor *editor, - gboolean *inline_p); - -#endif /* CAL_ATTACHMENT_SELECT_FILE_H */ diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 99dc3ea851..9de8839955 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -62,7 +62,6 @@ #include "comp-editor.h" #include "comp-editor-util.h" #include "../calendar-config-keys.h" -#include "cal-attachment-select-file.h" #include "widgets/misc/e-attachment-view.h" #include "widgets/misc/e-attachment-paned.h" |