inital gtk2 patch
[claws.git] / src / mimeview.c
index c807a93dd60027f5ae0c4c2258006e4c39fa792f..dc3b013c72fa9caf53297618ef96270128148edf 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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>
+#include <gtk/gtkhbox.h>
 #include <gtk/gtkvpaned.h>
 #include <gtk/gtktext.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkselection.h>
+#include <gtk/gtktooltips.h>
+#include <gtk/gtkcontainer.h>
+#include <gtk/gtkbutton.h>
 #include <stdio.h>
-#include <unistd.h>
+
+#ifndef HAVE_APACHE_FNMATCH
+/* kludge: apache's fnmatch clashes with <regex.h>, don't include
+ * fnmatch.h */
+#include <fnmatch.h>
+#endif
 
 #include "intl.h"
 #include "main.h"
@@ -51,6 +61,9 @@
 #include "gtkutils.h"
 #include "prefs_common.h"
 #include "rfc2015.h"
+#include "stock_pixmap.h"
+#include "gtk/gtkvscrollbutton.h"
+
 
 typedef enum
 {
@@ -69,8 +82,6 @@ static GtkCTreeNode *mimeview_append_part     (MimeView       *mimeview,
                                                 GtkCTreeNode   *parent);
 static void mimeview_show_message_part         (MimeView       *mimeview,
                                                 MimeInfo       *partinfo);
-static void mimeview_show_image_part           (MimeView       *mimeview,
-                                                MimeInfo       *partinfo);
 static void mimeview_change_view_type          (MimeView       *mimeview,
                                                 MimeViewType    type);
 static void mimeview_clear                     (MimeView       *mimeview);
@@ -83,10 +94,10 @@ static void mimeview_start_drag     (GtkWidget      *widget,
                                         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);
 
@@ -99,21 +110,48 @@ static void mimeview_drag_data_get      (GtkWidget   *widget,
 
 static void mimeview_display_as_text   (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 gboolean icon_clicked_cb                (GtkWidget      *button, 
+                                        GdkEventButton *event, 
+                                        MimeView       *mimeview);
+static void icon_selected               (MimeView       *mimeview, 
+                                        gint            num, 
+                                        MimeInfo       *partinfo);
+static gint icon_key_pressed            (GtkWidget      *button, 
+                                        GdkEventKey    *event,
+                                        MimeView       *mimeview);
+static void toggle_icon                        (GtkToggleButton *button,
+                                        MimeView       *mimeview);
+static void icon_list_append_icon      (MimeView       *mimeview, 
+                                        MimeInfo       *mimeinfo);
+static void icon_list_create           (MimeView       *mimeview, 
+                                        MimeInfo       *mimeinfo);
+static void icon_list_clear            (MimeView       *mimeview);
+static void icon_list_toggle_by_mime_info (MimeView    *mimeview,
+                                          MimeInfo     *mimeinfo);
+static gboolean icon_list_select_by_number(MimeView    *mimeview,
+                                          gint          number);
+static void mime_toggle_button_cb      (GtkWidget      *button,
+                                        MimeView       *mimeview);
+static void part_button_pressed                (MimeView       *mimeview, 
+                                        GdkEventButton *event, 
+                                        MimeInfo       *partinfo);
+static void icon_scroll_size_allocate_cb(GtkWidget     *widget, 
+                                        GtkAllocation  *layout_size, 
+                                        MimeView       *mimeview);
 
 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_("/_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}
@@ -125,29 +163,53 @@ static GtkTargetEntry mimeview_mime_types[] =
        {"text/uri-list", 0, 0}
 };
 
-MimeView *mimeview_create(void)
+GSList *mimeviewer_factories;
+GSList *mimeviews;
+
+MimeView *mimeview_create(MainWindow *mainwin)
 {
        MimeView *mimeview;
 
+       GtkWidget *notebook;
+       GtkWidget *vbox;
        GtkWidget *paned;
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
-       GtkWidget *vbox;
+       GtkWidget *mime_notebook;
        GtkWidget *popupmenu;
+       GtkWidget *ctree_mainbox;
+       GtkWidget *mime_toggle;
+       GtkWidget *icon_mainbox;
+       GtkWidget *icon_scroll;
+       GtkWidget *icon_vbox;
+       GtkWidget *arrow;
+       GtkWidget *scrollbutton;
+       GtkWidget *hbox;
+       GtkTooltips *tooltips;
        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);
+       gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
+       gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
+
+       vbox = gtk_vbox_new(FALSE, 0);
+       gtk_container_add(GTK_CONTAINER(notebook), vbox);
+       
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_ALWAYS);
-       gtk_widget_set_usize(scrolledwin, -1, 80);
 
        ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
@@ -155,47 +217,106 @@ MimeView *mimeview_create(void)
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_SIZE,
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_width(GTK_CLIST(ctree), COL_MIMETYPE, 240);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_SIZE, 64);
+       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_SIZE, 90);
        for (i = 0; i < N_MIMEVIEW_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 
-       gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
-                          GTK_SIGNAL_FUNC(mimeview_selected), mimeview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_press_event",
-                          GTK_SIGNAL_FUNC(mimeview_button_pressed), mimeview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
-                          GTK_SIGNAL_FUNC(mimeview_key_pressed), mimeview);
-       gtk_signal_connect(GTK_OBJECT (ctree),"start_drag",
-                          GTK_SIGNAL_FUNC (mimeview_start_drag), mimeview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_get",
-                          GTK_SIGNAL_FUNC(mimeview_drag_data_get), mimeview);
-    
-       vbox = gtk_vbox_new(FALSE, 0);
+       g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+                        G_CALLBACK(mimeview_selected), mimeview);
+       g_signal_connect(G_OBJECT(ctree), "button_press_event",
+                        G_CALLBACK(mimeview_button_pressed), mimeview);
+       g_signal_connect(G_OBJECT(ctree), "key_press_event",
+                        G_CALLBACK(mimeview_key_pressed), mimeview);
+       g_signal_connect(G_OBJECT (ctree),"start_drag",
+                        G_CALLBACK (mimeview_start_drag), mimeview);
+       g_signal_connect(G_OBJECT(ctree), "drag_data_get",
+                        G_CALLBACK(mimeview_drag_data_get), mimeview);
+
+       mime_notebook = gtk_notebook_new();
+        gtk_widget_show(mime_notebook);
+        GTK_WIDGET_UNSET_FLAGS(mime_notebook, GTK_CAN_FOCUS);
+        gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
+        gtk_notebook_set_show_border(GTK_NOTEBOOK(mime_notebook), FALSE);
+       
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
+                               
+       icon_vbox = gtk_vbox_new(FALSE, 2);
+       icon_scroll = gtk_layout_new(NULL, NULL);
+       gtk_layout_put(GTK_LAYOUT(icon_scroll), icon_vbox, 0, 0);
+       scrollbutton = gtk_vscrollbutton_new(gtk_layout_get_vadjustment(GTK_LAYOUT(icon_scroll)));
+
+       mime_toggle = gtk_toggle_button_new();
+       arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+       gtk_widget_show(arrow);
+       gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
+       g_signal_connect(G_OBJECT(mime_toggle), "toggled", 
+                        G_CALLBACK(mime_toggle_button_cb), mimeview);
+
+       icon_mainbox = gtk_vbox_new(FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(icon_mainbox), icon_scroll, TRUE, TRUE, 3);
+       gtk_box_pack_end(GTK_BOX(icon_mainbox), scrollbutton, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT(icon_mainbox), "size_allocate", 
+                        G_CALLBACK(icon_scroll_size_allocate_cb), mimeview);
+       
+       ctree_mainbox = gtk_hbox_new(FALSE, 0); 
+       gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
+
+       n_entries = sizeof(mimeview_popup_entries) /
+               sizeof(mimeview_popup_entries[0]);
+       popupmenu = menu_create_items(mimeview_popup_entries, n_entries,
+                                     "<MimeView>", &popupfactory, mimeview);
+       tooltips = gtk_tooltips_new();
+       gtk_tooltips_set_delay(tooltips, 0); 
 
        paned = gtk_vpaned_new();
