X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=14bf6e70834c946c6f963e412e30e0dd5ab80ab9;hb=c17300cfaa7dcc95b70112281491b8fb1a530f8e;hp=e567ee118fe7ae43281329bc6216dc5cfaed3337;hpb=77cfe07c52d25554779c60d37e4a55e34a0164f2;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index e567ee1..14bf6e7 100644
--- a/main.c
+++ b/main.c
@@ -47,12 +47,21 @@ static void on_destroy(GtkWidget* w, gpointer data)
 	gtk_main_quit();
 }
 
+static GtkWidget *dive_profile;
+
+void repaint_dive(void)
+{
+	update_dive_info(current_dive);
+	gtk_widget_queue_draw(dive_profile);
+}
+
 int main(int argc, char **argv)
 {
 	int i;
 	GtkWidget *win;
 	GtkWidget *divelist;
-	GtkWidget *vbox;
+	GtkWidget *table;
+	GtkWidget *notebook;
 	GtkWidget *frame;
 
 	parse_xml_init();
@@ -74,19 +83,28 @@ 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);
 
-	/* 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);
+	/* 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_container_add(GTK_CONTAINER(win), table);
+	gtk_widget_show(table);
 
 	/* Create the atual divelist */
 	divelist = create_dive_list();
-	gtk_container_add(GTK_CONTAINER(vbox), divelist);
+	gtk_table_attach_defaults(GTK_TABLE(table), divelist, 0, 1, 0, 2);
+
+	/* 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 info */
+	frame = dive_info_frame();
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Info"));
 
 	/* Frame for dive profile */
 	frame = dive_profile_frame();
-	gtk_container_add(GTK_CONTAINER(vbox), frame);
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Profile"));
+	dive_profile = frame;
 
 	gtk_widget_set_app_paintable(win, TRUE);
 	gtk_widget_show_all(win);