diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.ja | 4 | ||||
| -rw-r--r-- | src/summaryview.c | 35 | ||||
| -rw-r--r-- | src/summaryview.h | 2 |
4 files changed, 43 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2005-11-30 + * src/summaryview.[ch]: display progress on filtering. + +2005-11-30 + * version 2.1.8 2005-11-29 diff --git a/ChangeLog.ja b/ChangeLog.ja index 27fe8fef..0f8b4b5c 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,9 @@ 2005-11-30 + * src/summaryview.[ch]: 振り分け時に進捗を表示。 + +2005-11-30 + * version 2.1.8 2005-11-29 diff --git a/src/summaryview.c b/src/summaryview.c index 2023ae6c..498d965e 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -816,6 +816,8 @@ void summary_clear_list(SummaryView *summaryview) summaryview->folder_table = NULL; } summaryview->filtered = 0; + summaryview->flt_count = 0; + summaryview->flt_total = 0; summaryview->on_button_press = FALSE; summaryview->can_toggle_selection = TRUE; @@ -3832,6 +3834,15 @@ static gboolean summary_filter_func(GtkTreeModel *model, GtkTreePath *path, gtk_tree_model_get(model, iter, S_COL_MSG_INFO, &msginfo, -1); + summaryview->flt_count++; + { + gchar msg[1024]; + g_snprintf(msg, sizeof(msg), _("Filtering (%d / %d)..."), + summaryview->flt_count, summaryview->flt_total); + STATUSBAR_POP(summaryview->mainwin); + STATUSBAR_PUSH(summaryview->mainwin, msg); + } + fltinfo = filter_info_new(); fltinfo->flags = msginfo->flags; filter_apply_msginfo(prefs_common.fltlist, msginfo, fltinfo); @@ -3879,6 +3890,15 @@ static gboolean summary_filter_junk_func(GtkTreeModel *model, GtkTreePath *path, gtk_tree_model_get(model, iter, S_COL_MSG_INFO, &msginfo, -1); + summaryview->flt_count++; + { + gchar msg[1024]; + g_snprintf(msg, sizeof(msg), _("Filtering (%d / %d)..."), + summaryview->flt_count, summaryview->flt_total); + STATUSBAR_POP(summaryview->mainwin); + STATUSBAR_PUSH(summaryview->mainwin, msg); + } + fltinfo = filter_info_new(); fltinfo->flags = msginfo->flags; filter_apply_msginfo(prefs_common.junk_fltlist, msginfo, fltinfo); @@ -3913,7 +3933,10 @@ static void summary_filter_real(SummaryView *summaryview, GtkTreeModelForeachFunc func, gboolean selected_only) { + GList *rows; + if (!prefs_common.fltlist) return; + if (!summaryview->folder_item) return; summary_lock(summaryview); @@ -3924,15 +3947,21 @@ static void summary_filter_real(SummaryView *summaryview, main_window_cursor_wait(summaryview->mainwin); summaryview->filtered = 0; + summaryview->flt_count = 0; + + if (selected_only) { + rows = summary_get_selected_rows(summaryview); + summaryview->flt_total = g_list_length(rows); - if (selected_only) gtk_tree_selection_selected_foreach (summaryview->selection, (GtkTreeSelectionForeachFunc)func, summaryview); - else + } else { + summaryview->flt_total = summaryview->folder_item->total; gtk_tree_model_foreach(GTK_TREE_MODEL(summaryview->store), func, summaryview); + } summary_unlock(summaryview); @@ -3955,6 +3984,8 @@ static void summary_filter_real(SummaryView *summaryview, STATUSBAR_PUSH(summaryview->mainwin, result_msg); } summaryview->filtered = 0; + summaryview->flt_count = 0; + summaryview->flt_total = 0; } void summary_filter(SummaryView *summaryview, gboolean selected_only) diff --git a/src/summaryview.h b/src/summaryview.h index 8137f6ef..f5267629 100644 --- a/src/summaryview.h +++ b/src/summaryview.h @@ -122,6 +122,8 @@ private: GHashTable *folder_table; /* counter for filtering */ gint filtered; + gint flt_count; + gint flt_total; gboolean on_button_press; |