Merge branch 'add-info-stats-page' of git://github.com/dirkhh/subsurface

* 'add-info-stats-page' of git://github.com/dirkhh/subsurface:
  Add Info & Stats page to the notebook
  Even more places with pressure and volume conversions
  Further cleanup of pressure and volume conversions
  Use unit functions to get column headers, add unit function for pressure
  More consistency improvements
  Add new helper function to get temperature and unit
This commit is contained in:
Linus Torvalds 2011-11-02 12:39:55 -07:00
commit 55352a051c
12 changed files with 429 additions and 88 deletions

View file

@ -746,6 +746,7 @@ void init_ui(int *argcp, char ***argvp)
GtkWidget *dive_info;
GtkWidget *dive_list;
GtkWidget *equipment;
GtkWidget *stats;
GtkWidget *menubar;
GtkWidget *vbox;
GdkScreen *screen;
@ -875,6 +876,10 @@ void init_ui(int *argcp, char ***argvp)
equipment = equipment_widget();
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), equipment, gtk_label_new("Equipment"));
/* Frame for dive statistics */
stats = stats_widget();
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), stats, gtk_label_new("Info & Stats"));
gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win);