filter items (not trackers+dirs for now) show counts next to them. while doing this, I made the stats update loop something that happens only if something changes, which avoids a full iteration over all torrents (even in active only).

1 files changed, 221 insertions, 244 deletions

diff --git a/src/trg-state-selector.c b/src/trg-state-selector.c
index 1fd0367..413c8fc 100644
--- a/src/trg-state-selector.c
+++ b/src/trg-state-selector.c
@@ -23,6 +23,7 @@
 #include <gtk/gtk.h>
 
 #include "torrent.h"
+#include "trg-cell-renderer-counter.h"
 #include "trg-state-selector.h"
 #include "trg-torrent-model.h"
 #include "util.h"
@@ -30,13 +31,11 @@
 #include "trg-client.h"
 
 enum {
-    SELECTOR_STATE_CHANGED,
-    SELECTOR_SIGNAL_COUNT
+    SELECTOR_STATE_CHANGED, SELECTOR_SIGNAL_COUNT
 };
 
 enum {
-    PROP_0,
-    PROP_CLIENT
+    PROP_0, PROP_CLIENT
 };
 
 static guint signals[SELECTOR_SIGNAL_COUNT] = { 0 };
@@ -58,23 +57,29 @@ struct _TrgStateSelectorPrivate {
     gint n_categories;
     GtkListStore *store;
     GtkTreeRowReference *error_rr;
+    GtkTreeRowReference *all_rr;
+    GtkTreeRowReference *paused_rr;
+    GtkTreeRowReference *down_rr;
+    GtkTreeRowReference *seeding_rr;
+    GtkTreeRowReference *complete_rr;
+    GtkTreeRowReference *incomplete_rr;
+    GtkTreeRowReference *checking_rr;
+    GtkTreeRowReference *active_rr;
+    GtkTreeRowReference *seed_wait_rr;
+    GtkTreeRowReference *down_wait_rr;
 };
 
-GRegex *trg_state_selector_get_url_host_regex(TrgStateSelector * s)
-{
+GRegex *trg_state_selector_get_url_host_regex(TrgStateSelector * s) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
     return priv->urlHostRegex;
 }
 
-guint32 trg_state_selector_get_flag(TrgStateSelector * s)
-{
+guint32 trg_state_selector_get_flag(TrgStateSelector * s) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
     return priv->flag;
 }
 
