#include <stdlib.h>
#include <time.h>
+#include <gconf/gconf-client.h>
+
#include "dive.h"
#include "divelist.h"
#include "display.h"
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;
static GtkWidget *dive_profile;
+void update_dive(struct dive *new_dive)
+{
+ static struct dive *buffered_dive;
+ struct dive *old_dive = buffered_dive;
+
+ if (old_dive) {
+ flush_dive_info_changes(old_dive);
+ flush_dive_equipment_changes(old_dive);
+ }
+ if (new_dive) {
+ buffered_dive = new_dive;
+ show_dive_info(new_dive);
+ show_dive_equipment(new_dive);
+ }
+}
+
void repaint_dive(void)
{
- update_dive_info(current_dive);
+ update_dive(current_dive);
gtk_widget_queue_draw(dive_profile);
}
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 (;;) {
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();
+#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 void set_psi(GtkWidget *w, gpointer data)
-{
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
- output_units.pressure = PSI;
- repaint_dive();
-}
+static struct units menu_units;
-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),
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);
+ 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_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();
+ 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[] = {
GtkWidget *notebook;
GtkWidget *frame;
GtkWidget *dive_info;
+ GtkWidget *equipment;
GtkWidget *menubar;
GtkWidget *vbox;
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);
/* 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 dive equipment */
+ equipment = equipment_widget();
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), equipment, gtk_label_new("Equipment"));
gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win);