X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=5157c54e3e595ee0d792b9bc150830354c3f0d81;hb=42f627b8b1cf7e929a30c0a07a5fb44a4cec9e1f;hp=970e85ffbde5d3d4ff644bda8f2c9bee94088f9a;hpb=7bbdea19ed0c634b4a990e49be7a2c8936a61818;p=ext%2Fsubsurface.git diff --git a/main.c b/main.c index 970e85f..5157c54 100644 --- a/main.c +++ b/main.c @@ -3,6 +3,8 @@ #include #include +#include + #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; @@ -32,7 +37,7 @@ static int sortfn(const void *_a, const void *_b) * This doesn't really report anything at all. We just sort the * dives, the GUI does the reporting */ -static void report_dives(void) +void report_dives(void) { int i; @@ -85,9 +90,25 @@ static void on_destroy(GtkWidget* w, gpointer data) 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) { + show_dive_info(new_dive); + show_dive_equipment(new_dive); + } + buffered_dive = new_dive; +} + void repaint_dive(void) { - update_dive_info(current_dive); + update_dive(current_dive); gtk_widget_queue_draw(dive_profile); } @@ -103,7 +124,7 @@ static void on_info_bar_response(GtkWidget *widget, gint response, } } -static void report_error(GError* error) +void report_error(GError* error) { if (error == NULL) { @@ -210,11 +231,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 +253,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); } @@ -243,11 +261,11 @@ static void create_radio(GtkWidget *dialog, const char *name, ...) static void name(GtkWidget *w, gpointer data) \ { \ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) \ - output_units.type = value; \ - repaint_dive(); \ - dive_list_update_dives(dive_list); \ + menu_units.type = value; \ } +static struct units menu_units; + UNITCALLBACK(set_meter, length, METERS) UNITCALLBACK(set_feet, length, FEET) UNITCALLBACK(set_bar, pressure, BAR) @@ -259,11 +277,17 @@ 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), @@ -285,15 +309,68 @@ 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) { + /* Make sure to flush any modified old dive data with old units */ + update_dive(NULL); + 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 void renumber_dives(int nr) +{ + int i; + + for (i = 0; i < dive_table.nr; i++) { + struct dive *dive = dive_table.dives[i]; + dive->number = nr + i; + } +} + +static void renumber_dialog(GtkWidget *w, gpointer data) +{ + int result; + GtkWidget *dialog, *frame, *button; + + dialog = gtk_dialog_new_with_buttons("Renumber", + GTK_WINDOW(main_window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + NULL); + + frame = gtk_frame_new("New starting number"); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), frame); + + button = gtk_spin_button_new_with_range(1, 50000, 1); + gtk_container_add(GTK_CONTAINER(frame), button); + + gtk_widget_show_all(dialog); + result = gtk_dialog_run(GTK_DIALOG(dialog)); + if (result == GTK_RESPONSE_ACCEPT) { + int nr = gtk_spin_button_get_value(GTK_SPIN_BUTTON(button)); + renumber_dives(nr); + repaint_dive(); + } + gtk_widget_destroy(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) }, + { "Import", NULL, "Import", NULL, NULL, G_CALLBACK(import_dialog) }, + { "Units", NULL, "Units", NULL, NULL, G_CALLBACK(unit_dialog) }, + { "Renumber", NULL, "Renumber", NULL, NULL, G_CALLBACK(renumber_dialog) }, { "Quit", GTK_STOCK_QUIT, NULL, "Q", NULL, G_CALLBACK(quit) }, - { "Units", NULL, "Units", NULL, NULL, G_CALLBACK(unit_dialog) }, }; static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); @@ -304,8 +381,11 @@ static const gchar* ui_string = " \ \ \ \ - \ + \ \ + \ + \ + \ \ \ \ @@ -337,6 +417,7 @@ int main(int argc, char **argv) GtkWidget *notebook; GtkWidget *frame; GtkWidget *dive_info; + GtkWidget *equipment; GtkWidget *menubar; GtkWidget *vbox; @@ -345,6 +426,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); @@ -383,7 +476,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 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);