Save default units using GConf

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index daad244f5a3f8ac4d2a612b964135c17cb80a5b2..7088a6dfacac37a824c62886ff039cba02756153 100644 (file)
--- a/main.c
+++ b/main.c
@@ -3,6 +3,8 @@
 #include <stdlib.h>
 #include <time.h>
 
+#include <gconf/gconf-client.h>
+
 #include "dive.h"
 #include "divelist.h"
 #include "display.h"
@@ -14,8 +16,11 @@ GtkWidget *error_label;
 int        error_count;
 struct DiveList   dive_list;
 
+GConfClient *gconf;
 struct units output_units;
 
+#define GCONF_NAME(x) "/apps/diveclog/" #x
+
 static int sortfn(const void *_a, const void *_b)
 {
        const struct dive *a = *(void **)_a;
@@ -239,48 +244,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();
-}
-
-static void set_feet(GtkWidget *w, gpointer data)
-{
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
-               output_units.length = FEET;
-       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_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 +284,30 @@ 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();
+               gconf_client_set_bool(gconf, GCONF_NAME(feet), output_units.length == FEET, NULL);
+               gconf_client_set_bool(gconf, GCONF_NAME(psi), output_units.pressure == PSI, NULL);
+               gconf_client_set_bool(gconf, GCONF_NAME(cuft), output_units.volume == CUFT, NULL);
+               gconf_client_set_bool(gconf, GCONF_NAME(fahrenheit), output_units.temperature == FAHRENHEIT, NULL);
+       }
+       gtk_widget_destroy(dialog);
 }
 
 static GtkActionEntry menu_items[] = {
@@ -353,6 +367,18 @@ int main(int argc, char **argv)
 
        gtk_init(&argc, &argv);
 
+       g_type_init();
+       gconf = gconf_client_get_default();
+
+       if (gconf_client_get_bool(gconf, GCONF_NAME(feet), NULL))
+               output_units.length = FEET;
+       if (gconf_client_get_bool(gconf, GCONF_NAME(psi), NULL))
+               output_units.pressure = PSI;
+       if (gconf_client_get_bool(gconf, GCONF_NAME(cuft), NULL))
+               output_units.volume = CUFT;
+       if (gconf_client_get_bool(gconf, GCONF_NAME(fahrenheit), NULL))
+               output_units.temperature = FAHRENHEIT;
+
        error_info_bar = NULL;
        win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);