-static void state_selection_changed(GtkTreeSelection * selection,
-                                    gpointer data)
-{
+static void state_selection_changed(GtkTreeSelection * selection, gpointer data) {
     TrgStateSelectorPrivate *priv;
     GtkTreeIter iter;
     GtkTreeModel *stateModel;
@@ -83,21 +88,20 @@ static void state_selection_changed(GtkTreeSelection * selection,
     priv = TRG_STATE_SELECTOR_GET_PRIVATE(data);
 
     if (gtk_tree_selection_get_selected(selection, &stateModel, &iter))
-        gtk_tree_model_get(stateModel, &iter, STATE_SELECTOR_BIT,
-                           &priv->flag, STATE_SELECTOR_INDEX, &index, -1);
+        gtk_tree_model_get(stateModel, &iter, STATE_SELECTOR_BIT, &priv->flag,
+                STATE_SELECTOR_INDEX, &index, -1);
     else
         priv->flag = 0;
 
     trg_prefs_set_int(priv->prefs, TRG_PREFS_STATE_SELECTOR_LAST, index,
-                      TRG_PREFS_GLOBAL);
+            TRG_PREFS_GLOBAL);
 
-    g_signal_emit(TRG_STATE_SELECTOR(data),
-                  signals[SELECTOR_STATE_CHANGED], 0, priv->flag);
+    g_signal_emit(TRG_STATE_SELECTOR(data), signals[SELECTOR_STATE_CHANGED], 0,
+            priv->flag);
 }
 
 static GtkTreeRowReference *quick_tree_ref_new(GtkTreeModel * model,
-                                               GtkTreeIter * iter)
-{
+        GtkTreeIter * iter) {
     GtkTreePath *path = gtk_tree_model_get_path(model, iter);
     GtkTreeRowReference *rr = gtk_tree_row_reference_new(model, path);
     gtk_tree_path_free(path);
@@ -109,10 +113,8 @@ struct cruft_remove_args {
     gint64 serial;
 };
 
-static gboolean trg_state_selector_remove_cruft(gpointer key,
-                                                gpointer value,
-                                                gpointer data)
-{
+static gboolean trg_state_selector_remove_cruft(gpointer key, gpointer value,
+        gpointer data) {
     struct cruft_remove_args *args = (struct cruft_remove_args *) data;
     GtkTreeRowReference *rr = (GtkTreeRowReference *) value;
     GtkTreeModel *model = gtk_tree_row_reference_get_model(rr);
@@ -123,8 +125,7 @@ static gboolean trg_state_selector_remove_cruft(gpointer key,
     gint64 currentSerial;
 
     gtk_tree_model_get_iter(model, &iter, path);
-    gtk_tree_model_get(model, &iter, STATE_SELECTOR_SERIAL, &currentSerial,
-                       -1);
+    gtk_tree_model_get(model, &iter, STATE_SELECTOR_SERIAL, &currentSerial, -1);
 
     remove = (args->serial != currentSerial);
 
@@ -133,8 +134,7 @@ static gboolean trg_state_selector_remove_cruft(gpointer key,
     return remove;
 }
 
-gchar *trg_state_selector_get_selected_text(TrgStateSelector * s)
-{
+gchar *trg_state_selector_get_selected_text(TrgStateSelector * s) {
     GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s));
     GtkTreeModel *model;
     GtkTreeIter iter;
@@ -147,25 +147,21 @@ gchar *trg_state_selector_get_selected_text(TrgStateSelector * s)
 }
 
 static void trg_state_selector_update_serial(GtkTreeModel * model,
-                                             GtkTreeRowReference * rr,
-                                             gint64 serial)
-{
+        GtkTreeRowReference * rr, gint64 serial) {
     GtkTreeIter iter;
     GtkTreePath *path = gtk_tree_row_reference_get_path(rr);
     gtk_tree_model_get_iter(model, &iter, path);
     gtk_list_store_set(GTK_LIST_STORE(model), &iter, STATE_SELECTOR_SERIAL,
-                       serial, -1);
+            serial, -1);
     gtk_tree_path_free(path);
 }
 
-static void refresh_statelist_cb(GtkWidget * w, gpointer data)
-{
+static void refresh_statelist_cb(GtkWidget * w, gpointer data) {
     trg_state_selector_update(TRG_STATE_SELECTOR(data));
 }
 
 static void view_popup_menu(GtkWidget * treeview, GdkEventButton * event,
-                            gpointer data G_GNUC_UNUSED)
-{
+        gpointer data G_GNUC_UNUSED) {
     GtkWidget *menu, *item;
 
     menu = gtk_menu_new();
@@ -173,28 +169,25 @@ static void view_popup_menu(GtkWidget * treeview, GdkEventButton * event,
     item = gtk_image_menu_item_new_with_label(GTK_STOCK_REFRESH);
     gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(item), TRUE);
     gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM
-                                              (item), TRUE);
+    (item), TRUE);
     g_signal_connect(item, "activate", G_CALLBACK(refresh_statelist_cb),
-                     treeview);
+            treeview);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
     gtk_widget_show_all(menu);
 
     gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
-                   (event != NULL) ? event->button : 0,
-                   gdk_event_get_time((GdkEvent *) event));
-}
+            (event != NULL) ? event->button : 0,
+            gdk_event_get_time((GdkEvent *) event));
+        }
 
-static gboolean view_onPopupMenu(GtkWidget * treeview, gpointer userdata)
-{
+static gboolean view_onPopupMenu(GtkWidget * treeview, gpointer userdata) {
     view_popup_menu(treeview, NULL, userdata);
     return TRUE;
 }
 
 static gboolean view_onButtonPressed(GtkWidget * treeview,
-                                     GdkEventButton * event,
-                                     gpointer userdata)
-{
+        GdkEventButton * event, gpointer userdata) {
     if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
         view_popup_menu(treeview, event, userdata);
         return TRUE;
@@ -211,10 +204,7 @@ struct state_find_pos {
 };
 
 static gboolean trg_state_selector_find_pos_foreach(GtkTreeModel * model,
-                                                    GtkTreePath * path,
-                                                    GtkTreeIter * iter,
-                                                    gpointer data)
-{
+        GtkTreePath * path, GtkTreeIter * iter, gpointer data) {
     struct state_find_pos *args = (struct state_find_pos *) data;
     gchar *name;
     gboolean res;
@@ -222,8 +212,7 @@ static gboolean trg_state_selector_find_pos_foreach(GtkTreeModel * model,
     if (args->pos < args->offset) {
         args->pos++;
         return FALSE;
-    } else if (args->range >= 0
-               && args->pos > args->offset + args->range - 1) {
+    } else if (args->range >= 0 && args->pos > args->offset + args->range - 1) {
         return TRUE;
     }
 
@@ -238,9 +227,7 @@ static gboolean trg_state_selector_find_pos_foreach(GtkTreeModel * model,
 }
 
 static void trg_state_selector_insert(TrgStateSelector * s, int offset,
-                                      gint range, const gchar * name,
-                                      GtkTreeIter * iter)
-{
+        gint range, const gchar * name, GtkTreeIter * iter) {
     GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(s));
 
     struct state_find_pos args;
@@ -249,13 +236,11 @@ static void trg_state_selector_insert(TrgStateSelector * s, int offset,
     args.range = range;
     args.name = name;
 
-    gtk_tree_model_foreach(model, trg_state_selector_find_pos_foreach,
-                           &args);
+    gtk_tree_model_foreach(model, trg_state_selector_find_pos_foreach, &args);
     gtk_list_store_insert(GTK_LIST_STORE(model), iter, args.pos);
 }
 
-void trg_state_selector_update(TrgStateSelector * s)
-{
+void trg_state_selector_update(TrgStateSelector * s) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
     GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(s));
     TrgClient *client = priv->client;
@@ -272,8 +257,8 @@ void trg_state_selector_update(TrgStateSelector * s)
     if (!trg_client_is_connected(client))
         return;
 
-    torrentItemRefs =
-        g_hash_table_get_values(trg_client_get_torrent_table(client));
+    torrentItemRefs = g_hash_table_get_values(
+            trg_client_get_torrent_table(client));
 
     for (li = torrentItemRefs; li; li = g_list_next(li)) {
         JsonObject *t = NULL;
@@ -284,7 +269,7 @@ void trg_state_selector_update(TrgStateSelector * s)
         if (path) {
             if (gtk_tree_model_get_iter(torrentModel, &torrentIter, path)) {
                 gtk_tree_model_get(torrentModel, &torrentIter,
-                                   TORRENT_COLUMN_JSON, &t, -1);
+                        TORRENT_COLUMN_JSON, &t, -1);
             }
             gtk_tree_path_free(path);
         }
@@ -293,17 +278,15 @@ void trg_state_selector_update(TrgStateSelector * s)
             continue;
 
         if (priv->showTrackers) {
-            trackersList
-                = json_array_get_elements(torrent_get_tracker_stats(t));
-            for (trackerItem = trackersList; trackerItem; trackerItem
-                 = g_list_next(trackerItem)) {
-                JsonObject *tracker = json_node_get_object((JsonNode *)
-                                                           trackerItem->data);
-                const gchar *announceUrl =
-                    tracker_stats_get_announce(tracker);
-                gchar *announceHost =
-                    trg_gregex_get_first(priv->urlHostRegex,
-                                         announceUrl);
+            trackersList = json_array_get_elements(
+                    torrent_get_tracker_stats(t));
+            for (trackerItem = trackersList; trackerItem;
+                    trackerItem = g_list_next(trackerItem)) {
+                JsonObject *tracker = json_node_get_object(
+                        (JsonNode *) trackerItem->data);
+                const gchar *announceUrl = tracker_stats_get_announce(tracker);
+                gchar *announceHost = trg_gregex_get_first(priv->urlHostRegex,
+                        announceUrl);
 
                 if (!announceHost)
                     continue;
@@ -312,25 +295,20 @@ void trg_state_selector_update(TrgStateSelector * s)
 
                 if (result) {
                     trg_state_selector_update_serial(model,
-                                                     (GtkTreeRowReference
-                                                      *) result,
-                                                     updateSerial);
+                            (GtkTreeRowReference *) result, updateSerial);
                     g_free(announceHost);
                 } else {
                     trg_state_selector_insert(s, priv->n_categories,
-                                              g_hash_table_size
-                                              (priv->trackers),
-                                              announceHost, &iter);
+                            g_hash_table_size(priv->trackers), announceHost,
+                            &iter);
                     gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                                       STATE_SELECTOR_ICON,
-                                       GTK_STOCK_NETWORK,
-                                       STATE_SELECTOR_NAME, announceHost,
-                                       STATE_SELECTOR_SERIAL, updateSerial,
-                                       STATE_SELECTOR_BIT,
-                                       FILTER_FLAG_TRACKER,
-                                       STATE_SELECTOR_INDEX, 0, -1);
+                            STATE_SELECTOR_ICON, GTK_STOCK_NETWORK,
+                            STATE_SELECTOR_NAME, announceHost,
+                            STATE_SELECTOR_SERIAL, updateSerial,
+                            STATE_SELECTOR_BIT, FILTER_FLAG_TRACKER,
+                            STATE_SELECTOR_INDEX, 0, -1);
                     g_hash_table_insert(priv->trackers, announceHost,
-                                        quick_tree_ref_new(model, &iter));
+                            quick_tree_ref_new(model, &iter));
                 }
             }
             g_list_free(trackersList);
@@ -339,28 +317,23 @@ void trg_state_selector_update(TrgStateSelector * s)
         if (priv->showDirs) {
             gchar *dir;
             gtk_tree_model_get(torrentModel, &torrentIter,
-                               TORRENT_COLUMN_DOWNLOADDIR_SHORT, &dir, -1);
+                    TORRENT_COLUMN_DOWNLOADDIR_SHORT, &dir, -1);
 
             result = g_hash_table_lookup(priv->directories, dir);
             if (result) {
                 trg_state_selector_update_serial(model,
-                                                 (GtkTreeRowReference *)
-                                                 result, updateSerial);
+                        (GtkTreeRowReference *) result, updateSerial);
             } else {
                 trg_state_selector_insert(s,
-                                          priv->n_categories +
-                                          g_hash_table_size
-                                          (priv->trackers), -1, dir,
-                                          &iter);
+                        priv->n_categories + g_hash_table_size(priv->trackers),
+                        -1, dir, &iter);
                 gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                                   STATE_SELECTOR_ICON,
