Changeset 10512

Timestamp:

Apr 23, 2010, 1:46:02 AM (11 years ago)

Author:

charles

Message:

(trunk gtk) #3166 "Add Tracker Favicons to Tracker Tab in Properties Window." -- implemented in trunk for 2.00

Location:

trunk/gtk

Files:

• details.c (modified) (8 diffs)
• favicon.c (modified) (1 diff)
• favicon.h (modified) (1 diff)
• filter.c (modified) (3 diffs)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/details.c

@@ -24 +24 @@
 #include "actions.h"
 #include "details.h"
+#include "favicon.h" /* gtr_get_favicon() */
 #include "file-list.h"
 #include "hig.h"
@@ -1886 +1887 @@
   TRACKER_COL_TORRENT_NAME,
   TRACKER_COL_TRACKER_NAME,
+  TRACKER_COL_FAVICON,
   TRACKER_N_COLS
 };
@@ -1928 +1930 @@
 
 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_list_store_set( GTK_LIST_STORE( model ), &iter,
+                                TRACKER_COL_FAVICON, pixbuf,
+                                -1 );
+
+        gtk_tree_path_free( path );
+
+        g_object_unref( pixbuf );
+    }
+
+    gtk_tree_row_reference_free( reference );
+}
+
+static void
 refreshTracker( struct DetailsImpl * di, tr_torrent ** torrents, int n )
 {
@@ -1958 +1984 @@
                                                     G_TYPE_BOOLEAN,
                                                     G_TYPE_STRING,
-                                                    G_TYPE_STRING );
+                                                    G_TYPE_STRING,
+                                                    GDK_TYPE_PIXBUF );
 
         filter = gtk_tree_model_filter_new( GTK_TREE_MODEL( store ), NULL );
@@ -1980 +2007 @@
     if( n && !gtk_tree_model_get_iter_first( model, &iter ) )
     {
+        tr_session * session = tr_core_session( di->core );
+
         for( i=0; i<n; ++i )
         {
@@ -1988 +2017 @@
 
             for( j=0; j<statCount[i]; ++j )
+            {
+                GtkTreePath * path;
+                GtkTreeRowReference * reference;
+                const tr_tracker_stat * st = &stats[i][j];
+
                 gtk_list_store_insert_with_values( store, &iter, -1,
                     TRACKER_COL_TORRENT_ID, torrentId,
                     TRACKER_COL_TRACKER_INDEX, j,
                     TRACKER_COL_TORRENT_NAME, inf->name,
-                    TRACKER_COL_TRACKER_NAME, stats[i][j].host,
+                    TRACKER_COL_TRACKER_NAME, st->host,
                     -1 );
+
+                path = gtk_tree_model_get_path( model, &iter );
+                reference = gtk_tree_row_reference_new( model, path );
+                gtr_get_favicon_from_url( session, st->announce, favicon_ready_cb, reference );
+                gtk_tree_path_free( path );
+            }
         }
     }
@@ -2171 +2211 @@
 {
     gboolean b;
-    GtkWidget *vbox, *sw, *w, *v, *hbox;
     GtkCellRenderer *r;
     GtkTreeViewColumn *c;
+    GtkWidget *vbox, *sw, *w, *v, *hbox;
+    const int pad = ( GUI_PAD + GUI_PAD_BIG ) / 2;
 
     vbox = gtk_vbox_new( FALSE, GUI_PAD );
@@ -2184 +2225 @@
                       G_CALLBACK( on_tree_view_button_released ), NULL );
     gtk_tree_view_set_rules_hint( GTK_TREE_VIEW( v ), TRUE );
+
+    c = gtk_tree_view_column_new( );
+    gtk_tree_view_column_set_title( c, _( "Trackers" ) );
+    gtk_tree_view_append_column( GTK_TREE_VIEW( v ), c );
+
+    r = gtk_cell_renderer_pixbuf_new( );
+    g_object_set( r, "width", 20 + (GUI_PAD_SMALL*2), "xpad", GUI_PAD_SMALL, "ypad", pad, "yalign", 0.0f, NULL );
+    gtk_tree_view_column_pack_start( c, r, FALSE );
+    gtk_tree_view_column_add_attribute( c, r, "pixbuf", TRACKER_COL_FAVICON );
+
     r = gtk_cell_renderer_text_new( );
