/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 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>
#include <gdk/gdkkeysyms.h>
+#include <gtk/gtknotebook.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkctree.h>
#include <gtk/gtkvbox.h>
gint button,
GdkEvent *event,
MimeView *mimeview);
-static void mimeview_button_pressed (GtkWidget *widget,
+static gint mimeview_button_pressed (GtkWidget *widget,
GdkEventButton *event,
MimeView *mimeview);
-static void mimeview_key_pressed (GtkWidget *widget,
+static gint mimeview_key_pressed (GtkWidget *widget,
GdkEventKey *event,
MimeView *mimeview);
MimeView *mimeview);
static void mimeview_display_as_text (MimeView *mimeview);
+static void mimeview_show_image (MimeView *mimeview);
static void mimeview_save_as (MimeView *mimeview);
+static void mimeview_save_all (MimeView *mimeview);
static void mimeview_launch (MimeView *mimeview);
static void mimeview_open_with (MimeView *mimeview);
static void mimeview_view_file (const gchar *filename,
MimeInfo *partinfo,
const gchar *cmdline);
-#if USE_GPGME
-static void mimeview_check_signature (MimeView *mimeview);
-#endif
static GtkItemFactoryEntry mimeview_popup_entries[] =
{
{N_("/_Open"), NULL, mimeview_launch, 0, NULL},
{N_("/Open _with..."), NULL, mimeview_open_with, 0, NULL},
{N_("/_Display as text"), NULL, mimeview_display_as_text, 0, NULL},
- {N_("/_Save as..."), NULL, mimeview_save_as, 0, NULL}
+ {N_("/_Display image"), NULL, mimeview_show_image, 0, NULL},
+ {N_("/_Save as..."), NULL, mimeview_save_as, 0, NULL},
+ {N_("/Save _all..."), NULL, mimeview_save_all, 0, NULL}
#if USE_GPGME
,
{N_("/_Check signature"), NULL, mimeview_check_signature, 0, NULL}
{
MimeView *mimeview;
+ GtkWidget *notebook;
+ GtkWidget *vbox;
GtkWidget *paned;
GtkWidget *scrolledwin;
GtkWidget *ctree;
- GtkWidget *vbox;
+ GtkWidget *mime_vbox;
GtkWidget *popupmenu;
GtkItemFactory *popupfactory;
-
- gchar *titles[] = {_("MIME Type"), _("Size"), _("Name")};
+ gchar *titles[N_MIMEVIEW_COLS];
gint n_entries;
gint i;
- debug_print(_("Creating MIME view...\n"));
+ debug_print("Creating MIME view...\n");
mimeview = g_new0(MimeView, 1);
+ titles[COL_MIMETYPE] = _("MIME Type");
+ titles[COL_SIZE] = _("Size");
+ titles[COL_NAME] = _("Name");
+
+ notebook = gtk_notebook_new();
+ gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), TRUE);
+
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(notebook), vbox);
+ gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook), vbox,
+ _("Text"));
+
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_get",
GTK_SIGNAL_FUNC(mimeview_drag_data_get), mimeview);
- vbox = gtk_vbox_new(FALSE, 0);
+ mime_vbox = gtk_vbox_new(FALSE, 0);
paned = gtk_vpaned_new();
gtk_paned_add1(GTK_PANED(paned), scrolledwin);
- gtk_paned_add2(GTK_PANED(paned), vbox);
- gtk_widget_show_all(paned);
+ gtk_paned_add2(GTK_PANED(paned), mime_vbox);
+ gtk_container_add(GTK_CONTAINER(notebook), paned);
+ gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook), paned,
+ _("Attachments"));
+
+ gtk_widget_show_all(notebook);
+
+ gtk_notebook_set_page(GTK_NOTEBOOK(notebook), 0);
n_entries = sizeof(mimeview_popup_entries) /
sizeof(mimeview_popup_entries[0]);
popupmenu = menu_create_items(mimeview_popup_entries, n_entries,
"<MimeView>", &popupfactory, mimeview);
- mimeview->paned = paned;
- mimeview->scrolledwin = scrolledwin;
- mimeview->ctree = ctree;
- mimeview->vbox = vbox;
- mimeview->popupmenu = popupmenu;
+ mimeview->notebook = notebook;
+ mimeview->vbox = vbox;
+ mimeview->paned = paned;
+ mimeview->scrolledwin = scrolledwin;
+ mimeview->ctree = ctree;
+ mimeview->mime_vbox = mime_vbox;
+ mimeview->popupmenu = popupmenu;
mimeview->popupfactory = popupfactory;
+ mimeview->type = -1;
return mimeview;
}
#if USE_GPGME
static gboolean mimeview_is_signed(MimeView *mimeview)
{
- MimeInfo *partinfo;
+ MimeInfo *partinfo = NULL;
debug_print("mimeview_is signed of %p\n", mimeview);
do {
if (rfc2015_has_signature(partinfo))
return TRUE;
- if (pgptext_has_signature(partinfo))
- return TRUE;
} while ((partinfo = partinfo->parent) != NULL);
debug_print("mimeview_is_signed: FALSE\n" );
FILE *fp;
mimeview_clear(mimeview);
+ textview_clear(mimeview->messageview->textview);
g_return_if_fail(file != NULL);
g_return_if_fail(mimeinfo != NULL);
mimeview->mimeinfo = mimeinfo;
- if ((fp = fopen(file, "r")) == NULL) {
+ if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return;
}
/* skip MIME part headers */
if (mimeinfo->mime_type == MIME_MULTIPART) {
if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
- perror("fseek");
+ perror("fseek");
while (fgets(buf, sizeof(buf), fp) != NULL)
if (buf[0] == '\r' || buf[0] == '\n') break;
}
procmime_scan_multipart_message(mimeinfo, fp);
#if USE_GPGME
- if (prefs_common.auto_check_signatures)
+ if ((prefs_common.auto_check_signatures)
+ && (gpg_started))
rfc2015_check_signature(mimeinfo, fp);
else
set_unchecked_signature(mimeinfo);
#endif
- fclose(fp);
gtk_signal_handler_block_by_func(GTK_OBJECT(ctree), mimeview_selected,
mimeview);
partinfo->mime_type == MIME_TEXT_HTML))
break;
}
+ fclose(fp);
+ textview_show_message(mimeview->messageview->textview, mimeinfo, file);
+
if (!node)
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
if (!mimeinfo->sub && mimeinfo->parent)
current = mimeview_append_part(mimeview, mimeinfo, parent);
+ if (mimeinfo->sub && !mimeinfo->sub->children &&
+ mimeinfo->sub->mime_type != MIME_TEXT &&
+ mimeinfo->sub->mime_type != MIME_TEXT_HTML) {
+ mimeview_append_part(mimeview, mimeinfo->sub, parent);
+ return;
+ }
if (mimeinfo->sub)
mimeview_set_multipart_tree(mimeview, mimeinfo->sub, current);
return partinfo->name;
else if (partinfo->filename)
return partinfo->filename;
+ else if (partinfo->description)
+ return partinfo->description;
+ else
+ return "";
+}
+
+static gchar *get_part_description(MimeInfo *partinfo)
+{
+ if (partinfo->description)
+ return partinfo->description;
+ else if (partinfo->name)
+ return partinfo->name;
+ else if (partinfo->filename)
+ return partinfo->filename;
else
return "";
}
str[COL_MIMETYPE] =
partinfo->content_type ? partinfo->content_type : "";
str[COL_SIZE] = to_human_readable(partinfo->size);
- str[COL_NAME] = get_part_name(partinfo);
+ if (prefs_common.attach_desc)
+ str[COL_NAME] = get_part_description(partinfo);
+ else
+ str[COL_NAME] = get_part_name(partinfo);
node = gtk_ctree_insert_node(ctree, parent, NULL, str, 0,
NULL, NULL, NULL, NULL,
#endif /* USE_GPGME */
if (!fname) return;
- if ((fp = fopen(fname, "r")) == NULL) {
+ if ((fp = fopen(fname, "rb")) == NULL) {
FILE_OP_ERROR(fname, "fopen");
return;
}
(_("Can't get the part of multipart message."));
else {
mimeview_change_view_type(mimeview, MIMEVIEW_IMAGE);
- imageview_show_image(mimeview->imageview, partinfo, filename);
+ /* Workaround for the GTK+ bug with handling scroll adjustments
+ * in GtkViewport */
+ imageview_clear(mimeview->imageview);
+ imageview_show_image(mimeview->imageview, partinfo, filename,
+ prefs_common.resize_image);
unlink(filename);
}
{
TextView *textview = mimeview->textview;
ImageView *imageview = mimeview->imageview;
+ GList *children;
if (mimeview->type == type) return;
+ children = gtk_container_children(GTK_CONTAINER(mimeview->mime_vbox));
+ if (children) {
+ gtkut_container_remove(GTK_CONTAINER(mimeview->mime_vbox),
+ GTK_WIDGET(children->data));
+ g_list_free(children);
+ }
+
switch (type) {
case MIMEVIEW_IMAGE:
- gtkut_container_remove(GTK_CONTAINER(mimeview->vbox),
- GTK_WIDGET_PTR(textview));
- gtk_container_add(GTK_CONTAINER(mimeview->vbox),
+ gtk_container_add(GTK_CONTAINER(mimeview->mime_vbox),
GTK_WIDGET_PTR(imageview));
break;
case MIMEVIEW_TEXT:
- gtkut_container_remove(GTK_CONTAINER(mimeview->vbox),
- GTK_WIDGET_PTR(imageview));
- gtk_container_add(GTK_CONTAINER(mimeview->vbox),
+ gtk_container_add(GTK_CONTAINER(mimeview->mime_vbox),
GTK_WIDGET_PTR(textview));
break;
default:
gtk_clist_clear(clist);
textview_clear(mimeview->textview);
+ imageview_clear(mimeview->imageview);
mimeview->opened = NULL;
g_free(mimeview->file);
mimeview->file = NULL;
+
+ /* gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0); */
}
static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
if (gdk_pointer_is_grabbed())
gdk_pointer_ungrab(GDK_CURRENT_TIME);
}
-
+
+ mimeview->textview->default_text = FALSE;
+
switch (partinfo->mime_type) {
case MIME_TEXT:
case MIME_TEXT_HTML:
case MIME_MESSAGE_RFC822:
case MIME_MULTIPART:
mimeview_show_message_part(mimeview, partinfo);
+
break;
#if (HAVE_GDK_PIXBUF || HAVE_GDK_IMLIB)
case MIME_IMAGE:
- mimeview_show_image_part(mimeview, partinfo);
+ mimeview->textview->default_text = TRUE;
+ if (prefs_common.display_img)
+ mimeview_show_image_part(mimeview, partinfo);
+ else {
+ mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
+ textview_show_mime_part(mimeview->textview, partinfo);
+ }
break;
#endif
default:
+ mimeview->textview->default_text = TRUE;
mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
#if USE_GPGME
if (g_strcasecmp(partinfo->content_type,
}
}
-static void mimeview_start_drag (GtkWidget *widget, gint button,
- GdkEvent *event, MimeView *mimeview)
+static void mimeview_start_drag(GtkWidget *widget, gint button,
+ GdkEvent *event, MimeView *mimeview)
{
GtkTargetList *list;
GdkDragContext *context;
gtk_drag_set_icon_default(context);
}
-static void mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
+static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
MimeView *mimeview)
{
GtkCList *clist = GTK_CLIST(widget);
MimeInfo *partinfo;
gint row, column;
- if (!event) return;
+ if (!event) return FALSE;
if (event->button == 2 || event->button == 3) {
if (!gtk_clist_get_selection_info(clist, event->x, event->y,
&row, &column))
- return;
+ return FALSE;
gtk_clist_unselect_all(clist);
gtk_clist_select_row(clist, row, column);
gtkut_clist_set_focus_row(clist, row);
else
menu_set_sensitive(mimeview->popupfactory,
"/Open", TRUE);
+
+#if (HAVE_GDK_PIXBUF || HAVE_GDK_IMLIB)
+ if (partinfo && (partinfo->mime_type == MIME_IMAGE))
+ menu_set_sensitive(mimeview->popupfactory,
+ "/Display image", TRUE);
+#endif
#if USE_GPGME
menu_set_sensitive(mimeview->popupfactory,
"/Check signature",
NULL, NULL, NULL, NULL,
event->button, event->time);
}
+
+ return TRUE;
+}
+
+void mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
+{
+ mimeview_key_pressed(mimeview->ctree, event, mimeview);
}
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
-static void mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
+#define KEY_PRESS_EVENT_STOP() \
+ if (gtk_signal_n_emissions_by_name \
+ (GTK_OBJECT(ctree), "key_press_event") > 0) { \
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree), \
+ "key_press_event"); \
+ }
+
+static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
MimeView *mimeview)
{
SummaryView *summaryview;
- GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
+ GtkCTree *ctree = GTK_CTREE(widget);
GtkCTreeNode *node;
- if (!event) return;
- if (!mimeview->opened) return;
+ if (!event) return FALSE;
+ if (!mimeview->opened) return FALSE;
switch (event->keyval) {
case GDK_space:
- if (textview_scroll_page(mimeview->textview, FALSE)) return;
+ if (textview_scroll_page(mimeview->textview, FALSE))
+ return TRUE;
node = GTK_CTREE_NODE_NEXT(mimeview->opened);
if (node) {
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
- return;
+ return TRUE;
}
break;
case GDK_BackSpace:
textview_scroll_page(mimeview->textview, TRUE);
- return;
+ return TRUE;
case GDK_Return:
textview_scroll_one_line(mimeview->textview,
(event->state & GDK_MOD1_MASK) != 0);
- return;
+ return TRUE;
case GDK_n:
case GDK_N:
BREAK_ON_MODIFIER_KEY();
if (!GTK_CTREE_NODE_NEXT(mimeview->opened)) break;
+ KEY_PRESS_EVENT_STOP();
gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
GTK_SCROLL_STEP_FORWARD, 0.0);
- return;
+ return TRUE;
case GDK_p:
case GDK_P:
BREAK_ON_MODIFIER_KEY();
if (!GTK_CTREE_NODE_PREV(mimeview->opened)) break;
+ KEY_PRESS_EVENT_STOP();
gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
GTK_SCROLL_STEP_BACKWARD, 0.0);
- return;
+ return TRUE;
case GDK_y:
BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
mimeview_save_as(mimeview);
- return;
+ return TRUE;
case GDK_t:
BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
mimeview_display_as_text(mimeview);
- return;
+ return TRUE;
+ case GDK_i:
+ BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
+ mimeview_show_image(mimeview);
+ return TRUE;
case GDK_l:
BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
mimeview_launch(mimeview);
- return;
+ return TRUE;
default:
break;
}
- if (!mimeview->messageview->mainwin) return;
+ if (!mimeview->messageview->mainwin) return FALSE;
summaryview = mimeview->messageview->mainwin->summaryview;
summary_pass_key_press_event(summaryview, event);
+ return TRUE;
}
static void mimeview_drag_data_get(GtkWidget *widget,
g_free(filename);
}
+static void mimeview_save_all(MimeView *mimeview)
+{
+ gchar *dirname;
+ gchar *defname = NULL;
+ MimeInfo *partinfo;
+ MimeInfo *attachment;
+ gchar buf[1024];
+
+ if (!mimeview->opened) return;
+ if (!mimeview->file) return;
+
+ partinfo = gtk_ctree_node_get_row_data
+ (GTK_CTREE(mimeview->ctree), mimeview->opened);
+ g_return_if_fail(partinfo != NULL);
+
+ dirname = filesel_select_file(_("Save as"), defname);
+ if (!dirname) return;
+
+ /* return to first children */
+ if (!partinfo->parent->children) return; /* multipart container? */
+ attachment = partinfo->parent->children->next;
+ /* for each attachment, extract it in the selected dir. */
+ while (attachment != NULL) {
+ static guint subst_cnt = 1;
+ gchar *attachdir;
+ gchar *attachname = g_strdup(get_part_name(attachment));
+ AlertValue aval = G_ALERTDEFAULT;
+ gchar *res;
+
+ if (!attachname || !strlen(attachname))
+ attachname = g_strdup_printf("noname.%d",subst_cnt++);
+ subst_chars(attachname, ":?*&|<>\t\r\n", '_');
+ g_snprintf(buf, sizeof(buf), "%s%s",
+ dirname,
+ (attachname[0] == G_DIR_SEPARATOR)
+ ? &attachname[1]
+ : attachname);
+ subst_chars(buf, "/\\", G_DIR_SEPARATOR);
+ attachdir = g_dirname(buf);
+ make_dir_hier(attachdir);
+ g_free(attachdir);
+
+ if (is_file_exist(buf)) {
+ res = g_strdup_printf(_("Overwrite existing file '%s'?"),
+ attachname);
+ aval = alertpanel(_("Overwrite"), res, _("OK"),
+ _("Cancel"), NULL);
+ g_free(res);
+ }
+ g_free(attachname);
+
+ if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, mimeview->file, attachment) < 0))
+ alertpanel_error(_("Can't save the part of multipart message."));
+ attachment = attachment->next;
+ }
+}
+
static void mimeview_display_as_text(MimeView *mimeview)
{
MimeInfo *partinfo;
mimeview_show_message_part(mimeview, partinfo);
}
+static void mimeview_show_image(MimeView *mimeview)
+{
+ MimeInfo *partinfo;
+
+ if (!mimeview->opened) return;
+
+ partinfo = gtk_ctree_node_get_row_data
+ (GTK_CTREE(mimeview->ctree), mimeview->opened);
+ mimeview_show_image_part(mimeview, partinfo);
+}
+
static void mimeview_save_as(MimeView *mimeview)
{
gchar *filename;
+ gchar *defname = NULL;
MimeInfo *partinfo;
+ gchar *res;
if (!mimeview->opened) return;
if (!mimeview->file) return;
(GTK_CTREE(mimeview->ctree), mimeview->opened);
g_return_if_fail(partinfo != NULL);
- filename = filesel_select_file
- (_("Save as"),
- partinfo->filename ? partinfo->filename : partinfo->name);
+ if (partinfo->filename)
+ defname = partinfo->filename;
+ else if (partinfo->name) {
+ Xstrdup_a(defname, partinfo->name, return);
+ subst_for_filename(defname);
+ }
+
+ filename = filesel_select_file(_("Save as"), defname);
if (!filename) return;
if (is_file_exist(filename)) {
AlertValue aval;
-
- aval = alertpanel(_("Overwrite"),
- _("Overwrite existing file?"),
- _("OK"), _("Cancel"), NULL);
+ res = g_strdup_printf(_("Overwrite existing file '%s'?"),
+ filename);
+ aval = alertpanel(_("Overwrite"), res, _("OK"),
+ _("Cancel"), NULL);
+ g_free(res);
if (G_ALERTDEFAULT != aval) return;
}
_("Enter the command line to open file:\n"
"(`%s' will be replaced with file name)"),
prefs_common.mime_open_cmd,
- prefs_common.mime_open_cmd_history);
+ prefs_common.mime_open_cmd_history,
+ TRUE);
if (cmd) {
mimeview_view_file(filename, partinfo, cmd);
g_free(prefs_common.mime_open_cmd);
{
static gchar *default_image_cmdline = "display '%s'";
static gchar *default_audio_cmdline = "play '%s'";
- static gchar *default_html_cmdline =
- "netscape -remote 'openURL(%s,raise)'";
+ static gchar *default_html_cmdline = DEFAULT_BROWSER_CMD;
static gchar *mime_cmdline = "metamail -d -b -x -c %s '%s'";
gchar buf[1024];
gchar m_buf[1024];
g_snprintf(buf, sizeof(buf), cmd, filename);
else {
if (cmd)
- g_warning(_("MIME viewer command line is invalid: `%s'"), cmd);
+ g_warning("MIME viewer command line is invalid: `%s'", cmd);
if (def_cmd)
g_snprintf(buf, sizeof(buf), def_cmd, filename);
else
}
}
-static void mimeview_check_signature(MimeView *mimeview)
+void mimeview_check_signature(MimeView *mimeview)
{
MimeInfo *mimeinfo;
- gchar buf[BUFFSIZE];
FILE *fp;
g_return_if_fail (mimeview_is_signed(mimeview));
+ g_return_if_fail (gpg_started);
mimeinfo = gtk_ctree_node_get_row_data
(GTK_CTREE(mimeview->ctree), mimeview->opened);
while (mimeinfo->parent)
mimeinfo = mimeinfo->parent;
- if ((fp = fopen(mimeview->file, "r")) == NULL) {
+ if ((fp = fopen(mimeview->file, "rb")) == NULL) {
FILE_OP_ERROR(mimeview->file, "fopen");
return;
}
- /* skip headers */
- if (mimeinfo->mime_type == MIME_MULTIPART) {
- if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
- FILE_OP_ERROR(mimeview->file, "fseek");
- while (fgets(buf, sizeof(buf), fp) != NULL)
- if (buf[0] == '\r' || buf[0] == '\n') break;
- }
-
- procmime_scan_multipart_message(mimeinfo, fp);
rfc2015_check_signature(mimeinfo, fp);
fclose(fp);
mimeview_update_names(mimeview);
mimeview_update_signature_info(mimeview);
+
+ textview_show_message(mimeview->messageview->textview, mimeinfo,
+ mimeview->file);
}
#endif /* USE_GPGME */
projects / claws.git / blobdiff