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

diff --git a/main.c b/main.c
index daad244..e927412 100644
--- a/main.c
+++ b/main.c
@@ -239,48 +239,37 @@ static void create_radio(GtkWidget *dialog, const char *name, ...)
 	va_end(args);
 }
 
-static void set_meter(GtkWidget *w, gpointer data)
-{
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
-		output_units.length = METERS;
-	repaint_dive();
+#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 set_feet(GtkWidget *w, gpointer data)
-{
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
-		output_units.length = FEET;
-	repaint_dive();
-}
-
-static void set_bar(GtkWidget *w, gpointer data)
-{
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
-		output_units.pressure = BAR;
-	repaint_dive();
-}
+static struct units menu_units;
 
-static void set_psi(GtkWidget *w, gpointer data)
-{
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
-		output_units.pressure = PSI;
-	repaint_dive();
-}
-
-static void set_pascal(GtkWidget *w, gpointer data)
-{
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
-		output_units.pressure = PASCAL;
-	repaint_dive();
-}
+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)
 {
+	int result;
 	GtkWidget *dialog;
 
+	menu_units = output_units;
+
 	dialog = gtk_dialog_new_with_buttons("Units",
 		GTK_WINDOW(main_window),
-		GTK_DIALOG_DESTROY_WITH_PARENT, NULL);
+		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),
@@ -290,10 +279,26 @@ static void unit_dialog(GtkWidget *w, gpointer data)
 	create_radio(dialog, "Pressure:",
 		"Bar", set_bar, (output_units.pressure == BAR),
 		"PSI",  set_psi, (output_units.pressure == PSI),
-		"Pascal",  set_pascal, (output_units.pressure == PASCAL),
+		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[] = {