mirror of
https://github.com/transmission/transmission
synced 2025-01-31 19:34:05 +00:00
(gtk 1.0x) #632 combine the two status bars
This commit is contained in:
Charles Kerr
parent
179b7b3672
commit
961cb0137d
2 changed files with 51 additions and 60 deletions
109
gtk/tr_window.c
109
gtk/tr_window.c
|
|
@ -460,53 +460,6 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
|
|||
w = p->toolbar = action_get_widget( "/main-window-toolbar" );
|
||||
gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 );
|
||||
|
||||
/* status menu */
|
||||
menu = p->status_menu = gtk_menu_new( );
|
||||
status_stats_mode = 0;
|
||||
l = NULL;
|
||||
pch = pref_string_get( PREF_KEY_STATUS_BAR_STATS );
|
||||
for( i=0, n=G_N_ELEMENTS(stats_modes); i<n; ++i )
|
||||
{
|
||||
const char * val = stats_modes[i].val;
|
||||
w = gtk_radio_menu_item_new_with_label( l, _( stats_modes[i].i18n ) );
|
||||
l = gtk_radio_menu_item_get_group( GTK_RADIO_MENU_ITEM(w) );
|
||||
gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(w), !strcmp( val, pch ) );
|
||||
g_object_set_data( G_OBJECT(w), STATS_MODE, (gpointer)stats_modes[i].val );
|
||||
g_signal_connect( w, "toggled", G_CALLBACK(status_menu_toggled_cb), p );
|
||||
gtk_menu_shell_append( GTK_MENU_SHELL(menu), w );
|
||||
gtk_widget_show( w );
|
||||
}
|
||||
g_free( pch );
|
||||
|
||||
/* statusbar */
|
||||
h = p->status = gtk_hbox_new( FALSE, GUI_PAD );
|
||||
gtk_container_set_border_width( GTK_CONTAINER(h), GUI_PAD );
|
||||
|
||||
w = p->ul_lb = gtk_label_new( NULL );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = gtk_image_new_from_stock( GTK_STOCK_GO_UP, GTK_ICON_SIZE_SMALL_TOOLBAR );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
|
||||
gtk_widget_set_usize( w, GUI_PAD, 0u );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = p->dl_lb = gtk_label_new( NULL );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = gtk_image_new_from_stock( GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_SMALL_TOOLBAR );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
|
||||
w = gtk_image_new_from_stock( GTK_STOCK_REFRESH, GTK_ICON_SIZE_SMALL_TOOLBAR );
|
||||
c = gtk_event_box_new( );
|
||||
gtk_container_add( GTK_CONTAINER(c), w );
|
||||
w = c;
|
||||
g_signal_connect( w, "button-release-event", G_CALLBACK(onYinYangReleased), p );
|
||||
gtk_box_pack_start( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = p->stats_lb = gtk_label_new( NULL );
|
||||
gtk_box_pack_start( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
gtk_box_pack_start( GTK_BOX(vbox), h, FALSE, FALSE, 0 );
|
||||
|
||||
w = gtk_hseparator_new( );
|
||||
gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 );
|
||||
|
||||
/* filter */
|
||||
toggles = NULL;
|
||||
h = p->filter = gtk_hbox_new( FALSE, 0 );
|
||||
|
|
@ -532,6 +485,56 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
|
|||
gtk_box_pack_start( GTK_BOX(vbox), h, FALSE, FALSE, 0 );
|
||||
g_signal_connect( s, "changed", G_CALLBACK( filter_entry_changed ), p );
|
||||
|
||||
w = gtk_hseparator_new( );
|
||||
gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 );
|
||||
|
||||
/* status menu */
|
||||
menu = p->status_menu = gtk_menu_new( );
|
||||
status_stats_mode = 0;
|
||||
l = NULL;
|
||||
pch = pref_string_get( PREF_KEY_STATUS_BAR_STATS );
|
||||
for( i=0, n=G_N_ELEMENTS(stats_modes); i<n; ++i )
|
||||
{
|
||||
const char * val = stats_modes[i].val;
|
||||
w = gtk_radio_menu_item_new_with_label( l, _( stats_modes[i].i18n ) );
|
||||
l = gtk_radio_menu_item_get_group( GTK_RADIO_MENU_ITEM(w) );
|
||||
gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(w), !strcmp( val, pch ) );
|
||||
g_object_set_data( G_OBJECT(w), STATS_MODE, (gpointer)stats_modes[i].val );
|
||||
g_signal_connect( w, "toggled", G_CALLBACK(status_menu_toggled_cb), p );
|
||||
gtk_menu_shell_append( GTK_MENU_SHELL(menu), w );
|
||||
gtk_widget_show( w );
|
||||
}
|
||||
g_free( pch );
|
||||
|
||||
/* status */
|
||||
h = p->status = gtk_hbox_new( FALSE, GUI_PAD );
|
||||
gtk_container_set_border_width( GTK_CONTAINER( h ), GUI_PAD );
|
||||
w = p->gutter_lb = gtk_label_new( "N transfers" );
|
||||
gtk_box_pack_start( GTK_BOX(h), w, 0, 0, 0 );
|
||||
w = p->ul_lb = gtk_label_new( NULL );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = gtk_image_new_from_stock( GTK_STOCK_GO_UP, GTK_ICON_SIZE_SMALL_TOOLBAR );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
|
||||
gtk_widget_set_usize( w, GUI_PAD, 0u );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = p->dl_lb = gtk_label_new( NULL );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = gtk_image_new_from_stock( GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_SMALL_TOOLBAR );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
|
||||
gtk_widget_set_usize( w, GUI_PAD, 0u );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = p->stats_lb = gtk_label_new( NULL );
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
w = gtk_image_new_from_stock( GTK_STOCK_REFRESH, GTK_ICON_SIZE_SMALL_TOOLBAR );
|
||||
c = gtk_event_box_new( );
|
||||
gtk_container_add( GTK_CONTAINER(c), w );
|
||||
w = c;
|
||||
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
|
||||
g_signal_connect( w, "button-release-event", G_CALLBACK(onYinYangReleased), p );
|
||||
gtk_box_pack_start( GTK_BOX(vbox), h, FALSE, FALSE, 0 );
|
||||
|
||||
menu = gtk_menu_new( );
|
||||
l = NULL;
|
||||
for( i=0; i<FILTER_TEXT_MODE_QTY; ++i )
|
||||
|
|
@ -546,7 +549,6 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
|
|||
}
|
||||
g_signal_connect( s, "icon-released", G_CALLBACK(entry_icon_released), menu );
|
||||
|
||||
|
||||
/* workarea */
|
||||
p->view = makeview( p, core );
|
||||
w = p->scroll = gtk_scrolled_window_new( NULL, NULL );
|
||||
|
|
@ -554,17 +556,6 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
|
|||
gtk_box_pack_start_defaults( GTK_BOX(vbox), w );
|
||||
gtk_container_set_focus_child( GTK_CONTAINER( vbox ), w );
|
||||
|
||||
/* spacer */
|
||||
w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
|
||||
gtk_widget_set_usize (w, 0u, 6u);
|
||||
gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 );
|
||||
|
||||
/* status */
|
||||
h = gtk_hbox_new( FALSE, GUI_PAD );
|
||||
w = p->gutter_lb = gtk_label_new( "N transfers" );
|
||||
gtk_box_pack_start_defaults( GTK_BOX(h), w );
|
||||
gtk_box_pack_start( GTK_BOX(vbox), h, FALSE, FALSE, 0 );
|
||||
|
||||
/* show all but the window */
|
||||
gtk_widget_show_all( vbox );
|
||||
|
||||
|
|
|
|||
2
gtk/ui.h
2
gtk/ui.h
|
|
@ -24,8 +24,8 @@ const char * fallback_ui_file =
|
|||
" <menu action='view-menu'>\n"
|
||||
" <menuitem action='minimal-view'/>\n"
|
||||
" <menuitem action='show-toolbar'/>\n"
|
||||
" <menuitem action='show-status-bar'/>\n"
|
||||
" <menuitem action='show-filter-bar'/>\n"
|
||||
" <menuitem action='show-status-bar'/>\n"
|
||||
" <separator/>\n"
|
||||
" <menuitem action='sort-by-activity'/>\n"
|
||||
" <menuitem action='sort-by-name'/>\n"
|
||||
|
|
|
|||
Loading…
Reference in a new issue