-                                   GTK_STOCK_DIRECTORY,
-                                   STATE_SELECTOR_NAME, dir,
-                                   STATE_SELECTOR_SERIAL, updateSerial,
-                                   STATE_SELECTOR_BIT, FILTER_FLAG_DIR,
-                                   STATE_SELECTOR_INDEX, 0, -1);
+                        STATE_SELECTOR_ICON, GTK_STOCK_DIRECTORY,
+                        STATE_SELECTOR_NAME, dir, STATE_SELECTOR_SERIAL,
+                        updateSerial, STATE_SELECTOR_BIT, FILTER_FLAG_DIR,
+                        STATE_SELECTOR_INDEX, 0, -1);
                 g_hash_table_insert(priv->directories, g_strdup(dir),
-                                    quick_tree_ref_new(model, &iter));
+                        quick_tree_ref_new(model, &iter));
             }
 
             g_free(dir);
@@ -374,20 +347,17 @@ void trg_state_selector_update(TrgStateSelector * s)
     if (priv->showTrackers) {
         cruft.table = priv->trackers;
         g_hash_table_foreach_remove(priv->trackers,
-                                    trg_state_selector_remove_cruft,
-                                    &cruft);
+                trg_state_selector_remove_cruft, &cruft);
     }
 
     if (priv->showDirs) {
         cruft.table = priv->directories;
         g_hash_table_foreach_remove(priv->directories,
-                                    trg_state_selector_remove_cruft,
-                                    &cruft);
+                trg_state_selector_remove_cruft, &cruft);
     }
 }
 
-void trg_state_selector_set_show_dirs(TrgStateSelector * s, gboolean show)
-{
+void trg_state_selector_set_show_dirs(TrgStateSelector * s, gboolean show) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
     priv->showDirs = show;
     if (!show)
@@ -396,9 +366,15 @@ void trg_state_selector_set_show_dirs(TrgStateSelector * s, gboolean show)
         trg_state_selector_update(s);
 }
 
-void trg_state_selector_set_show_trackers(TrgStateSelector * s,
-                                          gboolean show)
-{
+static void on_torrents_state_change(TrgTorrentModel * model,
+        guint whatsChanged, gpointer data) {
+    TrgStateSelector *selector = TRG_STATE_SELECTOR(data);
+    trg_state_selector_update(selector);
+    trg_state_selector_stats_update(selector,
+            trg_torrent_model_get_stats(model));
+}
+
+void trg_state_selector_set_show_trackers(TrgStateSelector * s, gboolean show) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
     priv->showTrackers = show;
     if (!show)
@@ -408,14 +384,11 @@ void trg_state_selector_set_show_trackers(TrgStateSelector * s,
 }
 
 static void trg_state_selector_add_state(TrgStateSelector * selector,
-                                         GtkTreeIter * iter, gint pos,
-                                         gchar * icon, gchar * name,
-                                         guint32 flag)
-{
-    TrgStateSelectorPrivate *priv =
-        TRG_STATE_SELECTOR_GET_PRIVATE(selector);
+        GtkTreeIter * iter, gint pos, gchar * icon, gchar * name, guint32 flag,
+        GtkTreeRowReference **rr) {
+    TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(selector);
     GtkListStore *model =
-        GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(selector)));
+            GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(selector)));
 
     if (pos < 0)
         gtk_list_store_append(priv->store, iter);
