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 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}
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;
}
summaryview->folder_item->prefs->important_score;
}
- if (summaryview->folder_item->threaded) {
+ if (summaryview->threaded) {
GNode *root, *gnode;
root = procmsg_get_thread_tree(mlist);
{
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;
gtk_clist_freeze(clist);
- if (summaryview->folder_item->threaded)
+ if (summaryview->threaded)
summary_unthread_for_exec(summaryview);
summary_execute_move(summaryview);
node = next;
}
- if (summaryview->folder_item->threaded)
+ if (summaryview->threaded)
summary_thread_build(summaryview);
summaryview->selected = clist->selection ?
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+ summaryview->threaded = TRUE;
+
summary_unlock(summaryview);
}
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+ summaryview->threaded = FALSE;
+
summary_unlock(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)
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;
/* Sorting */
summaryview->sort_key = item->sort_key;
summaryview->sort_type = item->sort_type;
+
+ /* Threading */
+ summaryview->threaded = item->threaded;
}
void summary_save_prefs_to_folderitem(SummaryView *summaryview, FolderItem *item)
{
+ /* Sorting */
item->sort_key = summaryview->sort_key;
item->sort_type = summaryview->sort_type;
+
+ /* Threading */
+ item->threaded = summaryview->threaded;
}
/*
projects / claws.git / blobdiff