-    g_object_set( r, "ellipsize", PANGO_ELLIPSIZE_END, NULL );
-    c = gtk_tree_view_column_new_with_attributes( _( "Trackers" ), r, "markup", TRACKER_COL_TEXT, NULL );
-    gtk_tree_view_append_column( GTK_TREE_VIEW( v ), c );
-    g_object_set( G_OBJECT( r ), "ypad", (GUI_PAD+GUI_PAD_BIG)/2,
-                                 "xpad", (GUI_PAD+GUI_PAD_BIG)/2,
-                                 NULL );
+    g_object_set( G_OBJECT( r ), "ellipsize", PANGO_ELLIPSIZE_END, "xpad", GUI_PAD_SMALL, "ypad", pad, NULL );
+    gtk_tree_view_column_pack_start( c, r, TRUE );
+    gtk_tree_view_column_add_attribute( c, r, "markup", TRACKER_COL_TEXT );
 
     sw = gtk_scrolled_window_new( NULL, NULL );

trunk/gtk/favicon.c

@@ -170 +170 @@
     }
 }
+
+void
+gtr_get_favicon_from_url( tr_session  * session,
+                          const char  * url,
+                          GFunc         pixbuf_ready_func,
+                          gpointer      pixbuf_ready_func_data )
+{
+    char * host = gtr_get_host_from_url( url );
+    gtr_get_favicon( session, host, pixbuf_ready_func, pixbuf_ready_func_data );
+    g_free( host );
+}

trunk/gtk/favicon.h

@@ -17 +17 @@
 #include <libtransmission/transmission.h>
 
-void gtr_get_favicon( tr_session * session,
-                      const char * host,
-                      GFunc pixbuf_ready_func,
-                      gpointer pixbuf_ready_func_data );
+void gtr_get_favicon( tr_session  * session,
+                      const char  * host,
+                      GFunc         pixbuf_ready_func,
+                      gpointer      pixbuf_ready_func_data );
+
+void gtr_get_favicon_from_url( tr_session  * session,
+                               const char  * url,
+                               GFunc         pixbuf_ready_func,
+                               gpointer      pixbuf_ready_func_data );
+
 
 #endif

trunk/gtk/filter.c

@@ -70 +70 @@
 {
     return strcmp( *(const char**)a, *(const char**)b );
-}
-
-/* pattern-matching text; ie, legaltorrents.com */
-static char*
-get_host_from_url( const char * url )
-{
-    char * h = NULL;
-    char * name;
-    const char * first_dot;
-    const char * last_dot;
-
-    tr_urlParse( url, -1, NULL, &h, NULL, NULL );
-    first_dot = strchr( h, '.' );
-    last_dot = strrchr( h, '.' );
-
-    if( ( first_dot ) && ( last_dot ) && ( first_dot != last_dot ) )
-        name = g_strdup( first_dot + 1 );
-    else
-        name = g_strdup( h );
-
-    tr_free( h );
-    return name;
 }
 
@@ -186 +164 @@
         {
             int k;
-            char * key = get_host_from_url( inf->trackers[i].announce );
+            char * key = gtr_get_host_from_url( inf->trackers[i].announce );
             int * count = g_hash_table_lookup( hosts_hash, key );
             if( count == NULL )
@@ -581 +559 @@
             gtk_tree_model_get( model, &iter, CAT_FILTER_COL_HOST, &host, -1 );
             for( i=0; i<inf->trackerCount; ++i ) {
-                char * tmp = get_host_from_url( inf->trackers[i].announce );
+                char * tmp = gtr_get_host_from_url( inf->trackers[i].announce );
                 const gboolean hit = !strcmp( tmp, host );
                 g_free( tmp );

trunk/gtk/util.c

@@ -332 +332 @@
 }
 
+/* pattern-matching text; ie, legaltorrents.com */
+char*
+gtr_get_host_from_url( const char * url )
+{
+    char * h = NULL;
+    char * name;
+    const char * first_dot;
+    const char * last_dot;
+
+    tr_urlParse( url, -1, NULL, &h, NULL, NULL );
+    first_dot = strchr( h, '.' );
+    last_dot = strrchr( h, '.' );
+
+    if( ( first_dot ) && ( last_dot ) && ( first_dot != last_dot ) )
+        name = g_strdup( first_dot + 1 );
+    else
+        name = g_strdup( h );
+
+    tr_free( h );
+    return name;
+}
 
 gboolean

trunk/gtk/util.h

@@ -62 +62 @@
 ****
 ***/
+
+/* http://www.legaltorrents.com/some/announce/url --> legaltorrents.com */
+char* gtr_get_host_from_url( const char * url );
 
 gboolean gtr_is_supported_url( const char * str );