]> git.tdb.fi Git - ext/subsurface.git/blobdiff - divelist.c
Merge branch 'alignment-change' of git://github.com/dirkhh/subsurface
[ext/subsurface.git] / divelist.c
index 01ab1b11ad2c6b126b0e49a74c025b4b3c9b96e6..51646c460f7b05761134227d94e604c761ac1a15 100644 (file)
@@ -1,3 +1,15 @@
+/* divelist.c */
+/* this creates the UI for the dive list -
+ * controlled through the following interfaces:
+ *
+ * void flush_divelist(struct dive *dive)
+ * GtkWidget dive_list_create(void)
+ * void dive_list_update_dives(void)
+ * void update_dive_list_units(void)
+ * void set_divelist_font(const char *font)
+ * void mark_divelist_changed(int changed)
+ * int unsaved_changes()
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,6 +18,7 @@
 #include "divelist.h"
 #include "dive.h"
 #include "display.h"
+#include "display-gtk.h"
 
 struct DiveList {
        GtkWidget    *tree_view;
@@ -13,6 +26,7 @@ struct DiveList {
        GtkListStore *model;
        GtkTreeViewColumn *date, *depth, *duration, *location;
        GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac;
+       int changed;
 };
 
 static struct DiveList dive_list;
@@ -26,15 +40,14 @@ enum {
        DIVE_DATE,              /* time_t: dive->when */
        DIVE_DEPTH,             /* int: dive->maxdepth in mm */
        DIVE_DURATION,          /* int: in seconds */
-       DIVE_LOCATION,          /* "2nd Cathedral, Lanai" */
        DIVE_TEMPERATURE,       /* int: in mkelvin */
        DIVE_CYLINDER,
        DIVE_NITROX,            /* int: in permille */
        DIVE_SAC,               /* int: in ml/min */
+       DIVE_LOCATION,          /* "2nd Cathedral, Lanai" */
        DIVELIST_COLUMNS
 };
 
-
 static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 {
        GtkTreeIter iter;
@@ -48,23 +61,6 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
        repaint_dive();
 }
 
-const char *weekday(int wday)
-{
-       static const char wday_array[7][4] = {
-               "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-       };
-       return wday_array[wday];
-}
-
-const char *monthname(int mon)
-{
-       static const char month_array[12][4] = {
-               "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-               "Jul", "Aug", "Oct", "Sep", "Nov", "Dec",
-       };
-       return month_array[mon];
-}
-
 static void date_data_func(GtkTreeViewColumn *col,
                           GtkCellRenderer *renderer,
                           GtkTreeModel *model,
@@ -358,20 +354,20 @@ void update_dive_list_units(void)
 
        switch (output_units.length) {
        case METERS:
-               unit = "max/m";
+               unit = "m";
                break;
        case FEET:
-               unit = "max/ft";
+               unit = "ft";
                break;
        }
        gtk_tree_view_column_set_title(dive_list.depth, unit);
 
        switch (output_units.temperature) {
        case CELSIUS:
-               unit = "degC";
+               unit = UTF8_DEGREE "C";
                break;
        case FAHRENHEIT:
-               unit = "degF";
+               unit = UTF8_DEGREE "F";
                break;
        case KELVIN:
                unit = "Kelvin";
@@ -407,6 +403,11 @@ static void fill_dive_list(void)
        }
 
        update_dive_list_units();
+       if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(dive_list.model), &iter)) {
+               GtkTreeSelection *selection;
+               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
+               gtk_tree_selection_select_iter(selection, &iter);
+       }
 }
 
 void dive_list_update_dives(void)
@@ -423,33 +424,49 @@ typedef void (*data_func_t)(GtkTreeViewColumn *col,
                            gpointer data);
 
 static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const char *title,
