Changeset 10380

Timestamp:

Mar 15, 2010, 2:53:31 AM (11 years ago)

Author:

charles

Message:

(trunk gtk) add favicon support to the new filterbar

Location:

trunk/gtk

Files:

• Makefile.am (modified) (2 diffs)
• favicon.c (added)
• favicon.h (added)
• filter.c (modified) (11 diffs)
• filter.h (modified) (1 diff)
• tr-window.c (modified) (5 diffs)

trunk/gtk/Makefile.am

@@ -43 +43 @@
     details.h \
     dialogs.h \
+    favicon.h \
     filter.h \
     hig.h \
@@ -80 +81 @@
     details.c \
     dialogs.c \
+    favicon.c \
     file-list.c \
     filter.c \

trunk/gtk/filter.c

@@ -17 +17 @@
 #include <libtransmission/utils.h>
 
+#include "favicon.h"
 #include "filter.h"
 #include "hig.h" /* GUI_PAD */
@@ -23 +24 @@
 
 #define DIRTY_KEY          "tr-filter-dirty"
+#define SESSION_KEY        "tr-session-key"
 #define TEXT_KEY           "tr-filter-text"
 #define TEXT_MODE_KEY      "tr-filter-text-mode"
@@ -60 +62 @@
     CAT_FILTER_COL_TYPE,
     CAT_FILTER_COL_HOST, /* pattern-matching text; ie, legaltorrents.com */
+    CAT_FILTER_COL_PIXBUF,
     CAT_FILTER_N_COLS
 };
@@ -114 +117 @@
     if( n != count )
         gtk_tree_store_set( store, iter, CAT_FILTER_COL_COUNT, n, -1 );
+}
+
+static void
+favicon_ready_cb( gpointer pixbuf, gpointer vreference )
+{
+    GtkTreeIter iter;
+    GtkTreeRowReference * reference = vreference;
+
+    if( pixbuf != NULL )
+    {
+        GtkTreePath * path = gtk_tree_row_reference_get_path( reference );
+        GtkTreeModel * model = gtk_tree_row_reference_get_model( reference );
+
+        if( gtk_tree_model_get_iter( model, &iter, path ) )
+            gtk_tree_store_set( GTK_TREE_STORE( model ), &iter, CAT_FILTER_COL_PIXBUF, pixbuf, -1 );
+
+        gtk_tree_path_free( path );
+
+        g_object_unref( pixbuf );
+    }
+
+    gtk_tree_row_reference_free( reference );
 }
 
@@ -264 +289 @@
             gtk_tree_store_remove( store, &iter );
         } else if( insert_row ) {
+            GtkTreeIter child;
+            GtkTreePath * path;
+            GtkTreeRowReference * reference;
+            tr_session * session = g_object_get_data( G_OBJECT( store ), SESSION_KEY );
             const char * host = hosts->pdata[i];
             char * name = get_name_from_host( host );
             const int count = *(int*)g_hash_table_lookup( hosts_hash, host );
-            gtk_tree_store_insert_with_values( store, NULL, &parent, store_pos,
+            gtk_tree_store_insert_with_values( store, &child, &parent, store_pos,
                 CAT_FILTER_COL_HOST, host,
                 CAT_FILTER_COL_NAME, name,
@@ -273 +302 @@
                 CAT_FILTER_COL_TYPE, CAT_FILTER_TYPE_HOST,
                 -1 );
+            path = gtk_tree_model_get_path( model, &child );
+            reference = gtk_tree_row_reference_new( model, path );
+            gtr_get_favicon( session, host, favicon_ready_cb, reference );
+            gtk_tree_path_free( path );
             g_free( name );
             ++store_pos;
@@ -303 +336 @@
                                 G_TYPE_INT,
                                 G_TYPE_INT,
-                                G_TYPE_STRING );
+                                G_TYPE_STRING,
+                                GDK_TYPE_PIXBUF );
 
     gtk_tree_store_insert_with_values( store, NULL, NULL, -1,
@@ -395 +429 @@
 
 static void
+render_pixbuf_func( GtkCellLayout    * cell_layout UNUSED,
+                    GtkCellRenderer  * cell_renderer,
+                    GtkTreeModel     * tree_model,
+                    GtkTreeIter      * iter,
+                    gpointer           data UNUSED )
+{
+    int type;
+    gtk_tree_model_get( tree_model, iter, CAT_FILTER_COL_TYPE, &type, -1 );
+    g_object_set( cell_renderer, "width", type==CAT_FILTER_TYPE_HOST ? 16 : 0, NULL );
+}
+static void
 render_hit_count_func( GtkCellLayout    * cell_layout UNUSED,
                        GtkCellRenderer  * cell_renderer,
@@ -441 +486 @@
                                           is_it_a_separator, NULL, NULL );
     gtk_combo_box_set_active( GTK_COMBO_BOX( c ), 0 );
+
+    r = gtk_cell_renderer_pixbuf_new( );
+    gtk_cell_layout_pack_start( GTK_CELL_LAYOUT( c ), r, FALSE );
+    gtk_cell_layout_set_cell_data_func( GTK_CELL_LAYOUT( c ), r, render_pixbuf_func, NULL, NULL );
+    gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( c ), r,
+                                    "pixbuf", CAT_FILTER_COL_PIXBUF,
+                                    NULL );
+    
 
     r = gtk_cell_renderer_text_new( );