-       gtk_paned_add1(GTK_PANED(paned), scrolledwin);
-       gtk_paned_add2(GTK_PANED(paned), vbox);
-       gtk_widget_show_all(paned);
-
-       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->popupfactory = popupfactory;
+       gtk_paned_set_gutter_size(GTK_PANED(paned), 6);
+       gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
+       gtk_paned_pack2(GTK_PANED(paned), mime_notebook, TRUE, TRUE);
+       gtk_container_add(GTK_CONTAINER(notebook), paned);
+       
+       hbox = gtk_hbox_new(FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), notebook, TRUE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), icon_mainbox, FALSE, FALSE, 0);
+
+       gtk_widget_show_all(hbox);
+       gtk_widget_hide(ctree_mainbox);
+
+       mimeview->notebook      = notebook;
+       mimeview->vbox          = vbox;
+       mimeview->hbox          = hbox;
+       mimeview->paned         = paned;
+       mimeview->scrolledwin   = scrolledwin;
+       mimeview->ctree         = ctree;
+       mimeview->mime_notebook = mime_notebook;
+       mimeview->popupmenu     = popupmenu;
+       mimeview->popupfactory  = popupfactory;
+       mimeview->type          = -1;
+       mimeview->ctree_mainbox = ctree_mainbox;
+       mimeview->icon_scroll   = icon_scroll;
+       mimeview->icon_vbox     = icon_vbox;
+       mimeview->icon_mainbox  = icon_mainbox;
+       mimeview->icon_count    = 0;
+       mimeview->mainwin       = mainwin;
+       mimeview->tooltips      = tooltips;
+       mimeview->oldsize       = 60;
+       mimeview->mime_toggle   = mime_toggle;
+
+       mimeview->target_list   = gtk_target_list_new(mimeview_mime_types, 1); 
+       
+       mimeviews = g_slist_prepend(mimeviews, mimeview);
 
        return mimeview;
 }
 
 void mimeview_init(MimeView *mimeview)
 {
+       textview_init(mimeview->textview);
+
+       gtk_container_add(GTK_CONTAINER(mimeview->mime_notebook),
+               GTK_WIDGET_PTR(mimeview->textview));
 }
 
 /* 
@@ -204,7 +325,7 @@ void mimeview_init(MimeView *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);
 
@@ -241,7 +362,7 @@ static void set_unchecked_signature(MimeInfo *mimeinfo)
 
        g_free(sig_partinfo->sigstatus);
        sig_partinfo->sigstatus =
-               g_strdup(_("Select \"Check signature\" to check"));
+               g_strdup(_("Right-click here to verify the signature"));
 
        g_free(sig_partinfo->sigstatus_full);
        sig_partinfo->sigstatus_full = NULL;
@@ -253,80 +374,118 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
 {
        GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
        GtkCTreeNode *node;
-       gchar buf[BUFFSIZE];
        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) {
-               FILE_OP_ERROR(file, "fopen");
-               return;
-       }
        mimeview->file = g_strdup(file);
 
-       /* skip headers */
-       if (mimeinfo->mime_type == MIME_MULTIPART) {
-               if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
-               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) {
+               if ((fp = fopen(file, "rb")) == NULL) {
+                       FILE_OP_ERROR(file, "fopen");
+                       return;
+               }
                rfc2015_check_signature(mimeinfo, fp);
-       else
+               fclose(fp);
+       } else
                set_unchecked_signature(mimeinfo);
 #endif
