/*
* 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;
+ 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"));
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);
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;
+ MsgInfo *msginfo = NULL;
debug_print("mimeview_is signed of %p\n", mimeview);
do {
if (rfc2015_has_signature(partinfo))
return TRUE;
- if (pgptext_has_signature(partinfo))
+ if (pgptext_has_signature(msginfo, partinfo))
return TRUE;
} while ((partinfo = partinfo->parent) != NULL);
FILE *fp;
mimeview_clear(mimeview);
+ textview_clear(mimeview->messageview->textview);
g_return_if_fail(file != NULL);
g_return_if_fail(mimeinfo != NULL);
/* 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;
}
else
set_unchecked_signature(mimeinfo);
#endif
- fclose(fp);
gtk_signal_handler_block_by_func(GTK_OBJECT(ctree), mimeview_selected,
mimeview);
MimeInfo *partinfo;
partinfo = gtk_ctree_node_get_row_data(ctree, node);
- if (partinfo && partinfo->mime_type == MIME_TEXT)
+ if (partinfo &&
+ (partinfo->mime_type == MIME_TEXT ||
+ partinfo->mime_type == MIME_TEXT_HTML)) {
+ if (fseek(fp, partinfo->fpos, SEEK_SET) < 0)
+ perror("fseek");
+ else
+ textview_show_part
+ (mimeview->messageview->textview,
+ partinfo, fp);
break;
+ }
}
+ fclose(fp);
+
if (!node)
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
MimeInfo *mimeinfo,
GtkCTreeNode *parent)
{
+ GtkCTreeNode *current = parent;
+
g_return_if_fail(mimeinfo != NULL);
- if (!mimeinfo->main && mimeinfo->parent)
- parent = mimeview_append_part(mimeview, mimeinfo, parent);
+ if (!mimeinfo->sub && mimeinfo->parent)
+ current = mimeview_append_part(mimeview, mimeinfo, parent);
- if (mimeinfo->sub && mimeinfo->sub->children)
- mimeview_set_multipart_tree(mimeview, mimeinfo->sub, parent);
+ if (mimeinfo->sub)
+ mimeview_set_multipart_tree(mimeview, mimeinfo->sub, current);
- if (mimeinfo->children) {
- MimeInfo *child;
+ if (mimeinfo->children)
+ mimeview_set_multipart_tree(mimeview, mimeinfo->children, current);
- child = mimeinfo->children;
- while (child) {
- mimeview_set_multipart_tree(mimeview, child, parent);
- child = child->next;
- }
- }
+ if (mimeinfo->next)
+ mimeview_set_multipart_tree(mimeview, mimeinfo->next, parent);
}
static gchar *get_part_name(MimeInfo *partinfo)
(_("Can't get the part of multipart message."));
else {
mimeview_change_view_type(mimeview, MIMEVIEW_IMAGE);
+ /* Workaround for the GTK+ bug with handling scroll adjustments
+ * in GtkViewport */
+ imageview_clear(mimeview->imageview);
imageview_show_image(mimeview->imageview, partinfo, filename);
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:
- gtk_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:
- gtk_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,
}
}
-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);
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_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,
static void mimeview_save_as(MimeView *mimeview)
{
gchar *filename;
+ gchar *defname = NULL;
MimeInfo *partinfo;
if (!mimeview->opened) 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;
projects / claws.git / blobdiff