X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=51646c460f7b05761134227d94e604c761ac1a15;hb=7bbe44f46a96a405b3a67b452f18a95044b9b25d;hp=77298e3785c5021f6102c682b8901cf7659e288a;hpb=61ebee05dcc550a5e5719ecdf68812afb55a88c0;p=ext%2Fsubsurface.git diff --git a/divelist.c b/divelist.c index 77298e3..51646c4 100644 --- a/divelist.c +++ b/divelist.c @@ -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 #include #include @@ -6,6 +18,18 @@ #include "divelist.h" #include "dive.h" #include "display.h" +#include "display-gtk.h" + +struct DiveList { + GtkWidget *tree_view; + GtkWidget *container_widget; + GtkListStore *model; + GtkTreeViewColumn *date, *depth, *duration, *location; + GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac; + int changed; +}; + +static struct DiveList dive_list; /* * The dive list has the dive data in both string format (for showing) @@ -16,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; @@ -38,23 +61,6 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model) repaint_dive(); } -static const char *weekday(int wday) -{ - static const char wday_array[7][4] = { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" - }; - return wday_array[wday]; -} - -static 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, @@ -204,7 +210,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"; @@ -267,8 +273,8 @@ static void get_string(char **str, const char *s) if (!s) s = ""; len = strlen(s); - if (len > 16) - len = 16; + if (len > 40) + len = 40; n = malloc(len+1); memcpy(n, s, len); n[len] = 0; @@ -327,17 +333,24 @@ static gboolean set_one_dive(GtkTreeModel *model, return dive == data; } -void flush_divelist(struct DiveList *dive_list, struct dive *dive) +void flush_divelist(struct dive *dive) { - GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model); + GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model); gtk_tree_model_foreach(model, set_one_dive, dive); } -void update_dive_list_units(struct DiveList *dive_list) +void set_divelist_font(const char *font) +{ + PangoFontDescription *font_desc = pango_font_description_from_string(font); + gtk_widget_modify_font(dive_list.tree_view, font_desc); + pango_font_description_free(font_desc); +} + +void update_dive_list_units(void) { const char *unit; - GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model); + GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model); switch (output_units.length) { case METERS: @@ -347,18 +360,31 @@ void update_dive_list_units(struct DiveList *dive_list) unit = "ft"; break; } - gtk_tree_view_column_set_title(dive_list->depth, unit); + gtk_tree_view_column_set_title(dive_list.depth, unit); + + switch (output_units.temperature) { + case CELSIUS: + unit = UTF8_DEGREE "C"; + break; + case FAHRENHEIT: + unit = UTF8_DEGREE "F"; + 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); } -static void fill_dive_list(struct DiveList *dive_list) +static void fill_dive_list(void) { int i; GtkTreeIter iter; GtkListStore *store; - store = GTK_LIST_STORE(dive_list->model); + store = GTK_LIST_STORE(dive_list.model); for (i = 0; i < dive_table.nr; i++) { struct dive *dive = dive_table.dives[i]; @@ -376,128 +402,129 @@ static void fill_dive_list(struct DiveList *dive_list) -1); } - update_dive_list_units(dive_list); + 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(struct DiveList dive_list) +void dive_list_update_dives(void) { gtk_list_store_clear(GTK_LIST_STORE(dive_list.model)); - fill_dive_list(&dive_list); + fill_dive_list(); repaint_dive(); } -struct DiveList dive_list_create(void) +typedef void (*data_func_t)(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data); + +static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const char *title, + data_func_t data_func, PangoAlignment align) { - struct DiveList dive_list; - GtkTreeSelection *selection; - GtkCellRenderer *renderer; + 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, 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); + 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_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; dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS, G_TYPE_INT, /* index */ 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); + 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); gtk_widget_set_size_request(dive_list.tree_view, 200, 200); - renderer = gtk_cell_renderer_text_new(); - dive_list.date = col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(col, "Date"); - gtk_tree_view_column_set_sort_column_id(col, DIVE_DATE); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_pack_start(col, renderer, TRUE); - gtk_tree_view_column_set_cell_data_func(col, renderer, date_data_func, NULL, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); - - renderer = gtk_cell_renderer_text_new(); - dive_list.depth = col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(col, "ft"); - gtk_tree_view_column_set_sort_column_id(col, DIVE_DEPTH); - gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_set_cell_data_func(col, renderer, depth_data_func, NULL, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); - gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); - gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); - - renderer = gtk_cell_renderer_text_new(); - dive_list.duration = col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(col, "min"); - gtk_tree_view_column_set_sort_column_id(col, DIVE_DURATION); - gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_set_cell_data_func(col, renderer, duration_data_func, NULL, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); - gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); - gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); - - renderer = gtk_cell_renderer_text_new(); - dive_list.location = col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(col, "Location"); - gtk_tree_view_column_set_sort_column_id(col, DIVE_LOCATION); - gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_LOCATION); - gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); + 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); - renderer = gtk_cell_renderer_text_new(); - dive_list.temperature = col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(col, "deg"); - gtk_tree_view_column_set_sort_column_id(col, DIVE_TEMPERATURE); - gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_set_cell_data_func(col, renderer, temperature_data_func, NULL, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); - gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); - gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); - - renderer = gtk_cell_renderer_text_new(); - dive_list.temperature = col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(col, "Cyl"); - gtk_tree_view_column_set_sort_column_id(col, DIVE_CYLINDER); - gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_CYLINDER); - gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); - - renderer = gtk_cell_renderer_text_new(); - dive_list.nitrox = col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(col, "O2%"); - gtk_tree_view_column_set_sort_column_id(col, DIVE_NITROX); - gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_set_cell_data_func(col, renderer, nitrox_data_func, NULL, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); - gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); - gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); - - renderer = gtk_cell_renderer_text_new(); - dive_list.sac = col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(col, "SAC"); - gtk_tree_view_column_set_sort_column_id(col, DIVE_SAC); - gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_set_cell_data_func(col, renderer, sac_data_func, NULL, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); - gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); - gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); - - fill_dive_list(&dive_list); + 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); 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; + 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; }