From c17300cfaa7dcc95b70112281491b8fb1a530f8e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 31 Aug 2011 16:10:11 -0700 Subject: [PATCH] Use a 'notebook' for Info vs Profile I dunno. This seems a better interface at least if we get more info for the dive, but I suspect I'll want to the add basic info to the profile page too. This makes the 'table' approach to layout be kind of pointless again, and the table has become a fancy vbox. Maybe I'll put the core info back, and use the notebook 'Info' page for extended information. I should just bite the bullet and start saving the dive data, and adding editing functions for adding information. But instead I'm playing around with random gtk widgets. Signed-off-by: Linus Torvalds --- main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index 6a82c6f93..14bf6e708 100644 --- a/main.c +++ b/main.c @@ -61,6 +61,7 @@ int main(int argc, char **argv) GtkWidget *win; GtkWidget *divelist; GtkWidget *table; + GtkWidget *notebook; GtkWidget *frame; parse_xml_init(); @@ -92,14 +93,18 @@ int main(int argc, char **argv) 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; + /* 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_table_attach_defaults(GTK_TABLE(table), frame, 1, 2, 0, 1); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Info")); + + /* Frame for dive profile */ + frame = dive_profile_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);