--- /dev/null
+2001-04-21
+ * sync with recent sylpheed cvs. Untested though. [alfons]
+
passphrase.c passphrase.h \
select-keys.c select-keys.h \
manual.c manual.h \
- addr_compl.c addr_compl.h
+ addr_compl.c addr_compl.h \
+ export.c export.h
EXTRA_DIST = \
pixmaps/clip.xpm \
GList *cur;
if (event && event->type == GDK_2BUTTON_PRESS) {
- addressbook_edit_address_cb(NULL, 0, NULL);
+ if (prefs_common.add_address_by_click &&
+ addrbook.target_compose)
+ addressbook_to_clicked(NULL, NULL);
+ else
+ addressbook_edit_address_cb(NULL, 0, NULL);
return;
}
--- /dev/null
+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 "config.h"
+#endif
+
+#include "defs.h"
+
+#include <glib.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkwidget.h>
+#include <gtk/gtkwindow.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkhbbox.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkfilesel.h>
+#include <gtk/gtksignal.h>
+
+#include "intl.h"
+#include "main.h"
+#include "inc.h"
+#include "mbox.h"
+#include "filesel.h"
+#include "foldersel.h"
+#include "gtkutils.h"
+#include "manage_window.h"
+#include "folder.h"
+
+static GtkWidget *window;
+static GtkWidget *src_entry;
+static GtkWidget *file_entry;
+static GtkWidget *src_button;
+static GtkWidget *file_button;
+static GtkWidget *ok_button;
+static GtkWidget *cancel_button;
+static gboolean export_ack;
+
+static void export_create(void);
+static void export_ok_cb(GtkWidget *widget, gpointer data);
+static void export_cancel_cb(GtkWidget *widget, gpointer data);
+static void export_srcsel_cb(GtkWidget *widget, gpointer data);
+static void export_filesel_cb(GtkWidget *widget, gpointer data);
+static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
+
+gint export_mbox(FolderItem *default_src)
+{
+ gint ok = 0;
+
+ if (!window)
+ export_create();
+ else
+ gtk_widget_show(window);
+
+ if (default_src && default_src->path)
+ gtk_entry_set_text(GTK_ENTRY(src_entry), default_src->path);
+ else
+ gtk_entry_set_text(GTK_ENTRY(src_entry), "");
+ gtk_entry_set_text(GTK_ENTRY(file_entry), "");
+ gtk_widget_grab_focus(file_entry);
+
+ manage_window_set_transient(GTK_WINDOW(window));
+
+ gtk_main();
+
+ if (export_ack) {
+ gchar *srcdir, *mbox;
+ FolderItem *src;
+
+ srcdir = gtk_entry_get_text(GTK_ENTRY(src_entry));
+ mbox = gtk_entry_get_text(GTK_ENTRY(file_entry));
+
+ if (mbox && *mbox) {
+ src = folder_find_item_from_path(srcdir);
+ if (!src)
+ g_warning("Can't find the folder.\n");
+ else
+ ok = export_to_mbox(src, mbox);
+ }
+ }
+
+ gtk_widget_hide(window);
+
+ return ok;
+}
+
+static void export_create(void)
+{
+ GtkWidget *vbox;
+ GtkWidget *hbox;
+ GtkWidget *desc_label;
+ GtkWidget *table;
+ GtkWidget *file_label;
+ GtkWidget *src_label;
+ GtkWidget *confirm_area;
+
+ window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_title(GTK_WINDOW(window), _("Export"));
+ gtk_container_set_border_width(GTK_CONTAINER(window), 5);
+ gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+ gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
+ gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+ GTK_SIGNAL_FUNC(export_cancel_cb), NULL);
+ gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
+ GTK_SIGNAL_FUNC(key_pressed), NULL);
+ gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
+ GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
+ gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
+ GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+
+ vbox = gtk_vbox_new(FALSE, 4);
+ gtk_container_add(GTK_CONTAINER(window), vbox);
+
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
+
+ desc_label = gtk_label_new
+ (_("Specify target folder and mbox file."));
+ gtk_box_pack_start(GTK_BOX(hbox), desc_label, FALSE, FALSE, 0);
+
+ table = gtk_table_new(2, 3, FALSE);
+ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(table), 8);
+ gtk_table_set_row_spacings(GTK_TABLE(table), 8);
+ gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+ gtk_widget_set_usize(table, 420, -1);
+
+ src_label = gtk_label_new(_("Source dir:"));
+ gtk_table_attach(GTK_TABLE(table), src_label, 0, 1, 0, 1,
+ GTK_FILL, GTK_EXPAND|GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(src_label), 1, 0.5);
+
+ file_label = gtk_label_new(_("Exporting file:"));
+ gtk_table_attach(GTK_TABLE(table), file_label, 0, 1, 1, 2,
+ GTK_FILL, GTK_EXPAND|GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(file_label), 1, 0.5);
+
+ src_entry = gtk_entry_new();
+ gtk_table_attach(GTK_TABLE(table), src_entry, 1, 2, 0, 1,
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ file_entry = gtk_entry_new();
+ gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, 1, 2,
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ src_button = gtk_button_new_with_label(_(" Select... "));
+ gtk_table_attach(GTK_TABLE(table), src_button, 2, 3, 0, 1,
+ 0, 0, 0, 0);
+ gtk_signal_connect(GTK_OBJECT(src_button), "clicked",
+ GTK_SIGNAL_FUNC(export_srcsel_cb), NULL);
+
+ file_button = gtk_button_new_with_label(_(" Select... "));
+ gtk_table_attach(GTK_TABLE(table), file_button, 2, 3, 1, 2,
+ 0, 0, 0, 0);
+ gtk_signal_connect(GTK_OBJECT(file_button), "clicked",
+ GTK_SIGNAL_FUNC(export_filesel_cb), NULL);
+
+ gtkut_button_set_create(&confirm_area,
+ &ok_button, _("OK"),
+ &cancel_button, _("Cancel"),
+ NULL, NULL);
+ gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
+ gtk_widget_grab_default(ok_button);
+
+ gtk_signal_connect(GTK_OBJECT(ok_button), "clicked",
+ GTK_SIGNAL_FUNC(export_ok_cb), NULL);
+ gtk_signal_connect(GTK_OBJECT(cancel_button), "clicked",
+ GTK_SIGNAL_FUNC(export_cancel_cb), NULL);
+
+ gtk_widget_show_all(window);
+}
+
+static void export_ok_cb(GtkWidget *widget, gpointer data)
+{
+ export_ack = TRUE;
+ if (gtk_main_level() > 1)
+ gtk_main_quit();
+}
+
+static void export_cancel_cb(GtkWidget *widget, gpointer data)
+{
+ export_ack = FALSE;
+ if (gtk_main_level() > 1)
+ gtk_main_quit();
+}
+
+static void export_filesel_cb(GtkWidget *widget, gpointer data)
+{
+ gchar *filename;
+
+ filename = filesel_select_file(_("Select exporting file"), NULL);
+ if (filename)
+ gtk_entry_set_text(GTK_ENTRY(file_entry), filename);
+}
+
+static void export_srcsel_cb(GtkWidget *widget, gpointer data)
+{
+ FolderItem *src;
+
+ src = foldersel_folder_sel(NULL);
+ if (src && src->path)
+ gtk_entry_set_text(GTK_ENTRY(src_entry), src->path);
+}
+
+static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ if (event && event->keyval == GDK_Escape)
+ export_cancel_cb(NULL, NULL);
+}
--- /dev/null
+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 __EXPORT_H__
+#define __EXPORT_H__
+
+#include <glib.h>
+
+#include "folder.h"
+
+gint export_mbox(FolderItem *default_src);
+
+#endif /* __EXPORT_H__ */
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
*
* 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
static void import_destsel_cb(GtkWidget *widget, gpointer data);
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
-gint import_mbox(void)
+gint import_mbox(FolderItem *default_dest)
{
gint ok = 0;
else
gtk_widget_show(window);
+ gtk_entry_set_text(GTK_ENTRY(file_entry), "");
+ if (default_dest && default_dest->path)
+ gtk_entry_set_text(GTK_ENTRY(dest_entry), default_dest->path);
+ else
+ gtk_entry_set_text(GTK_ENTRY(dest_entry), "");
+ gtk_widget_grab_focus(file_entry);
+
manage_window_set_transient(GTK_WINDOW(window));
gtk_main();
static void import_create(void)
{
GtkWidget *vbox;
+ GtkWidget *hbox;
+ GtkWidget *desc_label;
GtkWidget *table;
GtkWidget *file_label;
GtkWidget *dest_label;
window = gtk_window_new(GTK_WINDOW_DIALOG);
gtk_window_set_title(GTK_WINDOW(window), _("Import"));
- gtk_widget_set_usize(window, 450, -1);
- gtk_container_set_border_width(GTK_CONTAINER(window), 4);
+ gtk_container_set_border_width(GTK_CONTAINER(window), 5);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
+ gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(import_cancel_cb), NULL);
gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_vbox_new(FALSE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
+
+ desc_label = gtk_label_new
+ (_("Specify target mbox file and destination folder."));
+ gtk_box_pack_start(GTK_BOX(hbox), desc_label, FALSE, FALSE, 0);
+
table = gtk_table_new(2, 3, FALSE);
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(table), 8);
- gtk_table_set_row_spacings(GTK_TABLE(table), 12);
+ gtk_table_set_row_spacings(GTK_TABLE(table), 8);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+ gtk_widget_set_usize(table, 420, -1);
file_label = gtk_label_new(_("Importing file:"));
gtk_table_attach(GTK_TABLE(table), file_label, 0, 1, 0, 1,
static void import_ok_cb(GtkWidget *widget, gpointer data)
{
import_ack = TRUE;
- gtk_main_quit();
+ if (gtk_main_level() > 1)
+ gtk_main_quit();
}
static void import_cancel_cb(GtkWidget *widget, gpointer data)
{
import_ack = FALSE;
- gtk_main_quit();
+ if (gtk_main_level() > 1)
+ gtk_main_quit();
}
static void import_filesel_cb(GtkWidget *widget, gpointer data)
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
*
* 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
#include <glib.h>
-gint import_mbox(void);
+#include "folder.h"
+
+gint import_mbox(FolderItem *default_dest);
#endif /* __IMPORT_H__ */
#include "compose.h"
#include "procmsg.h"
#include "import.h"
+#include "export.h"
#include "prefs_common.h"
#include "prefs_filter.h"
#include "prefs_account.h"
static void import_mbox_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void export_mbox_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void empty_trash_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
{N_("/_File/_Folder/_Rename folder..."),NULL, rename_folder_cb, 0, NULL},
{N_("/_File/_Folder/_Delete folder"), NULL, delete_folder_cb, 0, NULL},
{N_("/_File/_Import mbox file..."), NULL, import_mbox_cb, 0, NULL},
+ {N_("/_File/_Export to mbox file..."), NULL, export_mbox_cb, 0, NULL},
{N_("/_File/Empty _trash"), NULL, empty_trash_cb, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_File/_Save as..."), NULL, save_as_cb, 0, NULL},
static void import_mbox_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- import_mbox();
+ import_mbox(mainwin->summaryview->folder_item);
+}
+
+static void export_mbox_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ export_mbox(mainwin->summaryview->folder_item);
}
static void empty_trash_cb(MainWindow *mainwin, guint action,
}
/* read all messages in SRC, and store them into one MBOX file. */
-gint export_mbox(FolderItem *src, const gchar *mbox)
+gint export_to_mbox(FolderItem *src, const gchar *mbox)
{
- GSList *mlist = NULL;
+ GSList *mlist;
GSList *cur;
MsgInfo *msginfo;
FILE *msg_fp;
debug_print(_("Exporting messages from %s into %s...\n"),
src->path, mbox);
- mlist = src->folder->get_msg_list(src->folder, src, TRUE);
- if (!mlist) return 0;
-
if ((mbox_fp = fopen(mbox, "w")) == NULL) {
FILE_OP_ERROR(mbox, "fopen");
return -1;
}
+ mlist = src->folder->get_msg_list(src->folder, src, TRUE);
+
for (cur = mlist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
const gchar *dest);
void empty_mbox (const gchar *mbox);
-gint export_mbox (FolderItem *src,
+gint export_to_mbox (FolderItem *src,
const gchar *mbox);
#endif /* __MBOX_H__ */
GtkWidget *checkbtn_confonexit;
GtkWidget *checkbtn_cleanonexit;
GtkWidget *checkbtn_askonclean;
+ GtkWidget *checkbtn_addaddrbyclick;
} interface;
static struct Other {
{"immediate_execution", "TRUE", &prefs_common.immediate_exec, P_BOOL,
&interface.checkbtn_immedexec,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
+ P_BOOL, &interface.checkbtn_addaddrbyclick,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"confirm_on_exit", "TRUE", &prefs_common.confirm_on_exit, P_BOOL,
&interface.checkbtn_confonexit,
GtkWidget *checkbtn_openunread;
GtkWidget *checkbtn_openinbox;
GtkWidget *checkbtn_immedexec;
+ GtkWidget *checkbtn_addaddrbyclick;
GtkWidget *label;
GtkWidget *frame_exit;
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 8);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+ PACK_CHECK_BUTTON
+ (vbox2, checkbtn_addaddrbyclick,
+ _("Add address to destination when double-clicked"));
+
PACK_FRAME (vbox1, frame_exit, _("On exit"));
vbox_exit = gtk_vbox_new (FALSE, VSPACING_NARROW);
_("Ask before emptying"));
SET_TOGGLE_SENSITIVITY (checkbtn_cleanonexit, checkbtn_askonclean);
- interface.checkbtn_emacs = checkbtn_emacs;
- interface.checkbtn_openunread = checkbtn_openunread;
- interface.checkbtn_openinbox = checkbtn_openinbox;
- interface.checkbtn_immedexec = checkbtn_immedexec;
- interface.checkbtn_confonexit = checkbtn_confonexit;
- interface.checkbtn_cleanonexit = checkbtn_cleanonexit;
- interface.checkbtn_askonclean = checkbtn_askonclean;
+ interface.checkbtn_emacs = checkbtn_emacs;
+ interface.checkbtn_openunread = checkbtn_openunread;
+ interface.checkbtn_openinbox = checkbtn_openinbox;
+ interface.checkbtn_immedexec = checkbtn_immedexec;
+ interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
+ interface.checkbtn_confonexit = checkbtn_confonexit;
+ interface.checkbtn_cleanonexit = checkbtn_cleanonexit;
+ interface.checkbtn_askonclean = checkbtn_askonclean;
}
static void prefs_other_create(void)
gboolean open_unread_on_enter;
gboolean open_inbox_on_inc;
gboolean immediate_exec;
+ gboolean add_address_by_click;
gboolean confirm_on_exit;
gboolean clean_on_exit;
STATUSBAR_POP(summaryview->mainwin);
is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
- if (is_refresh)
+ if (is_refresh) {
prev_msgnum = summary_get_current_msgnum(summaryview);
+ if (prev_msgnum < 1)
+ is_refresh = FALSE;
+ }
#if 0
/* process the marks if any */
projects / claws.git / commitdiff