@@ -423,17 +396,17 @@ static void trg_state_selector_add_state(TrgStateSelector * selector,
         gtk_list_store_insert(priv->store, iter, pos);
 
     gtk_list_store_set(model, iter, STATE_SELECTOR_ICON, icon,
-                       STATE_SELECTOR_NAME, name, STATE_SELECTOR_BIT, flag,
-                       STATE_SELECTOR_INDEX,
-                       gtk_tree_model_iter_n_children(GTK_TREE_MODEL
-                                                      (model), NULL) - 1,
-                       -1);
+            STATE_SELECTOR_NAME, name, STATE_SELECTOR_BIT, flag,
+            STATE_SELECTOR_INDEX, gtk_tree_model_iter_n_children(GTK_TREE_MODEL
+            (model), NULL) - 1, -1);
+
+    if (rr)
+        *rr = quick_tree_ref_new(GTK_TREE_MODEL(model), iter);
 
     priv->n_categories++;
 }
 
-static void remove_row_ref_and_free(GtkTreeRowReference * rr)
-{
+static void remove_row_ref_and_free(GtkTreeRowReference * rr) {
     GtkTreeModel *model = gtk_tree_row_reference_get_model(rr);
     GtkTreePath *path = gtk_tree_row_reference_get_path(rr);
     GtkTreeIter iter;
@@ -444,27 +417,53 @@ static void remove_row_ref_and_free(GtkTreeRowReference * rr)
     gtk_tree_row_reference_free(rr);
 }
 
+static void trg_state_selector_update_stat(GtkTreeRowReference *rr, gint count) {
+    if (rr) {
+        GValue gvalue = { 0 };
+        GtkTreeIter iter;
+        GtkTreePath *path = gtk_tree_row_reference_get_path(rr);
+        GtkTreeModel *model = gtk_tree_row_reference_get_model(rr);
+
+        gtk_tree_model_get_iter(model, &iter, path);
+
+        g_value_init(&gvalue, G_TYPE_INT);
+        g_value_set_int(&gvalue, count);
+        gtk_list_store_set_value(GTK_LIST_STORE(model), &iter,
+                STATE_SELECTOR_COUNT, &gvalue);
+
+        gtk_tree_path_free(path);
+    }
+}
+
 void trg_state_selector_stats_update(TrgStateSelector * s,
-                                     trg_torrent_model_update_stats *
-                                     stats)
-{
+        trg_torrent_model_update_stats * stats) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
     GtkTreeIter iter;
     if (stats->error > 0 && !priv->error_rr) {
         trg_state_selector_add_state(s, &iter, priv->n_categories - 1,
-                                     GTK_STOCK_DIALOG_WARNING, _("Error"),
-                                     TORRENT_FLAG_ERROR);
-        priv->error_rr =
-            quick_tree_ref_new(GTK_TREE_MODEL(priv->store), &iter);
+                GTK_STOCK_DIALOG_WARNING, _("Error"), TORRENT_FLAG_ERROR,
+                &priv->error_rr);
+
     } else if (stats->error < 1 && priv->error_rr) {
         remove_row_ref_and_free(priv->error_rr);
         priv->error_rr = NULL;
         priv->n_categories--;
     }
+
+    trg_state_selector_update_stat(priv->all_rr, stats->count);
+    trg_state_selector_update_stat(priv->down_rr, stats->down);
+    trg_state_selector_update_stat(priv->seeding_rr, stats->seeding);
+    trg_state_selector_update_stat(priv->error_rr, stats->error);
+    trg_state_selector_update_stat(priv->paused_rr, stats->paused);
+    trg_state_selector_update_stat(priv->complete_rr, stats->complete);
+    trg_state_selector_update_stat(priv->incomplete_rr, stats->incomplete);
+    trg_state_selector_update_stat(priv->active_rr, stats->active);
+    trg_state_selector_update_stat(priv->checking_rr, stats->checking);
+    trg_state_selector_update_stat(priv->down_wait_rr, stats->down_wait);
+    trg_state_selector_update_stat(priv->seed_wait_rr, stats->seed_wait);
 }
 