-       fclose(fp);
 
-       gtk_signal_handler_block_by_func(GTK_OBJECT(ctree), mimeview_selected,
-                                        mimeview);
+       g_signal_handlers_block_by_func(G_OBJECT(ctree), mimeview_selected,
+                                       mimeview);
 
        mimeview_set_multipart_tree(mimeview, mimeinfo, NULL);
+       icon_list_create(mimeview, mimeinfo);
+
+       g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+                                         mimeview_selected, mimeview);
 
-       gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
-                                          mimeview_selected, mimeview);
+       /* search first text part */
+       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+            node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+               MimeInfo *partinfo;
+
+               partinfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (partinfo &&
+                   (partinfo->mime_type == MIME_TEXT ||
+                    partinfo->mime_type == MIME_TEXT_HTML))
+                       break;
+       }
+       textview_show_message(mimeview->messageview->textview, mimeinfo, file);
 
-       if ((node = gtk_ctree_node_nth(ctree, 0))) {
+       if (!node)
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       if (node) {
                gtk_ctree_select(ctree, node);
-               gtk_widget_grab_focus(mimeview->ctree);
+               icon_list_toggle_by_mime_info
+                       (mimeview, gtk_ctree_node_get_row_data(ctree, node));
+               gtkut_ctree_set_focus_row(ctree, node);
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mimeview->mime_toggle)))
+                       gtk_widget_grab_focus(mimeview->ctree);
        }
 }
 
 void mimeview_destroy(MimeView *mimeview)
 {
+       GSList *cur;
+       
+       for (cur = mimeview->viewers; cur != NULL; cur = g_slist_next(cur)) {
+               MimeViewer *viewer = (MimeViewer *) cur->data;
+               gtk_container_remove(GTK_CONTAINER(mimeview->mime_notebook),
+                       GTK_WIDGET(viewer->get_widget(viewer)));
+               viewer->destroy_viewer(viewer);
+       }
+       g_slist_free(mimeview->viewers);
+       gtk_target_list_unref(mimeview->target_list);
+
        procmime_mimeinfo_free_all(mimeview->mimeinfo);
        g_free(mimeview->file);
        g_free(mimeview);
+
+       mimeviews = g_slist_remove(mimeviews, mimeview);
+       
+}
+
+MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
+{
+       if (gtk_notebook_get_current_page
+               (GTK_NOTEBOOK(mimeview->notebook)) == 0)
+               return NULL;
+
+       return gtk_ctree_node_get_row_data
+               (GTK_CTREE(mimeview->ctree), mimeview->opened);
 }
 
 static void mimeview_set_multipart_tree(MimeView *mimeview,
                                        MimeInfo *mimeinfo,
                                        GtkCTreeNode *parent)
 {
-       g_return_if_fail(mimeinfo != NULL);
+       GtkCTreeNode *node;
 
-       if (!mimeinfo->main && mimeinfo->parent)
-               parent = mimeview_append_part(mimeview, mimeinfo, parent);
+       g_return_if_fail(mimeinfo != NULL);
 
-       if (mimeinfo->sub && mimeinfo->sub->children)
-               mimeview_set_multipart_tree(mimeview, mimeinfo->sub, parent);
+       if (mimeinfo->children)
+               mimeinfo = mimeinfo->children;
 
-       if (mimeinfo->children) {
-               MimeInfo *child;
+       while (mimeinfo != NULL) {
+               node = mimeview_append_part(mimeview, mimeinfo, parent);
 
-               child = mimeinfo->children;
-               while (child) {
-                       mimeview_set_multipart_tree(mimeview, child, parent);
-                       child = child->next;
-               }
+               if (mimeinfo->children)
+                       mimeview_set_multipart_tree(mimeview, mimeinfo, node);
+               else if (mimeinfo->sub &&
+                        mimeinfo->sub->mime_type != MIME_TEXT &&
+                        mimeinfo->sub->mime_type != MIME_TEXT_HTML)
+                       mimeview_set_multipart_tree(mimeview, mimeinfo->sub,
+                                                   node);
+               mimeinfo = mimeinfo->next;
        }
 }
 
@@ -341,6 +500,20 @@ static gchar *get_part_name(MimeInfo *partinfo)
                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 "";
 }
@@ -356,7 +529,10 @@ static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
        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,
@@ -385,7 +561,7 @@ static void mimeview_show_message_part(MimeView *mimeview, MimeInfo *partinfo)
 #endif /* USE_GPGME */
        if (!fname) return;
 
-       if ((fp = fopen(fname, "r")) == NULL) {
+       if ((fp = fopen(fname, "rb")) == NULL) {
                FILE_OP_ERROR(fname, "fopen");
                return;
        }
@@ -402,45 +578,117 @@ static void mimeview_show_message_part(MimeView *mimeview, MimeInfo *partinfo)
        fclose(fp);
 }
 
