X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=df966a7e8b2f9f8ad1d7220db8dc36d6528353fa;hb=3cb360b51484f3416289aa52c09d60d87df60027;hp=7cc1fce14c2d286af65b2f1d6ee789b9ee14cae3;hpb=8e95ded57bdbaa66ba1c2ec25c55a56d53bce943;p=ext%2Fsubsurface.git diff --git a/main.c b/main.c index 7cc1fce..df966a7 100644 --- a/main.c +++ b/main.c @@ -1,36 +1,18 @@ #include +#include #include #include #include "dive.h" +#include "divelist.h" #include "display.h" -static void show_dive(int nr, struct dive *dive) -{ - int i; - struct tm *tm; - - tm = gmtime(&dive->when); - - printf("At %02d:%02d:%02d %04d-%02d-%02d (%d ft max, %d minutes)\n", - tm->tm_hour, tm->tm_min, tm->tm_sec, - tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, - to_feet(dive->maxdepth), dive->duration.seconds / 60); - - if (!verbose) - return; - - for (i = 0; i < dive->samples; i++) { - struct sample *s = dive->sample + i; - - printf("%4d:%02d: %3d ft, %2d C, %4d PSI\n", - s->time.seconds / 60, - s->time.seconds % 60, - to_feet(s->depth), - to_C(s->temperature), - to_PSI(s->tankpressure)); - } -} +GtkWidget *main_window; +GtkWidget *main_vbox; +GtkWidget *error_info_bar; +GtkWidget *error_label; +int error_count; +struct DiveList dive_list; static int sortfn(const void *_a, const void *_b) { @@ -50,7 +32,32 @@ static int sortfn(const void *_a, const void *_b) */ static 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) @@ -74,98 +81,242 @@ static void on_destroy(GtkWidget* w, gpointer data) gtk_main_quit(); } -static GtkTreeModel *fill_dive_list(void) +static GtkWidget *dive_profile; + +void repaint_dive(void) { - int i; - GtkListStore *store; - GtkTreeIter iter; + update_dive_info(current_dive); + gtk_widget_queue_draw(dive_profile); +} - store = gtk_list_store_new(1, G_TYPE_STRING); +static char *existing_filename; - for (i = 0; i < dive_table.nr; i++) { - struct dive *dive = dive_table.dives[i]; +static void on_info_bar_response(GtkWidget *widget, gint response, + gpointer data) +{ + if (response == GTK_RESPONSE_OK) + { + gtk_widget_destroy(widget); + error_info_bar = NULL; + } +} - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, - 0, dive->name, - -1); +static void report_error(GError* error) +{ + if (error == NULL) + { + return; + } + + if (error_info_bar == NULL) + { + error_count = 1; + error_info_bar = gtk_info_bar_new_with_buttons(GTK_STOCK_OK, + GTK_RESPONSE_OK, + NULL); + g_signal_connect(error_info_bar, "response", G_CALLBACK(on_info_bar_response), NULL); + gtk_info_bar_set_message_type(GTK_INFO_BAR(error_info_bar), + GTK_MESSAGE_ERROR); + + error_label = gtk_label_new(error->message); + GtkWidget *container = gtk_info_bar_get_content_area(GTK_INFO_BAR(error_info_bar)); + gtk_container_add(GTK_CONTAINER(container), error_label); + + gtk_box_pack_start(GTK_BOX(main_vbox), error_info_bar, FALSE, FALSE, 0); + gtk_widget_show_all(main_vbox); } + else + { + error_count++; + char buffer[256]; + snprintf(buffer, sizeof(buffer), "Failed to open %i files.", error_count); + gtk_label_set(GTK_LABEL(error_label), buffer); + } +} - return GTK_TREE_MODEL(store); +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); + gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE); + + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + GSList *filenames; + char *filename; + filenames = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)); + + GError *error = NULL; + while(filenames != NULL) { + filename = (char *)filenames->data; + parse_xml_file(filename, &error); + if (error != NULL) + { + report_error(error); + g_error_free(error); + error = NULL; + } + + g_free(filename); + filenames = g_slist_next(filenames); + } + g_slist_free(filenames); + report_dives(); + repaint_dive(); + dive_list_update_dives(dive_list); + } + gtk_widget_destroy(dialog); } -static GtkWidget *create_dive_list(void) +static void file_save(GtkWidget *w, gpointer data) { - GtkWidget *list; - GtkCellRenderer *renderer; - GtkTreeModel *model; + 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); + } + gtk_widget_destroy(dialog); +} - list = gtk_tree_view_new(); +static void quit(GtkWidget *w, gpointer data) +{ + gtk_main_quit(); +} - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(list), - -1, "Dive", renderer, "text", 0, NULL); +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) }, + { "Quit", GTK_STOCK_QUIT, NULL, "Q", NULL, G_CALLBACK(quit) }, +}; +static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); + +static const gchar* ui_string = " \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +"; + +static GtkWidget *get_menubar_menu(GtkWidget *window) +{ + GtkActionGroup *action_group = gtk_action_group_new("Menu"); + gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0); - model = fill_dive_list(); - gtk_tree_view_set_model(GTK_TREE_VIEW(list), model); - g_object_unref(model); - return list; + GtkUIManager *ui_manager = gtk_ui_manager_new(); + gtk_ui_manager_insert_action_group(ui_manager, action_group, 0); + GError* error = 0; + gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ui_manager), ui_string, -1, &error); + + gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ui_manager)); + GtkWidget* menu = gtk_ui_manager_get_widget(ui_manager, "/MainMenu"); + + return menu; } int main(int argc, char **argv) { int i; GtkWidget *win; - GtkWidget *divelist; - GtkWidget *vbox; - GtkWidget *scrolled_window; + GtkWidget *paned; + GtkWidget *info_box; + GtkWidget *notebook; GtkWidget *frame; + GtkWidget *dive_info; + GtkWidget *menubar; + GtkWidget *vbox; parse_xml_init(); gtk_init(&argc, &argv); - for (i = 1; i < argc; i++) { - const char *a = argv[i]; + error_info_bar = NULL; + win = gtk_window_new(GTK_WINDOW_TOPLEVEL); + g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); + main_window = win; - if (a[0] == '-') { - parse_argument(a); - continue; - } - parse_xml_file(a); - } + vbox = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(win), vbox); + main_vbox = vbox; - report_dives(); + menubar = get_menubar_menu(win); + gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); - win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); + /* HPane for left the dive list, and right the dive info */ + paned = gtk_hpaned_new(); + gtk_box_pack_end(GTK_BOX(vbox), paned, TRUE, TRUE, 0); - /* HBOX for the list of dives and cairo window */ - vbox=gtk_hbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); - gtk_container_add(GTK_CONTAINER(win), vbox); - gtk_widget_show(vbox); + /* Create the actual divelist */ + dive_list = dive_list_create(); + gtk_paned_add1(GTK_PANED(paned), dive_list.container_widget); - /* Scrolled window for the list goes into the vbox.. */ - scrolled_window=gtk_scrolled_window_new(NULL, NULL); - gtk_widget_set_usize(scrolled_window, 150, 350); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(vbox), scrolled_window); - gtk_widget_show(scrolled_window); + /* VBox for dive info, and tabs */ + info_box = gtk_vbox_new(FALSE, 6); + gtk_paned_add2(GTK_PANED(paned), info_box); - /* Frame for dive profile */ - frame = dive_profile_frame(); + /* Frame for minimal dive info */ + frame = dive_info_frame(); + gtk_box_pack_start(GTK_BOX(info_box), frame, FALSE, TRUE, 6); - gtk_container_add(GTK_CONTAINER(vbox), frame); + /* Notebook for dive info vs profile vs .. */ + notebook = gtk_notebook_new(); + gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 6); - /* Create the atual divelist */ - divelist = create_dive_list(); + /* Frame for dive profile */ + dive_profile = dive_profile_widget(); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_profile, gtk_label_new("Dive Profile")); - /* .. and connect it to the scrolled window */ - gtk_container_add(GTK_CONTAINER(scrolled_window), divelist); + /* 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_widget_set_app_paintable(win, TRUE); gtk_widget_show_all(win); + + for (i = 1; i < argc; i++) { + const char *a = argv[i]; + + if (a[0] == '-') { + parse_argument(a); + continue; + } + 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(dive_list); gtk_main(); return 0;