Minor tweaks to column headers

[ext/subsurface.git] / divelist.c

diff --git a/divelist.c b/divelist.c
index b7cc0a3117818cddc16380fe4cfc9f9dbe4f7454..eb6e8482f337eddf82f7806866bc608e09b70c68 100644 (file)
--- a/divelist.c
+++ b/divelist.c
@@ -38,7 +38,7 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
        repaint_dive();
 }
 
-static const char *weekday(int wday)
+const char *weekday(int wday)
 {
        static const char wday_array[7][4] = {
                "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
@@ -46,7 +46,7 @@ static const char *weekday(int wday)
        return wday_array[wday];
 }
 
-static const char *monthname(int mon)
+const char *monthname(int mon)
 {
        static const char month_array[12][4] = {
                "Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -204,7 +204,7 @@ static void sac_data_func(GtkTreeViewColumn *col,
        sac = value / 1000.0;
        switch (output_units.volume) {
        case LITER:
-               fmt = "%4.0f";
+               fmt = "%4.1f";
                break;
        case CUFT:
                fmt = "%4.2f";
@@ -341,14 +341,27 @@ void update_dive_list_units(struct DiveList *dive_list)
 
        switch (output_units.length) {
        case METERS:
-               unit = "m";
+               unit = "max/m";
                break;
        case FEET:
-               unit = "ft";
+               unit = "max/ft";
                break;
        }
        gtk_tree_view_column_set_title(dive_list->depth, unit);
 
+       switch (output_units.temperature) {
+       case CELSIUS:
+               unit = "degC";
+               break;
+       case FAHRENHEIT:
+               unit = "degF";
+               break;
+       case KELVIN:
+               unit = "Kelvin";
+               break;
+       }
+       gtk_tree_view_column_set_title(dive_list->temperature, unit);
+
        gtk_tree_model_foreach(model, set_one_dive, NULL);
 }
 
@@ -421,6 +434,7 @@ struct DiveList dive_list_create(void)
 {
        struct DiveList    dive_list;
        GtkTreeSelection  *selection;
+       PangoFontDescription *font_desc = pango_font_description_from_string("sans 8");
 
        dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS,
                                G_TYPE_INT,                     /* index */
@@ -434,6 +448,9 @@ struct DiveList dive_list_create(void)
                                G_TYPE_INT                      /* SAC */
                                );
        dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model));
+       gtk_widget_modify_font(dive_list.tree_view, font_desc);
+       pango_font_description_free(font_desc);
+
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
 
        gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
@@ -459,7 +476,7 @@ struct DiveList dive_list_create(void)
 
        dive_list.container_widget = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dive_list.container_widget),
-                              GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+                              GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
        gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
 
        return dive_list;