-                                       data_func_t data_func, int align_right, int expand)
+                                       data_func_t data_func, PangoAlignment align)
 {
        GtkCellRenderer *renderer;
        GtkTreeViewColumn *col;
+       double xalign = 0.0; /* left as default */
 
        renderer = gtk_cell_renderer_text_new();
        col = gtk_tree_view_column_new();
 
        gtk_tree_view_column_set_title(col, title);
-       gtk_tree_view_column_set_sort_column_id(col, DIVE_DATE);
+       gtk_tree_view_column_set_sort_column_id(col, index);
        gtk_tree_view_column_set_resizable(col, TRUE);
        gtk_tree_view_column_pack_start(col, renderer, TRUE);
        if (data_func)
                gtk_tree_view_column_set_cell_data_func(col, renderer, data_func, NULL, NULL);
        else
                gtk_tree_view_column_add_attribute(col, renderer, "text", index);
-       if (align_right) {
-               gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
-               gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+       gtk_object_set(GTK_OBJECT(renderer), "alignment", align, NULL);
+       switch (align) {
+       case PANGO_ALIGN_LEFT:
+               xalign = 0.0;
+               break;
+       case PANGO_ALIGN_CENTER:
+               xalign = 0.5;
+               break;
+       case PANGO_ALIGN_RIGHT:
+               xalign = 1.0;
+               break;
        }
-       gtk_tree_view_column_set_expand(col,expand);
-       if (expand) 
-               gtk_tree_view_column_set_min_width(col,50);
+       gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), xalign, 0.5);
        gtk_tree_view_append_column(GTK_TREE_VIEW(dl->tree_view), col);
        return col;
 }
 
+/*
+ * This is some crazy crap. The only way to get default focus seems
+ * to be to grab focus as the widget is being shown the first time.
+ */
+static void realize_cb(GtkWidget *tree_view, gpointer userdata)
+{
+       gtk_widget_grab_focus(tree_view);
+}
+
 GtkWidget *dive_list_create(void)
 {
        GtkTreeSelection  *selection;
@@ -459,11 +476,11 @@ GtkWidget *dive_list_create(void)
                                G_TYPE_INT,                     /* Date */
                                G_TYPE_INT,                     /* Depth */
                                G_TYPE_INT,                     /* Duration */
-                               G_TYPE_STRING,                  /* Location */
                                G_TYPE_INT,                     /* Temperature */
                                G_TYPE_STRING,                  /* Cylinder */
                                G_TYPE_INT,                     /* Nitrox */
-                               G_TYPE_INT                      /* SAC */
+                               G_TYPE_INT,                     /* SAC */
+                               G_TYPE_STRING                   /* Location */
                                );
        dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model));
        set_divelist_font(divelist_font);
@@ -473,22 +490,23 @@ GtkWidget *dive_list_create(void)
        gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
        gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
 
-       dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0, 0);
-       dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "max/ft", depth_data_func, 1, 0);
-       dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1, 0);
-       dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0, 1);
-       dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "degF", temperature_data_func, 1, 0);
-       dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0, 0);
-       dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1, 0);
-       dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1, 0);
+       dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, PANGO_ALIGN_LEFT);
+       dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "ft", depth_data_func, PANGO_ALIGN_RIGHT);
+       dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, PANGO_ALIGN_RIGHT);
+       dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, UTF8_DEGREE "F", temperature_data_func, PANGO_ALIGN_RIGHT);
+       dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, PANGO_ALIGN_CENTER);
+       dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O" UTF8_SUBSCRIPT_2 "%", nitrox_data_func, PANGO_ALIGN_CENTER);
+       dive_list.sac = divelist_column(&dive_list, DIVE_SAC, "SAC", sac_data_func, PANGO_ALIGN_CENTER);
+       dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, PANGO_ALIGN_LEFT);
 
        fill_dive_list();
 
        g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE,
-                                         "search-column", 0,
+                                         "search-column", DIVE_LOCATION,
                                          "rules-hint", TRUE,
                                          NULL);
 
+       g_signal_connect_after(dive_list.tree_view, "realize", G_CALLBACK(realize_cb), NULL);
        g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), dive_list.model);
 
        dive_list.container_widget = gtk_scrolled_window_new(NULL, NULL);
@@ -496,5 +514,17 @@ GtkWidget *dive_list_create(void)
                               GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
        gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
 
+       dive_list.changed = 0;
+
        return dive_list.container_widget;
 }
+
+void mark_divelist_changed(int changed)
+{
+       dive_list.changed = changed;
+}
+
+int unsaved_changes()
+{
+       return dive_list.changed;
+}