static void summary_searchbar_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
-static void summary_searchtype_changed (GtkWidget *ctree,
- GdkEventAny *event,
- SummaryView *summaryview);
+static void summary_searchtype_changed (GtkMenuItem *widget,
+ gpointer data);
static void summary_open_row (GtkSCTree *sctree,
SummaryView *summaryview);
static void summary_tree_expanded (GtkCTree *ctree,
static gint summary_cmp_by_from (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
+static gint summary_cmp_by_to (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
static gint summary_cmp_by_subject (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
static void news_flag_crosspost (MsgInfo *msginfo);
+static void tog_searchbar_cb (GtkWidget *w,
+ gpointer data);
+
+
GtkTargetEntry summary_drag_types[1] =
{
{"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
{N_("/M_ove..."), NULL, summary_move_to, 0, NULL},
{N_("/_Copy..."), NULL, summary_copy_to, 0, NULL},
{N_("/_Delete"), NULL, summary_delete, 0, NULL},
+ {N_("/Cancel a news message"), NULL, summary_cancel, 0, NULL},
{N_("/E_xecute"), NULL, summary_execute_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
GtkWidget *search_type;
GtkWidget *search_string;
GtkWidget *menuitem;
+ GtkWidget *toggle_search;
+ GtkTooltips *search_tip;
GtkItemFactory *popupfactory;
gint n_entries;
/* create status label */
hbox = gtk_hbox_new(FALSE, 0);
+
+ search_tip = gtk_tooltips_new();
+ toggle_search = gtk_toggle_button_new();
+
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
+ toggle_search,
+ _("Toggle quick-search bar"), NULL);
+
+ gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
hbox_l = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
-
+
statlabel_folder = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
statlabel_select = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
-
+
/* toggle view button */
toggle_eventbox = gtk_event_box_new();
gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
GTK_SIGNAL_FUNC(summary_toggle_pressed),
summaryview);
-
+
+
statlabel_msgs = gtk_label_new("");
gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
GTK_SIGNAL_FUNC(summary_searchbar_pressed),
summaryview);
+ gtk_signal_connect (GTK_OBJECT(toggle_search), "toggled",
+ GTK_SIGNAL_FUNC(tog_searchbar_cb), hbox_search);
+
/* create popup menu */
n_entries = sizeof(summary_popup_entries) /
sizeof(summary_popup_entries[0]);
summaryview->statlabel_msgs = statlabel_msgs;
summaryview->toggle_eventbox = toggle_eventbox;
summaryview->toggle_arrow = toggle_arrow;
+ summaryview->toggle_search = toggle_search;
summaryview->popupmenu = popupmenu;
summaryview->popupfactory = popupfactory;
summaryview->lock_count = 0;
gtk_widget_show(pixmap);
summaryview->folder_pixmap = pixmap;
+ pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+ gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
+ gtk_widget_show(pixmap);
+
/* Init summaryview prefs */
summaryview->sort_key = SORT_BY_NONE;
summaryview->sort_type = SORT_ASCENDING;
gint search_type = GPOINTER_TO_INT(gtk_object_get_user_data(
GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
GTK_MENU(summaryview->search_type))))));
- gchar *search_string = g_strdup(gtk_entry_get_text(
- GTK_ENTRY(summaryview->search_string)));
+ gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
gchar *searched_header = NULL;
not_killed = NULL;
- g_strdown(search_string);
-
- for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+ for (cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
+
switch (search_type) {
- case S_SEARCH_SUBJECT:
- searched_header = g_strdup(msginfo->subject);
- break;
- case S_SEARCH_FROM:
- searched_header = g_strdup(msginfo->from);
- break;
- case S_SEARCH_TO:
- searched_header = g_strdup(msginfo->to);
- break;
- default:
- printf("bug in search_type (=%d)\n",search_type);
+ case S_SEARCH_SUBJECT:
+ searched_header = msginfo->subject;
+ break;
+ case S_SEARCH_FROM:
+ searched_header = msginfo->from;
+ break;
+ case S_SEARCH_TO:
+ searched_header = msginfo->to;
+ break;
+ default:
+ debug_print("unknown search type (%d)\n", search_type);
+ break;
}
-
- g_strdown(searched_header);
- if (searched_header != NULL
- && strstr(searched_header, search_string) != NULL)
+ if (searched_header && strcasestr(searched_header, search_string) != NULL)
not_killed = g_slist_append(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
g_slist_free(mlist);
- g_free(search_string);
- g_free(searched_header);
mlist = not_killed;
}
else
menu_set_sensitive(ifactory, "/Move...", FALSE);
+#if 0
menu_set_sensitive(ifactory, "/Delete", TRUE);
+#endif
menu_set_sensitive(ifactory, "/Select all", TRUE);
menu_set_sensitive(ifactory, "/Copy...", TRUE);
menu_set_sensitive(ifactory, "/Execute", TRUE);
else
sens = FALSE;
menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
+ menu_set_sensitive(ifactory, "/Cancel a news message", sens);
+ menu_set_sensitive(ifactory, "/Delete", !sens);
+
summary_lock(summaryview);
menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
gtk_check_menu_item_set_active
cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
break;
case SORT_BY_FROM:
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_from;
+ cmp_func = summaryview->folder_item->stype != F_OUTBOX ?
+ (GtkCListCompareFunc) summary_cmp_by_from :
+ (GtkCListCompareFunc) summary_cmp_by_to;
break;
case SORT_BY_SUBJECT:
if (summaryview->simplify_subject_preg)
{
static gchar date_modified[80];
static gchar *to = NULL;
- static gchar *from = NULL;
static gchar col_score[11];
static gchar buf[BUFFSIZE];
gint *col_pos = summaryview->col_pos;
g_free(to);
to = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
text[col_pos[S_COL_FROM]] = to;
+ g_free(addr);
}
} else {
if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
* the --> in sent boxes) was executed.
*/
if (text[col_pos[S_COL_FROM]] != to && prefs_common.use_addr_book && msginfo->from) {
- g_free(from);
- from = summary_complete_address(msginfo->from);
- if (from)
- text[col_pos[S_COL_FROM]] = from;
+ gchar *from = summary_complete_address(msginfo->from);
+ if (from) {
+ g_free(to);
+ to = from;
+ text[col_pos[S_COL_FROM]] = to;
+ }
}
if (summaryview->simplify_subject_preg != NULL)
if (new_window) {
MessageView *msgview;
- msgview = messageview_create_with_new_window();
+ msgview = messageview_create_with_new_window(summaryview->mainwin);
messageview_show(msgview, msginfo, all_headers);
} else {
MessageView *msgview;
msginfo->folder->path, msginfo->msgnum);
}
+void summary_cancel(SummaryView *summaryview)
+{
+ MsgInfo * msginfo;
+ GtkCList *clist = GTK_CLIST(summaryview->ctree);
+
+ msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+ summaryview->selected);
+ if (!msginfo) return;
+
+ if (!check_permission(summaryview, msginfo))
+ return;
+
+ news_cancel_article(summaryview->folder_item->folder, msginfo);
+
+ if (summary_is_locked(summaryview)) return;
+
+ summary_lock(summaryview);
+
+ gtk_clist_freeze(clist);
+
+ summary_update_status(summaryview);
+ summary_status_show(summaryview);
+
+ gtk_clist_thaw(clist);
+
+ summary_unlock(summaryview);
+}
+
void summary_delete(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
{
GtkCTree *ctree = GTK_CTREE(widget);
GtkCTreeNode *node;
+ MessageView *messageview;
+ TextView *textview;
if (summary_is_locked(summaryview)) return;
if (!event) return;
return;
}
+ messageview = summaryview->messageview;
+ if (messageview->type == MVIEW_MIME &&
+ gtk_notebook_get_current_page
+ (GTK_NOTEBOOK(messageview->mimeview->notebook)) == 1)
+ textview = messageview->mimeview->textview;
+ else
+ textview = messageview->textview;
+
switch (event->keyval) {
case GDK_space: /* Page down or go to the next */
if (summaryview->displayed != summaryview->selected) {
summaryview->selected);
break;
}
- if (!textview_scroll_page(summaryview->messageview->textview,
- FALSE))
+ if (!textview_scroll_page(textview, FALSE))
summary_select_next_unread(summaryview);
break;
case GDK_BackSpace: /* Page up */
- textview_scroll_page(summaryview->messageview->textview, TRUE);
+ textview_scroll_page(textview, TRUE);
break;
case GDK_Return: /* Scroll up/down one line */
if (summaryview->displayed != summaryview->selected) {
summaryview->selected);
break;
}
- textview_scroll_one_line(summaryview->messageview->textview,
- (event->state & GDK_MOD1_MASK) != 0);
+ textview_scroll_one_line
+ (textview, (event->state & GDK_MOD1_MASK) != 0);
break;
case GDK_asterisk: /* Mark */
summary_mark(summaryview);
summary_show(summaryview, summaryview->folder_item);
}
-static void summary_searchtype_changed(GtkWidget *widget, GdkEventAny *event,
- SummaryView *summaryview)
+static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
{
- if (gtk_entry_get_text(GTK_ENTRY(summaryview->search_string)))
- summary_show(summaryview, summaryview->folder_item);
+ SummaryView *sw = (SummaryView *)data;
+ if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
+ summary_show(sw, sw->folder_item);
+}
+
+static void tog_searchbar_cb(GtkWidget *w, gpointer data)
+{
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
+ prefs_common.show_searchbar = TRUE;
+ gtk_widget_show(GTK_WIDGET(data));
+ } else {
+ prefs_common.show_searchbar = FALSE;
+ gtk_widget_hide(GTK_WIDGET(data));
+ }
}
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
return strcasecmp(msginfo1->fromname, msginfo2->fromname);
}
+static gint summary_cmp_by_to(GtkCList *clist,
+ gconstpointer ptr1, gconstpointer ptr2)
+{
+ const gchar *str1, *str2;
+ const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
+ const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
+ const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+
+ g_return_val_if_fail(sv, -1);
+
+ str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_FROM]])->text;
+ str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_FROM]])->text;
+
+ if (!str1)
+ return str2 != NULL;
+
+ if (!str2)
+ return -1;
+
+ if (g_strncasecmp(str1, "-->", 3) == 0)
+ str1 += 3;
+ if (g_strncasecmp(str2, "-->", 3) == 0)
+ str2 += 3;
+
+ return strcasecmp(str1, str2);
+}
+
static gint summary_cmp_by_subject(GtkCList *clist,
gconstpointer ptr1, gconstpointer ptr2)
{
GtkCTreeNode *node = summaryview->selected;
GList *cur;
+ g_return_if_fail(node != NULL);
+
while (GTK_CTREE_ROW(node)->parent != NULL)
node = GTK_CTREE_ROW(node)->parent;
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
- gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 0);
+ gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 1); /* search_toggle before */
gtk_widget_show(pixmap);
summaryview->folder_pixmap = pixmap;
projects / claws.git / blobdiff