X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=dfd1b1447e22c5dd2437a351e9dcdd24876017d3;hb=03b2e565503d383acc5f2867404cc39c0a2add80;hp=9ef4fa0b4b6b9eff42fa0b28d3c506bc6d9b35a6;hpb=05857e0a05bc15672ddd5e835714d2cd20405b97;p=ext%2Fsubsurface.git diff --git a/main.c b/main.c index 9ef4fa0..dfd1b14 100644 --- a/main.c +++ b/main.c @@ -3,6 +3,8 @@ #include #include +#include + #include "dive.h" #include "divelist.h" #include "display.h" @@ -12,10 +14,12 @@ GtkWidget *main_vbox; GtkWidget *error_info_bar; GtkWidget *error_label; int error_count; -struct DiveList dive_list; +GConfClient *gconf; struct units output_units; +#define GCONF_NAME(x) "/apps/subsurface/" #x + static int sortfn(const void *_a, const void *_b) { const struct dive *a = *(void **)_a; @@ -32,7 +36,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 +89,26 @@ 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); + flush_divelist(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) { @@ -168,7 +189,7 @@ static void file_open(GtkWidget *w, gpointer data) } g_slist_free(filenames); report_dives(); - dive_list_update_dives(dive_list); + dive_list_update_dives(); } gtk_widget_destroy(dialog); } @@ -202,23 +223,156 @@ 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); + + label = gtk_label_new(name); + gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0); + + 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); + } + va_end(args); +} + +#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 metric(GtkWidget *w, gpointer data) +static struct units menu_units; + +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) { - output_units = SI_units; + int result; + GtkWidget *dialog; + + menu_units = output_units; + + dialog = gtk_dialog_new_with_buttons("Units", + GTK_WINDOW(main_window), + 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), + "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), + 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_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(); + 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}, + { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL}, + { "LogMenuAction", 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) }, + { "Print", GTK_STOCK_PRINT, NULL, "P", NULL, G_CALLBACK(do_print) }, + { "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) }, - { "Metric", NULL, "Metric", NULL, NULL, G_CALLBACK(metric) }, - { "Imperial", NULL, "Imperial", NULL, NULL, G_CALLBACK(imperial) }, }; static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); @@ -228,12 +382,16 @@ static const gchar* ui_string = " \ \ \ \ - \ - \ - \ - \ + \ + \ + \ + \ \ \ + \ + \ + \ + \ \ \ "; @@ -254,6 +412,11 @@ static GtkWidget *get_menubar_menu(GtkWidget *window) return menu; } +static void switch_page(GtkNotebook *notebook, gint arg1, gpointer user_data) +{ + repaint_dive(); +} + int main(int argc, char **argv) { int i; @@ -261,8 +424,9 @@ int main(int argc, char **argv) GtkWidget *paned; GtkWidget *info_box; GtkWidget *notebook; - GtkWidget *frame; GtkWidget *dive_info; + GtkWidget *dive_list; + GtkWidget *equipment; GtkWidget *menubar; GtkWidget *vbox; @@ -271,8 +435,21 @@ 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); + gtk_window_set_icon_from_file(GTK_WINDOW(win), "icon.svg", NULL); g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); main_window = win; @@ -284,23 +461,20 @@ int main(int argc, char **argv) gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); /* HPane for left the dive list, and right the dive info */ - paned = gtk_hpaned_new(); + paned = gtk_vpaned_new(); gtk_box_pack_end(GTK_BOX(vbox), paned, TRUE, TRUE, 0); /* Create the actual divelist */ dive_list = dive_list_create(); - gtk_paned_add1(GTK_PANED(paned), dive_list.container_widget); + gtk_paned_add2(GTK_PANED(paned), dive_list); /* VBox for dive info, and tabs */ info_box = gtk_vbox_new(FALSE, 6); - gtk_paned_add2(GTK_PANED(paned), info_box); - - /* Frame for minimal dive info */ - frame = dive_info_frame(); - gtk_box_pack_start(GTK_BOX(info_box), frame, FALSE, TRUE, 6); + gtk_paned_add1(GTK_PANED(paned), info_box); /* Notebook for dive info vs profile vs .. */ notebook = gtk_notebook_new(); + g_signal_connect(notebook, "switch-page", G_CALLBACK(switch_page), NULL); gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 6); /* Frame for dive profile */ @@ -309,7 +483,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); @@ -333,7 +511,7 @@ int main(int argc, char **argv) } report_dives(); - dive_list_update_dives(dive_list); + dive_list_update_dives(); gtk_main(); return 0;