#include <stdio.h>
#include <stdlib.h>
#include <time.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <cairo.h>
#include "dive.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));
- }
-}
+#include "display.h"
static int sortfn(const void *_a, const void *_b)
{
gtk_main_quit();
}
-static gboolean on_expose(GtkWidget* w, GdkEventExpose* e, gpointer data)
-{
- cairo_t* cr;
- cr = gdk_cairo_create(w->window);
- cairo_destroy(cr);
- return FALSE;
-}
-
int main(int argc, char **argv)
{
int i;
- GtkWidget* win;
+ GtkWidget *win;
+ GtkWidget *divelist;
+ GtkWidget *vbox;
+ GtkWidget *frame;
parse_xml_init();
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);
+
+ /* 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 atual divelist */
+ divelist = create_dive_list();
+ gtk_container_add(GTK_CONTAINER(vbox), divelist);
+
+ /* Frame for dive profile */
+ frame = dive_profile_frame();
+ gtk_container_add(GTK_CONTAINER(vbox), frame);
+
gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win);
gtk_main();
return 0;
}
-