guint action);
static void toolbar_delete_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_trash_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_compose_cb (GtkWidget *widget,
gpointer data);
{ "A_REPLY_ALL", N_("Reply to All") },
{ "A_REPLY_ML", N_("Reply to Mailing-list") },
{ "A_FORWARD", N_("Forward Message") },
- { "A_DELETE", N_("Delete Message") },
+ { "A_TRASH", N_("Trash Message") },
+ { "A_DELETE_REAL", N_("Delete Message") },
{ "A_EXECUTE", N_("Execute") },
{ "A_GOTO_PREV", N_("Go to Previous Unread Message") },
{ "A_GOTO_NEXT", N_("Go to Next Unread Message") },
if (g_utf8_collate(toolbar_text[i].index_str, text) == 0)
return i;
}
-
+
return -1;
}
gint main_items[] = { A_RECEIVE_ALL, A_RECEIVE_CUR, A_SEND_QUEUED,
A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
- A_DELETE, A_EXECUTE, A_GOTO_PREV,
+ A_TRASH , A_DELETE_REAL, A_EXECUTE, A_GOTO_PREV,
A_GOTO_NEXT, A_IGNORE_THREAD, A_PRINT,
A_ADDRBOOK, A_SYL_ACTIONS };
else if (source == TOOLBAR_MSGVIEW) {
gint msgv_items[] = { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
- A_DELETE, A_GOTO_PREV, A_GOTO_NEXT,
+ A_TRASH, A_DELETE_REAL, A_GOTO_PREV, A_GOTO_NEXT,
A_ADDRBOOK, A_SYL_ACTIONS };
for (i = 0; i < sizeof msgv_items / sizeof msgv_items[0]; i++)
GList *attr;
gchar *name, *value;
ToolbarItem *item = NULL;
+ gboolean rewrite = FALSE;
attr = xml_get_current_tag_attr(file);
item = g_new0(ToolbarItem, 1);
item->text = g_strdup (value);
else if (g_utf8_collate(name, TOOLBAR_ICON_ACTION) == 0)
item->index = toolbar_ret_val_from_text(value);
-
+ if (item->index == -1 && !strcmp(value, "A_DELETE")) {
+ /* switch button */
+ item->index = A_TRASH;
+ g_free(item->file);
+ item->file = g_strdup("trash_open");
+ g_free(item->text);
+ item->text = g_strdup(_("Trash"));
+ rewrite = TRUE;
+ }
attr = g_list_next(attr);
}
if (item->index != -1) {
toolbar_config[source].item_list = g_slist_append(toolbar_config[source].item_list,
item);
}
+ if (rewrite) {
+ toolbar_save_config_file(source);
+ }
}
static void toolbar_set_default_main(void)
{ A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender") },
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
- { A_DELETE, STOCK_PIXMAP_CLOSE, _("Delete") },
+ { A_TRASH, STOCK_PIXMAP_TRASH_OPEN, _("Trash") },
{ A_EXECUTE, STOCK_PIXMAP_EXEC, _("Execute") },
{ A_GOTO_PREV, STOCK_PIXMAP_UP_ARROW, _("Previous")},
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
{ A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender") },
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
- { A_DELETE, STOCK_PIXMAP_CLOSE, _("Delete") },
+ { A_TRASH, STOCK_PIXMAP_TRASH_OPEN, _("Trash") },
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
};
/*
* Delete current/selected(s) message(s)
*/
-static void toolbar_delete_cb(GtkWidget *widget, gpointer data)
+static void toolbar_trash_cb(GtkWidget *widget, gpointer data)
{
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
}
}
+/*
+ * Delete current/selected(s) message(s)
+ */
+static void toolbar_delete_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+
+ g_return_if_fail(toolbar_item != NULL);
+ g_return_if_fail(toolbar_item->parent);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MSGVIEW:
+ messageview_delete((MessageView *)toolbar_item->parent);
+ break;
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow *)toolbar_item->parent;
+ summary_delete(mainwin->summaryview);
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ break;
+ }
+}
+
/*
* Compose new message
{ A_REPLY_ALL, toolbar_reply_to_all_cb },
{ A_REPLY_ML, toolbar_reply_to_list_cb },
{ A_FORWARD, toolbar_forward_cb },
- { A_DELETE, toolbar_delete_cb },
+ { A_TRASH, toolbar_trash_cb },
+ { A_DELETE_REAL, toolbar_delete_cb },
{ A_EXECUTE, toolbar_exec_cb },
{ A_GOTO_PREV, toolbar_prev_unread_cb },
{ A_GOTO_NEXT, toolbar_next_unread_cb },
_("Forward Message"), "Fwd");
toolbar_data->fwd_combo = fwd_combo;
break;
- case A_DELETE:
+ case A_TRASH:
+ toolbar_data->trash_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ toolbar_data->trash_btn,
+ _("Trash Message"), NULL);
+ break;
+ case A_DELETE_REAL:
toolbar_data->delete_btn = item;
gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
toolbar_data->delete_btn,
SET_WIDGET_COND(toolbar->next_btn, 0);
}
+ SET_WIDGET_COND(toolbar->trash_btn,
+ M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
SET_WIDGET_COND(toolbar->delete_btn,
M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
toolbar->replyall_btn = NULL;
toolbar->replylist_btn = NULL;
toolbar->fwd_btn = NULL;
+ toolbar->trash_btn = NULL;
toolbar->delete_btn = NULL;
toolbar->prev_btn = NULL;
toolbar->next_btn = NULL;