Add fake 'info' frame contents

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index b7df3bfaa38df9c35c19e5bbfa1bba54cc423a0b..d3853faabd9aaba473f194d6b07462387aba1ac8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -47,42 +47,11 @@ static void on_destroy(GtkWidget* w, gpointer data)
        gtk_main_quit();
 }
 
-static GtkTreeModel *fill_dive_list(void)
-{
-       int i;
-       GtkListStore *store;
-       GtkTreeIter iter;
-
-       store = gtk_list_store_new(1, G_TYPE_STRING);
+static GtkWidget *dive_profile;
 
-       for (i = 0; i < dive_table.nr; i++) {
-               struct dive *dive = dive_table.dives[i];
-
-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter,
-                       0, dive->name,
-                       -1);
-       }
-
-       return GTK_TREE_MODEL(store);
-}
-
-static GtkWidget *create_dive_list(void)
+void repaint_dive(void)
 {
-       GtkWidget *list;
-       GtkCellRenderer *renderer;
-       GtkTreeModel *model;
-
-       list = gtk_tree_view_new();
-
-       renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(list),
-               -1, "Dive", renderer, "text", 0, NULL);
-
-       model = fill_dive_list();
-       gtk_tree_view_set_model(GTK_TREE_VIEW(list), model);
-       g_object_unref(model);
-       return list;
+       gtk_widget_queue_draw(dive_profile);
 }
 
 int main(int argc, char **argv)
@@ -90,8 +59,7 @@ int main(int argc, char **argv)
        int i;
        GtkWidget *win;
        GtkWidget *divelist;
-       GtkWidget *vbox;
-       GtkWidget *scrolled_window;
+       GtkWidget *table;
        GtkWidget *frame;
 
        parse_xml_init();
@@ -113,29 +81,24 @@ 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);
 
-       /* 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);
+       /* Create the atual divelist */
+       divelist = create_dive_list();
+       gtk_table_attach_defaults(GTK_TABLE(table), divelist, 0, 1, 0, 2);
 
        /* Frame for dive profile */
        frame = dive_profile_frame();
+       gtk_table_attach_defaults(GTK_TABLE(table), frame, 1, 2, 1, 2);
+       dive_profile = frame;
 
-       gtk_container_add(GTK_CONTAINER(vbox), frame);
-
-       /* Create the atual divelist */
-       divelist = create_dive_list();
-
-       /* .. and connect it to the scrolled window */
-       gtk_container_add(GTK_CONTAINER(scrolled_window), divelist);
+       /* 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);