-void trg_state_selector_disconnect(TrgStateSelector * s)
-{
+void trg_state_selector_disconnect(TrgStateSelector * s) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
 
     if (priv->error_rr) {
@@ -475,23 +474,32 @@ void trg_state_selector_disconnect(TrgStateSelector * s)
 
     g_hash_table_remove_all(priv->trackers);
     g_hash_table_remove_all(priv->directories);
+
+    trg_state_selector_update_stat(priv->all_rr, -1);
+    trg_state_selector_update_stat(priv->down_rr, -1);
+    trg_state_selector_update_stat(priv->seeding_rr, -1);
+    trg_state_selector_update_stat(priv->error_rr, -1);
+    trg_state_selector_update_stat(priv->paused_rr, -1);
+    trg_state_selector_update_stat(priv->complete_rr, -1);
+    trg_state_selector_update_stat(priv->incomplete_rr, -1);
+    trg_state_selector_update_stat(priv->active_rr, -1);
+    trg_state_selector_update_stat(priv->checking_rr, -1);
 }
 
-static void trg_state_selector_init(TrgStateSelector * self)
-{
+static void trg_state_selector_init(TrgStateSelector * self) {
 }
 
-TrgStateSelector *trg_state_selector_new(TrgClient * client)
-{
-    return g_object_new(TRG_TYPE_STATE_SELECTOR, "client", client, NULL);
+TrgStateSelector *trg_state_selector_new(TrgClient * client,
+        TrgTorrentModel *tmodel) {
+    TrgStateSelector *selector = g_object_new(TRG_TYPE_STATE_SELECTOR, "client",
+            client, NULL);
+    g_signal_connect(tmodel, "torrents-state-change",
+            G_CALLBACK(on_torrents_state_change), selector);
+    return selector;
 }
 
 static GObject *trg_state_selector_constructor(GType type,
-                                               guint
-                                               n_construct_properties,
-                                               GObjectConstructParam *
-                                               construct_params)
-{
+        guint n_construct_properties, GObjectConstructParam * construct_params) {
     GObject *object;
     TrgStateSelector *selector;
     TrgStateSelectorPrivate *priv;
@@ -503,20 +511,17 @@ static GObject *trg_state_selector_constructor(GType type,
     GtkTreeSelection *selection;
 
     object = G_OBJECT_CLASS
-        (trg_state_selector_parent_class)->constructor(type,
-                                                       n_construct_properties,
-                                                       construct_params);
+    (trg_state_selector_parent_class)->constructor(type,
+            n_construct_properties, construct_params);
 
     selector = TRG_STATE_SELECTOR(object);
     priv = TRG_STATE_SELECTOR_GET_PRIVATE(object);
 
     priv->urlHostRegex = trg_uri_host_regex_new();
     priv->trackers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
-                                           (GDestroyNotify)
-                                           remove_row_ref_and_free);
-    priv->directories =
-        g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
-                              (GDestroyNotify) remove_row_ref_and_free);
+            (GDestroyNotify) remove_row_ref_and_free);
+    priv->directories = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+            (GDestroyNotify) remove_row_ref_and_free);
 
     gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(object), FALSE);
 
@@ -525,110 +530,95 @@ static GObject *trg_state_selector_constructor(GType type,
     renderer = gtk_cell_renderer_pixbuf_new();
     gtk_tree_view_column_pack_start(column, renderer, FALSE);
     g_object_set(renderer, "stock-size", 4, NULL);
-    gtk_tree_view_column_set_attributes(column, renderer, "stock-id", STATE_SELECTOR_ICON,
-                                        NULL);
+    gtk_tree_view_column_set_attributes(column, renderer, "stock-id",
+            STATE_SELECTOR_ICON, NULL);
 
-    renderer = gtk_cell_renderer_text_new();
+    renderer = trg_cell_renderer_counter_new();
     gtk_tree_view_column_pack_start(column, renderer, TRUE);
-    gtk_tree_view_column_set_attributes(column, renderer, "text", STATE_SELECTOR_NAME, NULL);
+    gtk_tree_view_column_set_attributes(column, renderer, "state-label",
+            STATE_SELECTOR_NAME, "state-count", STATE_SELECTOR_COUNT, NULL);
 
     gtk_tree_view_append_column(GTK_TREE_VIEW(object), column);
 
-    store = priv->store =
-        gtk_list_store_new(STATE_SELECTOR_COLUMNS, G_TYPE_STRING,
-                           G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INT64,
-                           G_TYPE_UINT);
+    store = priv->store = gtk_list_store_new(STATE_SELECTOR_COLUMNS,
+            G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_UINT, G_TYPE_INT64,
+            G_TYPE_UINT);
     gtk_tree_view_set_model(GTK_TREE_VIEW(object), GTK_TREE_MODEL(store));
 
-    trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_ABOUT,
-                                 _("All"), 0);
+    trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_ABOUT, _("All"),
+            0, &priv->all_rr);
     trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_GO_DOWN,
