Changeset 10856

Timestamp:

Jun 25, 2010, 8:15:05 PM (12 years ago)

Author:

charles

Message:

(trunk gtk) #3344 "statusbar needs better grouping of speeds and their icons" -- fixed

File:

• trunk/gtk/tr-window.c (modified) (3 diffs)

trunk/gtk/tr-window.c

@@ -644 +644 @@
 
     /* 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 );
 
@@ -663 +663 @@
 
         w = p->gutter_lb = gtk_label_new( "N Torrents" );
-        gtk_box_pack_start( GTK_BOX( h ), w, 1, 1, GUI_PAD_BIG );
-
-        hbox = gtk_hbox_new( FALSE, GUI_PAD_SMALL );
+        gtk_box_pack_start( GTK_BOX( h ), w, 1, 1, GUI_PAD );
+
+        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 = p->ul_lb = gtk_label_new( NULL );
+            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 );
-            gtk_box_pack_start( GTK_BOX( hbox ), w, 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 = p->dl_lb = gtk_label_new( NULL );
+            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 );
-            gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
         gtk_box_pack_end( GTK_BOX( h ), hbox, FALSE, FALSE, 0 );
 
-        hbox = gtk_hbox_new( FALSE, GUI_PAD_SMALL );
-            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 );
+        hbox = gtk_hbox_new( FALSE, GUI_PAD );
             w = gtk_button_new( );
             gtr_widget_set_tooltip_text( w, _( "Statistics" ) );
@@ -696 +693 @@
             gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
             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 );