X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=3e4145645ba9ed48ecdf647e865d414b291e224c;hb=682135838ff313594c7f67fabd9be8f88a33883b;hp=96eca191f092e46d0d660af0297bd72d08f19942;hpb=1155ad3f0fb2471163335d1d7c6856a81f495e49;p=ext%2Fsubsurface.git diff --git a/main.c b/main.c index 96eca19..3e41456 100644 --- a/main.c +++ b/main.c @@ -1,12 +1,20 @@ +/* main.c */ #include +#include #include #include +#include + #include "dive.h" -#include "display.h" +#include "divelist.h" + +GConfClient *gconf; +struct units output_units; -GtkWidget *main_window; +#define GCONF_NAME(x) "/apps/subsurface/" #x +/* random helper functions, used here or elsewhere */ static int sortfn(const void *_a, const void *_b) { const struct dive *a = *(void **)_a; @@ -19,13 +27,55 @@ static int sortfn(const void *_a, const void *_b) return 0; } +const char *weekday(int wday) +{ + static const char wday_array[7][4] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" + }; + return wday_array[wday]; +} + +const char *monthname(int mon) +{ + static const char month_array[12][4] = { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Oct", "Sep", "Nov", "Dec", + }; + return month_array[mon]; +} + /* * 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; + qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn); + + for (i = 1; i < dive_table.nr; i++) { + struct dive **pp = &dive_table.dives[i-1]; + struct dive *prev = pp[0]; + struct dive *dive = pp[1]; + struct dive *merged; + + if (prev->when + prev->duration.seconds < dive->when) + continue; + + merged = try_to_merge(prev, dive); + if (!merged) + continue; + + free(prev); + free(dive); + *pp = merged; + dive_table.nr--; + memmove(pp+1, pp+2, sizeof(*pp)*(dive_table.nr - i)); + + /* Redo the new 'i'th dive */ + i--; + } } static void parse_argument(const char *arg) @@ -44,100 +94,42 @@ static void parse_argument(const char *arg) } while (*++p); } -static void on_destroy(GtkWidget* w, gpointer data) -{ - gtk_main_quit(); -} - -static GtkWidget *dive_profile; - -void repaint_dive(void) +void update_dive(struct dive *new_dive) { - update_dive_info(current_dive); - gtk_widget_queue_draw(dive_profile); -} - -static char *existing_filename; + static struct dive *buffered_dive; + struct dive *old_dive = buffered_dive; -static void file_open(GtkWidget *w, gpointer data) -{ - GtkWidget *dialog; - dialog = gtk_file_chooser_dialog_new("Open File", - GTK_WINDOW(main_window), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL); - - if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - char *filename; - filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - printf("Open: '%s'\n", filename); - g_free(filename); + if (old_dive) { + flush_dive_info_changes(old_dive); + flush_dive_equipment_changes(old_dive); + flush_divelist(old_dive); } - gtk_widget_destroy(dialog); -} - -static void file_save(GtkWidget *w, gpointer data) -{ - GtkWidget *dialog; - dialog = gtk_file_chooser_dialog_new("Save File", - GTK_WINDOW(main_window), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); - if (!existing_filename) { - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), "Untitled document"); - } else - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), existing_filename); - - if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - char *filename; - filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - save_dives(filename); - g_free(filename); + if (new_dive) { + show_dive_info(new_dive); + show_dive_equipment(new_dive); } - gtk_widget_destroy(dialog); + buffered_dive = new_dive; } -static GtkItemFactoryEntry menu_items[] = { - { "/_File", NULL, NULL, 0, "" }, - { "/File/_Open", "O", file_open, 0, "", GTK_STOCK_OPEN }, - { "/File/_Save", "S", file_save, 0, "", GTK_STOCK_SAVE }, -}; -static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); - -/* This is just directly from the gtk menubar tutorial. */ -static GtkWidget *get_menubar_menu(GtkWidget *window) +void renumber_dives(int nr) { - GtkItemFactory *item_factory; - GtkAccelGroup *accel_group; - - accel_group = gtk_accel_group_new(); - item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "
", accel_group); + int i; - gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL); - gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); - return gtk_item_factory_get_widget(item_factory, "
"); + for (i = 0; i < dive_table.nr; i++) { + struct dive *dive = dive_table.dives[i]; + dive->number = nr + i; + } } int main(int argc, char **argv) { int i; - GtkWidget *win; - GtkWidget *divelist; - GtkWidget *table; - GtkWidget *notebook; - GtkWidget *frame; - GtkWidget *menubar; - GtkWidget *vbox; + output_units = SI_units; parse_xml_init(); - gtk_init(&argc, &argv); - + init_ui(argc, argv); + for (i = 1; i < argc; i++) { const char *a = argv[i]; @@ -145,53 +137,20 @@ int main(int argc, char **argv) parse_argument(a); continue; } - parse_xml_file(a); + GError *error = NULL; + parse_xml_file(a, &error); + + if (error != NULL) + { + report_error(error); + g_error_free(error); + error = NULL; + } } report_dives(); + dive_list_update_dives(); - win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); - main_window = win; - - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(win), vbox); - - menubar = get_menubar_menu(win); - gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); - - /* Table for the list of dives, cairo window, and dive info */ - table = gtk_table_new(2, 2, FALSE); - gtk_container_set_border_width(GTK_CONTAINER(table), 5); - gtk_box_pack_end(GTK_BOX(vbox), table, TRUE, TRUE, 0); - gtk_widget_show(table); - - /* Create the atual divelist */ - divelist = create_dive_list(); - gtk_table_attach(GTK_TABLE(table), divelist, 0, 1, 0, 2, - 0, GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0); - - /* Frame for minimal dive info */ - frame = dive_info_frame(); - gtk_table_attach(GTK_TABLE(table), frame, 1, 2, 0, 1, - GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0); - - /* Notebook for dive info vs profile vs .. */ - notebook = gtk_notebook_new(); - gtk_table_attach_defaults(GTK_TABLE(table), notebook, 1, 2, 1, 2); - - /* Frame for dive profile */ - frame = dive_profile_frame(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Profile")); - dive_profile = frame; - - /* Frame for extended dive info */ - frame = extended_dive_info_frame(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Extended dive Info")); - - gtk_widget_set_app_paintable(win, TRUE); - gtk_widget_show_all(win); - - gtk_main(); + run_ui(); return 0; }