-static void mimeview_show_image_part(MimeView *mimeview, MimeInfo *partinfo)
+static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *content_type)
 {
-       gchar *filename;
+       GSList *cur;
+       MimeViewerFactory *factory = NULL;
+       MimeViewer *viewer = NULL;
 
-       if (!partinfo) return;
+/*
+ * FNM_CASEFOLD is a GNU extension
+ * if its not defined copy the string to the stack and
+ * convert the copy to lower case
+ */
+#ifndef FNM_CASEFOLD
+#define FNM_CASEFOLD 0
+       Xstrdup_a(content_type, content_type, return NULL);
+       g_strdown((gchar *)content_type);
+#endif
+       
+       for (cur = mimeviewer_factories; cur != NULL; cur = g_slist_next(cur)) {
+               MimeViewerFactory *curfactory = cur->data;
+               gint i = 0;
+
+               while (curfactory->content_types[i] != NULL) {
+                       debug_print("%s\n", curfactory->content_types[i]);
+                       if(!fnmatch(curfactory->content_types[i], content_type, FNM_CASEFOLD)) {
+                               factory = curfactory;
+                               break;
+                       }
+                       i++;
+               }
+               if (factory != NULL)
+                       break;
+       }
+       if (factory == NULL)
+               return NULL;
+
+       for (cur = mimeview->viewers; cur != NULL; cur = g_slist_next(cur)) {
+               MimeViewer *curviewer = cur->data;
+               
+               if (curviewer->factory == factory)
+                       return curviewer;
+       }
+       viewer = factory->create_viewer();
+       gtk_container_add(GTK_CONTAINER(mimeview->mime_notebook),
+               GTK_WIDGET(viewer->get_widget(viewer)));
+               
+       mimeview->viewers = g_slist_append(mimeview->viewers, viewer);
 
-       filename = procmime_get_tmp_file_name(partinfo);
+       return viewer;
+}
 
-       if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
-               alertpanel_error
-                       (_("Can't get the part of multipart message."));
-       else {
-               mimeview_change_view_type(mimeview, MIMEVIEW_IMAGE);
-               imageview_show_image(mimeview->imageview, partinfo, filename);
-               unlink(filename);
+static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinfo)
+{
+       gchar *content_type = NULL;
+       MimeViewer *viewer = NULL;
+
+       if ((partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM) &&
+           (partinfo->name != NULL)) {
+               content_type = procmime_get_mime_type(partinfo->name);
+       } else {
+               content_type = g_strdup(partinfo->content_type);
        }
 
-       g_free(filename);
+       if (content_type != NULL) {
+               viewer = get_viewer_for_content_type(mimeview, content_type);
+               g_free(content_type);
+       }
+
+       return viewer;
+}
+
+static gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
+{
+       MimeViewer *viewer;
+       
+       viewer = get_viewer_for_mimeinfo(mimeview, partinfo);
+       if (viewer == NULL) {
+               if (mimeview->mimeviewer != NULL)
+                       mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
+               mimeview->mimeviewer = NULL;
+               return FALSE;
+       }
+
+       if (mimeview->mimeviewer != viewer) {
+               if (mimeview->mimeviewer != NULL)
+                       mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
+               mimeview->mimeviewer = viewer;
+               mimeview_change_view_type(mimeview, MIMEVIEW_VIEWER);
+       }
+       viewer->show_mimepart(viewer, mimeview->file, partinfo);
+
+#warning FIXME_GTK2 Is it correct?
+       return FALSE;
 }
 
 static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
 {
        TextView  *textview  = mimeview->textview;
-       ImageView *imageview = mimeview->imageview;
 
-       if (mimeview->type == type) return;
+       if ((mimeview->type != MIMEVIEW_VIEWER) && 
+           (mimeview->type == type)) return;
 
        switch (type) {
-       case MIMEVIEW_IMAGE:
-               gtk_container_remove(GTK_CONTAINER(mimeview->vbox),
-                                    GTK_WIDGET_PTR(textview));
-               gtk_container_add(GTK_CONTAINER(mimeview->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_WIDGET_PTR(textview));
+               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->mime_notebook),
+                       gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook), 
+                       GTK_WIDGET_PTR(textview)));
+               break;
+       case MIMEVIEW_VIEWER:
+               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->mime_notebook),
+                       gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook), 
+                       GTK_WIDGET(mimeview->mimeviewer->get_widget(mimeview->mimeviewer))));
                break;
        default:
                return;
@@ -458,11 +706,18 @@ static void mimeview_clear(MimeView *mimeview)
 
        gtk_clist_clear(clist);
        textview_clear(mimeview->textview);
+       if (mimeview->mimeviewer != NULL)
+               mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
 
        mimeview->opened = NULL;
 
        g_free(mimeview->file);
        mimeview->file = NULL;
+
+       icon_list_clear(mimeview);
+
+       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mimeview->mime_toggle)))
+               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0);
 }
 
 static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
@@ -483,79 +738,83 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
                if (gdk_pointer_is_grabbed())
                        gdk_pointer_ungrab(GDK_CURRENT_TIME);
        }
-
-       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);
-               break;
-#endif
-       default:
-               mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
+       
+       mimeview->textview->default_text = FALSE;
+       
+       if (!mimeview_show_part(mimeview, partinfo)) {
+               switch (partinfo->mime_type) {
+               case MIME_TEXT:
+               case MIME_TEXT_HTML:
+               case MIME_TEXT_ENRICHED:
+               case MIME_MESSAGE_RFC822:
+               case MIME_MULTIPART:
+                       mimeview_show_message_part(mimeview, partinfo);
+               
+                       break;
+               default:
+                       mimeview->textview->default_text = TRUE;        
+                       mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
 #if USE_GPGME
-               if (g_strcasecmp(partinfo->content_type,
-                                "application/pgp-signature") == 0)
-                       textview_show_signature_part(mimeview->textview,
-                                                    partinfo);
-               else
+                       if (g_strcasecmp(partinfo->content_type,
+                                        "application/pgp-signature") == 0)
+                               textview_show_signature_part(mimeview->textview,
+                                                            partinfo);
+                       else
 #endif
-                       textview_show_mime_part(mimeview->textview, partinfo);
-               break;
+                               textview_show_mime_part(mimeview->textview, partinfo);
+                       break;
+               }
        }
 }
 
-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;
        MimeInfo *partinfo;
-       GtkCTree *ctree;
 
        g_return_if_fail(mimeview != NULL);
-       ctree = GTK_CTREE(mimeview->ctree);
-       partinfo = gtk_ctree_node_get_row_data(ctree, mimeview->opened);
+
+       partinfo = mimeview_get_selected_part(mimeview);
        if (partinfo->filename == NULL && partinfo->name == NULL) return;
 
