Changeset 10648

Timestamp:

May 16, 2010, 3:51:01 PM (11 years ago)

Author:

charles

Message:

(trunk gtk) futz with the filter bar a little bit

File:

• trunk/gtk/filter.c (modified) (6 diffs)

trunk/gtk/filter.c

@@ -213 +213 @@
     /* skip separator */
     gtk_tree_model_iter_next( model, &top );
-
-    /* update the "public" subtree */
-    gtk_tree_model_iter_next( model, &top );
-    gtk_tree_model_iter_children( model, &iter, &top );
-    category_model_update_count( store, &iter, public );
-    gtk_tree_model_iter_next( model, &iter );
-    category_model_update_count( store, &iter, private );
-
-    /* update the "priority" subtree */
-    gtk_tree_model_iter_next( model, &top );
-    gtk_tree_model_iter_children( model, &iter, &top );
-    category_model_update_count( store, &iter, high );
-    gtk_tree_model_iter_next( model, &iter );
-    category_model_update_count( store, &iter, normal );
-    gtk_tree_model_iter_next( model, &iter );
-    category_model_update_count( store, &iter, low );
 
     /* update the "hosts" subtree */
@@ -294 +278 @@
     }
 
+    /* update the "public" subtree */
+    gtk_tree_model_iter_next( model, &top );
+    gtk_tree_model_iter_children( model, &iter, &top );
+    category_model_update_count( store, &iter, public );
+    gtk_tree_model_iter_next( model, &iter );
+    category_model_update_count( store, &iter, private );
+
+    /* update the "priority" subtree */
+    gtk_tree_model_iter_next( model, &top );
+    gtk_tree_model_iter_children( model, &iter, &top );
+    category_model_update_count( store, &iter, high );
+    gtk_tree_model_iter_next( model, &iter );
+    category_model_update_count( store, &iter, normal );
+    gtk_tree_model_iter_next( model, &iter );
+    category_model_update_count( store, &iter, low );
+
     /* cleanup */
     g_ptr_array_foreach( hosts, (GFunc)g_free, NULL );
@@ -319 +319 @@
     gtk_tree_store_insert_with_values( store, NULL, NULL, -1,
         CAT_FILTER_COL_TYPE, CAT_FILTER_TYPE_SEPARATOR,
+        -1 );
+
+    gtk_tree_store_insert_with_values( store, &iter, NULL, -1,
+        CAT_FILTER_COL_NAME, _( "Trackers" ),
+        CAT_FILTER_COL_COUNT, invisible_number,
+        CAT_FILTER_COL_TYPE, CAT_FILTER_TYPE_PARENT,
         -1 );
 
@@ -353 +359 @@
         -1 );
 
-    gtk_tree_store_insert_with_values( store, &iter, NULL, -1,
-        CAT_FILTER_COL_NAME, _( "Trackers" ),
-        CAT_FILTER_COL_COUNT, invisible_number,
-        CAT_FILTER_COL_TYPE, CAT_FILTER_TYPE_PARENT,
-        -1 );
-
     g_object_set_data( G_OBJECT( store ), TORRENT_MODEL_KEY, tmodel );
     category_filter_model_update( store );
@@ -989 +989 @@
     h = gtk_hbox_new( FALSE, GUI_PAD_SMALL );
 
-    /* add the category combobox */
-    str = _( "_Category:" );
-    w = category;
+    /* add the activity combobox */
+    str = _( "_Show:" );
+    w = activity;
     l = gtk_label_new( NULL );
     gtk_label_set_markup_with_mnemonic( GTK_LABEL( l ), str );
@@ -1003 +1003 @@
     gtk_box_pack_start( GTK_BOX( h ), w, FALSE, FALSE, 0 );
 
-    /* add the activity combobox */
-    str = _( "_Activity:" );
-    w = activity;
-    l = gtk_label_new( NULL );
-    gtk_label_set_markup_with_mnemonic( GTK_LABEL( l ), str );
-    gtk_label_set_mnemonic_widget( GTK_LABEL( l ), w );
-    gtk_box_pack_start( GTK_BOX( h ), l, FALSE, FALSE, 0 );
+    /* add the category combobox */
+    w = category;
     gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 );