Changeset 11983

Timestamp:

Feb 19, 2011, 1:04:09 PM (12 years ago)

Author:

jordan

Message:

(trunk gtk) #4040 "Show the torrent name in the Peers Tab's tooltips" -- done.

File:

• trunk/gtk/details.c (modified) (7 diffs)

trunk/gtk/details.c

@@ -1106 +1106 @@
     PEER_COL_ENCRYPTION_STOCK_ID,
     PEER_COL_FLAGS,
+    PEER_COL_TORRENT_NAME,
     N_PEER_COLS
 };
@@ -1165 +1166 @@
                                G_TYPE_STRING,   /* # blocks cancelled by peer string */
                                G_TYPE_STRING,   /* encryption stock id */
-                               G_TYPE_STRING);  /* flagString */
+                               G_TYPE_STRING,   /* flagString */
+                               G_TYPE_STRING);  /* torrent name */
 }
 
@@ -1172 +1174 @@
              GtkTreeIter         * iter,
              const char          * key,
+             const char          * torrentName,
              const tr_peer_stat  * peer )
 {
@@ -1193 +1196 @@
                         PEER_COL_ENCRYPTION_STOCK_ID, peer->isEncrypted ? "transmission-lock" : NULL,
                         PEER_COL_KEY, key,
+                        PEER_COL_TORRENT_NAME, torrentName,
                         -1 );
 }
@@ -1291 +1295 @@
                 GtkTreePath * p;
                 gtk_list_store_append( store, &iter );
-                initPeerRow( store, &iter, key, s );
+                initPeerRow( store, &iter, key, tr_torrentName( tor ), s );
                 p = gtk_tree_model_get_path( model, &iter );
                 g_hash_table_insert( hash, g_strdup( key ),
@@ -1465 +1469 @@
     {
         const char * pch;
-        char *       str = NULL;
-        GString *    gstr = g_string_new( NULL );
-        gtk_tree_model_get( model, &iter, PEER_COL_FLAGS, &str, -1 );
-        for( pch = str; pch && *pch; ++pch )
+        char * name = NULL;
+        char * addr = NULL;
+        char * flagstr = NULL;
+        GString * gstr = g_string_new( NULL );
+        gtk_tree_model_get( model, &iter, PEER_COL_TORRENT_NAME, &name,
+                                          PEER_COL_ADDRESS, &addr,
+                                          PEER_COL_FLAGS, &flagstr,
+                                          -1 );
+
+        g_string_append_printf( gstr, "<b>%s</b>\n%s\n \n", name, addr );
+
+        for( pch = flagstr; pch && *pch; ++pch )
         {
             const char * s = NULL;
@@ -1491 +1503 @@
         if( gstr->len ) /* remove the last linefeed */
             g_string_set_size( gstr, gstr->len - 1 );
-        gtk_tooltip_set_text( tooltip, gstr->str );
+        gtk_tooltip_set_markup( tooltip, gstr->str );
         g_string_free( gstr, TRUE );
-        g_free( str );
+        g_free( flagstr );
+        g_free( addr );
+        g_free( name );
         show_tip = TRUE;
     }