/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include "gtk/gtkvscrollbutton.h"
#include "gtk/logwindow.h"
#include "timing.h"
+#include "manage_window.h"
+#include "privacy.h"
#ifdef MAEMO
#include <libosso.h>
static void mimeview_selected (GtkTreeSelection *selection,
MimeView *mimeview);
-static void mimeview_start_drag (GtkWidget *widget,
- gint button,
- GdkEvent *event,
- MimeView *mimeview);
static gint mimeview_button_pressed (GtkWidget *widget,
GdkEventButton *event,
MimeView *mimeview);
static gboolean mimeview_scrolled (GtkWidget *widget,
GdkEventScroll *event,
MimeView *mimeview);
-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,
- MimeInfo *partinfo);
#ifndef G_OS_WIN32
-static void mimeview_open_with (MimeView *mimeview);
static void mimeview_open_part_with (MimeView *mimeview,
MimeInfo *partinfo,
gboolean automatic);
#endif
-static void mimeview_select_next_part (MimeView *mimeview);
-static void mimeview_select_prev_part (MimeView *mimeview);
+static void mimeview_send_to (MimeView *mimeview,
+ MimeInfo *partinfo);
static void mimeview_view_file (const gchar *filename,
MimeInfo *partinfo,
const gchar *cmd,
static void icon_list_clear (MimeView *mimeview);
static void icon_list_toggle_by_mime_info (MimeView *mimeview,
MimeInfo *mimeinfo);
+static void ctree_size_allocate_cb (GtkWidget *widget,
+ GtkAllocation *allocation,
+ MimeView *mimeview);
static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
MimeView *mimeview);
static gboolean part_button_pressed (MimeView *mimeview,
}
#endif
+static void mimeview_send_to_cb(GtkAction *action, gpointer data)
+{
+ MimeView *mimeview = (MimeView *)data;
+ mimeview_send_to(mimeview, mimeview_get_part_to_use(mimeview));
+}
+
static void mimeview_display_as_text_cb(GtkAction *action, gpointer data)
{
mimeview_display_as_text((MimeView *)data);
static GtkActionEntry mimeview_menu_actions[] = {
{ "MimeView", NULL, "MimeView" },
- { "MimeView/Open", NULL, N_("_Open (l)"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) },
+ { "MimeView/Open", NULL, N_("_Open"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) },
#if (!defined MAEMO && !defined G_OS_WIN32)
- { "MimeView/OpenWith", NULL, N_("Open _with (o)..."), NULL, "Open MIME part with...", G_CALLBACK(mimeview_open_with_cb) },
+ { "MimeView/OpenWith", NULL, N_("Open _with..."), NULL, "Open MIME part with...", G_CALLBACK(mimeview_open_with_cb) },
#endif
- { "MimeView/DisplayAsText", NULL, N_("_Display as text (t)"), NULL, "Display as text", G_CALLBACK(mimeview_display_as_text_cb) },
- { "MimeView/SaveAs", NULL, N_("_Save as (y)..."), NULL, "Save as", G_CALLBACK(mimeview_save_as_cb) },
+ { "MimeView/SendTo", NULL, N_("Send to..."), NULL, "Send to", G_CALLBACK(mimeview_send_to_cb) },
+ { "MimeView/DisplayAsText", NULL, N_("_Display as text"), NULL, "Display as text", G_CALLBACK(mimeview_display_as_text_cb) },
+ { "MimeView/SaveAs", NULL, N_("_Save as..."), NULL, "Save as", G_CALLBACK(mimeview_save_as_cb) },
{ "MimeView/SaveAll", NULL, N_("Save _all..."), NULL, "Save all parts", G_CALLBACK(mimeview_save_all_cb) },
- { "MimeView/NextPart", NULL, N_("Next part (a)"), NULL, "Next part", G_CALLBACK(mimeview_select_next_part_cb) },
- { "MimeView/PrevPart", NULL, N_("Previous part (z)"), NULL, "Previous part", G_CALLBACK(mimeview_select_prev_part_cb) }
+ { "MimeView/NextPart", NULL, N_("Next part"), NULL, "Next part", G_CALLBACK(mimeview_select_next_part_cb) },
+ { "MimeView/PrevPart", NULL, N_("Previous part"), NULL, "Previous part", G_CALLBACK(mimeview_select_prev_part_cb) }
};
static GtkTargetEntry mimeview_mime_types[] =
column = gtk_tree_view_get_column(GTK_TREE_VIEW(ctree), cols-1);
renderer = gtk_cell_renderer_text_new();
+#if(GTK_CHECK_VERSION(2,18,0))
gtk_cell_renderer_set_alignment(renderer, 1, 0.5);
+#endif
cols = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ctree),
-1, titles[COL_SIZE], renderer,
"text", COL_SIZE, NULL);
gtk_widget_show(ctree);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
+ gtk_drag_source_set(ctree, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
+ mimeview_mime_types, 1, GDK_ACTION_COPY);
g_signal_connect(G_OBJECT(selection), "changed",
G_CALLBACK(mimeview_selected), mimeview);
- g_signal_connect(G_OBJECT(ctree), "button-release-event",
+ g_signal_connect(G_OBJECT(ctree), "button_release_event",
G_CALLBACK(mimeview_button_pressed), mimeview);
- g_signal_connect(G_OBJECT(ctree), "key-press-event",
+ g_signal_connect(G_OBJECT(ctree), "key_press_event",
G_CALLBACK(mimeview_key_pressed), mimeview);
- g_signal_connect(G_OBJECT (ctree),"drag-begin",
- G_CALLBACK (mimeview_start_drag), mimeview);
- g_signal_connect(G_OBJECT(ctree), "drag-data-get",
+ g_signal_connect(G_OBJECT(ctree), "drag_data_get",
G_CALLBACK(mimeview_drag_data_get), mimeview);
mime_notebook = gtk_notebook_new();
ctree_mainbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
+ g_signal_connect(G_OBJECT(ctree_mainbox), "size_allocate",
+ G_CALLBACK(ctree_size_allocate_cb), mimeview);
mimeview->ui_manager = gtk_ui_manager_new();
mimeview->action_group = cm_menu_create_action_group_full(mimeview->ui_manager,
"/Menus/MimeView/", "OpenWith", "MimeView/OpenWith",
GTK_UI_MANAGER_MENUITEM);
#endif
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "SendTo", "MimeView/SendTo",
+ GTK_UI_MANAGER_MENUITEM);
MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "DisplayAsText", "MimeView/DisplayAsText",
GTK_UI_MANAGER_MENUITEM);
#if !(GTK_CHECK_VERSION(2,12,0))
mimeview->tooltips = tips;
#endif
- mimeview->oldsize = 60;
mimeview->mime_toggle = mime_toggle;
mimeview->siginfoview = siginfoview;
mimeview->scrollbutton = scrollbutton;
has_parent = gtk_tree_model_iter_parent(model, &parent, &iter);
if (!gtk_tree_model_iter_next(model, &iter)) {
- if (has_parent && gtk_tree_model_iter_next(model, &parent)) {
+ while (has_parent) {
+ GtkTreeIter saved_parent = parent;
gtk_tree_path_up(path);
- gtk_tree_path_next(path);
- return TRUE;
+ if (gtk_tree_model_iter_next(model, &parent)) {
+ gtk_tree_path_next(path);
+ return TRUE;
+ } else {
+ has_parent = gtk_tree_model_iter_parent(model, &parent, &saved_parent);
+ }
}
} else {
}
static void check_signature_cb(GtkWidget *widget, gpointer user_data);
-static void mimeview_check_signature(MimeView *mimeview);
static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
icon = STOCK_PIXMAP_PRIVACY_FAILED;
break;
case SIGNATURE_CHECK_FAILED:
- button_text = _("Check again");
- func = check_signature_cb;
- icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
case SIGNATURE_CHECK_TIMEOUT:
button_text = _("Check again");
func = check_signature_cb;
icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
+ break;
default:
break;
}
}
}
-static void mimeview_check_signature(MimeView *mimeview)
+void mimeview_check_signature(MimeView *mimeview)
{
check_signature_cb(NULL, mimeview);
}
siginfo = procmime_mimeinfo_parent(siginfo);
}
mimeview->siginfo = siginfo;
-
+
+ /* This shortcut boolean is there to correctly set the menu's
+ * CheckSignature item sensitivity without killing performance
+ * each time the menu sensitiveness is updated (a lot).
+ */
+ mimeview->signed_part = (siginfo == selected);
+
if (siginfo == NULL) {
noticeview_hide(mimeview->siginfoview);
return;
}
}
-static void mimeview_start_drag(GtkWidget *widget, gint button,
- GdkEvent *event, MimeView *mimeview)
-{
- GdkDragContext *context;
- MimeInfo *partinfo;
-
- cm_return_if_fail(mimeview != NULL);
-
- partinfo = mimeview_get_selected_part(mimeview);
- if (partinfo == NULL ||
- partinfo->disposition == DISPOSITIONTYPE_INLINE)
- return;
-
- context = gtk_drag_begin(widget, mimeview->target_list,
- GDK_ACTION_COPY, button, event);
- gtk_drag_set_icon_default(context);
-}
-
static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
MimeView *mimeview)
{
return mimeview_key_pressed(mimeview->ctree, event, mimeview);
}
-static void mimeview_select_next_part(MimeView *mimeview)
+void mimeview_select_next_part(MimeView *mimeview)
{
GtkTreeView *ctree = GTK_TREE_VIEW(mimeview->ctree);
GtkTreeModel *model = gtk_tree_view_get_model(ctree);
gtk_tree_path_free(path);
}
-static void mimeview_select_prev_part(MimeView *mimeview)
+void mimeview_select_prev_part(MimeView *mimeview)
{
GtkTreeView *ctree = GTK_TREE_VIEW(mimeview->ctree);
GtkTreeModel *model = gtk_tree_view_get_model(ctree);
case GDK_KEY_Down:
mimeview_scroll_one_line(mimeview, (event->keyval == GDK_KEY_Up));
return TRUE;
- case GDK_KEY_y:
- BREAK_ON_MODIFIER_KEY();
- mimeview_save_as(mimeview);
- return TRUE;
- case GDK_KEY_t:
- BREAK_ON_MODIFIER_KEY();
- mimeview_display_as_text(mimeview);
- return TRUE;
- case GDK_KEY_l:
- BREAK_ON_MODIFIER_KEY();
- mimeview_launch(mimeview, NULL);
- return TRUE;
- case GDK_KEY_o:
- BREAK_ON_MODIFIER_KEY();
-#ifndef G_OS_WIN32
- mimeview_open_with(mimeview);
-#endif
- return TRUE;
- case GDK_KEY_c:
- BREAK_ON_MODIFIER_KEY();
- mimeview_check_signature(mimeview);
- return TRUE;
- case GDK_KEY_a:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_next_part(mimeview);
- return TRUE;
- case GDK_KEY_z:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_prev_part(mimeview);
- return TRUE;
default:
break;
}
else
startdir = g_strdup(get_home_dir());
+ manage_window_focus_in(gtk_widget_get_ancestor(mimeview->hbox, GTK_TYPE_WINDOW), NULL, NULL);
dirname = filesel_select_file_save_folder(_("Select destination folder"), startdir);
if (!dirname) {
g_free(startdir);
* Menu callback: Save the selected attachment
* \param mimeview Current display
*/
-static void mimeview_save_as(MimeView *mimeview)
+void mimeview_save_as(MimeView *mimeview)
{
gchar *filename;
gchar *filepath = NULL;
g_free(partname);
+ manage_window_focus_in(gtk_widget_get_ancestor(mimeview->hbox, GTK_TYPE_WINDOW), NULL, NULL);
filename = filesel_select_file_save(_("Save as"), filepath);
if (!filename) {
g_free(filepath);
g_free(filepath);
}
-static void mimeview_display_as_text(MimeView *mimeview)
+void mimeview_display_as_text(MimeView *mimeview)
{
MimeInfo *partinfo;
mimeview_show_message_part(mimeview, partinfo);
}
-static void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
+void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
{
gchar *filename;
gint err;
}
#ifndef G_OS_WIN32
-static void mimeview_open_with(MimeView *mimeview)
+void mimeview_open_with(MimeView *mimeview)
{
MimeInfo *partinfo;
}
#endif
+static void mimeview_send_to(MimeView *mimeview, MimeInfo *partinfo)
+{
+ GList *attach_file = NULL;
+ AttachInfo *ainfo = NULL;
+ gchar *filename;
+ gint err;
+
+ if (!mimeview->opened) return;
+ if (!mimeview->file) return;
+
+ cm_return_if_fail(partinfo != NULL);
+
+ filename = procmime_get_tmp_file_name(partinfo);
+
+ if (!(err = procmime_get_part(filename, partinfo))) {
+ ainfo = g_new0(AttachInfo, 1);
+ ainfo->file = filename;
+ ainfo->name = g_strdup(get_part_name(partinfo));
+ ainfo->content_type = procmime_get_content_type_str(
+ partinfo->type, partinfo->subtype);
+ ainfo->charset = g_strdup(procmime_mimeinfo_get_parameter(
+ partinfo, "charset"));
+ attach_file = g_list_append(attach_file, ainfo);
+
+ compose_new(NULL, NULL, attach_file);
+
+ g_free(ainfo->name);
+ g_free(ainfo->content_type);
+ g_free(ainfo->charset);
+ g_free(ainfo);
+ g_list_free(attach_file);
+ } else
+ alertpanel_error
+ (_("Couldn't save the part of multipart message: %s"),
+ strerror(-err));
+ g_free(filename);
+}
+
static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
const gchar *cmd, MimeView *mimeview)
{
if (event->button == 1) {
icon_selected(mimeview, num, partinfo);
gtk_widget_grab_focus(button);
+ icon_list_toggle_by_mime_info(mimeview, partinfo);
}
part_button_pressed(mimeview, event, partinfo);
- icon_list_toggle_by_mime_info(mimeview, partinfo);
return FALSE;
}
static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
MimeView *mimeview)
{
- gint num;
- MimeInfo *partinfo;
SummaryView *summaryview;
- TextView *textview;
-
- num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "icon_number"));
- partinfo = g_object_get_data(G_OBJECT(button), "partinfo");
if (!event) return FALSE;
- textview = mimeview->textview;
-
switch (event->keyval) {
case GDK_KEY_space:
if (mimeview_scroll_page(mimeview, FALSE))
tiptmp = g_strconcat(tip, "\n<b>",
prefs_common.attach_desc && mimeinfo->description ?
_("Description:") : _("Filename:"),
- " </b>", tmp, NULL);
+ " </b>", g_markup_escape_text(tmp,-1), NULL);
g_free(tip);
tip = tiptmp;
g_free(tmp);
}
}
+static void ctree_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation,
+ MimeView *mimeview)
+{
+ prefs_common.mimeview_tree_height = allocation->height;
+}
+
static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
MimeView *mimeview)
{
- GtkAllocation allocation;
g_object_ref(button);
mimeview_leave_notify(button, NULL, NULL);
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);
+ gtk_paned_set_position(GTK_PANED(mimeview->paned),
+ prefs_common.mimeview_tree_height);
gtkut_container_remove(GTK_CONTAINER(mimeview->icon_mainbox),
button);
} else {
gtk_arrow_set(GTK_ARROW(gtk_bin_get_child(GTK_BIN((button)))), GTK_ARROW_LEFT,
GTK_SHADOW_NONE);
- gtk_widget_get_allocation(mimeview->ctree_mainbox, &allocation);
- mimeview->oldsize = allocation.height;
gtk_widget_hide(mimeview->ctree_mainbox);
gtk_widget_show(mimeview->icon_mainbox);
gtk_paned_set_position(GTK_PANED(mimeview->paned), 0);
GTK_TOGGLE_BUTTON(mimeview->messageview->mainwin->summaryview->toggle_search),
TRUE);
quicksearch_set(mimeview->messageview->mainwin->summaryview->quicksearch,
- QUICK_SEARCH_EXTENDED, buf);
+ ADVANCED_SEARCH_EXTENDED, buf);
g_free(buf);
}
}
projects / claws.git / blobdiff