From a6d510f5f1705d2c31b93f0323937925811bb2d1 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 6 Sep 2011 21:19:04 -0700 Subject: [PATCH] Make a 'units' dialog window Set the output units to feet/meter or psi/bar. Of course, we only actually react to the psi/bar one right now, but it's all coming some day. Signed-off-by: Linus Torvalds --- main.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 90 insertions(+), 10 deletions(-) diff --git a/main.c b/main.c index e516d38..daad244 100644 --- a/main.c +++ b/main.c @@ -202,25 +202,106 @@ 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; + 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); +} + +static void set_meter(GtkWidget *w, gpointer data) +{ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) + output_units.length = METERS; repaint_dive(); } -static void metric(GtkWidget *w, gpointer data) +static void set_feet(GtkWidget *w, gpointer data) { - output_units = SI_units; + 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 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(); } +static void unit_dialog(GtkWidget *w, gpointer data) +{ + GtkWidget *dialog; + + dialog = gtk_dialog_new_with_buttons("Units", + GTK_WINDOW(main_window), + GTK_DIALOG_DESTROY_WITH_PARENT, 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), + "Pascal", set_pascal, (output_units.pressure == PASCAL), + NULL); + + gtk_widget_show(dialog); +} + static GtkActionEntry menu_items[] = { { "FileMenuAction", GTK_STOCK_FILE, "Log", NULL, NULL, NULL}, { "OpenFile", GTK_STOCK_OPEN, NULL, "O", NULL, G_CALLBACK(file_open) }, { "SaveFile", GTK_STOCK_SAVE, NULL, "S", NULL, G_CALLBACK(file_save) }, { "Quit", GTK_STOCK_QUIT, NULL, "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 +311,9 @@ static const gchar* ui_string = " \ \ \ \ - \ - \ - \ - \ + \ + \ + \ \ \ \ -- 2.45.2