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

[kemm at garage.maemo.org]

Author: kemm
Date: 2008-03-16 00:38:34 +0200 (Sun, 16 Mar 2008)
New Revision: 26

Modified:
   trunk/client/gtk/trade.c
Log:
Fix trade page

Modified: trunk/client/gtk/trade.c
===================================================================
--- trunk/client/gtk/trade.c	2008-03-10 21:56:35 UTC (rev 25)
+++ trunk/client/gtk/trade.c	2008-03-15 22:38:34 UTC (rev 26)
@@ -405,6 +405,7 @@
 /** Build the page */
 GtkWidget *trade_build_page(void)
 {
+    GtkWidget *ovbox;
 	GtkWidget *panel_mainbox;
 	GtkWidget *vbox;
 	GtkWidget *label;
@@ -413,15 +414,23 @@
 	GtkWidget *bbox;
 	GtkWidget *finish_btn;
 	GtkWidget *accept_btn;
+    GtkWidget *notebook;
 	gint idx;
 
+    ovbox = gtk_vbox_new(FALSE, 6);
+    gtk_widget_show(ovbox);
+
 	panel_mainbox = gtk_hbox_new(FALSE, 6);
 	gtk_widget_show(panel_mainbox);
 	gtk_container_set_border_width(GTK_CONTAINER(panel_mainbox), 6);
+    gtk_box_pack_start(GTK_BOX(ovbox), panel_mainbox, FALSE, TRUE, 3);
 
+    notebook = gtk_notebook_new();
+    gtk_widget_show(notebook);
+	gtk_box_pack_start(GTK_BOX(panel_mainbox), notebook, FALSE, TRUE, 0);
+    
 	vbox = gtk_vbox_new(FALSE, 6);
 	gtk_widget_show(vbox);
-	gtk_box_pack_start(GTK_BOX(panel_mainbox), vbox, FALSE, TRUE, 0);
 
 	label = gtk_label_new(NULL);
 	/* Frame title, trade: I want to trade these resources */
@@ -446,6 +455,13 @@
 	for (idx = 0; idx < NO_RESOURCE; ++idx)
 		add_trade_row(table, we_receive_rows + idx, idx);
 
+    label = gtk_label_new(NULL);
+    gtk_label_set_markup(GTK_LABEL(label), _("<span size=\"x-small\">Ports</span>"));
+    gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), vbox, label, 0);
+
+    vbox = gtk_vbox_new(FALSE, 6);
+    gtk_widget_show(vbox);
+
 	we_receive_frame = gtk_vbox_new(FALSE, 6);
 	gtk_widget_show(we_receive_frame);
 	gtk_box_pack_start(GTK_BOX(vbox), we_receive_frame, FALSE, TRUE,
@@ -476,33 +492,28 @@
 	for (idx = 0; idx < NO_RESOURCE; ++idx)
 		add_trade_row(table, we_supply_rows + idx, idx);
 
+    label = gtk_label_new(NULL);
+    gtk_label_set_markup(GTK_LABEL(label), _("<span size=\"x-small\">Players</span>"));
+    gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), vbox, label, 1);
+
 	bbox = gtk_hbutton_box_new();
 	gtk_widget_show(bbox);
 	gtk_box_pack_start(GTK_BOX(we_receive_frame), bbox, FALSE, TRUE,
 			   0);
 
-	vbox = gtk_vbox_new(FALSE, 6);
-	gtk_widget_show(vbox);
-	gtk_box_pack_start(GTK_BOX(panel_mainbox), vbox, TRUE, TRUE, 0);
-
-	active_quote_label = gtk_label_new("");
-	gtk_widget_show(active_quote_label);
-	gtk_misc_set_alignment(GTK_MISC(active_quote_label), 0, 0.5);
-	gtk_box_pack_start(GTK_BOX(vbox), active_quote_label,
-			   FALSE, FALSE, 0);
-
 	quoteview = quote_view_new(TRUE, is_good_quote, GTK_STOCK_APPLY,
 				   GTK_STOCK_CANCEL);
 	gtk_widget_show(quoteview);
-	gtk_box_pack_start(GTK_BOX(vbox), quoteview, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(panel_mainbox), quoteview, TRUE, TRUE, 0);
 	g_signal_connect(QUOTEVIEW(quoteview), "selection-changed",
 			 G_CALLBACK(quote_selected_cb), NULL);
 
 	bbox = gtk_hbutton_box_new();
 	gtk_widget_show(bbox);
-	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(ovbox), bbox, FALSE, TRUE, 0);
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
 
+#if 0
 	/* Button text, trade: call for quotes from other players */
 	call_btn = gtk_button_new_with_mnemonic(_("_Call for Quotes"));
 	frontend_gui_register(call_btn, GUI_TRADE_CALL, "clicked");
@@ -520,13 +531,44 @@
 	frontend_gui_register(finish_btn, GUI_TRADE_FINISH, "clicked");
 	gtk_widget_show(finish_btn);
 	gtk_container_add(GTK_CONTAINER(bbox), finish_btn);
+#endif
+    
+    /* Button text, trade: call for quotes from other players */
+    call_btn = gtk_button_new();
+    label = gtk_label_new(NULL);
+    gtk_label_set_markup(GTK_LABEL(label), _("<span size=\"x-small\">Call for Quotes</span>"));
+    gtk_widget_show(label);
+    gtk_container_add(GTK_CONTAINER(call_btn), label);
+	frontend_gui_register(call_btn, GUI_TRADE_CALL, "clicked");
+	gtk_widget_show(call_btn);
+	gtk_container_add(GTK_CONTAINER(bbox), call_btn);
 
+    /* Button text: Trade page, accept selected quote */
+    accept_btn = gtk_button_new();
+    label = gtk_label_new(NULL);
+    gtk_label_set_markup(GTK_LABEL(label), _("<span size=\"x-small\">Accept Quote</span>"));
+    gtk_widget_show(label);
+    gtk_container_add(GTK_CONTAINER(accept_btn), label);
+	frontend_gui_register(accept_btn, GUI_TRADE_ACCEPT, "clicked");
+	gtk_widget_show(accept_btn);
+	gtk_container_add(GTK_CONTAINER(bbox), accept_btn);
+
+    /* Button text: Trade page, finish trading */
+    finish_btn = gtk_button_new();
+    label = gtk_label_new(NULL);
+    gtk_label_set_markup(GTK_LABEL(label), _("<span size=\"x-small\">Finish Trading</span>"));
+    gtk_widget_show(label);
+    gtk_container_add(GTK_CONTAINER(finish_btn), label);
+	frontend_gui_register(finish_btn, GUI_TRADE_FINISH, "clicked");
+	gtk_widget_show(finish_btn);
+	gtk_container_add(GTK_CONTAINER(bbox), finish_btn);
+    
 	g_signal_connect(G_OBJECT(quoteview), "selection-activated",
 			 G_CALLBACK(quote_dblclick_cb), accept_btn);
 
 	theme_register_callback(G_CALLBACK(trade_theme_changed));
 
-	return panel_mainbox;
+	return ovbox;
 }
 
 /** A trade is performed/a new trade is possible */