Permalink
Browse files

Create separate single dive and total stats pages

No additional statistics added, yet.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
  • Loading branch information...
1 parent 68a1ff9 commit 788ebc0500b12fb502b82473c1459ccca06345a5 @dirkhh dirkhh committed Jan 15, 2012
Showing with 18 additions and 21 deletions.
  1. +2 −1 display-gtk.h
  2. +12 −10 gtk-gui.c
  3. +4 −10 statistics.c
View
@@ -61,7 +61,8 @@ extern GtkWidget *dive_profile_widget(void);
extern GtkWidget *dive_info_frame(void);
extern GtkWidget *extended_dive_info_widget(void);
extern GtkWidget *equipment_widget(void);
-extern GtkWidget *stats_widget(void);
+extern GtkWidget *single_stats_widget(void);
+extern GtkWidget *total_stats_widget(void);
extern GtkWidget *cylinder_list_widget(void);
extern GtkWidget *dive_list_create(void);
View
@@ -646,10 +646,8 @@ void init_ui(int *argcp, char ***argvp)
{
GtkWidget *win;
GtkWidget *notebook;
- GtkWidget *dive_info;
+ GtkWidget *nb_page;
GtkWidget *dive_list;
- GtkWidget *equipment;
- GtkWidget *stats;
GtkWidget *menubar;
GtkWidget *vbox;
GdkScreen *screen;
@@ -735,16 +733,20 @@ void init_ui(int *argcp, char ***argvp)
gtk_paned_add2(GTK_PANED(hpane), dive_profile);
/* Frame for extended dive info */
- dive_info = extended_dive_info_widget();
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_info, gtk_label_new("Dive Notes"));
+ nb_page = extended_dive_info_widget();
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Dive Notes"));
/* Frame for dive equipment */
- equipment = equipment_widget();
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), equipment, gtk_label_new("Equipment"));
+ nb_page = equipment_widget();
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Equipment"));
- /* Frame for dive statistics */
- stats = stats_widget();
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), stats, gtk_label_new("Info & Stats"));
+ /* Frame for single dive statistics */
+ nb_page = single_stats_widget();
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Dive Info"));
+
+ /* Frame for total dive statistics */
+ nb_page = total_stats_widget();
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Overall Stats"));
gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win);
View
@@ -242,10 +242,11 @@ static GtkWidget *new_info_label_in_frame(GtkWidget *box, const char *label)
return label_widget;
}
-static GtkWidget *total_stats_widget(GtkWidget *vbox)
+GtkWidget *total_stats_widget(void)
{
+ GtkWidget *vbox, *hbox, *statsframe, *framebox;
- GtkWidget *hbox, *statsframe, *framebox;
+ vbox = gtk_vbox_new(FALSE, 3);
statsframe = gtk_frame_new("Statistics");
gtk_box_pack_start(GTK_BOX(vbox), statsframe, TRUE, FALSE, 3);
@@ -272,9 +273,8 @@ static GtkWidget *total_stats_widget(GtkWidget *vbox)
return vbox;
}
-static GtkWidget *single_stats_widget(void)
+GtkWidget *single_stats_widget(void)
{
-
GtkWidget *vbox, *hbox, *infoframe, *framebox;
vbox = gtk_vbox_new(FALSE, 3);
@@ -311,9 +311,3 @@ static GtkWidget *single_stats_widget(void)
return vbox;
}
-
-GtkWidget* stats_widget(void)
-{
- GtkWidget *vbox = single_stats_widget();
- return total_stats_widget(vbox);
-}

0 comments on commit 788ebc0

Please sign in to comment.