-                                 _("Downloading"),
-                                 TORRENT_FLAG_DOWNLOADING);
-    trg_state_selector_add_state(selector, &iter, -1,
-                                 GTK_STOCK_MEDIA_REWIND, _("Queue Down"),
-                                 TORRENT_FLAG_DOWNLOADING_WAIT);
+            _("Downloading"), TORRENT_FLAG_DOWNLOADING, &priv->down_rr);
+    trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_MEDIA_REWIND,
+            _("Queue Down"), TORRENT_FLAG_DOWNLOADING_WAIT, &priv->down_wait_rr);
     trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_GO_UP,
-                                 _("Seeding"), TORRENT_FLAG_SEEDING);
-    trg_state_selector_add_state(selector, &iter, -1,
-                                 GTK_STOCK_MEDIA_FORWARD, _("Queue Up"),
-                                 TORRENT_FLAG_SEEDING_WAIT);
-    trg_state_selector_add_state(selector, &iter, -1,
-                                 GTK_STOCK_MEDIA_PAUSE, _("Paused"),
-                                 TORRENT_FLAG_PAUSED);
+            _("Seeding"), TORRENT_FLAG_SEEDING, &priv->seeding_rr);
+    trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_MEDIA_FORWARD,
+            _("Queue Up"), TORRENT_FLAG_SEEDING_WAIT, &priv->seed_wait_rr);
+    trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_MEDIA_PAUSE,
+            _("Paused"), TORRENT_FLAG_PAUSED, &priv->paused_rr);
     trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_APPLY,
-                                 _("Complete"), TORRENT_FLAG_COMPLETE);
+            _("Complete"), TORRENT_FLAG_COMPLETE, &priv->complete_rr);
     trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_SELECT_ALL,
-                                 _("Incomplete"), TORRENT_FLAG_INCOMPLETE);
+            _("Incomplete"), TORRENT_FLAG_INCOMPLETE, &priv->incomplete_rr);
     trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_NETWORK,
-                                 _("Active"), TORRENT_FLAG_ACTIVE);
+            _("Active"), TORRENT_FLAG_ACTIVE, &priv->active_rr);
     trg_state_selector_add_state(selector, &iter, -1, GTK_STOCK_REFRESH,
-                                 _("Checking"), TORRENT_FLAG_CHECKING_ANY);
-    trg_state_selector_add_state(selector, &iter, -1, NULL, NULL, 0);
+            _("Checking"), TORRENT_FLAG_CHECKING_ANY, &priv->checking_rr);
+    trg_state_selector_add_state(selector, &iter, -1, NULL, NULL, 0, NULL);
 
     gtk_tree_view_set_rubber_banding(GTK_TREE_VIEW(object), TRUE);
 
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(object));
 
     g_signal_connect(G_OBJECT(selection), "changed",
-                     G_CALLBACK(state_selection_changed), object);
+            G_CALLBACK(state_selection_changed), object);
     g_signal_connect(object, "button-press-event",
-                     G_CALLBACK(view_onButtonPressed), NULL);
-    g_signal_connect(object, "popup-menu", G_CALLBACK(view_onPopupMenu),
-                     NULL);
+            G_CALLBACK(view_onButtonPressed), NULL);
+    g_signal_connect(object, "popup-menu", G_CALLBACK(view_onPopupMenu), NULL);
 
-    gtk_tree_view_set_search_column(GTK_TREE_VIEW(object),
-                                    STATE_SELECTOR_NAME);
+    gtk_tree_view_set_search_column(GTK_TREE_VIEW(object), STATE_SELECTOR_NAME);
 
     index = trg_prefs_get_int(priv->prefs, TRG_PREFS_STATE_SELECTOR_LAST,
-                              TRG_PREFS_GLOBAL);
-    if (index > 0 && gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store),
-                                                   &iter, NULL, index)) {
-        GtkTreeSelection *selection =
-            gtk_tree_view_get_selection(GTK_TREE_VIEW(object));
+            TRG_PREFS_GLOBAL);
+    if (index > 0
+            && gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL,
+                    index)) {
+        GtkTreeSelection *selection = gtk_tree_view_get_selection(
+                GTK_TREE_VIEW(object));
         gtk_tree_selection_select_iter(selection, &iter);
     }
 