-       list = gtk_target_list_new(mimeview_mime_types, 1);
-       context = gtk_drag_begin(widget, list,
+       context = gtk_drag_begin(widget, mimeview->target_list,
                                 GDK_ACTION_COPY, button, event);
        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);
        }
+       part_button_pressed(mimeview, event, mimeview_get_selected_part(mimeview));
+
+       return TRUE;
+}
 
+static void part_button_pressed(MimeView *mimeview, GdkEventButton *event, 
+                               MimeInfo *partinfo)
+{
        if (event->button == 2 ||
            (event->button == 1 && event->type == GDK_2BUTTON_PRESS)) {
                /* call external program for image, audio or html */
                mimeview_launch(mimeview);
        } else if (event->button == 3) {
-               partinfo = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(mimeview->ctree), mimeview->opened);
                if (partinfo && (partinfo->mime_type == MIME_TEXT ||
                                 partinfo->mime_type == MIME_TEXT_HTML ||
+                                partinfo->mime_type == MIME_TEXT_ENRICHED ||
                                 partinfo->mime_type == MIME_MESSAGE_RFC822 ||
                                 partinfo->mime_type == MIME_IMAGE ||
                                 partinfo->mime_type == MIME_MULTIPART))
@@ -564,85 +823,118 @@ static void mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                else
                        menu_set_sensitive(mimeview->popupfactory,
                                           "/Display as text", TRUE);
+               if (partinfo &&
+                   partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM)
+                       menu_set_sensitive(mimeview->popupfactory,
+                                          "/Open", FALSE);
+               else
+                       menu_set_sensitive(mimeview->popupfactory,
+                                          "/Open", TRUE);
+
 #if USE_GPGME
                menu_set_sensitive(mimeview->popupfactory,
                                   "/Check signature",
                                   mimeview_is_signed(mimeview));
 #endif
-
+               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+                                   "pop_partinfo", partinfo);
+                                   
                gtk_menu_popup(GTK_MENU(mimeview->popupmenu),
                               NULL, NULL, NULL, NULL,
                               event->button, event->time);
        }
+
+}
+
+
+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,
+#warning FIXME_GTK2
+#if 0
+#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"); \
+       }
+#else
+#define KEY_PRESS_EVENT_STOP()
+#endif
+
+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:
-       case GDK_Delete:
                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;
-
-               gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
+               KEY_PRESS_EVENT_STOP();
+               g_signal_emit_by_name(G_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;
-
-               gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
+               KEY_PRESS_EVENT_STOP();
+               g_signal_emit_by_name(G_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,
@@ -653,22 +945,22 @@ static void mimeview_drag_data_get(GtkWidget          *widget,
                                   MimeView         *mimeview)
 {
        gchar *filename, *uriname;
+       const gchar *bname;
        MimeInfo *partinfo;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
 
-       partinfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) return;
        if (!partinfo->filename && !partinfo->name) return;
 
        filename = partinfo->filename ? partinfo->filename : partinfo->name;
-       filename = g_basename(filename);
-       if (*filename == '\0') return;
+       bname = g_basename(filename);
+       if (*bname == '\0') return;
 
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
-                              filename, NULL);
+                              bname, NULL);
 
        if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
                alertpanel_error
@@ -682,39 +974,117 @@ 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 = mimeview_get_selected_part(mimeview);
+       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;
 
        if (!mimeview->opened) return;
 
-       partinfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       partinfo = mimeview_get_selected_part(mimeview);
+       if (!partinfo)  {
+               partinfo = (MimeInfo *) gtk_object_get_data
+                       (GTK_OBJECT(mimeview->popupmenu),
+                        "pop_partinfo");
+               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+                                   "pop_partinfo", NULL);
+       
+       }                        
+       g_return_if_fail(partinfo != NULL);
        mimeview_show_message_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;
 
-       partinfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       partinfo = mimeview_get_selected_part(mimeview);
+       if (!partinfo) { 
+               partinfo = (MimeInfo *) gtk_object_get_data
+                       (GTK_OBJECT(mimeview->popupmenu),
+                        "pop_partinfo");
+               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+                                   "pop_partinfo", NULL);
+       }                        
        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;
        }
 
@@ -731,8 +1101,14 @@ static void mimeview_launch(MimeView *mimeview)
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
 
-       partinfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       partinfo = mimeview_get_selected_part(mimeview);
+       if (!partinfo) { 
+               partinfo = (MimeInfo *) gtk_object_get_data
+                       (GTK_OBJECT(mimeview->popupmenu),
+                        "pop_partinfo");
+               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+                                   "pop_partinfo", NULL);
+       }                        
        g_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
@@ -750,31 +1126,47 @@ static void mimeview_open_with(MimeView *mimeview)
 {
        MimeInfo *partinfo;
        gchar *filename;
+       gchar *cmd;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
 
-       partinfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       partinfo = mimeview_get_selected_part(mimeview);
+       if (!partinfo) { 
+               partinfo = (MimeInfo *) gtk_object_get_data
+                       (GTK_OBJECT(mimeview->popupmenu),
+                        "pop_partinfo");
+               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+                                   "pop_partinfo", NULL);
+       }                        
        g_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
 
