X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=e9274129cc36b65897093f23786a791d73d84292;hb=bd315a4804cf60123c7016ece084f2593df5101f;hp=e516d38c8bdafbc526d1f6a4f693b3b44ba9993e;hpb=a06d93217f1eded198e39d971a9286539f82b5c5;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index e516d38..e927412 100644
--- a/main.c
+++ b/main.c
@@ -202,16 +202,103 @@ static void quit(GtkWidget *w, gpointer data)
 	gtk_main_quit();
 }
 
-static void imperial(GtkWidget *w, gpointer data)
+static void create_radio(GtkWidget *dialog, const char *name, ...)
 {
-	output_units = IMPERIAL_units;
-	repaint_dive();
+	va_list args;
+	GtkRadioButton *group = NULL;
+	GtkWidget *box, *label;
+
+	box = gtk_hbox_new(TRUE, 10);
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), box);
+	gtk_widget_show(box);
+
+	label = gtk_label_new(name);
+	gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0);
+	gtk_widget_show(label);
+
+	va_start(args, name);
+	for (;;) {
+		int enabled;
+		const char *name;
+		GtkWidget *button;
+		void *callback_fn;
+
+		name = va_arg(args, char *);
+		if (!name)
+			break;
+		callback_fn = va_arg(args, void *);
+		enabled = va_arg(args, int);
+
+		button = gtk_radio_button_new_with_label_from_widget(group, name);
+		group = GTK_RADIO_BUTTON(button);
+		gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), enabled);
+		g_signal_connect(button, "toggled", G_CALLBACK(callback_fn), NULL);
+		gtk_widget_show(button);
+	}
+	va_end(args);
+}
+
+#define UNITCALLBACK(name, type, value)				\
+static void name(GtkWidget *w, gpointer data) 			\
+{								\
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))	\
+		menu_units.type = value;			\
 }
 
-static void metric(GtkWidget *w, gpointer data)
+static struct units menu_units;
+
+UNITCALLBACK(set_meter, length, METERS)
+UNITCALLBACK(set_feet, length, FEET)
+UNITCALLBACK(set_bar, pressure, BAR)
+UNITCALLBACK(set_psi, pressure, PSI)
+UNITCALLBACK(set_liter, volume, LITER)
+UNITCALLBACK(set_cuft, volume, CUFT)
+UNITCALLBACK(set_celsius, temperature, CELSIUS)
+UNITCALLBACK(set_fahrenheit, temperature, FAHRENHEIT)
+
+static void unit_dialog(GtkWidget *w, gpointer data)
 {
-	output_units = SI_units;
-	repaint_dive();
+	int result;
+	GtkWidget *dialog;
+
+	menu_units = output_units;
+
+	dialog = gtk_dialog_new_with_buttons("Units",
+		GTK_WINDOW(main_window),
+		GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+		NULL);
+
+	create_radio(dialog, "Depth:",
+		"Meter", set_meter, (output_units.length == METERS),
+		"Feet",  set_feet, (output_units.length == FEET),
+		NULL);
+
+	create_radio(dialog, "Pressure:",
+		"Bar", set_bar, (output_units.pressure == BAR),
+		"PSI",  set_psi, (output_units.pressure == PSI),
+		NULL);
+
+	create_radio(dialog, "Volume:",
+		"Liter",  set_liter, (output_units.volume == LITER),
+		"CuFt", set_cuft, (output_units.volume == CUFT),
+		NULL);
+
+	create_radio(dialog, "Temperature:",
+		"Celsius", set_celsius, (output_units.temperature == CELSIUS),
+		"Fahrenheit",  set_fahrenheit, (output_units.temperature == FAHRENHEIT),
+		NULL);
+
+	gtk_widget_show(dialog);
+	result = gtk_dialog_run(GTK_DIALOG(dialog));
+	if (result == GTK_RESPONSE_ACCEPT) {
+		output_units = menu_units;
+		update_dive_list_units(&dive_list);
+		repaint_dive();
+	}
+	gtk_widget_destroy(dialog);
 }
 
 static GtkActionEntry menu_items[] = {
@@ -219,8 +306,7 @@ static GtkActionEntry menu_items[] = {
 	{ "OpenFile",       GTK_STOCK_OPEN, NULL,   "<control>O", NULL, G_CALLBACK(file_open) },
 	{ "SaveFile",       GTK_STOCK_SAVE, NULL,   "<control>S", NULL, G_CALLBACK(file_save) },
 	{ "Quit",           GTK_STOCK_QUIT, NULL,   "<control>Q", NULL, G_CALLBACK(quit) },
-	{ "Metric",         NULL, "Metric", NULL, NULL, G_CALLBACK(metric) },
-	{ "Imperial",       NULL, "Imperial", NULL, NULL, G_CALLBACK(imperial) },
+	{ "Units",          NULL, "Units", NULL, NULL, G_CALLBACK(unit_dialog) },
 };
 static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
 
@@ -230,10 +316,9 @@ static const gchar* ui_string = " \
 			<menu name=\"FileMenu\" action=\"FileMenuAction\"> \
 				<menuitem name=\"Open\" action=\"OpenFile\" /> \
 				<menuitem name=\"Save\" action=\"SaveFile\" /> \
-				<separator name=\"Seperator\"/> \
-				<menuitem name=\"Metric\" action=\"Metric\" /> \
-				<menuitem name=\"Imperial\" action=\"Imperial\" /> \
-				<separator name=\"Seperator\"/> \
+				<separator name=\"Separator1\"/> \
+				<menuitem name=\"Units\" action=\"Units\" /> \
+				<separator name=\"Separator2\"/> \
 				<menuitem name=\"Quit\" action=\"Quit\" /> \
 			</menu> \
 		</menubar> \