#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkwidget.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkctree.h>
#include <gtk/gtkvpaned.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkeditable.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtktreeview.h>
+#include <gtk/gtkliststore.h>
+#include <gtk/gtktreeselection.h>
+#include <gtk/gtktreemodel.h>
#include <gtk/gtkdnd.h>
#include <stdio.h>
#include "foldersel.h"
#include "toolbar.h"
-typedef enum
+enum
{
COL_MIMETYPE = 0,
COL_SIZE = 1,
- COL_NAME = 2
-} AttachColumnPos;
+ COL_NAME = 2,
+ COL_DATA = 3,
+ COL_AUTODATA = 4,
+ N_COL_COLUMNS
+};
-#define N_ATTACH_COLS 3
+#define N_ATTACH_COLS (N_COL_COLUMNS)
typedef enum
{
GtkSHRuler *shruler);
static void account_activated (GtkMenuItem *menuitem,
gpointer data);
-static void attach_selected (GtkCList *clist,
- gint row,
- gint column,
- GdkEvent *event,
- gpointer data);
+static void attach_selected (GtkTreeView *tree_view,
+ GtkTreePath *tree_path,
+ GtkTreeViewColumn *column,
+ Compose *compose);
static gboolean attach_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
guint info,
guint time,
gpointer user_data);
+static void compose_header_drag_received_cb (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ gpointer user_data);
+static gboolean compose_drag_drop (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x, gint y,
+ guint time, gpointer user_data);
#if 0
static void to_activated (GtkWidget *widget,
Compose *compose);
Compose *compose);
#endif
-static void text_activated (GtkWidget *widget,
- Compose *compose);
static void text_inserted (GtkTextBuffer *buffer,
GtkTextIter *iter,
const gchar *text,
static void compose_check_forwards_go (Compose *compose);
#endif
-static gboolean compose_send_control_enter (Compose *compose);
static gint compose_defer_auto_save_draft (Compose *compose);
static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
static GtkTargetEntry compose_mime_types[] =
{
- {"text/uri-list", 0, 0}
+ {"text/uri-list", 0, 0},
+ {"text/plain", 0, 0},
+ {"STRING", 0, 0}
};
static gboolean compose_put_existing_to_front(MsgInfo *info)
gtk_widget_grab_focus(compose->header_last->entry);
- filename = procmsg_get_message_file(msginfo);
+ filename = procmsg_get_message_file_path(msginfo);
if (filename == NULL)
return NULL;
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
compose_quote_fmt(compose, msginfo, "%M", NULL, NULL);
- gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
ifactory = gtk_item_factory_from_widget(compose->popupmenu);
menu_set_sensitive(ifactory, "/Add...", FALSE);
menu_set_sensitive(ifactory, "/Remove", FALSE);
- menu_set_sensitive(ifactory, "/Property...", FALSE);
+ menu_set_sensitive(ifactory, "/Properties...", FALSE);
ifactory = gtk_item_factory_from_widget(compose->menubar);
menu_set_sensitive(ifactory, "/Message/Save", FALSE);
menu_set_sensitive(ifactory, "/Message/Attach file", FALSE);
menu_set_sensitive(ifactory, "/Message/Insert signature", FALSE);
menu_set_sensitive(ifactory, "/Edit", FALSE);
- menu_set_sensitive(ifactory, "/Options/Sign", FALSE);
- menu_set_sensitive(ifactory, "/Options/Encrypt", FALSE);
- menu_set_sensitive(ifactory, "/Options/Priority", FALSE);
- menu_set_sensitive(ifactory, "/Options/Request Return Receipt", FALSE);
+ menu_set_sensitive(ifactory, "/Options", FALSE);
menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
gchar *bcc = NULL;
gchar *subject = NULL;
gchar *body = NULL;
+ gchar *temp = NULL;
+ gint len = 0;
scan_mailto_url(mailto, &to, &cc, &bcc, &subject, &body);
if (bcc)
compose_entry_append(compose, bcc, COMPOSE_BCC);
if (subject)
- gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
+ if (!g_utf8_validate (subject, -1, NULL)) {
+ temp = g_locale_to_utf8 (subject, -1, NULL, &len, NULL);
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), temp);
+ g_free(temp);
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
+ }
if (body) {
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
- gtk_text_buffer_insert(buffer, &iter, body, -1);
+ if (!g_utf8_validate (body, -1, NULL)) {
+ temp = g_locale_to_utf8 (body, -1, NULL, &len, NULL);
+ gtk_text_buffer_insert(buffer, &iter, temp, -1);
+ g_free(temp);
+ } else {
+ gtk_text_buffer_insert(buffer, &iter, body, -1);
+ }
gtk_text_buffer_insert(buffer, &iter, "\n", 1);
}
GtkTextBuffer *buffer;
GtkTextMark *mark;
GtkTextIter iter;
+ const gchar *cur_encoding;
gchar buf[BUFFSIZE];
gint len;
FILE *fp;
G_CALLBACK(text_inserted),
compose);
+ cur_encoding = conv_get_locale_charset_str();
+
while (fgets(buf, sizeof(buf), fp) != NULL) {
- const gchar *cur_encoding = conv_get_current_charset_str();
- gchar *str = NULL;
- if (!g_utf8_validate(buf, -1, NULL))
- str = conv_codeset_strdup(buf, cur_encoding, CS_UTF_8);
- else
- str = g_strdup(buf);
+ gchar *str;
+ str = conv_codeset_strdup(buf, cur_encoding, CS_INTERNAL);
if (!str) continue;
/* strip <CR> if DOS/Windows file,
while (--len >= 0)
if (str[len] == '\r') str[len] = '\n';
}
- gtk_text_buffer_insert(buffer, &iter, str, -1);
- g_free (str);
+ gtk_text_buffer_insert(buffer, &iter, str, -1);
+ g_free(str);
}
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
const gchar *content_type)
{
AttachInfo *ainfo;
- gchar *text[N_ATTACH_COLS];
+ GtkTreeIter iter;
FILE *fp;
off_t size;
- gint row;
+ GAuto *auto_ainfo;
+ gchar *size_text;
+ GtkListStore *store;
gchar *name;
if (!is_file_exist(file)) {
}
#endif
ainfo = g_new0(AttachInfo, 1);
+ auto_ainfo = g_auto_pointer_new_with_free
+ (ainfo, (GFreeFunc) compose_attach_info_free);
ainfo->file = g_strdup(file);
if (content_type) {
}
ainfo->size = size;
+ size_text = to_human_readable(size);
- text[COL_MIMETYPE] = ainfo->content_type;
- text[COL_SIZE] = to_human_readable(size);
- text[COL_NAME] = ainfo->name;
-
- row = gtk_clist_append(GTK_CLIST(compose->attach_clist), text);
- gtk_clist_set_row_data(GTK_CLIST(compose->attach_clist), row, ainfo);
+ store = GTK_LIST_STORE(gtk_tree_view_get_model
+ (GTK_TREE_VIEW(compose->attach_clist)));
+
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ COL_MIMETYPE, ainfo->content_type,
+ COL_SIZE, size_text,
+ COL_NAME, ainfo->name,
+ COL_DATA, ainfo,
+ COL_AUTODATA, auto_ainfo,
+ -1);
+
+ g_auto_pointer_free(auto_ainfo);
}
static void compose_use_signing(Compose *compose, gboolean use_signing)
}
#define DISP_WIDTH(len) \
- ((len > 2 && conv_get_current_charset() == C_UTF_8) ? 2 : \
- (len == 2 && conv_get_current_charset() == C_UTF_8) ? 1 : len)
+ ((len > 2 && conv_get_locale_charset() == C_UTF_8) ? 2 : \
+ (len == 2 && conv_get_locale_charset() == C_UTF_8) ? 1 : len)
#define SPACE_CHARS " \t"
#endif
- if (account->default_sign)
+ if (account->default_sign && compose->mode != COMPOSE_REDIRECT)
menu_set_active(ifactory, "/Options/Sign", TRUE);
else
menu_set_active(ifactory, "/Options/Sign", FALSE);
- if (account->default_encrypt)
+ if (account->default_encrypt && compose->mode != COMPOSE_REDIRECT)
menu_set_active(ifactory, "/Options/Encrypt", TRUE);
else
menu_set_active(ifactory, "/Options/Encrypt", FALSE);
aval = alertpanel(_("Send"),
_("Subject is empty. Send it anyway?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (aval != G_ALERTDEFAULT)
return FALSE;
}
static gboolean compose_use_attach(Compose *compose)
{
- return gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL;
+ GtkTreeModel *model = gtk_tree_view_get_model
+ (GTK_TREE_VIEW(compose->attach_clist));
+ return gtk_tree_model_iter_n_children(model, NULL) > 0;
}
static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
else
encoding = procmime_get_encoding_for_charset(out_codeset);
- src_codeset = CS_UTF_8;
+ src_codeset = CS_INTERNAL;
/* if current encoding is US-ASCII, set it the same as
outgoing one to prevent code conversion failure */
if (!g_ascii_strcasecmp(src_codeset, CS_US_ASCII))
mimetext->subtype = g_strdup("plain");
g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
g_strdup(out_codeset));
+ /* protect trailing spaces when signing message */
+ if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
+ privacy_system_can_sign(compose->privacy_system))
+ encoding = ENC_QUOTED_PRINTABLE;
if (encoding != ENC_UNKNOWN)
procmime_encode_content(mimetext, encoding);
gtk_text_buffer_get_end_iter(buffer, &end);
tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
- src_codeset = CS_UTF_8;
- dest_codeset = conv_get_current_charset_str();
- chars = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
+ chars = conv_codeset_strdup
+ (tmp, CS_INTERNAL, conv_get_locale_charset_str());
+
g_free(tmp);
if (!chars) return -1;
static void compose_add_attachments(Compose *compose, MimeInfo *parent)
{
AttachInfo *ainfo;
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
- gint row;
+ GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
MimeInfo *mimepart;
struct stat statbuf;
gchar *type, *subtype;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
- for (row = 0; (ainfo = gtk_clist_get_row_data(clist, row)) != NULL;
- row++) {
+ model = gtk_tree_view_get_model(tree_view);
+
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return;
+ do {
+ gtk_tree_model_get(model, &iter,
+ COL_DATA, &ainfo,
+ -1);
+
mimepart = procmime_mimeinfo_new();
mimepart->content = MIMECONTENT_FILE;
mimepart->data.filename = g_strdup(ainfo->file);
procmime_encode_content(mimepart, ainfo->encoding);
g_node_append(parent->node, mimepart->node);
- }
+ } while (gtk_tree_model_iter_next(model, &iter));
}
#define QUOTE_IF_REQUIRED(out, str) \
g_signal_connect(G_OBJECT(entry), "changed",
G_CALLBACK(compose_headerentry_changed_cb),
headerentry);
- g_signal_connect(G_OBJECT(entry), "activate",
- G_CALLBACK(text_activated), compose);
g_signal_connect(G_OBJECT(entry), "grab_focus",
G_CALLBACK(compose_grab_focus_before_cb), compose);
g_signal_connect_after(G_OBJECT(entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
+
+ /* email dnd */
+ gtk_drag_dest_set(entry, GTK_DEST_DEFAULT_ALL, compose_mime_types,
+ sizeof(compose_mime_types)/sizeof(compose_mime_types[0]),
+ GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ g_signal_connect(G_OBJECT(entry), "drag_data_received",
+ G_CALLBACK(compose_header_drag_received_cb),
+ entry);
+ g_signal_connect(G_OBJECT(entry), "drag-drop",
+ G_CALLBACK(compose_drag_drop),
+ compose);
+
address_completion_register_entry(GTK_ENTRY(entry));
headerentry->compose = compose;
GtkWidget *compose_create_attach(Compose *compose)
{
- gchar *titles[N_ATTACH_COLS];
- gint i;
-
GtkWidget *attach_scrwin;
GtkWidget *attach_clist;
- titles[COL_MIMETYPE] = _("MIME type");
- titles[COL_SIZE] = _("Size");
- titles[COL_NAME] = _("Name");
+ GtkListStore *store;
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *column;
+ GtkTreeSelection *selection;
/* attachment list */
attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
GTK_POLICY_AUTOMATIC);
gtk_widget_set_size_request(attach_scrwin, -1, 80);
- attach_clist = gtk_clist_new_with_titles(N_ATTACH_COLS, titles);
- gtk_clist_set_column_justification(GTK_CLIST(attach_clist), COL_SIZE,
- GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_width(GTK_CLIST(attach_clist), COL_MIMETYPE, 240);
- gtk_clist_set_column_width(GTK_CLIST(attach_clist), COL_SIZE, 64);
- gtk_clist_set_selection_mode(GTK_CLIST(attach_clist),
- GTK_SELECTION_EXTENDED);
- for (i = 0; i < N_ATTACH_COLS; i++)
- GTK_WIDGET_UNSET_FLAGS
- (GTK_CLIST(attach_clist)->column[i].button,
- GTK_CAN_FOCUS);
+ store = gtk_list_store_new(N_ATTACH_COLS,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_POINTER,
+ G_TYPE_AUTO_POINTER,
+ -1);
+ attach_clist = GTK_WIDGET(gtk_tree_view_new_with_model
+ (GTK_TREE_MODEL(store)));
gtk_container_add(GTK_CONTAINER(attach_scrwin), attach_clist);
+ g_object_unref(store);
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Mime type"), renderer, "text",
+ COL_MIMETYPE, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Size"), renderer, "text",
+ COL_SIZE, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Name"), renderer, "text",
+ COL_NAME, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
+
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(attach_clist), TRUE);
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(attach_clist));
+ gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
- g_signal_connect(G_OBJECT(attach_clist), "select_row",
+ g_signal_connect(G_OBJECT(attach_clist), "row_activated",
G_CALLBACK(attach_selected), compose);
g_signal_connect(G_OBJECT(attach_clist), "button_press_event",
G_CALLBACK(attach_button_pressed), compose);
/* drag and drop */
gtk_drag_dest_set(attach_clist,
- GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
+ GTK_DEST_DEFAULT_ALL, compose_mime_types,
+ sizeof(compose_mime_types)/sizeof(compose_mime_types[0]),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
g_signal_connect(G_OBJECT(attach_clist), "drag_data_received",
G_CALLBACK(compose_attach_drag_received_cb),
compose);
+ g_signal_connect(G_OBJECT(attach_clist), "drag-drop",
+ G_CALLBACK(compose_drag_drop),
+ compose);
compose->attach_scrwin = attach_scrwin;
compose->attach_clist = attach_clist;
GtkItemFactory *ifactory;
GtkWidget *tmpl_menu;
gint n_entries;
+ GtkWidget *menuitem;
#if USE_ASPELL
GtkAspell * gtkaspell = NULL;
subject_entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 2);
- g_signal_connect(G_OBJECT(subject_entry), "activate",
- G_CALLBACK(text_activated), compose);
g_signal_connect(G_OBJECT(subject_entry), "grab_focus",
G_CALLBACK(compose_grab_focus_before_cb), compose);
g_signal_connect_after(G_OBJECT(subject_entry), "grab_focus",
ruler = gtk_shruler_new();
gtk_ruler_set_range(GTK_RULER(ruler), 0.0, 100.0, 1.0, 100.0);
gtk_box_pack_start(GTK_BOX(ruler_hbox), ruler, TRUE, TRUE,
- BORDER_WIDTH + 1);
- gtk_widget_set_size_request(ruler_hbox, 1, -1);
+ BORDER_WIDTH);
/* text widget */
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+ GTK_SHADOW_IN);
gtk_box_pack_start(GTK_BOX(edit_vbox), scrolledwin, TRUE, TRUE, 0);
gtk_widget_set_size_request(scrolledwin, prefs_common.compose_width, -1);
G_CALLBACK(compose_changed_cb), compose);
g_signal_connect(G_OBJECT(text), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(buffer), "insert-text",
+ g_signal_connect(G_OBJECT(buffer), "insert_text",
G_CALLBACK(text_inserted), compose);
/* drag and drop */
- gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
+ gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types,
+ sizeof(compose_mime_types)/sizeof(compose_mime_types[0]),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
g_signal_connect(G_OBJECT(text), "drag_data_received",
G_CALLBACK(compose_insert_drag_received_cb),
compose);
+ g_signal_connect(G_OBJECT(text), "drag-drop",
+ G_CALLBACK(compose_drag_drop),
+ compose);
gtk_widget_show_all(vbox);
/* pane between attach clist and text */
strcmp(prefs_common.dictionary, _("None"))) {
gtkaspell = gtkaspell_new(prefs_common.aspell_path,
prefs_common.dictionary,
- conv_get_current_charset_str(),
+ conv_get_locale_charset_str(),
prefs_common.misspelled_col,
prefs_common.check_while_typing,
prefs_common.use_alternate,
if (mode != COMPOSE_REDIRECT)
compose_set_template_menu(compose);
else {
- GtkWidget *menuitem;
menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Template");
menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
}
if (!prefs_common.show_ruler)
gtk_widget_hide(ruler_hbox);
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Show ruler");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ prefs_common.show_ruler);
/* Priority */
compose->priority = PRIORITY_NORMAL;
compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
if (replace)
- gtk_text_buffer_set_text(buffer, "\0", 1);
+ gtk_text_buffer_set_text(buffer, "", -1);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
static void compose_destroy(Compose *compose)
{
- gint row;
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
- AttachInfo *ainfo;
-
/* NOTE: address_completion_end() does nothing with the window
* however this may change. */
address_completion_end(compose->window);
g_free(compose->exteditor_file);
- for (row = 0; (ainfo = gtk_clist_get_row_data(clist, row)) != NULL;
- row++)
- compose_attach_info_free(ainfo);
-
if (addressbook_get_target_compose() == compose)
addressbook_set_target_compose(NULL);
static void compose_attach_remove_selected(Compose *compose)
{
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
+ GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
AttachInfo *ainfo;
- gint row;
+ GtkTreeSelection *selection;
+ GList *sel, *cur;
+ GtkTreeModel *model;
+
+ selection = gtk_tree_view_get_selection(tree_view);
+ sel = gtk_tree_selection_get_selected_rows(selection, &model);
+
+ if (!sel)
+ return;
- while (clist->selection != NULL) {
- row = GPOINTER_TO_INT(clist->selection->data);
- ainfo = gtk_clist_get_row_data(clist, row);
- compose_attach_info_free(ainfo);
- gtk_clist_remove(clist, row);
+ for (cur = sel; cur != NULL; cur = cur->next) {
+ GtkTreePath *path = cur->data;
+ GtkTreeRowReference *ref = gtk_tree_row_reference_new
+ (model, cur->data);
+ cur->data = ref;
+ gtk_tree_path_free(path);
}
+
+ for (cur = sel; cur != NULL; cur = cur->next) {
+ GtkTreeRowReference *ref = cur->data;
+ GtkTreePath *path = gtk_tree_row_reference_get_path(ref);
+ GtkTreeIter iter;
+
+ if (gtk_tree_model_get_iter(model, &iter, path))
+ gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+
+ gtk_tree_path_free(path);
+ gtk_tree_row_reference_free(ref);
+ }
+
+ g_list_free(sel);
}
static struct _AttachProperty
GtkWidget *cancel_btn;
} attach_prop;
+static void gtk_tree_path_free_(gpointer ptr, gpointer data)
+{
+ gtk_tree_path_free((GtkTreePath *)ptr);
+}
+
static void compose_attach_property(Compose *compose)
{
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
+ GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
AttachInfo *ainfo;
- gint row;
GtkOptionMenu *optmenu;
+ GtkTreeSelection *selection;
+ GList *sel;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreePath *path;
static gboolean cancelled;
- if (!clist->selection) return;
- row = GPOINTER_TO_INT(clist->selection->data);
+ /* only if one selected */
+ selection = gtk_tree_view_get_selection(tree_view);
+ if (gtk_tree_selection_count_selected_rows(selection) != 1)
+ return;
- ainfo = gtk_clist_get_row_data(clist, row);
- if (!ainfo) return;
+ sel = gtk_tree_selection_get_selected_rows(selection, &model);
+ if (!sel)
+ return;
+
+ path = (GtkTreePath *) sel->data;
+ gtk_tree_model_get_iter(model, &iter, path);
+ gtk_tree_model_get(model, &iter, COL_DATA, &ainfo, -1);
+
+ if (!ainfo) {
+ g_list_foreach(sel, gtk_tree_path_free_, NULL);
+ g_list_free(sel);
+ return;
+ }
+ g_list_free(sel);
if (!attach_prop.window)
compose_attach_property_create(&cancelled);
cancelled = FALSE;
gtk_main();
- if (cancelled == TRUE) {
- gtk_widget_hide(attach_prop.window);
+ gtk_widget_hide(attach_prop.window);
+
+ if (cancelled)
break;
- }
entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.mimetype_entry));
if (*entry_text != '\0') {
if (size)
ainfo->size = size;
- gtk_clist_set_text(clist, row, COL_MIMETYPE,
- ainfo->content_type);
- gtk_clist_set_text(clist, row, COL_SIZE,
- to_human_readable(ainfo->size));
- gtk_clist_set_text(clist, row, COL_NAME, ainfo->name);
-
- gtk_widget_hide(attach_prop.window);
+ /* update tree store */
+ text = to_human_readable(ainfo->size);
+ gtk_tree_model_get_iter(model, &iter, path);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+ COL_MIMETYPE, ainfo->content_type,
+ COL_SIZE, text,
+ COL_NAME, ainfo->file,
+ -1);
+
break;
}
+
+ gtk_tree_path_free(path);
}
#define SET_LABEL_AND_ENTRY(str, entry, top) \
SET_LABEL_AND_ENTRY(_("Path"), path_entry, 2);
SET_LABEL_AND_ENTRY(_("File name"), filename_entry, 3);
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
- gtk_text_buffer_set_text(buffer, "\0", 1);
+ gtk_text_buffer_set_text(buffer, "", -1);
compose_insert_file(compose, compose->exteditor_file);
compose_changed_cb(NULL, compose);
}
}
-static void attach_selected(GtkCList *clist, gint row, gint column,
- GdkEvent *event, gpointer data)
+static void attach_selected(GtkTreeView *tree_view, GtkTreePath *tree_path,
+ GtkTreeViewColumn *column, Compose *compose)
{
- Compose *compose = (Compose *)data;
-
- if (event && event->type == GDK_2BUTTON_PRESS)
- compose_attach_property(compose);
+ compose_attach_property(compose);
}
static gboolean attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
gpointer data)
{
Compose *compose = (Compose *)data;
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
- gint row, column;
+ GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
+ GtkTreeIter iter;
if (!event) return FALSE;
if (event->button == 3) {
- if ((clist->selection && !clist->selection->next) ||
- !clist->selection) {
- gtk_clist_unselect_all(clist);
- if (gtk_clist_get_selection_info(clist,
- event->x, event->y,
- &row, &column)) {
- gtk_clist_select_row(clist, row, column);
- gtkut_clist_set_focus_row(clist, row);
- }
- }
gtk_menu_popup(GTK_MENU(compose->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
+ return TRUE;
}
return FALSE;
if (compose->modified) {
val = alertpanel(_("Discard message"),
_("This message has been modified. discard it?"),
- _("Discard"), _("to Draft"), _("Cancel"));
+ _("Discard"), _("to Draft"), GTK_STOCK_CANCEL);
switch (val) {
case G_ALERTDEFAULT:
msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
tmpl->name);
val = alertpanel(_("Apply template"), msg,
- _("Replace"), _("Insert"), _("Cancel"));
+ _("Replace"), _("Insert"), GTK_STOCK_CANCEL);
g_free(msg);
if (val == G_ALERTDEFAULT)
{
Compose *compose = (Compose *)user_data;
GList *list, *tmp;
+
+ if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+ list = uri_list_extract_filenames((const gchar *)data->data);
+ for (tmp = list; tmp != NULL; tmp = tmp->next)
+ compose_attach_append
+ (compose, (const gchar *)tmp->data,
+ (const gchar *)tmp->data, NULL);
+ if (list) compose_changed_cb(NULL, compose);
+ list_free_strings(list);
+ g_list_free(list);
+ }
+}
- list = uri_list_extract_filenames((const gchar *)data->data);
- for (tmp = list; tmp != NULL; tmp = tmp->next)
- compose_attach_append
- (compose, (const gchar *)tmp->data,
- (const gchar *)tmp->data, NULL);
- if (list) compose_changed_cb(NULL, compose);
- list_free_strings(list);
- g_list_free(list);
+static gboolean compose_drag_drop(GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x, gint y,
+ guint time, gpointer user_data)
+{
+ /* not handling this signal makes compose_insert_drag_received_cb
+ * called twice */
+ return TRUE;
}
static void compose_insert_drag_received_cb (GtkWidget *widget,
Compose *compose = (Compose *)user_data;
GList *list, *tmp;
- list = uri_list_extract_filenames((const gchar *)data->data);
- for (tmp = list; tmp != NULL; tmp = tmp->next)
- compose_insert_file(compose, (const gchar *)tmp->data);
- list_free_strings(list);
- g_list_free(list);
+ /* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
+ * does not work */
+ if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+ list = uri_list_extract_filenames((const gchar *)data->data);
+ for (tmp = list; tmp != NULL; tmp = tmp->next) {
+ compose_insert_file(compose, (const gchar *)tmp->data);
+ }
+ list_free_strings(list);
+ g_list_free(list);
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
+ return;
+ } else {
+ gchar *tmpfile = get_tmp_file();
+ str_write_to_file((const gchar *)data->data, tmpfile);
+ compose_insert_file(compose, tmpfile);
+ unlink(tmpfile);
+ g_free(tmpfile);
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
+ return;
+ }
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
+}
+
+static void compose_header_drag_received_cb (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ gpointer user_data)
+{
+ GtkEditable *entry = (GtkEditable *)user_data;
+ gchar *email = (gchar *)data->data;
+
+ /* strangely, testing data->type == gdk_atom_intern("text/plain", TRUE)
+ * does not work */
+
+ if (!strncmp(email, "mailto:", strlen("mailto:"))) {
+ gchar decoded[strlen(email)];
+ int start = 0;
+
+ email += strlen("mailto:");
+ decode_uri(decoded, email); /* will fit */
+ gtk_editable_delete_text(entry, 0, -1);
+ gtk_editable_insert_text(entry, decoded, strlen(decoded), &start);
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
+ return;
+ }
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
}
#if 0 /* NEW COMPOSE GUI */
gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
}
-static void text_activated(GtkWidget *widget, Compose *compose)
-{
- compose_send_control_enter(compose);
-}
-
static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
const gchar *text, gint len, Compose *compose)
{
return FALSE;
}
-static gboolean compose_send_control_enter(Compose *compose)
-{
- GdkEvent *ev;
- GdkEventKey *kev;
- GtkItemFactory *ifactory;
- GtkAccelKey *accel;
- GtkWidget *send_menu;
- GSList *list;
- GdkModifierType ignored_mods =
- (GDK_LOCK_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK |
- GDK_MOD4_MASK | GDK_MOD5_MASK);
-
- ev = gtk_get_current_event();
- if (ev->type != GDK_KEY_PRESS) return FALSE;
-
- kev = (GdkEventKey *)ev;
- if (!(kev->keyval == GDK_Return && (kev->state & GDK_CONTROL_MASK)))
- return FALSE;
-
- if (compose->exteditor_tag != -1)
- return FALSE;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send");
- list = gtk_accel_groups_from_object(G_OBJECT(send_menu));
- if (!list)
- return FALSE;
-
- accel = (GtkAccelKey *)list->data;
- if (accel && accel->accel_key == kev->keyval &&
- (accel->accel_mods & ~ignored_mods) ==
- (kev->state & ~ignored_mods)) {
- compose_send_cb(compose, 0, NULL);
- return TRUE;
- }
-
- return FALSE;
-}
-
#if USE_ASPELL
static void compose_check_all(Compose *compose)
{
}
}
+void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
+ guint action)
+{
+ gchar *body;
+ GSList *new_msglist = NULL;
+ MsgInfo *tmp_msginfo = NULL;
+
+ g_return_if_fail(msgview != NULL);
+
+ g_return_if_fail(msginfo_list != NULL);
+
+ if (g_slist_length(msginfo_list) == 1) {
+ MimeInfo *mimeinfo = messageview_get_selected_mime_part(msgview);
+ MsgInfo *orig_msginfo = (MsgInfo *)msginfo_list->data;
+
+ if (mimeinfo != NULL && mimeinfo->type == MIMETYPE_MESSAGE &&
+ !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
+
+ tmp_msginfo = procmsg_msginfo_new_from_mimeinfo(
+ orig_msginfo, mimeinfo);
+ if (tmp_msginfo != NULL) {
+ new_msglist = g_slist_append(NULL, tmp_msginfo);
+ }
+ }
+ }
+
+ body = messageview_get_selection(msgview);
+
+ if (new_msglist) {
+ compose_reply_mode((ComposeMode)action, new_msglist, body);
+ procmsg_msginfo_free(tmp_msginfo);
+ g_slist_free(new_msglist);
+ } else
+ compose_reply_mode((ComposeMode)action, msginfo_list, body);
+
+ g_free(body);
+}
+
/*
* End of Source.
*/
-