-       if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
+       if (procmime_get_part(filename, mimeview->file, partinfo) < 0) {
                alertpanel_error
                        (_("Can't save the part of multipart message."));
-       else {
-               gchar *cmd;
-
-               cmd = input_dialog
-                       (_("Open with"),
-                        _("Enter the command line to open file:\n"
-                          "(`%s' will be replaced with file name)"),
-                        "gedit %s");
-               if (cmd) {
-                       mimeview_view_file(filename, partinfo, cmd);
-                       g_free(cmd);
-               }
+               g_free(filename);
+               return;
+       }
+
+       if (!prefs_common.mime_open_cmd_history)
+               prefs_common.mime_open_cmd_history =
+                       add_history(NULL, prefs_common.mime_open_cmd);
+
+       cmd = input_dialog_combo
+               (_("Open with"),
+                _("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,
+                TRUE);
+       if (cmd) {
+               mimeview_view_file(filename, partinfo, cmd);
+               g_free(prefs_common.mime_open_cmd);
+               prefs_common.mime_open_cmd = cmd;
+               prefs_common.mime_open_cmd_history =
+                       add_history(prefs_common.mime_open_cmd_history, cmd);
        }
 
        g_free(filename);
@@ -785,9 +1177,8 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
 {
        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 *mime_cmdline = "metamail -d -b -c %s '%s'";
+       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];
        const gchar *cmd;
@@ -820,14 +1211,14 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
                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
                        return;
        }
 
-       execute_command_line(buf);
+       execute_command_line(buf, TRUE);
 }
 
 #if USE_GPGME
@@ -858,8 +1249,7 @@ static void mimeview_update_signature_info(MimeView *mimeview)
        if (!mimeview) return;
        if (!mimeview->opened) return;
 
-       partinfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) return;
 
        if (g_strcasecmp(partinfo->content_type,
@@ -869,13 +1259,13 @@ static void mimeview_update_signature_info(MimeView *mimeview)
        }
 }
 
-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);
@@ -885,24 +1275,470 @@ static void mimeview_check_signature(MimeView *mimeview)
        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);
+                             
+       mimeview_update(mimeview);
 }
 #endif /* USE_GPGME */
