Index: src/interface.cpp
===================================================================
--- src/interface.cpp	(révision 2203)
+++ src/interface.cpp	(copie de travail)
@@ -209,94 +209,87 @@
   return label;
 }
 
-/* Make sure the cpu labels don't jump around. From the clock applet */
+/* Make sure the interface stays put by setting the 'legend' tables width
+ * to the max width seen so far for all tables.
+ * From the clock applet */
 static void
-size_request(GtkWidget* box, GtkRequisition* req, void* data)
+size_request (GtkWidget *box, GtkRequisition *req, void *data)
 {
-  gint* size = static_cast<gint*>(data);
-  req->width = *size = std::max(req->width, *size);
+	gint *size = static_cast<gint*>(data);
+	req->width = *size = std::max (req->width, *size);
 }
 
-
-
-
 static GtkWidget *
 create_sys_view (ProcData *procdata)
 {
-  static gint net_size;
-  static gint cpu_size;
-
-	GtkWidget *vbox, *hbox;
+	static gint table_width;
+	GtkWidget *vbox;
 	GtkWidget *cpu_box, *mem_box, *net_box;
-	GtkWidget *cpu_hbox, *mem_hbox, *net_hbox;
+	GtkWidget *cpu_alignment, *mem_alignment, *net_alignment;
 	GtkWidget *cpu_graph_box, *mem_graph_box, *net_graph_box;
-	GtkWidget *label,*cpu_label, *spacer;
-	GtkWidget *table;
+	GtkWidget *cpu_table, *mem_table, *net_table;
+	GtkWidget *label, *cpu_label;
 	GtkWidget *color_picker;
 	GtkSizeGroup *sizegroup;
 	LoadGraph *cpu_graph, *mem_graph, *net_graph;
 	gint i;
 
-
 	vbox = gtk_vbox_new (FALSE, 18);
 
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
-	/* The CPU BOX */
+	/* the CPU box */
 
 	cpu_box = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), cpu_box, TRUE, TRUE, 0);
 
 	label = make_title_label (_("CPU History"));
 	gtk_box_pack_start (GTK_BOX (cpu_box), label, FALSE, FALSE, 0);
+
+	cpu_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (cpu_alignment), 0, 0, 15, 0);
+	gtk_box_pack_start (GTK_BOX (cpu_box), cpu_alignment, TRUE, TRUE, 0);
 	
-	cpu_hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (cpu_box), cpu_hbox, TRUE, TRUE, 0);
+	cpu_graph_box = gtk_hbox_new (FALSE, 6);
+	gtk_container_add (GTK_CONTAINER (cpu_alignment), cpu_graph_box);
 
-	spacer = gtk_label_new ("    ");
-	gtk_box_pack_start (GTK_BOX (cpu_hbox), spacer, FALSE, FALSE, 0);
-
-	cpu_graph_box = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (cpu_hbox), cpu_graph_box, TRUE, TRUE, 0);
-
 	cpu_graph = load_graph_new (LOAD_GRAPH_CPU, procdata);
-	gtk_box_pack_start (GTK_BOX (cpu_graph_box),
-			    load_graph_get_widget(cpu_graph),
-			    TRUE,
-			    TRUE,
-			    0);
+	gtk_box_pack_start (GTK_BOX (cpu_graph_box), load_graph_get_widget (cpu_graph),
+			    TRUE, TRUE, 0);
 
-	sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+	/* horizontal is not stricly necessary thanks to the "size-request" hack,
+	 * but it makes the convergence to the final size faster.
+	 * vertical makes all graphs have the same height */
+	sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
 
-	GtkWidget* cpu_table = gtk_table_new(std::min(procdata->config.num_cpus / 4, 1),
-					     std::min(procdata->config.num_cpus, 4),
-					     TRUE);
-	gtk_table_set_row_spacings(GTK_TABLE(cpu_table), 6);
-	gtk_table_set_col_spacings(GTK_TABLE(cpu_table), 12);
-	gtk_box_pack_start(GTK_BOX(cpu_graph_box), cpu_table, FALSE, FALSE, 0);
+	cpu_table = gtk_table_new (std::min(procdata->config.num_cpus, 4),
+				   std::min(procdata->config.num_cpus / 4, 1),
+				   TRUE);
+	gtk_size_group_add_widget (sizegroup, cpu_table);
+	g_signal_connect (G_OBJECT (cpu_table), "size_request",
+			  G_CALLBACK (size_request), &table_width);
 
-	for (i=0;i<procdata->config.num_cpus; i++) {
+	gtk_table_set_row_spacings (GTK_TABLE (cpu_table), 6);
+	gtk_table_set_col_spacings (GTK_TABLE (cpu_table), 12);
+	gtk_box_pack_start (GTK_BOX (cpu_graph_box), cpu_table, FALSE, FALSE, 0);
+    
+	for (i=0; i<procdata->config.num_cpus; i++) {
 		GtkWidget *temp_hbox;
 		gchar *text;
 		
 		temp_hbox = gtk_hbox_new (FALSE, 6);
-		gtk_table_attach(GTK_TABLE(cpu_table), temp_hbox,
-				 i % 4, i % 4 + 1,
-				 i / 4, i / 4 + 1,
-				 GTK_FILL, GTK_FILL,
-				 0, 0);
-		gtk_size_group_add_widget (sizegroup, temp_hbox);
-		g_signal_connect (G_OBJECT (temp_hbox), "size_request",
-					 G_CALLBACK(size_request), &cpu_size);
+		gtk_table_attach (GTK_TABLE (cpu_table), temp_hbox,
+				  i / 4, i / 4 + 1,
+				  i % 4, i % 4 + 1,
+				  GTK_FILL, GTK_FILL, 0, 0);
 
-		color_picker = gtk_color_button_new_with_color (
-			&load_graph_get_colors(cpu_graph)[2+i]);
+		color_picker = gtk_color_button_new_with_color (&load_graph_get_colors (cpu_graph)[2+i]);
 
 		g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i));
+				  G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i));
 		gtk_box_pack_start (GTK_BOX (temp_hbox), color_picker, FALSE, FALSE, 0);
 		
-		if(procdata->config.num_cpus == 1) {
+		if (procdata->config.num_cpus == 1) {
 			text = g_strdup (_("CPU:"));
 		}
 		else {
@@ -308,14 +301,12 @@
 		
 		cpu_label = gtk_label_new (NULL);
 		gtk_box_pack_start (GTK_BOX (temp_hbox), cpu_label, FALSE, FALSE, 0);
-		load_graph_get_labels(cpu_graph)->cpu[i] = cpu_label;
-		
+		load_graph_get_labels (cpu_graph)->cpu[i] = cpu_label;
 	}
 	
-	
-	
 	procdata->cpu_graph = cpu_graph;
 
+	/* the memory box */
 
 	mem_box = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), mem_box, TRUE, TRUE, 0);
@@ -323,270 +314,224 @@
 	label = make_title_label (_("Memory and Swap History"));
 	gtk_box_pack_start (GTK_BOX (mem_box), label, FALSE, FALSE, 0);
 	
-	mem_hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (mem_box), mem_hbox, TRUE, TRUE, 0);
+	mem_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (mem_alignment), 0, 0, 15, 0);
+	gtk_box_pack_start (GTK_BOX (mem_box), mem_alignment, TRUE, TRUE, 0);
 
-	spacer = gtk_label_new ("    ");
-	gtk_box_pack_start (GTK_BOX (mem_hbox), spacer, FALSE, FALSE, 0);
+	mem_graph_box = gtk_hbox_new (FALSE, 6);
+	gtk_container_add (GTK_CONTAINER (mem_alignment), mem_graph_box);
 
-	mem_graph_box = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (mem_hbox), mem_graph_box, TRUE, TRUE, 0);
-
-
 	mem_graph = load_graph_new (LOAD_GRAPH_MEM, procdata);
-	gtk_box_pack_start (GTK_BOX (mem_graph_box),
-			    load_graph_get_widget(mem_graph),
-			    TRUE,
-			    TRUE,
-			    0);
+	gtk_box_pack_start (GTK_BOX (mem_graph_box), load_graph_get_widget (mem_graph),
+			    TRUE, TRUE, 0);
+
+	mem_table = gtk_table_new (4, 5, FALSE);
+	gtk_table_set_row_spacings (GTK_TABLE (mem_table), 6);
+	gtk_table_set_col_spacings (GTK_TABLE (mem_table), 12);
+	gtk_box_pack_start (GTK_BOX (mem_graph_box), mem_table, FALSE, FALSE, 0);
 	
-	table = gtk_table_new (2, 7, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-	gtk_box_pack_start (GTK_BOX (mem_graph_box), table, 
-			    FALSE, FALSE, 0);
+	gtk_size_group_add_widget (sizegroup, mem_table);
+	g_signal_connect (G_OBJECT (mem_table), "size_request",
+			  G_CALLBACK (size_request), &table_width);
 
-	color_picker = gtk_color_button_new_with_color (
-		&load_graph_get_colors(mem_graph)[2]);
+	color_picker = gtk_color_button_new_with_color (&load_graph_get_colors (mem_graph)[2]);
 	g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_mem_color_changed), procdata);
-	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+			  G_CALLBACK (cb_mem_color_changed), procdata);
+	gtk_table_attach (GTK_TABLE (mem_table), color_picker,
+			  0, 1,
+			  0, 2,
+			  GTK_FILL, GTK_SHRINK, 0, 0);
 	
 	label = gtk_label_new (_("User memory:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+	gtk_table_attach (GTK_TABLE (mem_table), label,
+			  1, 5,
+			  0, 1,
+			  GTK_FILL, GTK_FILL, 0, 0);
 	
 	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memused),
-				0.0,
-				0.5);
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(mem_graph)->memused,
-			  2,
-			  3,
-			  0,
-			  1,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
+				0.0, 0.5);
+
+	gtk_table_attach (GTK_TABLE (mem_table), load_graph_get_labels(mem_graph)->memused,
+			  1, 2,
+			  1, 2,
+			  GTK_FILL, GTK_FILL, 0, 0);
 	// xgettext: user memory: 123 MiB of 512MiB
 	label = gtk_label_new (_("of"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-	
+	gtk_table_attach (GTK_TABLE (mem_table), label,
+			  2, 3,
+			  1, 2,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
 	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memtotal),
-				0.0,
-				0.5);
+				0.0, 0.5);
 
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(mem_graph)->memtotal,
-			  4,
-			  5,
-			  0,
-			  1,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
-	
+	gtk_table_attach (GTK_TABLE (mem_table), load_graph_get_labels(mem_graph)->memtotal,
+			  3, 4,
+			  1, 2,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
 	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->mempercent),
-					  1.0,
-					  0.5);
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(mem_graph)->mempercent,
-			  5,
-			  6,
-			  0,
-			  1,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
+				0.0, 0.5);
 
-	color_picker = gtk_color_button_new_with_color (
-		&load_graph_get_colors(mem_graph)[3]);
+	gtk_table_attach (GTK_TABLE (mem_table), load_graph_get_labels(mem_graph)->mempercent,
+			  4, 5,
+			  1, 2,
+			  GTK_FILL, GTK_FILL, 0, 0);
+
+	color_picker = gtk_color_button_new_with_color (&load_graph_get_colors (mem_graph)[3]);
 	g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_swap_color_changed), procdata);
-	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+			  G_CALLBACK (cb_swap_color_changed), procdata);
+	gtk_table_attach (GTK_TABLE (mem_table), color_picker,
+			  0, 1,
+			  2, 4,
+			  GTK_FILL, GTK_SHRINK, 0, 0);
 			  
 	label = gtk_label_new (_("Used swap:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+	gtk_table_attach (GTK_TABLE (mem_table), label,
+			  1, 5,
+			  2, 3,
+			  GTK_FILL, GTK_FILL, 0, 0);
 	
-
-	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swapused ),
-				0.0,
-				0.5);
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(mem_graph)->swapused,
-			  2,
-			  3,
-			  1,
-			  2,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
+	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swapused),
+				0.0, 0.5);
+	gtk_table_attach (GTK_TABLE (mem_table), load_graph_get_labels(mem_graph)->swapused,
+			  1, 2,
+			  3, 4,
+			  GTK_FILL, GTK_FILL, 0, 0);
 	// xgettext: swap: 10MiB of 1GiB
 	label = gtk_label_new (_("of"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
-	
+	gtk_table_attach (GTK_TABLE (mem_table), label,
+			  2, 3,
+			  3, 4,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
 	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swaptotal),
-				0.0,
-				0.5);
-	gtk_table_attach (GTK_TABLE (table),
+				0.0, 0.5);
+	gtk_table_attach (GTK_TABLE (mem_table),
 			  load_graph_get_labels(mem_graph)->swaptotal,
-			  4,
-			  5,
-			  1,
-			  2,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
+			  3, 4,
+			  3, 4,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
-
 	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swappercent),
-				1.0,
-				0.5);
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(mem_graph)->swappercent,
-			  5,
-			  6,
-			  1,
-			  2,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
+				0.0, 0.5);
+	gtk_table_attach (GTK_TABLE (mem_table), load_graph_get_labels(mem_graph)->swappercent,
+			  4, 5,
+			  3, 4,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
 	procdata->mem_graph = mem_graph;
 
-	/* The net box */
+	/* the network box */
 	net_box = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), net_box, TRUE, TRUE, 0);
 
 	label = make_title_label (_("Network History"));
 	gtk_box_pack_start (GTK_BOX (net_box), label, FALSE, FALSE, 0);
 
-	net_hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (net_box), net_hbox, TRUE, TRUE, 0);
+	net_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (net_alignment), 0, 0, 15, 0);
+	gtk_box_pack_start (GTK_BOX (net_box), net_alignment, TRUE, TRUE, 0);
+	
+	net_graph_box = gtk_hbox_new (FALSE, 6);
+	gtk_container_add (GTK_CONTAINER (net_alignment), net_graph_box);
 
-	spacer = gtk_label_new ("    ");
-	gtk_box_pack_start (GTK_BOX (net_hbox), spacer, FALSE, FALSE, 0);
-
-	net_graph_box = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (net_hbox), net_graph_box, TRUE, TRUE, 0);
-
 	net_graph = load_graph_new (LOAD_GRAPH_NET, procdata);
-	gtk_box_pack_start (GTK_BOX (net_graph_box),
-			    load_graph_get_widget(net_graph),
-			    TRUE,
-			    TRUE,
-			    0);
+	gtk_box_pack_start (GTK_BOX (net_graph_box), load_graph_get_widget(net_graph),
+			    TRUE, TRUE, 0);
 
-	table = gtk_table_new (2, 5, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-	gtk_box_pack_start (GTK_BOX (net_graph_box), table,
-			    FALSE, FALSE, 0);
+	net_table = gtk_table_new (3, 4, FALSE);
+	gtk_table_set_row_spacings (GTK_TABLE (net_table), 6);
+	gtk_table_set_col_spacings (GTK_TABLE (net_table), 12);
+	gtk_box_pack_start (GTK_BOX (net_graph_box), net_table, FALSE, FALSE, 0);
+      
+	gtk_size_group_add_widget (sizegroup, net_table);
+	g_signal_connect (G_OBJECT (net_table), "size_request",
+			  G_CALLBACK (size_request), &table_width);
 
-	color_picker = gtk_color_button_new_with_color (
-		&load_graph_get_colors(net_graph)[2]);
+	color_picker = gtk_color_button_new_with_color (&load_graph_get_colors (net_graph)[2]);
 	g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_net_in_color_changed), procdata);
-	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+			  G_CALLBACK (cb_net_in_color_changed), procdata);
+	gtk_table_attach (GTK_TABLE (net_table), color_picker,
+			  0, 1,
+			  0, 2,
+			  GTK_FILL, GTK_SHRINK, 0, 0);
 
 	label = gtk_label_new (_("Received:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+	gtk_table_attach (GTK_TABLE (net_table), label,
+			  1, 2,
+			  0, 1,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
-	hbox = gtk_hbox_new (FALSE, 0);
-	g_signal_connect (G_OBJECT (hbox), "size_request",
-			  G_CALLBACK(size_request), &net_size);
+	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels (net_graph)->net_in), 0.0, 0.5);
 
+	gtk_table_attach (GTK_TABLE (net_table), load_graph_get_labels (net_graph)->net_in,
+			  2, 3,
+			  0, 1,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
-	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in),
-				0.0,
-				0.5);
-	gtk_box_pack_start (GTK_BOX (hbox),
-			    load_graph_get_labels(net_graph)->net_in,
-			    FALSE,
-			    FALSE,
-			    0);
-
-	gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-
 	label = gtk_label_new (_("Total:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+	gtk_table_attach (GTK_TABLE (net_table), label,
+			  1, 2,
+			  1, 2,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
-	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in_total),
-				0.0,
-				0.5);
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(net_graph)->net_in_total,
-			  4,
-			  5,
-			  0,
-			  1,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
+	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels (net_graph)->net_in_total),
+				0.0, 0.5);
+	gtk_table_attach (GTK_TABLE (net_table), load_graph_get_labels (net_graph)->net_in_total,
+			  2, 3,
+			  1, 2,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
-	color_picker = gtk_color_button_new_with_color (
-		&load_graph_get_colors(net_graph)[3]);
+	color_picker = gtk_color_button_new_with_color (&load_graph_get_colors (net_graph)[3]);
 	g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_net_out_color_changed), procdata);
-	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+			  G_CALLBACK (cb_net_out_color_changed), procdata);
+	gtk_table_attach (GTK_TABLE (net_table), color_picker,
+			  0, 1,
+			  2, 4,
+			  GTK_FILL, GTK_SHRINK, 0, 0);
 
 	label = gtk_label_new (_("Sent:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+	gtk_table_attach (GTK_TABLE (net_table), label,
+			  1, 2,
+			  2, 3,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
-	hbox = gtk_hbox_new (FALSE, 0);
-	g_signal_connect (G_OBJECT (hbox), "size_request",
-			  G_CALLBACK(size_request), &net_size);
+	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels (net_graph)->net_out),
+				0.0, 0.5);
 
-	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out),
-				0.0,
-				0.5);
-	gtk_box_pack_start (GTK_BOX (hbox),
-			    load_graph_get_labels(net_graph)->net_out,
-			    FALSE,
-			    FALSE,
-			    0);
+	gtk_table_attach (GTK_TABLE (net_table), load_graph_get_labels (net_graph)->net_out,
+			  2, 3,
+			  2, 3,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
-	gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
-
 	label = gtk_label_new (_("Total:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+	gtk_table_attach (GTK_TABLE (net_table), label,
+			  1, 2,
+			  3, 4,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
-	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out_total),
-				0.0,
-				0.5);
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(net_graph)->net_out_total,
-			  4,
-			  5,
-			  1,
-			  2,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
+	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels (net_graph)->net_out_total),
+				0.0, 0.5);
+	gtk_table_attach (GTK_TABLE (net_table), load_graph_get_labels (net_graph)->net_out_total,
+			  2, 3,
+			  3, 4,
+			  GTK_FILL, GTK_FILL, 0, 0);
 
 	procdata->net_graph = net_graph;
 
 	return vbox;
 }
 
+
 static void
 menu_item_select_cb (GtkMenuItem *proxy,
                      ProcData *procdata)
