From 7017d17562fe803946ef9e0d8e9af9611bc43ba5 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 31 Aug 2011 11:52:16 -0700 Subject: [PATCH] Use a gtk table instead of hbox We'll want to add various dive statistics, so... Without them, it all looks pretty much the same, though. Signed-off-by: Linus Torvalds --- divelist.c | 2 +- main.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/divelist.c b/divelist.c index 3a38e95..ba42658 100644 --- a/divelist.c +++ b/divelist.c @@ -48,7 +48,7 @@ GtkWidget *create_dive_list(void) selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE); - gtk_widget_set_size_request(tree_view, 200, -1); + gtk_widget_set_size_request(tree_view, 200, 100); fill_dive_list(model); diff --git a/main.c b/main.c index af13489..2df31c4 100644 --- a/main.c +++ b/main.c @@ -59,7 +59,7 @@ int main(int argc, char **argv) int i; GtkWidget *win; GtkWidget *divelist; - GtkWidget *vbox; + GtkWidget *table; GtkWidget *frame; parse_xml_init(); @@ -81,19 +81,20 @@ 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; gtk_widget_set_app_paintable(win, TRUE); -- 2.43.0