*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*
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);
static void toolbar_forward_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_prev_unread_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_next_unread_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_NEXT", N_("Goto Next Message") },
- { "A_IGNORE_THREAD", N_("Ignore thread") },
- { "A_PRINT", N_("Print") },
+ { "A_GOTO_PREV", N_("Go to Previous Unread Message") },
+ { "A_GOTO_NEXT", N_("Go to Next Unread Message") },
+ { "A_IGNORE_THREAD", N_("Ignore thread") },
+ { "A_PRINT", N_("Print") },
{ "A_SEND", N_("Send Message") },
{ "A_SENDL", N_("Put into queue folder and send later") },
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_NEXT,
- A_IGNORE_THREAD, A_PRINT,
+ A_TRASH , A_DELETE_REAL, A_EXECUTE, A_GOTO_PREV,
+ A_GOTO_NEXT, A_IGNORE_THREAD, A_PRINT,
A_ADDRBOOK, A_SYL_ACTIONS };
for (i = 0; i < sizeof main_items / sizeof main_items[0]; i++) {
items = g_list_append(items, gettext(toolbar_text[main_items[i]].descr));
- if (main_items[i] == A_PRINT) {
- g_print("$$$ descr %s, trans %s\n",
- toolbar_text[main_items[i]].descr,
- gettext(toolbar_text[main_items[i]].descr));
- }
}
}
else if (source == TOOLBAR_COMPOSE) {
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_NEXT, A_ADDRBOOK,
- A_SYL_ACTIONS };
+ 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++)
items = g_list_append(items, gettext(toolbar_text[msgv_items[i]].descr));
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_btn");
+ 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)
gint icon;
gchar *text;
} default_toolbar[] = {
- { A_RECEIVE_CUR, STOCK_PIXMAP_MAIL_RECEIVE, _("Get") },
- { A_RECEIVE_ALL, STOCK_PIXMAP_MAIL_RECEIVE_ALL, _("Get All") },
+ { A_RECEIVE_ALL, STOCK_PIXMAP_MAIL_RECEIVE_ALL, _("Get Mail") },
{ A_SEPARATOR, 0, ("") },
{ A_SEND_QUEUED, STOCK_PIXMAP_MAIL_SEND_QUEUE, _("Send") },
- { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE, _("Email") },
+ { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE, _("Compose") },
{ A_SEPARATOR, 0, ("") },
{ A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY, _("Reply") },
{ A_REPLY_ALL, STOCK_PIXMAP_MAIL_REPLY_TO_ALL, _("All") },
{ 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_EXECUTE, STOCK_PIXMAP_EXEC, _("Execute") },
+ { A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
+ { A_SEPARATOR, 0, ("") },
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
};
{ A_SEPARATOR, 0, ("") },
{ A_INSERT, STOCK_PIXMAP_INSERT_FILE, _("Insert") },
{ A_ATTACH, STOCK_PIXMAP_MAIL_ATTACH, _("Attach") },
- { A_SIG, STOCK_PIXMAP_MAIL_SIGN, _("Signature") },
- { A_SEPARATOR, 0, ("") },
- { A_EXTEDITOR, STOCK_PIXMAP_EDIT_EXTERN, _("Editor") },
- { A_LINEWRAP_CURRENT, STOCK_PIXMAP_LINEWRAP_CURRENT, _("Wrap paragraph") },
- { A_LINEWRAP_ALL, STOCK_PIXMAP_LINEWRAP_ALL, _("Wrap all") },
{ A_SEPARATOR, 0, ("") },
{ A_ADDRBOOK, STOCK_PIXMAP_ADDRESS_BOOK, _("Address") }
};
{ 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, _("Trash") },
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
};
summary_execute(mainwin->summaryview);
}
+/*
+ * Delete current/selected(s) message(s)
+ */
+static void toolbar_trash_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_trash(mainwin->summaryview);
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ break;
+ }
+}
+
/*
* Delete current/selected(s) message(s)
*/
toolbar_reply(data, COMPOSE_FORWARD);
}
+/*
+ * Goto Prev Unread Message
+ */
+static void toolbar_prev_unread_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+ MessageView *msgview;
+
+ g_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow*)toolbar_item->parent;
+ summary_select_prev_unread(mainwin->summaryview);
+ break;
+
+ case TOOLBAR_MSGVIEW:
+ msgview = (MessageView*)toolbar_item->parent;
+ summary_select_prev_unread(msgview->mainwin->summaryview);
+
+ /* Now we need to update the messageview window */
+ if (msgview->mainwin->summaryview->selected) {
+ GtkCTree *ctree = GTK_CTREE(msgview->mainwin->summaryview->ctree);
+
+ MsgInfo * msginfo = gtk_ctree_node_get_row_data(ctree,
+ msgview->mainwin->summaryview->selected);
+
+ messageview_show(msgview, msginfo,
+ msgview->all_headers);
+ } else {
+ gtk_widget_destroy(msgview->window);
+ }
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ }
+}
/*
* Goto Next Unread 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 },
{ A_IGNORE_THREAD, toolbar_ignore_thread_cb },
{ A_PRINT, toolbar_print_cb },
case A_COMPOSE_EMAIL:
icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("News"),
+ _("Compose"),
(""),
(""),
icon_news, G_CALLBACK(toolbar_buttons_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,
toolbar_data->exec_btn,
_("Execute"), NULL);
break;
+ case A_GOTO_PREV:
+ toolbar_data->prev_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ toolbar_data->prev_btn,
+ _("Go to Previous Unread Message"),
+ NULL);
+ break;
case A_GOTO_NEXT:
toolbar_data->next_btn = item;
gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
toolbar_data->next_btn,
- _("Goto Next Message"), NULL);
+ _("Go to Next Unread Message"),
+ NULL);
break;
/* Compose Toolbar */
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;
toolbar->exec_btn = NULL;
void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
{
GList *list;
+ gboolean found;
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
- _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return;
+ /* ask for confirmation before sending queued messages only
+ in online mode and if there is at least one message queued
+ in any of the folder queue
+ */
+ if (prefs_common.confirm_send_queued_messages) {
+ found = FALSE;
+ /* check if there's a queued message */
+ for (list = folder_get_list(); !found && list != NULL; list = list->next) {
+ Folder *folder = list->data;
+
+ found = !procmsg_queue_is_empty(folder->queue);
+ }
+ /* if necessary, ask for confirmation before sending */
+ if (found && !prefs_common.work_offline) {
+ if (alertpanel(_("Send queued messages"),
+ _("Send all queued messages?"),
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+ return;
+ }
+ }
+
for (list = folder_get_list(); list != NULL; list = list->next) {
Folder *folder = list->data;
prefs_common.savemsg) < 0)
alertpanel_error(_("Some errors occurred while "
"sending queued messages."));
- folder_item_scan(folder->queue);
}
}
}
projects / claws.git / blobdiff