Add some more dive info - and actually update it

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index af1348986b8aac1a18470051254988d112fd74e5..6a82c6f933e4e3f6cab9ef53d777e72c4a36b6aa 100644 (file)
--- a/main.c
+++ b/main.c
@@ -51,6 +51,7 @@ static GtkWidget *dive_profile;
 
 void repaint_dive(void)
 {
+       update_dive_info(current_dive);
        gtk_widget_queue_draw(dive_profile);
 }
 
@@ -59,7 +60,7 @@ int main(int argc, char **argv)
        int i;
        GtkWidget *win;
        GtkWidget *divelist;
-       GtkWidget *vbox;
+       GtkWidget *table;
        GtkWidget *frame;
 
        parse_xml_init();
@@ -81,21 +82,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);
 
-       /* 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);
 
        /* Frame for dive profile */
        frame = dive_profile_frame();
-       gtk_container_add(GTK_CONTAINER(vbox), frame);
+       gtk_table_attach_defaults(GTK_TABLE(table), frame, 1, 2, 1, 2);
        dive_profile = frame;
 
+       /* Frame for dive info */
+       frame = dive_info_frame();
+       gtk_table_attach_defaults(GTK_TABLE(table), frame, 1, 2, 0, 1);
+
        gtk_widget_set_app_paintable(win, TRUE);
        gtk_widget_show_all(win);