+
+void mimeview_register_viewer_factory(MimeViewerFactory *factory)
+{
+       mimeviewer_factories = g_slist_append(mimeviewer_factories, factory);
+}
+
+static gint cmp_viewer_by_factroy(gconstpointer a, gconstpointer b)
+{
+       return ((MimeViewer *) a)->factory == (MimeViewerFactory *) b ? 0 : -1;
+}
+
+void mimeview_unregister_viewer_factory(MimeViewerFactory *factory)
+{
+       GSList *mimeview_list, *viewer_list;
+
+       for (mimeview_list = mimeviews; mimeview_list != NULL; mimeview_list = g_slist_next(mimeview_list)) {
+               MimeView *mimeview = (MimeView *) mimeview_list->data;
+               
+               if (mimeview->mimeviewer && mimeview->mimeviewer->factory == factory) {
+                       mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
+                       mimeview->mimeviewer = NULL;
+               }
+
+               while ((viewer_list = g_slist_find_custom(mimeview->viewers, factory, cmp_viewer_by_factroy)) != NULL) {
+                       MimeViewer *mimeviewer = (MimeViewer *) viewer_list->data;
+
+                       mimeviewer->destroy_viewer(mimeviewer);
+                       mimeview->viewers = g_slist_remove(mimeview->viewers, mimeviewer);
+               }
+       }
+
+       mimeviewer_factories = g_slist_remove(mimeviewer_factories, factory);
+}
+
+static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeView *mimeview)
+{
+       gint      num;
+       MimeInfo *partinfo;
+
+       num      = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(button), "icon_number"));
+       partinfo = gtk_object_get_data(GTK_OBJECT(button), "partinfo");
+       if (event->button == 1) { 
+               icon_selected(mimeview, num, partinfo);
+               gtk_widget_grab_focus(button);
+               
+               if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
+                       toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+               else
+                       gtk_signal_emit_stop_by_name(GTK_OBJECT(button), "button_press_event");
+       }               
+
+       part_button_pressed(mimeview, event, partinfo);
+
+       return TRUE;
+}
+
+static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
+{
+       if (num == 1 && (partinfo->mime_type == MIME_TEXT ||  
+                        partinfo->mime_type == MIME_TEXT_HTML))  {
+               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0);
+               /* don't set the ctree, as it will unload the plugin, and
+                * we want to be able to switch quickly between the text
+                * part and the attachment */
+       } else {
+               GtkCTreeNode *node;
+               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 1);
+               node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
+               if (node)
+                       gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
+       }
+}              
+
+#warning FIXME_GTK2
+#if 0
+#undef  KEY_PRESS_EVENT_STOP
+#define KEY_PRESS_EVENT_STOP() \
+       if (gtk_signal_n_emissions_by_name \
+               (GTK_OBJECT(button), "key_press_event") > 0) { \
+               gtk_signal_emit_stop_by_name(GTK_OBJECT(button), \
+                                            "key_press_event"); \
+       }
+#endif
+static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
+                            MimeView *mimeview)
+{
+       gint          num;
+       MimeInfo     *partinfo;
+       SummaryView  *summaryview;
+       TextView     *textview;
+
+       num      = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(button), "icon_number"));
+       partinfo = gtk_object_get_data(GTK_OBJECT(button), "partinfo");
+       
+       if (!event) return FALSE;
+
+       if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
+               textview = mimeview->messageview->textview;
+       else
+               textview = mimeview->textview;
+
+       switch (event->keyval) {
+       case GDK_space:
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+                       /* stop the button being untoggled */
+                       KEY_PRESS_EVENT_STOP();
+                       if (textview_scroll_page(textview, FALSE))
+                               return TRUE;
+
+                       if (icon_list_select_by_number(mimeview, num + 1))
+                               return TRUE;
+               } else {
+                       icon_selected(mimeview, num, partinfo);
+                       toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+                       return TRUE;
+               }
+
+               break;
+       case GDK_BackSpace:
+               textview_scroll_page(textview, TRUE);
+               return TRUE;
+       case GDK_Return:
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+                       KEY_PRESS_EVENT_STOP();
+                       textview_scroll_one_line(textview,
+                                                (event->state & GDK_MOD1_MASK) != 0);
+                       return TRUE;
+               } else {
+                       icon_selected(mimeview, num, partinfo);
+                       toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+                       return TRUE;
+               }
+
+       case GDK_n:
+       case GDK_N:
+               BREAK_ON_MODIFIER_KEY();
+               if (icon_list_select_by_number(mimeview, num + 1))
+                       KEY_PRESS_EVENT_STOP();
+                       return TRUE;
+               break;
+               
+       case GDK_p:
+       case GDK_P:
+               BREAK_ON_MODIFIER_KEY();
+               if (icon_list_select_by_number(mimeview, num - 1))
+                       KEY_PRESS_EVENT_STOP();
+                       return TRUE;
+               break;
+
+       case GDK_y:
+               BREAK_ON_MODIFIER_KEY();
+               if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
+                       break;
+               KEY_PRESS_EVENT_STOP();
+               mimeview_save_as(mimeview);
+               return TRUE;
+       case GDK_t:
+               BREAK_ON_MODIFIER_KEY();
+               if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
+                       break;
+               KEY_PRESS_EVENT_STOP();
+               mimeview_display_as_text(mimeview);
+               return TRUE;    
+       case GDK_l:
+               BREAK_ON_MODIFIER_KEY();
+               if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
+                       break;
+               KEY_PRESS_EVENT_STOP();
+               mimeview_launch(mimeview);
+               return TRUE;
+       default:
+               break;
+       }
+
+       if (!mimeview->messageview->mainwin) return FALSE;
+       summaryview = mimeview->messageview->mainwin->summaryview;
+       summary_pass_key_press_event(summaryview, event);
+       return TRUE;
+}
+
+static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)
+{
+       GList *child;
+       
+       child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
+       for (; child != NULL; child = g_list_next(child)) {
+               if (GTK_IS_TOGGLE_BUTTON(child->data) && 
+                   GTK_TOGGLE_BUTTON(child->data) != button &&
+                   gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(child->data)))
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(child->data),
+                                FALSE);
+       }
+}
+
+static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo) 
+{
+       GtkWidget *pixmap;
+       GtkWidget *vbox;
+       GtkWidget *button;
+       gchar *tip;
+       gchar *desc = NULL;
+       StockPixmap stockp;
+       
+       vbox = mimeview->icon_vbox;
+       mimeview->icon_count++;
+       button = gtk_toggle_button_new();
+       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+       gtk_object_set_data(GTK_OBJECT(button), "icon_number", 
+               GINT_TO_POINTER(mimeview->icon_count));
+       gtk_object_set_data(GTK_OBJECT(button), "partinfo", 
+               mimeinfo);
+       
+       switch (mimeinfo->mime_type) {
+               
+       case MIME_TEXT:
+       case MIME_MESSAGE_RFC822:
+               stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
+               break;
+       case MIME_TEXT_HTML:
+               stockp = STOCK_PIXMAP_MIME_TEXT_HTML;
+               break;
+       case MIME_APPLICATION:
+#ifdef USE_GPGME       
+               if (mimeinfo->content_type
+                       &&  g_strcasecmp(mimeinfo->content_type, 
+                                        "application/pgp-signature")  == 0) {
+                       if (mimeinfo->sigstatus_full) {
+                               desc = mimeinfo->sigstatus;
+                               if (mimeinfo->sig_ok)
+                                       stockp = STOCK_PIXMAP_MIME_GPG_PASSED;
+                               else if (mimeinfo->sig_unknown) 
+                                       stockp = STOCK_PIXMAP_MIME_GPG_UNKNOWN;
+                               else if (mimeinfo->sig_expired 
+                                        || mimeinfo->key_expired) 
+                                       stockp = STOCK_PIXMAP_MIME_GPG_EXPIRED;
+                               else
+                                       stockp = STOCK_PIXMAP_MIME_GPG_FAILED;
+                       } else
+                               stockp = STOCK_PIXMAP_MIME_GPG_SIGNED;
+               } else
+#endif 
+                       stockp = STOCK_PIXMAP_MIME_APPLICATION;
+               break;
+       case MIME_APPLICATION_OCTET_STREAM:
+               stockp = STOCK_PIXMAP_MIME_APPLICATION_OCTET_STREAM;
+               break;
+       case MIME_IMAGE:
+               stockp = STOCK_PIXMAP_MIME_IMAGE;
+               break;
+       case MIME_AUDIO:
+               stockp = STOCK_PIXMAP_MIME_AUDIO;
+               break;
+       case MIME_TEXT_ENRICHED:
+               stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
+               break;
+       default:
+               stockp = STOCK_PIXMAP_MIME_UNKNOWN;
+               break;
+       }
+       
+       pixmap = stock_pixmap_widget(mimeview->mainwin->window, stockp);
+       gtk_container_add(GTK_CONTAINER(button), pixmap);
+       
+       if (!desc) {
+               if (prefs_common.attach_desc)
+                       desc = get_part_description(mimeinfo);
+               else
+                       desc = get_part_name(mimeinfo);
+       }
+       if (desc && *desc)
+               tip = g_strdup_printf("%s\n%s\n%s", desc, mimeinfo->content_type, 
+                               to_human_readable(mimeinfo->size));
+       else            
+               tip = g_strdup_printf("%s\n%s", mimeinfo->content_type, 
+                               to_human_readable(mimeinfo->size));
+
+       gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
+       g_free(tip);
+       gtk_widget_show_all(button);
+       g_signal_connect(G_OBJECT(button), "button_press_event", 
+                        G_CALLBACK(icon_clicked_cb), mimeview);
+       g_signal_connect(G_OBJECT(button), "key_press_event", 
+                        G_CALLBACK(icon_key_pressed), mimeview);
+       gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
+
+}
+
+static void icon_list_clear (MimeView *mimeview)
+{
+       GList     *child;
+       GtkAdjustment *adj;
+       
+       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+       for (; child != NULL; child = g_list_next(child)) {
+               gtkut_container_remove(GTK_CONTAINER(mimeview->icon_vbox), 
+                                      GTK_WIDGET(child->data));
+       }
+       mimeview->icon_count = 0;
+       adj  = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
+       adj->value = adj->lower;
+       gtk_signal_emit_by_name(GTK_OBJECT (adj), "value_changed");
+}
+
+static void icon_list_toggle_by_mime_info(MimeView     *mimeview,
+                                         MimeInfo      *mimeinfo)
+{
+       GList *child;
+       
+       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+       for (; child != NULL; child = g_list_next(child)) {
+               if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
+                   gtk_object_get_data(GTK_OBJECT(child->data),
+                                       "partinfo") == (gpointer)mimeinfo) {
+                       toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(child->data), TRUE);
+               }                                
+       }
+}
+
+/*!
+ *\brief        Used to 'click' the next or previous icon.
+ *
+ *\return       true if the icon 'number' exists and was selected.
+ */
+static gboolean icon_list_select_by_number(MimeView    *mimeview,
+                                          gint          number)
+{
+       GList *child;
+
+       if (number == 0) return FALSE;
+       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+       for (; child != NULL; child = g_list_next(child)) {
+               if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
+                   GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(child->data),
+                                       "icon_number")) == number) {
+                       icon_selected(mimeview, number,
+                                     (MimeInfo*)gtk_object_get_data(GTK_OBJECT(child->data),
+                                                                    "partinfo"));
+                       toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(child->data), TRUE);
+                       gtk_widget_grab_focus(GTK_WIDGET(child->data));
+               
+                       return TRUE;
+               }                                
+       }
+       return FALSE;
+}
+
+static void icon_scroll_size_allocate_cb(GtkWidget *widget, 
+                                       GtkAllocation *size, MimeView *mimeview)
+{
+       GtkAllocation *mainbox_size;
+       GtkAllocation *vbox_size;
+       GtkAllocation *layout_size;
+       GtkAdjustment *adj;
+       
+       adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
+
+       mainbox_size = &mimeview->icon_mainbox->allocation;
+       vbox_size = &mimeview->icon_vbox->allocation;
+       layout_size = &mimeview->icon_scroll->allocation;
+       
+       /* centralise the vbox */
+       gtk_layout_move(GTK_LAYOUT(mimeview->icon_scroll), mimeview->icon_vbox, 
+                       (mainbox_size->width - vbox_size->width)/2, 0);
+       
+       gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll), 
+                           GTK_LAYOUT(mimeview->icon_scroll)->width, 
+                           MAX(vbox_size->height, layout_size->height));
+       adj->step_increment = 5;
+}
+
+static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
+{
+       GtkRequisition size;
+       gint           width;
+       g_return_if_fail(mimeinfo != NULL);
+
+       if (mimeinfo->children)
+               mimeinfo = mimeinfo->children;
+
+       while (mimeinfo != NULL) {
+               if (mimeinfo->children)
+                       icon_list_create(mimeview, mimeinfo);
+               else if (mimeinfo->sub &&
+                        mimeinfo->sub->mime_type != MIME_TEXT &&
+                        mimeinfo->sub->mime_type != MIME_TEXT_HTML)
+                       icon_list_create(mimeview, mimeinfo->sub);
+               else 
+                       icon_list_append_icon(mimeview, mimeinfo);
+               mimeinfo = mimeinfo->next;
+       }
+       gtk_widget_size_request(mimeview->icon_vbox, &size);
+       width = size.width + 4;
+       if (width > mimeview->icon_mainbox->requisition.width) {
+               gtk_widget_set_size_request(mimeview->icon_mainbox, 
+                                           width, -1);
+       }
+
+}
+
+static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview) 
+{
+       gtk_widget_ref(button); 
+
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+               gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_RIGHT, 
+                                       GTK_SHADOW_NONE);
+               gtk_widget_hide(mimeview->icon_mainbox);
+               gtk_widget_show(mimeview->ctree_mainbox);
+               gtk_paned_set_position(GTK_PANED(mimeview->paned), mimeview->oldsize);
+
+               gtkut_container_remove(GTK_CONTAINER(mimeview->icon_mainbox), 
+                                       button);
+               gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox), 
+                                  button, FALSE, FALSE, 0);
+               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 1); 
+       } else {
+               gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_LEFT, 
+                             GTK_SHADOW_NONE);
+               mimeview->oldsize = mimeview->ctree_mainbox->allocation.height;
+               gtk_widget_hide(mimeview->ctree_mainbox);
+               gtk_widget_show(mimeview->icon_mainbox);
+               gtk_paned_set_position(GTK_PANED(mimeview->paned), 0);
+
+               gtkut_container_remove(GTK_CONTAINER(mimeview->ctree_mainbox), 
+                                       button);
+               gtk_box_pack_start(GTK_BOX(mimeview->icon_mainbox), 
+                                  button, FALSE, FALSE, 0);
+               gtk_box_reorder_child(GTK_BOX(button->parent), button, 0);
+               if (mimeview->opened)
+                       icon_list_toggle_by_mime_info
+                               (mimeview, gtk_ctree_node_get_row_data(GTK_CTREE(mimeview->ctree), 
+                                                                      mimeview->opened));
+
+       }
+       gtk_widget_grab_focus(button);
+       gtk_widget_unref(button);
+
+}
+
+void mimeview_update (MimeView *mimeview) {
+       if (mimeview && mimeview->mimeinfo) {
+               icon_list_clear(mimeview);
+               icon_list_create(mimeview, mimeview->mimeinfo);
+       }
+}