(trunk gtk) #3344 "statusbar needs better grouping of speeds and their icons" -- fixed
This commit is contained in:
parent
688ec1bafc
commit
e2b4933777
|
@ -643,7 +643,7 @@ tr_window_new( GtkUIManager * ui_mgr, TrCore * core )
|
||||||
}
|
}
|
||||||
|
|
||||||
/* status */
|
/* status */
|
||||||
h = status = p->status = gtk_hbox_new( FALSE, GUI_PAD );
|
h = status = p->status = gtk_hbox_new( FALSE, GUI_PAD_BIG );
|
||||||
gtk_container_set_border_width( GTK_CONTAINER( h ), GUI_PAD_SMALL );
|
gtk_container_set_border_width( GTK_CONTAINER( h ), GUI_PAD_SMALL );
|
||||||
|
|
||||||
w = gtk_button_new( );
|
w = gtk_button_new( );
|
||||||
|
@ -662,32 +662,29 @@ tr_window_new( GtkUIManager * ui_mgr, TrCore * core )
|
||||||
gtk_box_pack_start( GTK_BOX( h ), w, 0, 0, 0 );
|
gtk_box_pack_start( GTK_BOX( h ), w, 0, 0, 0 );
|
||||||
|
|
||||||
w = p->gutter_lb = gtk_label_new( "N Torrents" );
|
w = p->gutter_lb = gtk_label_new( "N Torrents" );
|
||||||
gtk_box_pack_start( GTK_BOX( h ), w, 1, 1, GUI_PAD_BIG );
|
gtk_box_pack_start( GTK_BOX( h ), w, 1, 1, GUI_PAD );
|
||||||
|
|
||||||
hbox = gtk_hbox_new( FALSE, GUI_PAD_SMALL );
|
hbox = gtk_hbox_new( FALSE, GUI_PAD );
|
||||||
w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
|
w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
|
||||||
gtk_widget_set_size_request( w, GUI_PAD, 0u );
|
gtk_widget_set_size_request( w, GUI_PAD, 0u );
|
||||||
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
w = gtk_image_new_from_stock( GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU );
|
|
||||||
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
|
||||||
w = p->ul_lb = gtk_label_new( NULL );
|
w = p->ul_lb = gtk_label_new( NULL );
|
||||||
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
|
w = gtk_image_new_from_stock( GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU );
|
||||||
|
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
gtk_box_pack_end( GTK_BOX( h ), hbox, FALSE, FALSE, 0 );
|
gtk_box_pack_end( GTK_BOX( h ), hbox, FALSE, FALSE, 0 );
|
||||||
|
|
||||||
hbox = gtk_hbox_new( FALSE, GUI_PAD_SMALL );
|
hbox = gtk_hbox_new( FALSE, GUI_PAD );
|
||||||
w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
|
w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
|
||||||
gtk_widget_set_size_request( w, GUI_PAD, 0u );
|
gtk_widget_set_size_request( w, GUI_PAD, 0u );
|
||||||
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
w = gtk_image_new_from_stock( GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU );
|
|
||||||
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
|
||||||
w = p->dl_lb = gtk_label_new( NULL );
|
w = p->dl_lb = gtk_label_new( NULL );
|
||||||
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
|
w = gtk_image_new_from_stock( GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU );
|
||||||
|
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
gtk_box_pack_end( GTK_BOX( h ), hbox, FALSE, FALSE, 0 );
|
gtk_box_pack_end( GTK_BOX( h ), hbox, FALSE, FALSE, 0 );
|
||||||
|
|
||||||
hbox = gtk_hbox_new( FALSE, GUI_PAD_SMALL );
|
hbox = gtk_hbox_new( FALSE, GUI_PAD );
|
||||||
w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
|
|
||||||
gtk_widget_set_size_request( w, GUI_PAD, 0u );
|
|
||||||
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
|
||||||
w = gtk_button_new( );
|
w = gtk_button_new( );
|
||||||
gtr_widget_set_tooltip_text( w, _( "Statistics" ) );
|
gtr_widget_set_tooltip_text( w, _( "Statistics" ) );
|
||||||
gtk_container_add( GTK_CONTAINER( w ), gtk_image_new_from_stock( "ratio", GTK_ICON_SIZE_SMALL_TOOLBAR ) );
|
gtk_container_add( GTK_CONTAINER( w ), gtk_image_new_from_stock( "ratio", GTK_ICON_SIZE_SMALL_TOOLBAR ) );
|
||||||
|
@ -695,7 +692,7 @@ tr_window_new( GtkUIManager * ui_mgr, TrCore * core )
|
||||||
g_signal_connect( w, "clicked", G_CALLBACK( onYinYangReleased ), p );
|
g_signal_connect( w, "clicked", G_CALLBACK( onYinYangReleased ), p );
|
||||||
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
w = p->stats_lb = gtk_label_new( NULL );
|
w = p->stats_lb = gtk_label_new( NULL );
|
||||||
gtk_box_pack_end( GTK_BOX( h ), w, FALSE, FALSE, 0 );
|
gtk_box_pack_end( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
gtk_box_pack_end( GTK_BOX( h ), hbox, FALSE, FALSE, 0 );
|
gtk_box_pack_end( GTK_BOX( h ), hbox, FALSE, FALSE, 0 );
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue