[Pioneers-commits] r25 - trunk/client/gtk

[kemm at garage.maemo.org]

Author: kemm
Date: 2008-03-10 23:56:35 +0200 (Mon, 10 Mar 2008)
New Revision: 25

Modified:
   trunk/client/gtk/legend.c
Log:
Legends tab & dialog fix

Modified: trunk/client/gtk/legend.c
===================================================================
--- trunk/client/gtk/legend.c	2008-03-10 17:35:27 UTC (rev 24)
+++ trunk/client/gtk/legend.c	2008-03-10 21:56:35 UTC (rev 25)
@@ -155,14 +155,21 @@
 	GtkWidget *hbox;
 	GtkWidget *vbox;
 	GtkWidget *label;
+    GtkWidget *lbl;
 	GtkWidget *table;
 	GtkWidget *vsep;
 	GtkWidget *alignment;
 	guint num_rows;
 
-	hbox = gtk_hbox_new(FALSE, 6);
-	gtk_container_set_border_width(GTK_CONTAINER(hbox), 6);
+	//hbox = gtk_hbox_new(FALSE, 6);
+	//gtk_container_set_border_width(GTK_CONTAINER(hbox), 6);
 
+    hbox = gtk_notebook_new();
+    gtk_notebook_set_tab_pos(GTK_NOTEBOOK(hbox), GTK_POS_TOP);
+
+    lbl = gtk_label_new(_("Terrain"));
+    gtk_widget_show(lbl);
+
 	vbox = gtk_vbox_new(FALSE, 6);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
 
@@ -198,6 +205,16 @@
 	add_legend_terrain(table, 2, 5, DESERT_TERRAIN, NO_RESOURCE);
 	add_legend_terrain(table, 3, 5, SEA_TERRAIN, NO_RESOURCE);
 
+    gtk_widget_show(vbox);
+    
+    gtk_notebook_insert_page(GTK_NOTEBOOK(hbox), vbox, lbl, 0);
+
+    lbl = gtk_label_new(_("Buildings"));
+    gtk_widget_show(lbl);
+
+	vbox = gtk_vbox_new(FALSE, 6);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+
 	label = gtk_label_new(NULL);
 	gtk_label_set_markup(GTK_LABEL(label), _("<b>Building Costs</b>"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -243,7 +260,9 @@
 			_("Development Card"), cost_development());
 
 	gtk_widget_show(vbox);
-	gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
+    
+    gtk_notebook_insert_page(GTK_NOTEBOOK(hbox), vbox, lbl, 1);
+
 	gtk_widget_show(hbox);
 	return hbox;
 }