-    priv->showDirs =
-        trg_prefs_get_bool(priv->prefs, TRG_PREFS_KEY_FILTER_DIRS,
-                           TRG_PREFS_GLOBAL);
-    priv->showTrackers =
-        trg_prefs_get_bool(priv->prefs, TRG_PREFS_KEY_FILTER_TRACKERS,
-                           TRG_PREFS_GLOBAL);
+    priv->showDirs = trg_prefs_get_bool(priv->prefs, TRG_PREFS_KEY_FILTER_DIRS,
+            TRG_PREFS_GLOBAL);
+    priv->showTrackers = trg_prefs_get_bool(priv->prefs,
+            TRG_PREFS_KEY_FILTER_TRACKERS, TRG_PREFS_GLOBAL);
 
     return object;
 }
 
 void trg_state_selector_set_queues_enabled(TrgStateSelector * s,
-                                           gboolean enabled)
-{
+        gboolean enabled) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
-    GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(s));
     GtkTreeIter iter;
 
     if (enabled) {
         trg_state_selector_add_state(s, &iter, 2, GTK_STOCK_MEDIA_REWIND,
-                                     _("Queue Down"),
-                                     TORRENT_FLAG_DOWNLOADING_WAIT);
+                _("Queue Down"), TORRENT_FLAG_DOWNLOADING_WAIT, &priv->down_wait_rr);
         trg_state_selector_add_state(s, &iter, 4, GTK_STOCK_MEDIA_FORWARD,
-                                     _("Queue Up"),
-                                     TORRENT_FLAG_SEEDING_WAIT);
+                _("Queue Up"), TORRENT_FLAG_SEEDING_WAIT, &priv->seed_wait_rr);
     } else {
-        gtk_tree_model_iter_nth_child(model, &iter, NULL, 4);
-        gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
-
-        gtk_tree_model_iter_nth_child(model, &iter, NULL, 2);
-        gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+        remove_row_ref_and_free(priv->seed_wait_rr);
+        remove_row_ref_and_free(priv->down_wait_rr);
+        priv->down_wait_rr = NULL;
+        priv->seed_wait_rr = NULL;
 
         priv->n_categories -= 2;
     }
 }
 
-static void trg_state_selector_get_property(GObject * object,
-                                            guint property_id,
-                                            GValue * value,
-                                            GParamSpec * pspec)
-{
+static void trg_state_selector_get_property(GObject * object, guint property_id,
+        GValue * value, GParamSpec * pspec) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(object);
     switch (property_id) {
     case PROP_CLIENT:
@@ -640,12 +630,8 @@ static void trg_state_selector_get_property(GObject * object,
     }
 }
 
-static void trg_state_selector_set_property(GObject * object,
-                                            guint prop_id,
-                                            const GValue * value,
-                                            GParamSpec *
-                                            pspec G_GNUC_UNUSED)
-{
+static void trg_state_selector_set_property(GObject * object, guint prop_id,
+        const GValue * value, GParamSpec * pspec G_GNUC_UNUSED) {
     TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(object);
 
     switch (prop_id) {
@@ -656,40 +642,31 @@ static void trg_state_selector_set_property(GObject * object,
     }
 }
 
-static void trg_state_selector_class_init(TrgStateSelectorClass * klass)
-{
+static void trg_state_selector_class_init(TrgStateSelectorClass * klass) {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
     object_class->constructor = trg_state_selector_constructor;
     object_class->set_property = trg_state_selector_set_property;
     object_class->get_property = trg_state_selector_get_property;
 
     signals[SELECTOR_STATE_CHANGED] = g_signal_new("torrent-state-changed",
-                                                   G_TYPE_FROM_CLASS
-                                                   (object_class),
-                                                   G_SIGNAL_RUN_LAST |
-                                                   G_SIGNAL_ACTION,
-                                                   G_STRUCT_OFFSET
-                                                   (TrgStateSelectorClass,
-                                                    torrent_state_changed),
-                                                   NULL, NULL,
-                                                   g_cclosure_marshal_VOID__UINT,
-                                                   G_TYPE_NONE, 1,
-                                                   G_TYPE_UINT);
-
-    g_object_class_install_property(object_class,
-                                    PROP_CLIENT,
-                                    g_param_spec_object("client",
-                                                        "Client",
-                                                        "Client",
-                                                        TRG_TYPE_CLIENT,
-                                                        G_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT_ONLY
-                                                        |
-                                                        G_PARAM_STATIC_NAME
-                                                        |
-                                                        G_PARAM_STATIC_NICK
-                                                        |
-                                                        G_PARAM_STATIC_BLURB));
+            G_TYPE_FROM_CLASS
+            (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+            G_STRUCT_OFFSET
+            (TrgStateSelectorClass,
+                    torrent_state_changed), NULL, NULL,
+            g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT);
+
+    g_object_class_install_property(
+            object_class,
+            PROP_CLIENT,
+            g_param_spec_object(
+                    "client",
+                    "Client",
+                    "Client",
+                    TRG_TYPE_CLIENT,
+                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY
+                            | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK
+                            | G_PARAM_STATIC_BLURB));
 
     g_type_class_add_private(klass, sizeof(TrgStateSelectorPrivate));
 }