X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=7cc1fce14c2d286af65b2f1d6ee789b9ee14cae3;hb=8e95ded57bdbaa66ba1c2ec25c55a56d53bce943;hp=dcafab5591edd2431f5caed2f6a88ec84c403c5b;hpb=5625b31873ae5a76b76b036be18858327a25d8f0;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index dcafab5..7cc1fce 100644
--- a/main.c
+++ b/main.c
@@ -1,11 +1,9 @@
 #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)
 {
@@ -76,14 +74,6 @@ static void on_destroy(GtkWidget* w, gpointer data)
 	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;
@@ -129,6 +119,7 @@ int main(int argc, char **argv)
 	GtkWidget *divelist;
 	GtkWidget *vbox;
 	GtkWidget *scrolled_window;
+	GtkWidget *frame;
 
 	parse_xml_init();
 
@@ -148,21 +139,25 @@ 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);
 
-	/* VBOX for the list of dives */
-	vbox=gtk_vbox_new(FALSE, 5);
+	/* 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, 250, 350);
+	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();