#include <stdio.h>
#include <stdlib.h>
#include <time.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <cairo.h>
#include "dive.h"
+#include "display.h"
static void show_dive(int nr, struct dive *dive)
{
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;
-}
-
static GtkTreeModel *fill_dive_list(void)
{
int i;
int i;
GtkWidget *win;
GtkWidget *divelist;
+ GtkWidget *vbox;
+ GtkWidget *scrolled_window;
+ 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);
+
+ /* 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);
+
+ /* Frame for dive profile */
+ frame = dive_profile_frame();
+
+ gtk_container_add(GTK_CONTAINER(vbox), frame);
+
+ /* Create the atual divelist */
divelist = create_dive_list();
- gtk_container_add(GTK_CONTAINER(win), divelist);
+
+ /* .. and connect it to the scrolled window */
+ gtk_container_add(GTK_CONTAINER(scrolled_window), divelist);
gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win);