#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>
#ifndef HAVE_APACHE_FNMATCH
#include "prefs_common.h"
#include "rfc2015.h"
#include "stock_pixmap.h"
+#include "gtk/gtkvscrollbutton.h"
+
typedef enum
{
MimeInfo *partinfo);
static void mimeview_change_view_type (MimeView *mimeview,
MimeViewType type);
-static void mimeview_clear (MimeView *mimeview);
static void mimeview_selected (GtkCTree *ctree,
GtkCTreeNode *node,
static void mimeview_view_file (const gchar *filename,
MimeInfo *partinfo,
const gchar *cmdline);
+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 _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 _all..."), NULL, mimeview_save_all, 0, NULL}
-#if USE_GPGME
- ,
- {N_("/_Check signature"), NULL, mimeview_check_signature, 0, NULL}
-#endif
+ {N_("/Save _all..."), NULL, mimeview_save_all, 0, NULL},
};
static GtkTargetEntry mimeview_mime_types[] =
{
MimeView *mimeview;
- GtkWidget *notebook;
- GtkWidget *vbox;
GtkWidget *paned;
GtkWidget *scrolledwin;
GtkWidget *ctree;
GtkWidget *mime_notebook;
GtkWidget *popupmenu;
- GtkWidget *icon;
+ GtkWidget *ctree_mainbox;
+ GtkWidget *vbox;
+ GtkWidget *mime_toggle;
+ GtkWidget *icon_mainbox;
+ GtkWidget *icon_scroll;
+ GtkWidget *icon_vbox;
+ GtkWidget *arrow;
+ GtkWidget *scrollbutton;
+ GtkWidget *hbox;
+ GtkTooltips *tooltips;
GtkItemFactory *popupfactory;
+ NoticeView *siginfoview;
gchar *titles[N_MIMEVIEW_COLS];
gint n_entries;
gint i;
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);
- icon = stock_pixmap_widget(mainwin->window, STOCK_PIXMAP_MESSAGEVIEW_TEXT);
- gtk_widget_show(icon);
- gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook), vbox, icon);
-
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_widget_show(scrolledwin);
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_widget_show(ctree);
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
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_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);
+
+ icon_vbox = gtk_vbox_new(FALSE, 2);
+ gtk_widget_show(icon_vbox);
+ icon_scroll = gtk_layout_new(NULL, NULL);
+ gtk_widget_show(icon_scroll);
+ gtk_layout_put(GTK_LAYOUT(icon_scroll), icon_vbox, 0, 0);
+ scrollbutton = gtk_vscrollbutton_new(gtk_layout_get_vadjustment(GTK_LAYOUT(icon_scroll)));
+ gtk_widget_show(scrollbutton);
+
+ mime_toggle = gtk_toggle_button_new();
+ gtk_widget_show(mime_toggle);
+ arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+ gtk_widget_show(arrow);
+ gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
+ gtk_signal_connect(GTK_OBJECT(mime_toggle), "toggled",
+ GTK_SIGNAL_FUNC(mime_toggle_button_cb), mimeview);
+
+ icon_mainbox = gtk_vbox_new(FALSE, 0);
+ gtk_widget_show(icon_mainbox);
+ 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);
+ gtk_signal_connect(GTK_OBJECT(icon_mainbox), "size_allocate",
+ GTK_SIGNAL_FUNC(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);
- paned = gtk_vpaned_new();
- gtk_paned_add1(GTK_PANED(paned), scrolledwin);
- gtk_paned_add2(GTK_PANED(paned), mime_notebook);
- gtk_container_add(GTK_CONTAINER(notebook), paned);
- icon = stock_pixmap_widget(mainwin->window, STOCK_PIXMAP_CLIP);
- gtk_widget_show(icon);
- gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook), paned, icon);
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_RIGHT);
+ 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);
- gtk_widget_show_all(notebook);
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_widget_show(vbox);
+ siginfoview = noticeview_create(mainwin);
+ noticeview_hide(siginfoview);
+ gtk_box_pack_start(GTK_BOX(vbox), mime_notebook, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(vbox), GTK_WIDGET_PTR(siginfoview), FALSE, FALSE, 0);
- gtk_notebook_set_page(GTK_NOTEBOOK(notebook), 0);
+ paned = gtk_vpaned_new();
+ gtk_widget_show(paned);
+ gtk_paned_set_gutter_size(GTK_PANED(paned), 0);
+ gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
+ gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
+
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), paned, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), icon_mainbox, FALSE, FALSE, 0);
- n_entries = sizeof(mimeview_popup_entries) /
- sizeof(mimeview_popup_entries[0]);
- popupmenu = menu_create_items(mimeview_popup_entries, n_entries,
- "<MimeView>", &popupfactory, mimeview);
+ gtk_widget_show(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->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->siginfoview = siginfoview;
+
+ mimeview->target_list = gtk_target_list_new(mimeview_mime_types, 1);
+
mimeviews = g_slist_prepend(mimeviews, mimeview);
return mimeview;
GTK_WIDGET_PTR(mimeview->textview));
}
-/*
- * Check whether the message is OpenPGP signed
- */
-#if USE_GPGME
-static gboolean mimeview_is_signed(MimeView *mimeview)
-{
- MimeInfo *partinfo = NULL;
-
- debug_print("mimeview_is signed of %p\n", mimeview);
-
- if (!mimeview) return FALSE;
- if (!mimeview->opened) return FALSE;
-
- debug_print("mimeview_is_signed: open\n" );
-
- if (!mimeview->file) return FALSE;
-
- debug_print("mimeview_is_signed: file\n" );
-
- partinfo = gtk_ctree_node_get_row_data
- (GTK_CTREE(mimeview->ctree), mimeview->opened);
- g_return_val_if_fail(partinfo != NULL, FALSE);
-
- /* walk the tree and see whether there is a signature somewhere */
- do {
- if (rfc2015_has_signature(partinfo))
- return TRUE;
- } while ((partinfo = partinfo->parent) != NULL);
-
- debug_print("mimeview_is_signed: FALSE\n" );
-
- return FALSE;
-}
-
-static void set_unchecked_signature(MimeInfo *mimeinfo)
-{
- MimeInfo *sig_partinfo;
-
- sig_partinfo = rfc2015_find_signature(mimeinfo);
- if (sig_partinfo == NULL) return;
-
- g_free(sig_partinfo->sigstatus);
- sig_partinfo->sigstatus =
- g_strdup(_("Right-click here to verify the signature"));
-
- g_free(sig_partinfo->sigstatus_full);
- sig_partinfo->sigstatus_full = NULL;
-}
-#endif /* USE_GPGME */
-
void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
const gchar *file)
{
GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
GtkCTreeNode *node;
- FILE *fp;
mimeview_clear(mimeview);
- textview_clear(mimeview->messageview->textview);
g_return_if_fail(file != NULL);
g_return_if_fail(mimeinfo != NULL);
mimeview->file = g_strdup(file);
-#if USE_GPGME
- 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);
- fclose(fp);
- } else
- set_unchecked_signature(mimeinfo);
-#endif
-
gtk_signal_handler_block_by_func(GTK_OBJECT(ctree), mimeview_selected,
mimeview);
mimeview_set_multipart_tree(mimeview, mimeinfo, NULL);
+ icon_list_create(mimeview, mimeinfo);
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)
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
+ node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
if (node) {
gtk_ctree_select(ctree, node);
+ icon_list_toggle_by_mime_info
+ (mimeview, gtk_ctree_node_get_row_data(ctree, node));
gtkut_ctree_set_focus_row(ctree, node);
- gtk_widget_grab_focus(mimeview->ctree);
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mimeview->mime_toggle)))
+ gtk_widget_grab_focus(mimeview->ctree);
}
}
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);
}
g_return_if_fail(mimeinfo != NULL);
- if (mimeinfo->children)
- mimeinfo = mimeinfo->children;
-
while (mimeinfo != NULL) {
node = mimeview_append_part(mimeview, mimeinfo, parent);
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);
+ mimeview_set_multipart_tree(mimeview, mimeinfo->children, node);
mimeinfo = mimeinfo->next;
}
}
static gchar *get_part_name(MimeInfo *partinfo)
{
-#if USE_GPGME
- if (partinfo->sigstatus)
- return partinfo->sigstatus;
- else
-#endif
- if (partinfo->name)
- return partinfo->name;
- else if (partinfo->filename)
- return partinfo->filename;
- else if (partinfo->description)
- return partinfo->description;
- else
- return "";
+ gchar *name;
+
+ name = g_hash_table_lookup(partinfo->parameters, "name");
+ if(name == NULL)
+ name = "";
+
+ return name;
}
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 if (g_hash_table_lookup(partinfo->parameters, "name") != NULL)
+ return g_hash_table_lookup(partinfo->parameters, "name");
else
return "";
}
{
GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
GtkCTreeNode *node;
+ static gchar content_type[64];
gchar *str[N_MIMEVIEW_COLS];
- str[COL_MIMETYPE] =
- partinfo->content_type ? partinfo->content_type : "";
- str[COL_SIZE] = to_human_readable(partinfo->size);
+ if (partinfo->type != MIMETYPE_UNKNOWN && partinfo->subtype) {
+ g_snprintf(content_type, 64, "%s/%s", procmime_get_type_str(partinfo->type), partinfo->subtype);
+ } else {
+ g_snprintf(content_type, 64, "UNKNOWN");
+ }
+
+ str[COL_MIMETYPE] = content_type;
+ str[COL_SIZE] = to_human_readable(partinfo->length);
if (prefs_common.attach_desc)
str[COL_NAME] = get_part_description(partinfo);
else
{
FILE *fp;
const gchar *fname;
-#if USE_GPGME
- MimeInfo *pi;
-#endif
if (!partinfo) return;
-#if USE_GPGME
- for (pi = partinfo; pi && !pi->plaintextfile ; pi = pi->parent)
- ;
- fname = pi ? pi->plaintextfile : mimeview->file;
-#else
fname = mimeview->file;
-#endif /* USE_GPGME */
if (!fname) return;
if ((fp = fopen(fname, "rb")) == NULL) {
return;
}
- if (fseek(fp, partinfo->fpos, SEEK_SET) < 0) {
+ if (fseek(fp, partinfo->offset, SEEK_SET) < 0) {
FILE_OP_ERROR(mimeview->file, "fseek");
fclose(fp);
return;
gchar *content_type = NULL;
MimeViewer *viewer = NULL;
- if ((partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM) &&
+ if ((partinfo->type == MIMETYPE_APPLICATION) &&
+ (g_strcasecmp(partinfo->subtype, "octet-stream")) &&
(partinfo->name != NULL)) {
content_type = procmime_get_mime_type(partinfo->name);
} else {
- content_type = g_strdup(partinfo->content_type);
+ content_type = g_strdup_printf("%s/%s", procmime_get_type_str(partinfo->type), partinfo->subtype);
}
if (content_type != NULL) {
mimeview->type = type;
}
-static void mimeview_clear(MimeView *mimeview)
+void mimeview_clear(MimeView *mimeview)
{
GtkCList *clist = GTK_CLIST(mimeview->ctree);
- procmime_mimeinfo_free_all(mimeview->mimeinfo);
- mimeview->mimeinfo = NULL;
+ noticeview_hide(mimeview->siginfoview);
gtk_clist_clear(clist);
textview_clear(mimeview->textview);
if (mimeview->mimeviewer != NULL)
mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
+ if (mimeview->mimeinfo != NULL)
+ procmime_mimeinfo_free_all(mimeview->mimeinfo);
+ mimeview->mimeinfo = NULL;
+
mimeview->opened = NULL;
g_free(mimeview->file);
mimeview->file = NULL;
- /* gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0); */
+ icon_list_clear(mimeview);
}
static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
}
mimeview->textview->default_text = FALSE;
-
+
+ if (privacy_mimeinfo_is_signed(partinfo)) {
+ noticeview_set_text(mimeview->siginfoview, "Signed Part");
+ noticeview_show(mimeview->siginfoview);
+ } else {
+ noticeview_hide(mimeview->siginfoview);
+ }
+
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:
+ switch (partinfo->type) {
+ case MIMETYPE_TEXT:
+ case MIMETYPE_MESSAGE:
+ case MIMETYPE_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
-#endif
- textview_show_mime_part(mimeview->textview, partinfo);
+ textview_show_mime_part(mimeview->textview, partinfo);
break;
}
}
static void mimeview_start_drag(GtkWidget *widget, gint button,
GdkEvent *event, MimeView *mimeview)
{
- GtkTargetList *list;
GdkDragContext *context;
MimeInfo *partinfo;
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);
}
MimeView *mimeview)
{
GtkCList *clist = GTK_CLIST(widget);
- MimeInfo *partinfo;
gint row, column;
if (!event) return FALSE;
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 = mimeview_get_selected_part(mimeview);
- 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))
+ if (partinfo && (partinfo->type == MIMETYPE_TEXT ||
+ partinfo->type == MIMETYPE_MESSAGE ||
+ partinfo->type == MIMETYPE_IMAGE ||
+ partinfo->type == MIMETYPE_MULTIPART))
menu_set_sensitive(mimeview->popupfactory,
"/Display as text", FALSE);
else
menu_set_sensitive(mimeview->popupfactory,
"/Display as text", TRUE);
if (partinfo &&
- partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM)
+ partinfo->type == MIMETYPE_APPLICATION)
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);
}
-
- return TRUE;
}
+
void mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
{
mimeview_key_pressed(mimeview->ctree, event, mimeview);
filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
filename, NULL);
- if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
+ if (procmime_get_part(filename, partinfo) < 0)
alertpanel_error
(_("Can't save the part of multipart message."));
dirname = filesel_select_file(_("Save as"), defname);
if (!dirname) return;
+ if (!is_dir_exist (dirname)) {
+ alertpanel_error(_("`%s' is not a directory."),
+ dirname);
+ g_free (dirname);
+ return;
+ }
+
+ { /* add a / after the dirname, in case the user didn't */
+ gchar *dirname_tmp = NULL;
+ int dirname_last_char = strlen (dirname) - 1;
+
+ if (dirname[dirname_last_char] != G_DIR_SEPARATOR) {
+ dirname_tmp = g_strconcat (dirname, G_DIR_SEPARATOR_S, NULL);
+ g_free (dirname);
+ dirname = dirname_tmp;
+ }
+ }
+
/* return to first children */
if (!partinfo->parent->children) return; /* multipart container? */
attachment = partinfo->parent->children->next;
}
g_free(attachname);
- if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, mimeview->file, attachment) < 0))
+ if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, attachment) < 0))
alertpanel_error(_("Can't save the part of multipart message."));
attachment = attachment->next;
}
if (!mimeview->opened) return;
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);
}
if (!mimeview->file) return;
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);
if (partinfo->filename)
if (G_ALERTDEFAULT != aval) return;
}
- if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
+ if (procmime_get_part(filename, partinfo) < 0)
alertpanel_error
(_("Can't save the part of multipart message."));
}
if (!mimeview->file) return;
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, partinfo) < 0)
alertpanel_error
(_("Can't save the part of multipart message."));
else
if (!mimeview->file) return;
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, partinfo) < 0) {
alertpanel_error
(_("Can't save the part of multipart message."));
g_free(filename);
if (cmdline) {
cmd = cmdline;
def_cmd = NULL;
- } else if (MIME_APPLICATION_OCTET_STREAM == partinfo->mime_type) {
+ } else if (MIMETYPE_APPLICATION == partinfo->type) {
return;
- } else if (MIME_IMAGE == partinfo->mime_type) {
+ } else if (MIMETYPE_IMAGE == partinfo->type) {
cmd = prefs_common.mime_image_viewer;
def_cmd = default_image_cmdline;
- } else if (MIME_AUDIO == partinfo->mime_type) {
+ } else if (MIMETYPE_AUDIO == partinfo->type) {
cmd = prefs_common.mime_audio_player;
def_cmd = default_audio_cmdline;
- } else if (MIME_TEXT_HTML == partinfo->mime_type) {
+ } else if (MIMETYPE_TEXT == partinfo->type && !strcmp(partinfo->subtype, "html")) {
cmd = prefs_common.uri_cmd;
def_cmd = default_html_cmdline;
} else {
+ gchar *content_type;
+
+ content_type = g_strdup_printf("%s/%s", procmime_get_type_str(partinfo->type), partinfo->subtype);
g_snprintf(m_buf, sizeof(m_buf), mime_cmdline,
- partinfo->content_type, "%s");
+ content_type, "%s");
+ g_free(content_type);
cmd = m_buf;
def_cmd = NULL;
}
execute_command_line(buf, TRUE);
}
-#if USE_GPGME
-static void update_node_name(GtkCTree *ctree, GtkCTreeNode *node,
- gpointer data)
+void mimeview_register_viewer_factory(MimeViewerFactory *factory)
{
- MimeInfo *partinfo;
- gchar *part_name;
-
- partinfo = gtk_ctree_node_get_row_data(ctree, node);
- g_return_if_fail(partinfo != NULL);
+ mimeviewer_factories = g_slist_append(mimeviewer_factories, factory);
+}
- part_name = get_part_name(partinfo);
- gtk_ctree_node_set_text(ctree, node, COL_NAME, part_name);
+static gint cmp_viewer_by_factroy(gconstpointer a, gconstpointer b)
+{
+ return ((MimeViewer *) a)->factory == (MimeViewerFactory *) b ? 0 : -1;
}
-static void mimeview_update_names(MimeView *mimeview)
+void mimeview_unregister_viewer_factory(MimeViewerFactory *factory)
{
- GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
+ 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;
- gtk_ctree_pre_recursive(ctree, NULL, update_node_name, NULL);
+ mimeviewer->destroy_viewer(mimeviewer);
+ mimeview->viewers = g_slist_remove(mimeview->viewers, mimeviewer);
+ }
+ }
+
+ mimeviewer_factories = g_slist_remove(mimeviewer_factories, factory);
}
-static void mimeview_update_signature_info(MimeView *mimeview)
+static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeView *mimeview)
{
+ gint num;
MimeInfo *partinfo;
- if (!mimeview) return;
- if (!mimeview->opened) return;
+ 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");
+ }
- partinfo = mimeview_get_selected_part(mimeview);
- if (!partinfo) return;
+ part_button_pressed(mimeview, event, partinfo);
- if (g_strcasecmp(partinfo->content_type,
- "application/pgp-signature") == 0) {
- mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
- textview_show_signature_part(mimeview->textview, partinfo);
- }
+ return TRUE;
}
-void mimeview_check_signature(MimeView *mimeview)
+static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
{
- MimeInfo *mimeinfo;
- FILE *fp;
+ GtkCTreeNode *node;
+ node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
+ if (node)
+ gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
+}
- g_return_if_fail (mimeview_is_signed(mimeview));
- g_return_if_fail (gpg_started);
+#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"); \
+ }
+static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
+ MimeView *mimeview)
+{
+ gint num;
+ MimeInfo *partinfo;
+ SummaryView *summaryview;
+ TextView *textview;
- mimeinfo = gtk_ctree_node_get_row_data
- (GTK_CTREE(mimeview->ctree), mimeview->opened);
- g_return_if_fail(mimeinfo != NULL);
- g_return_if_fail(mimeview->file != NULL);
+ 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;
- while (mimeinfo->parent)
- mimeinfo = mimeinfo->parent;
+ textview = mimeview->textview;
- if ((fp = fopen(mimeview->file, "rb")) == NULL) {
- FILE_OP_ERROR(mimeview->file, "fopen");
- return;
- }
+ 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;
+ }
- rfc2015_check_signature(mimeinfo, fp);
- fclose(fp);
+ 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;
+ }
- mimeview_update_names(mimeview);
- mimeview_update_signature_info(mimeview);
+ 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;
- textview_show_message(mimeview->messageview->textview, mimeinfo,
- mimeview->file);
+ case GDK_y:
+ BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
+ mimeview_save_as(mimeview);
+ return TRUE;
+ case GDK_t:
+ BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
+ mimeview_display_as_text(mimeview);
+ return TRUE;
+ case GDK_l:
+ BREAK_ON_MODIFIER_KEY();
+ 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;
}
-#endif /* USE_GPGME */
-void mimeview_register_viewer_factory(MimeViewerFactory *factory)
+static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)
{
- mimeviewer_factories = g_slist_append(mimeviewer_factories, factory);
+ 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_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 gint cmp_viewer_by_factroy(gconstpointer a, gconstpointer b)
+static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
{
- return ((MimeViewer *) a)->factory == (MimeViewerFactory *) b ? 0 : -1;
+ 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->type) {
+
+ case MIMETYPE_TEXT:
+ if (mimeinfo->subtype && !g_strcasecmp(mimeinfo->subtype, "html"))
+ stockp = STOCK_PIXMAP_MIME_TEXT_HTML;
+ else if (mimeinfo->subtype && !g_strcasecmp(mimeinfo->subtype, "enriched"))
+ stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
+ else
+ stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
+ break;
+ case MIMETYPE_MESSAGE:
+ stockp = STOCK_PIXMAP_MIME_MESSAGE;
+ break;
+ case MIMETYPE_APPLICATION:
+ if (mimeinfo->subtype && !g_strcasecmp(mimeinfo->subtype, "octet-stream"))
+ stockp = STOCK_PIXMAP_MIME_APPLICATION_OCTET_STREAM;
+ else
+ stockp = STOCK_PIXMAP_MIME_APPLICATION;
+ break;
+ case MIMETYPE_IMAGE:
+ stockp = STOCK_PIXMAP_MIME_IMAGE;
+ break;
+ case MIMETYPE_AUDIO:
+ stockp = STOCK_PIXMAP_MIME_AUDIO;
+ 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/%s\n%s", desc,
+ procmime_get_type_str(mimeinfo->type),
+ mimeinfo->subtype,
+ to_human_readable(mimeinfo->length));
+ else
+ tip = g_strdup_printf("%s/%s\n%s",
+ procmime_get_type_str(mimeinfo->type),
+ mimeinfo->subtype,
+ to_human_readable(mimeinfo->length));
+
+ gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
+ g_free(tip);
+ gtk_widget_show_all(button);
+ gtk_signal_connect(GTK_OBJECT(button), "button_press_event",
+ GTK_SIGNAL_FUNC(icon_clicked_cb), mimeview);
+ gtk_signal_connect(GTK_OBJECT(button), "key_press_event",
+ GTK_SIGNAL_FUNC(icon_key_pressed), mimeview);
+ gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
+
}
-void mimeview_unregister_viewer_factory(MimeViewerFactory *factory)
+static void icon_list_clear (MimeView *mimeview)
{
- GSList *mimeview_list, *viewer_list;
+ 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");
+}
- for (mimeview_list = mimeviews; mimeview_list != NULL; mimeview_list = g_slist_next(mimeview_list)) {
- MimeView *mimeview = (MimeView *) mimeview_list->data;
+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));
- if (mimeview->mimeviewer && mimeview->mimeviewer->factory == factory) {
- mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
- mimeview->mimeviewer = NULL;
- }
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
- while ((viewer_list = g_slist_find_custom(mimeview->viewers, factory, cmp_viewer_by_factroy)) != NULL) {
- MimeViewer *mimeviewer = (MimeViewer *) viewer_list->data;
+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));
- mimeviewer->destroy_viewer(mimeviewer);
- mimeview->viewers = g_slist_remove(mimeview->viewers, mimeviewer);
- }
+ 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);
+
+ while (mimeinfo != NULL) {
+ if (mimeinfo->type != MIMETYPE_MULTIPART)
+ icon_list_append_icon(mimeview, mimeinfo);
+ if (mimeinfo->children != NULL)
+ icon_list_create(mimeview, mimeinfo->children);
+ 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_usize(mimeview->icon_mainbox,
+ width, -1);
}
- mimeviewer_factories = g_slist_remove(mimeviewer_factories, factory);
+}
+
+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_paned_set_gutter_size(GTK_PANED(mimeview->paned), 6);
+ } 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_paned_set_gutter_size(GTK_PANED(mimeview->paned), 0);
+ }
+ 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);
+ }
}
projects / claws.git / blobdiff