(trunk gtk) set GtkLabel's "single-line-mode" flag to TRUE in the toolbar, in the stats dialog, and in the details dialog's info tab.
According to the GTK+ documentation, this "can be an advantage in situations where resizing the label because of text changes would be distracting, e.g. in a statusbar." It doesn't seem to prevent relayout in GTK+ 2.20.1, but maybe other versions of GTK+ will make better use of the flag.
This commit is contained in:
parent
acd941f17a
commit
287d61197a
|
@ -939,34 +939,42 @@ info_page_new( struct DetailsImpl * di )
|
||||||
|
|
||||||
/* size */
|
/* size */
|
||||||
l = di->size_lb = gtk_label_new( NULL );
|
l = di->size_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Torrent size:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Torrent size:" ), l, NULL );
|
||||||
|
|
||||||
/* have */
|
/* have */
|
||||||
l = di->have_lb = gtk_label_new( NULL );
|
l = di->have_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Have:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Have:" ), l, NULL );
|
||||||
|
|
||||||
/* downloaded */
|
/* downloaded */
|
||||||
l = di->dl_lb = gtk_label_new( NULL );
|
l = di->dl_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Downloaded:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Downloaded:" ), l, NULL );
|
||||||
|
|
||||||
/* uploaded */
|
/* uploaded */
|
||||||
l = di->ul_lb = gtk_label_new( NULL );
|
l = di->ul_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Uploaded:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Uploaded:" ), l, NULL );
|
||||||
|
|
||||||
/* state */
|
/* state */
|
||||||
l = di->state_lb = gtk_label_new( NULL );
|
l = di->state_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "State:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "State:" ), l, NULL );
|
||||||
|
|
||||||
/* running for */
|
/* running for */
|
||||||
l = di->date_started_lb = gtk_label_new( NULL );
|
l = di->date_started_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Running time:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Running time:" ), l, NULL );
|
||||||
|
|
||||||
/* eta */
|
/* eta */
|
||||||
l = di->eta_lb = gtk_label_new( NULL );
|
l = di->eta_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Remaining time:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Remaining time:" ), l, NULL );
|
||||||
|
|
||||||
/* last activity */
|
/* last activity */
|
||||||
l = di->last_activity_lb = gtk_label_new( NULL );
|
l = di->last_activity_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Last activity:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Last activity:" ), l, NULL );
|
||||||
|
|
||||||
/* error */
|
/* error */
|
||||||
|
@ -996,6 +1004,7 @@ info_page_new( struct DetailsImpl * di )
|
||||||
|
|
||||||
/* privacy */
|
/* privacy */
|
||||||
l = gtk_label_new( NULL );
|
l = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Privacy:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Privacy:" ), l, NULL );
|
||||||
di->privacy_lb = l;
|
di->privacy_lb = l;
|
||||||
|
|
||||||
|
|
|
@ -160,24 +160,33 @@ gtr_stats_dialog_new( GtkWindow * parent, TrCore * core )
|
||||||
|
|
||||||
hig_workarea_add_section_title( t, &row, _( "Current Session" ) );
|
hig_workarea_add_section_title( t, &row, _( "Current Session" ) );
|
||||||
l = ui->one_up_lb = gtk_label_new( NULL );
|
l = ui->one_up_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Uploaded:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Uploaded:" ), l, NULL );
|
||||||
l = ui->one_down_lb = gtk_label_new( NULL );
|
l = ui->one_down_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Downloaded:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Downloaded:" ), l, NULL );
|
||||||
l = ui->one_ratio_lb = gtk_label_new( NULL );
|
l = ui->one_ratio_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Ratio:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Ratio:" ), l, NULL );
|
||||||
l = ui->one_time_lb = gtk_label_new( NULL );
|
l = ui->one_time_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Duration:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Duration:" ), l, NULL );
|
||||||
hig_workarea_add_section_divider( t, &row );
|
hig_workarea_add_section_divider( t, &row );
|
||||||
hig_workarea_add_section_title( t, &row, _( "Total" ) );
|
hig_workarea_add_section_title( t, &row, _( "Total" ) );
|
||||||
l = ui->all_sessions_lb = gtk_label_new( _( "Started %'d time" ) );
|
l = ui->all_sessions_lb = gtk_label_new( _( "Started %'d time" ) );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_label_w( t, row++, l );
|
hig_workarea_add_label_w( t, row++, l );
|
||||||
l = ui->all_up_lb = gtk_label_new( NULL );
|
l = ui->all_up_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Uploaded:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Uploaded:" ), l, NULL );
|
||||||
l = ui->all_down_lb = gtk_label_new( NULL );
|
l = ui->all_down_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Downloaded:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Downloaded:" ), l, NULL );
|
||||||
l = ui->all_ratio_lb = gtk_label_new( NULL );
|
l = ui->all_ratio_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Ratio:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Ratio:" ), l, NULL );
|
||||||
l = ui->all_time_lb = gtk_label_new( NULL );
|
l = ui->all_time_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
|
||||||
hig_workarea_add_row( t, &row, _( "Duration:" ), l, NULL );
|
hig_workarea_add_row( t, &row, _( "Duration:" ), l, NULL );
|
||||||
hig_workarea_finish( t, &row );
|
hig_workarea_finish( t, &row );
|
||||||
gtr_dialog_set_content( GTK_DIALOG( d ), t );
|
gtr_dialog_set_content( GTK_DIALOG( d ), t );
|
||||||
|
|
|
@ -656,6 +656,7 @@ gtr_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_label_set_single_line_mode( GTK_LABEL( w ), TRUE );
|
||||||
gtk_box_pack_start( GTK_BOX( h ), w, 1, 1, GUI_PAD );
|
gtk_box_pack_start( GTK_BOX( h ), w, 1, 1, GUI_PAD );
|
||||||
|
|
||||||
hbox = gtk_hbox_new( FALSE, GUI_PAD );
|
hbox = gtk_hbox_new( FALSE, GUI_PAD );
|
||||||
|
@ -663,6 +664,7 @@ gtr_window_new( GtkUIManager * ui_mgr, TrCore * core )
|
||||||
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 = p->ul_lb = gtk_label_new( NULL );
|
w = p->ul_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( w ), TRUE );
|
||||||
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 );
|
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_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
|
@ -673,6 +675,7 @@ gtr_window_new( GtkUIManager * ui_mgr, TrCore * core )
|
||||||
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 = p->dl_lb = gtk_label_new( NULL );
|
w = p->dl_lb = gtk_label_new( NULL );
|
||||||
|
gtk_label_set_single_line_mode( GTK_LABEL( w ), TRUE );
|
||||||
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 );
|
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_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
|
||||||
|
@ -686,6 +689,7 @@ gtr_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_label_set_single_line_mode( GTK_LABEL( w ), TRUE );
|
||||||
gtk_box_pack_end( GTK_BOX( hbox ), 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