@@ -889 +942 @@
 
 GtkWidget *
-gtr_filter_bar_new( GtkTreeModel * tmodel, GtkTreeModel ** filter_model )
+gtr_filter_bar_new( tr_session * session, GtkTreeModel * tmodel, GtkTreeModel ** filter_model )
 {
     int i;
@@ -914 +967 @@
 
     g_object_set( G_OBJECT( data->category ), "width-request", 150, NULL );
+    g_object_set_data( G_OBJECT( gtk_combo_box_get_model( GTK_COMBO_BOX( data->category ) ) ), SESSION_KEY, session );
 
     gtk_tree_model_filter_set_visible_func( GTK_TREE_MODEL_FILTER( data->filter_model ),

trunk/gtk/filter.h

@@ -15 +15 @@
 
 #include <gtk/gtk.h>
+#include <libtransmission/transmission.h>
 
-GtkWidget * gtr_filter_bar_new( GtkTreeModel * torrent_model, GtkTreeModel ** filter_model );
+GtkWidget * gtr_filter_bar_new( tr_session     * session,
+                                GtkTreeModel   * torrent_model,
+                                GtkTreeModel  ** filter_model );
 
 #endif

trunk/gtk/tr-window.c

@@ -59 +59 @@
 #endif
 
-typedef enum
-{
-    FILTER_TEXT_MODE_NAME,
-    FILTER_TEXT_MODE_FILES,
-    FILTER_TEXT_MODE_TRACKER,
-    FILTER_TEXT_MODE_QTY
-}
-filter_text_mode_t;
-
-typedef enum
-{
-    FILTER_MODE_ALL,
-    FILTER_MODE_ACTIVE,
-    FILTER_MODE_DOWNLOADING,
-    FILTER_MODE_SEEDING,
-    FILTER_MODE_PAUSED,
-    FILTER_MODE_QTY
-}
-filter_mode_t;
-
 typedef struct
 {
@@ -104 +84 @@
     TrCore *              core;
     gulong                pref_handler_id;
-    filter_mode_t         filter_mode;
-    filter_text_mode_t    filter_text_mode;
-    char *                filter_text;
-    GtkToggleButton     * filter_toggles[FILTER_MODE_QTY];
 }
 PrivateData;
@@ -242 +218 @@
     PrivateData * p = vprivate;
     g_signal_handler_disconnect( p->core, p->pref_handler_id );
-    g_free( p->filter_text );
     g_free( p );
 }
@@ -608 +583 @@
 
     p = g_new0( PrivateData, 1 );
-    p->filter_text_mode = FILTER_TEXT_MODE_NAME;
-    p->filter_text = NULL;
 
     /* make the window */
@@ -645 +618 @@
 
     /* filter */
-    h = filter = p->filter = gtr_filter_bar_new( tr_core_model( core ), &p->filter_model );
+    h = filter = p->filter = gtr_filter_bar_new( tr_core_session( core ),
+                                                 tr_core_model( core ),
+                                                 &p->filter_model );
     gtk_container_set_border_width( GTK_CONTAINER( h ), GUI_PAD_SMALL );