Show tank type and O2 mix for air usage

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 4d96fa7c45e2d3f8a7ec4e6bd16b12f507f9a83e..dc5453892c2585a6de6d22ab0a16f8a418c963fe 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;
@@ -210,11 +215,9 @@ static void create_radio(GtkWidget *dialog, const char *name, ...)
 
        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 (;;) {
@@ -234,7 +237,6 @@ static void create_radio(GtkWidget *dialog, const char *name, ...)
                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);
 }
@@ -291,12 +293,16 @@ static void unit_dialog(GtkWidget *w, gpointer data)
                "Fahrenheit",  set_fahrenheit, (output_units.temperature == FAHRENHEIT),
                NULL);
 
-       gtk_widget_show(dialog);
+       gtk_widget_show_all(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();
-               dive_list_update_dives(dive_list);
+               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);
 }
@@ -350,6 +356,7 @@ int main(int argc, char **argv)
        GtkWidget *notebook;
        GtkWidget *frame;
        GtkWidget *dive_info;
+       GtkWidget *cylinder_management;
        GtkWidget *menubar;
        GtkWidget *vbox;
 
@@ -358,6 +365,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);
@@ -396,7 +415,11 @@ int main(int argc, char **argv)
 
        /* Frame for extended dive info */
        dive_info = extended_dive_info_widget();
-       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_info, gtk_label_new("Extended Dive Info"));
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_info, gtk_label_new("Dive Notes"));
+
+       /* Frame for extended dive info */
+       cylinder_management = cylinder_management_widget();
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), cylinder_management, gtk_label_new("Cylinders"));
 
        gtk_widget_set_app_paintable(win, TRUE);
        gtk_widget_show_all(win);