mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the redundant frames in the notebook. Closes #9

Browse source 
Signed-off-by: Nathan Samson <nathansamson@gmail.com>
This commit is contained in:
Nathan Samson 2011-09-04 19:01:30 +02:00
parent 1117cd37d7
commit 6138d151e9
4 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
display.h
View file

@ -8,9 +8,9 @@
extern int selected_dive; extern int selected_dive;
#define current_dive (get_dive(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 *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 GtkWidget *create_dive_list(void);
extern void update_dive_info(struct dive *dive); extern void update_dive_info(struct dive *dive);
extern void repaint_dive(void); extern void repaint_dive(void);

9
info.c
View file

@ -164,21 +164,16 @@ static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean exp
return buffer; return buffer;
} }
GtkWidget *extended_dive_info_frame(void) GtkWidget *extended_dive_info_widget(void)
{ {
GtkWidget *frame;
GtkWidget *vbox; GtkWidget *vbox;
frame = gtk_frame_new("Extended dive info");
gtk_widget_show(frame);
vbox = gtk_vbox_new(FALSE, 5); vbox = gtk_vbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(frame), vbox);
location = text_entry(vbox, "Location", FALSE); location = text_entry(vbox, "Location", FALSE);
notes = text_entry(vbox, "Notes", TRUE); notes = text_entry(vbox, "Notes", TRUE);
/* Add extended info here: name, description, yadda yadda */ /* Add extended info here: name, description, yadda yadda */
update_dive_info(current_dive); update_dive_info(current_dive);
return frame; return vbox;
} }

10
main.c
View file

@ -178,6 +178,7 @@ int main(int argc, char **argv)
GtkWidget *info_box; GtkWidget *info_box;
GtkWidget *notebook; GtkWidget *notebook;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *dive_info;
GtkWidget *menubar; GtkWidget *menubar;
GtkWidget *vbox; GtkWidget *vbox;
@ -228,13 +229,12 @@ int main(int argc, char **argv)
gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 5); gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 5);
/* Frame for dive profile */ /* Frame for dive profile */
frame = dive_profile_frame(); dive_profile = dive_profile_widget();
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Profile")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_profile, gtk_label_new("Dive Profile"));
dive_profile = frame;
/* Frame for extended dive info */ /* Frame for extended dive info */
frame = extended_dive_info_frame(); dive_info = extended_dive_info_widget();
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Extended dive Info")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_info, gtk_label_new("Extended dive Info"));
gtk_widget_set_app_paintable(win, TRUE); gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win); gtk_widget_show_all(win);

8
profile.c
View file

@ -195,17 +195,13 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer
return FALSE; return FALSE;
} }
GtkWidget *dive_profile_frame(void) GtkWidget *dive_profile_widget(void)
{ {
GtkWidget *frame;
GtkWidget *da; GtkWidget *da;
frame = gtk_frame_new("Dive profile");
gtk_widget_show(frame);
da = gtk_drawing_area_new(); da = gtk_drawing_area_new();
gtk_widget_set_size_request(da, 450, 350); gtk_widget_set_size_request(da, 450, 350);
g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL); g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL);
gtk_container_add(GTK_CONTAINER(frame), da);
return frame; return da;
} }