X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=3425cd856a5d520ed89d4792736ca29192bfb9f5;hb=23c6a42b084fbd1affbf7cc1b3f5e94fb15d3a92;hp=adceca9e6ab1159474ef86ecd4373b523c31e7ed;hpb=0ca546b31e5527713f11676bc965aa1ed8dac619;p=ext%2Fsubsurface.git diff --git a/main.c b/main.c index adceca9..3425cd8 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,18 +49,90 @@ static void on_destroy(GtkWidget* w, gpointer data) gtk_main_quit(); } -static gboolean on_expose(GtkWidget* w, GdkEventExpose* e, gpointer data) +static GtkWidget *dive_profile; + +void repaint_dive(void) { - cairo_t* cr; - cr = gdk_cairo_create(w->window); - cairo_destroy(cr); - return FALSE; + update_dive_info(current_dive); + gtk_widget_queue_draw(dive_profile); +} + +static char *existing_filename; + +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); + } + 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)); + printf("Save: '%s'\n", filename); + g_free(filename); + } + gtk_widget_destroy(dialog); +} + +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) +{ + GtkItemFactory *item_factory; + GtkAccelGroup *accel_group; + + accel_group = gtk_accel_group_new(); + item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "
", accel_group); + + 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) { int i; - GtkWidget* win; + GtkWidget *win; + GtkWidget *divelist; + GtkWidget *table; + GtkWidget *notebook; + GtkWidget *frame; + GtkWidget *menubar; + GtkWidget *vbox; parse_xml_init(); @@ -107,11 +152,45 @@ 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); - g_signal_connect(G_OBJECT(win), "expose-event", G_CALLBACK(on_expose), 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, 0, 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(); return 0; } -