X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=96eca191f092e46d0d660af0297bd72d08f19942;hb=c139aa8d51ef63a79cf8eeb809621ad06b72b808;hp=662459281b0262942943bb0de1742bd072838f01;hpb=3aa54e206ad214d21a53599a847ae07f1c039a84;p=ext%2Fsubsurface.git diff --git a/main.c b/main.c index 6624592..96eca19 100644 --- a/main.c +++ b/main.c @@ -1,38 +1,11 @@ #include #include #include -#include -#include -#include #include "dive.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; static int sortfn(const void *_a, const void *_b) { @@ -76,71 +49,78 @@ static void on_destroy(GtkWidget* w, gpointer data) gtk_main_quit(); } -static GtkTreeModel *fill_dive_list(void) -{ - int i; - GtkListStore *store; - GtkTreeIter iter; +static GtkWidget *dive_profile; - store = gtk_list_store_new(1, G_TYPE_STRING); +void repaint_dive(void) +{ + update_dive_info(current_dive); + gtk_widget_queue_draw(dive_profile); +} - for (i = 0; i < dive_table.nr; i++) { - struct dive *dive = dive_table.dives[i]; +static char *existing_filename; - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, - 0, dive->name, - -1); +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); } - - return GTK_TREE_MODEL(store); + gtk_widget_destroy(dialog); } -static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) +static void file_save(GtkWidget *w, gpointer data) { - struct dive *dive = dive_table.dives[0]; - cairo_t *cr; - int i; - - cr = gdk_cairo_create(widget->window); - cairo_set_source_rgb(cr, 0, 0, 0); - gdk_cairo_rectangle(cr, &event->area); - cairo_fill(cr); - - cairo_set_line_width(cr, 3); - cairo_set_source_rgb(cr, 1, 1, 1); - - if (dive->samples) { - struct sample *sample = dive->sample; - cairo_move_to(cr, sample->time.seconds / 5, to_feet(sample->depth) * 3); - for (i = 1; i < dive->samples; i++) { - sample++; - cairo_line_to(cr, sample->time.seconds / 5, to_feet(sample->depth) * 3); - } - cairo_stroke(cr); + 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); } - - cairo_destroy(cr); - - return FALSE; + gtk_widget_destroy(dialog); } -static GtkWidget *create_dive_list(void) -{ - GtkWidget *list; - GtkCellRenderer *renderer; - GtkTreeModel *model; +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]); - list = gtk_tree_view_new(); +/* This is just directly from the gtk menubar tutorial. */ +static GtkWidget *get_menubar_menu(GtkWidget *window) +{ + GtkItemFactory *item_factory; + GtkAccelGroup *accel_group; - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(list), - -1, "Dive", renderer, "text", 0, NULL); + accel_group = gtk_accel_group_new(); + item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "
", accel_group); - model = fill_dive_list(); - gtk_tree_view_set_model(GTK_TREE_VIEW(list), model); - g_object_unref(model); - return list; + 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, "
"); } int main(int argc, char **argv) @@ -148,10 +128,11 @@ int main(int argc, char **argv) int i; GtkWidget *win; GtkWidget *divelist; - GtkWidget *vbox; - GtkWidget *scrolled_window; + GtkWidget *table; + GtkWidget *notebook; GtkWidget *frame; - GtkWidget *da; + GtkWidget *menubar; + GtkWidget *vbox; parse_xml_init(); @@ -171,34 +152,42 @@ int main(int argc, char **argv) win = gtk_window_new(GTK_WINDOW_TOPLEVEL); g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); + main_window = win; - /* HBOX for the list of dives and cairo window */ - vbox=gtk_hbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); + vbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(win), vbox); - gtk_widget_show(vbox); - /* 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); + menubar = get_menubar_menu(win); + gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); - /* Frame for dive profile */ - frame = gtk_frame_new("Dive profile"); - gtk_container_add(GTK_CONTAINER(vbox), frame); - gtk_widget_show(frame); - da = gtk_drawing_area_new(); - gtk_widget_set_size_request(da, 450, 350); - gtk_container_add(GTK_CONTAINER(frame), da); - g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL); + /* 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; - /* .. and connect it to the scrolled window */ - gtk_container_add(GTK_CONTAINER(scrolled_window), divelist); + /* 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);