Changeset 11741

Timestamp:

Jan 21, 2011, 5:31:35 PM (12 years ago)

Author:

jordan

Message:

(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.

Location:

trunk/gtk

Files:

• details.c (modified) (2 diffs)
• stats.c (modified) (1 diff)
• tr-window.c (modified) (4 diffs)

trunk/gtk/details.c

@@ -940 +940 @@
         /* size */
         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 );
 
         /* have */
         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 );
 
         /* downloaded */
         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 );
 
         /* uploaded */
         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 );
 
         /* state */
         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 );
 
         /* running for */
         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 );
 
         /* eta */
         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 );
 
         /* last activity */
         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 );
 
@@ -997 +1005 @@
         /* privacy */
         l = gtk_label_new( NULL );
+        gtk_label_set_single_line_mode( GTK_LABEL( l ), TRUE );
         hig_workarea_add_row( t, &row, _( "Privacy:" ), l, NULL );
         di->privacy_lb = l;

trunk/gtk/stats.c

@@ -161 +161 @@
     hig_workarea_add_section_title( t, &row, _( "Current Session" ) );
     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 );
     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 );
     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 );
     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_section_divider( t, &row );
     hig_workarea_add_section_title( t, &row, _( "Total" ) );
     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 );
     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 );
     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 );
     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 );
     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_finish( t, &row );

trunk/gtk/tr-window.c

@@ -657 +657 @@
 
         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 );
 
@@ -664 +665 @@
             gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
             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 );
             w = gtk_image_new_from_stock( GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU );
@@ -674 +676 @@
             gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
             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 );
             w = gtk_image_new_from_stock( GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU );
@@ -687 +690 @@
             gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
             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( h ), hbox, FALSE, FALSE, 0 );