1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-25 17:17:31 +00:00

(trunk gtk) #1871: webseed peer list in transmission gtk does not scroll, but instead resizes the window to fit it.

This commit is contained in:
Charles Kerr 2009-02-26 17:53:55 +00:00
parent c07180fa49
commit f153ee7dd9

View file

@ -297,7 +297,8 @@ webseed_model_new( const tr_torrent * tor )
{ {
GtkTreeIter iter; GtkTreeIter iter;
gtk_list_store_append( store, &iter ); gtk_list_store_append( store, &iter );
gtk_list_store_set( store, &iter, WEBSEED_COL_URL, inf->webseeds[i], gtk_list_store_set( store, &iter,
WEBSEED_COL_URL, inf->webseeds[i],
WEBSEED_COL_DOWNLOAD_RATE, speeds[i], WEBSEED_COL_DOWNLOAD_RATE, speeds[i],
-1 ); -1 );
} }
@ -703,41 +704,40 @@ peer_page_new( TrTorrent * gtor )
GtkTreeViewColumn * c; GtkTreeViewColumn * c;
GtkCellRenderer * r; GtkCellRenderer * r;
const char * t; const char * t;
GtkWidget * fr; GtkWidget * w;
GtkWidget * v;
m = webseed_model_new( tr_torrent_handle( gtor ) ); m = webseed_model_new( tr_torrent_handle( gtor ) );
webtree = gtk_tree_view_new_with_model( m ); v = gtk_tree_view_new_with_model( m );
g_signal_connect( webtree, "button-release-event", g_signal_connect( v, "button-release-event", G_CALLBACK( on_tree_view_button_released ), NULL );
G_CALLBACK( on_tree_view_button_released ), NULL ); gtk_tree_view_set_rules_hint( GTK_TREE_VIEW( v ), TRUE );
gtk_tree_view_set_rules_hint( GTK_TREE_VIEW( webtree ), TRUE );
p->webseeds = GTK_LIST_STORE( m ); p->webseeds = GTK_LIST_STORE( m );
g_object_unref( G_OBJECT( m ) ); g_object_unref( G_OBJECT( m ) );
t = _( webseed_column_names[WEBSEED_COL_URL] ); t = _( webseed_column_names[WEBSEED_COL_URL] );
r = gtk_cell_renderer_text_new ( ); r = gtk_cell_renderer_text_new ( );
g_object_set( G_OBJECT( r ), "ellipsize", PANGO_ELLIPSIZE_END, NULL ); g_object_set( G_OBJECT( r ), "ellipsize", PANGO_ELLIPSIZE_END, NULL );
c = c = gtk_tree_view_column_new_with_attributes( t, r, "text", WEBSEED_COL_URL, NULL );
gtk_tree_view_column_new_with_attributes( t, r, "text",
WEBSEED_COL_URL,
NULL );
g_object_set( G_OBJECT( c ), "expand", TRUE, NULL ); g_object_set( G_OBJECT( c ), "expand", TRUE, NULL );
gtk_tree_view_column_set_sort_column_id( c, WEBSEED_COL_URL ); gtk_tree_view_column_set_sort_column_id( c, WEBSEED_COL_URL );
gtk_tree_view_append_column( GTK_TREE_VIEW( webtree ), c ); gtk_tree_view_append_column( GTK_TREE_VIEW( v ), c );
t = _( webseed_column_names[WEBSEED_COL_DOWNLOAD_RATE] ); t = _( webseed_column_names[WEBSEED_COL_DOWNLOAD_RATE] );
r = gtk_cell_renderer_text_new ( ); r = gtk_cell_renderer_text_new ( );
c = gtk_tree_view_column_new_with_attributes ( c = gtk_tree_view_column_new_with_attributes ( t, r, "text", WEBSEED_COL_DOWNLOAD_RATE, NULL );
t, r, "text", WEBSEED_COL_DOWNLOAD_RATE, NULL ); gtk_tree_view_column_set_cell_data_func ( c, r, render_dl_rate, NULL, NULL );
gtk_tree_view_column_set_cell_data_func ( c, r, render_dl_rate, gtk_tree_view_column_set_sort_column_id( c, WEBSEED_COL_DOWNLOAD_RATE );
NULL, NULL ); gtk_tree_view_append_column( GTK_TREE_VIEW( v ), c );
gtk_tree_view_column_set_sort_column_id( c,
WEBSEED_COL_DOWNLOAD_RATE );
gtk_tree_view_append_column( GTK_TREE_VIEW( webtree ), c );
fr = gtk_frame_new( NULL ); w = gtk_scrolled_window_new ( NULL, NULL );
gtk_frame_set_shadow_type( GTK_FRAME( fr ), GTK_SHADOW_IN ); gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW( w ),
gtk_container_add( GTK_CONTAINER( fr ), webtree ); GTK_POLICY_AUTOMATIC,
webtree = fr; GTK_POLICY_AUTOMATIC );
gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW( w ),
GTK_SHADOW_IN );
gtk_container_add ( GTK_CONTAINER( w ), v );
webtree = w;
} }
m = peer_model_new ( tor ); m = peer_model_new ( tor );
@ -841,12 +841,14 @@ peer_page_new( TrTorrent * gtor )
vbox = gtk_vbox_new ( FALSE, GUI_PAD ); vbox = gtk_vbox_new ( FALSE, GUI_PAD );
gtk_container_set_border_width ( GTK_CONTAINER( vbox ), GUI_PAD_BIG ); gtk_container_set_border_width ( GTK_CONTAINER( vbox ), GUI_PAD_BIG );
if( webtree ) if( webtree == NULL )
gtk_box_pack_start( GTK_BOX( vbox ), webtree, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox ), sw, TRUE, TRUE, 0 );
else {
/* h = gtk_hbox_new (FALSE, GUI_PAD); */ GtkWidget * vpaned = gtk_vpaned_new( );
/* gtk_box_pack_start_defaults (GTK_BOX(h), sw); */ gtk_paned_pack1( GTK_PANED( vpaned ), webtree, FALSE, TRUE );
gtk_box_pack_start( GTK_BOX( vbox ), sw, TRUE, TRUE, 0 ); gtk_paned_pack2( GTK_PANED( vpaned ), sw, TRUE, TRUE );
gtk_box_pack_start( GTK_BOX( vbox ), vpaned, TRUE, TRUE, 0 );
}
hbox = gtk_hbox_new ( FALSE, GUI_PAD ); hbox = gtk_hbox_new ( FALSE, GUI_PAD );
l = gtk_label_new ( NULL ); l = gtk_label_new ( NULL );