From: Nathan Samson Date: Sun, 4 Sep 2011 17:01:30 +0000 (+0200) Subject: Remove the redundant frames in the notebook. Closes #9 X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=6138d151e9156bdf15843b1b54104428c5124e38;p=ext%2Fsubsurface.git Remove the redundant frames in the notebook. Closes #9 Signed-off-by: Nathan Samson --- diff --git a/display.h b/display.h index f336bd5..96fa29a 100644 --- a/display.h +++ b/display.h @@ -8,9 +8,9 @@ extern int selected_dive; #define current_dive (get_dive(selected_dive)) -extern GtkWidget *dive_profile_frame(void); +extern GtkWidget *dive_profile_widget(void); extern GtkWidget *dive_info_frame(void); -extern GtkWidget *extended_dive_info_frame(void); +extern GtkWidget *extended_dive_info_widget(void); extern GtkWidget *create_dive_list(void); extern void update_dive_info(struct dive *dive); extern void repaint_dive(void); diff --git a/info.c b/info.c index 55708be..4275ad6 100644 --- a/info.c +++ b/info.c @@ -164,21 +164,16 @@ static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean exp return buffer; } -GtkWidget *extended_dive_info_frame(void) +GtkWidget *extended_dive_info_widget(void) { - GtkWidget *frame; GtkWidget *vbox; - frame = gtk_frame_new("Extended dive info"); - gtk_widget_show(frame); - vbox = gtk_vbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(frame), vbox); location = text_entry(vbox, "Location", FALSE); notes = text_entry(vbox, "Notes", TRUE); /* Add extended info here: name, description, yadda yadda */ update_dive_info(current_dive); - return frame; + return vbox; } diff --git a/main.c b/main.c index b748f69..57c8f70 100644 --- a/main.c +++ b/main.c @@ -178,6 +178,7 @@ int main(int argc, char **argv) GtkWidget *info_box; GtkWidget *notebook; GtkWidget *frame; + GtkWidget *dive_info; GtkWidget *menubar; GtkWidget *vbox; @@ -228,13 +229,12 @@ int main(int argc, char **argv) gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 5); /* Frame for dive profile */ - frame = dive_profile_frame(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Profile")); - dive_profile = frame; + dive_profile = dive_profile_widget(); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_profile, gtk_label_new("Dive Profile")); /* Frame for extended dive info */ - frame = extended_dive_info_frame(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Extended dive Info")); + dive_info = extended_dive_info_widget(); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_info, gtk_label_new("Extended dive Info")); gtk_widget_set_app_paintable(win, TRUE); gtk_widget_show_all(win); diff --git a/profile.c b/profile.c index 7a0a208..070e6fa 100644 --- a/profile.c +++ b/profile.c @@ -195,17 +195,13 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer return FALSE; } -GtkWidget *dive_profile_frame(void) +GtkWidget *dive_profile_widget(void) { - GtkWidget *frame; GtkWidget *da; - frame = gtk_frame_new("Dive profile"); - gtk_widget_show(frame); da = gtk_drawing_area_new(); gtk_widget_set_size_request(da, 450, 350); g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL); - gtk_container_add(GTK_CONTAINER(frame), da); - return frame; + return da; }