static void show_all_header_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void msg_hide_quotes_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
static void compose_cb (gpointer data,
guint action,
static void reply_cb (gpointer data,
guint action,
GtkWidget *widget);
-static void reedit_cb (gpointer data,
- guint action,
- GtkWidget *widget);
static PrefsAccount *select_account_from_list
(GList *ac_list);
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
{N_("/_View/Show all _headers"),"<control>H", show_all_header_cb, 0, "<ToggleItem>"},
+ {N_("/_View/Quotes"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Quotes/_Fold all"), "<control><shift>Q", msg_hide_quotes_cb, 1, "<ToggleItem>"},
+ {N_("/_View/Quotes/Fold from level _2"),NULL, msg_hide_quotes_cb, 2, "<ToggleItem>"},
+ {N_("/_View/Quotes/Fold from level _3"),NULL, msg_hide_quotes_cb, 3, "<ToggleItem>"},
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/Compose _new message"),
{N_("/_Message/For_ward as attachment"),
NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
{N_("/_Message/Redirec_t"), NULL, reply_cb, COMPOSE_REDIRECT, NULL},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL},
{N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/_Address book"), "<control><shift>A", addressbook_open_cb, 0, NULL},
static GdkGeometry geometry;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed - Message View"));
+ gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed-Claws - Message View"));
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
if (!geometry.min_height) {
if (messageview->msginfo != msginfo) {
procmsg_msginfo_free(messageview->msginfo);
+ messageview->msginfo = NULL;
+ messageview_set_menu_sensitive(messageview);
messageview->msginfo = procmsg_msginfo_get_full_info(msginfo);
if (!messageview->msginfo)
messageview->msginfo = procmsg_msginfo_copy(msginfo);
+ } else {
+ messageview->msginfo = NULL;
+ messageview_set_menu_sensitive(messageview);
+ messageview->msginfo = msginfo;
}
headerview_show(messageview->headerview, messageview->msginfo);
mimeinfo = procmime_mimeinfo_next(mimeinfo);
if (mimeinfo && (mimeinfo->type != MIMETYPE_TEXT ||
- strcmp(mimeinfo->subtype, "plain"))) {
- if (strcmp(mimeinfo->subtype, "html"))
+ strcasecmp(mimeinfo->subtype, "plain"))) {
+ if (strcasecmp(mimeinfo->subtype, "html"))
mimeview_show_part(messageview->mimeview,mimeinfo);
else if (prefs_common.invoke_plugin_on_html)
- mimeview_show_part(messageview->mimeview,mimeinfo);
+ mimeview_select_mimepart_icon(messageview->mimeview,mimeinfo);
}
g_free(file);
"Please choose which account do you want to "
"use for sending the receipt notification:"),
_("_Send Notification"), _("+_Cancel"), NULL,
- optmenu) != G_ALERTDEFAULT)
+ FALSE, optmenu) != G_ALERTDEFAULT)
return NULL;
return account_find_from_id(account_id);
}
g_return_val_if_fail(msgview != NULL, NULL);
+ if (msgview->mimeview->type == MIMEVIEW_VIEWER) {
+ MimeViewer *viewer = msgview->mimeview->mimeviewer;
+ if (viewer && viewer->get_selection) {
+ text = viewer->get_selection(viewer);
+ if (text)
+ return text;
+ }
+ }
+
textview = messageview_get_current_textview(msgview);
g_return_val_if_fail(textview != NULL, NULL);
main_window_set_menu_sensitive(messageview->mainwin);
}
+#define SET_CHECK_MENU_ACTIVE(path, active) \
+{ \
+ menuitem = gtk_item_factory_get_widget(ifactory, path); \
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
+}
+
+static void msg_hide_quotes_cb(gpointer data, guint action, GtkWidget *widget)
+{
+ MessageView *messageview = (MessageView *)data;
+ MsgInfo *msginfo = messageview->msginfo;
+ static gboolean updating_menu = FALSE;
+ GtkItemFactory *ifactory = gtk_item_factory_from_widget(messageview->menubar);
+ GtkWidget *menuitem;
+ if (updating_menu)
+ return;
+
+ prefs_common.hide_quotes =
+ GTK_CHECK_MENU_ITEM(widget)->active ? action : 0;
+
+ updating_menu=TRUE;
+ SET_CHECK_MENU_ACTIVE("/View/Quotes/Fold all", FALSE);
+ SET_CHECK_MENU_ACTIVE("/View/Quotes/Fold from level 2", FALSE);
+ SET_CHECK_MENU_ACTIVE("/View/Quotes/Fold from level 3", FALSE);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), prefs_common.hide_quotes > 0);
+ updating_menu=FALSE;
+ if (!msginfo) return;
+ messageview->msginfo = NULL;
+ messageview_show(messageview, msginfo,
+ messageview->all_headers);
+ procmsg_msginfo_free(msginfo);
+
+ /* update main window */
+ main_window_set_menu_sensitive(messageview->mainwin);
+ summary_redisplay_msg(messageview->mainwin->summaryview);
+}
+#undef SET_CHECK_MENU_ACTIVE
+
static void compose_cb(gpointer data, guint action, GtkWidget *widget)
{
MessageView *messageview = (MessageView *)data;
g_slist_free(msginfo_list);
}
-static void reedit_cb(gpointer data, guint action, GtkWidget *widget)
-{
- MessageView *messageview = (MessageView *)data;
- MsgInfo *msginfo;
-
- if (!messageview->msginfo) return;
- msginfo = messageview->msginfo;
- if (!msginfo->folder) return;
- if (!folder_has_parent_of_type(msginfo->folder, F_DRAFT) &&
- !folder_has_parent_of_type(msginfo->folder, F_OUTBOX) &&
- !folder_has_parent_of_type(msginfo->folder, F_QUEUE))
- return;
-
- compose_reedit(msginfo, FALSE);
-}
-
static void addressbook_open_cb(gpointer data, guint action, GtkWidget *widget)
{
addressbook_open(NULL);
void messageview_set_menu_sensitive(MessageView *messageview)
{
GtkItemFactory *ifactory;
- GtkWidget *menuitem;
+ GtkWidget *menuitem = NULL;
if (!messageview || !messageview->new_window)
return;
(GTK_CHECK_MENU_ITEM(menuitem),
messageview->mimeview->textview->show_all_headers);
}
+ if (prefs_common.hide_quotes) {
+ menuitem = NULL;
+ if (prefs_common.hide_quotes == 1)
+ menuitem = gtk_item_factory_get_widget(ifactory,
+ "/View/Quotes/Fold all");
+ if (prefs_common.hide_quotes == 2)
+ menuitem = gtk_item_factory_get_widget(ifactory,
+ "/View/Quotes/Fold from level 2");
+ if (prefs_common.hide_quotes == 3)
+ menuitem = gtk_item_factory_get_widget(ifactory,
+ "/View/Quotes/Fold from level 3");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem),
+ TRUE);
+ }
}
void messageview_learn (MessageView *msgview, gboolean is_spam)
projects / claws.git / blobdiff