X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=99f3446ce5eca25bc21165e3400858fc6e00420c;hb=ed1ce8ebc8590533291a9c5d6460f8d1c9f857dd;hp=de64bd88ceecf2b30ab91831382f30ee00666d8a;hpb=f6dfb0094cf095241377fae52ed02247cf3d03f5;p=ext%2Fsubsurface.git diff --git a/divelist.c b/divelist.c index de64bd8..99f3446 100644 --- a/divelist.c +++ b/divelist.c @@ -79,6 +79,83 @@ static void dump_model(GtkListStore *store) #endif static GList *selected_dives; +static int st_size = 0; + +gboolean is_in_st(int idx, int *atpos) +{ + int i; + + for (i = 0; i < amount_selected; i++) + if (selectiontracker[i] == idx) { + if (atpos) + *atpos = i; + return TRUE; + } + return FALSE; +} + +#if DEBUG_SELECTION_TRACKING +void dump_selection(void) +{ + int i; + + printf("currently selected are "); + for (i = 0; i < amount_selected; i++) + printf("%d ", selectiontracker[i]); + printf("\n"); +} +#endif + +void track_select(int idx) +{ + if (idx < 0) + return; + +#if DEBUG_SELECTION_TRACKING + printf("add %d to selection of %d entries\n", idx, amount_selected); +#endif + if (is_in_st(idx, NULL)) + return; + if (amount_selected >= st_size) { + selectiontracker = realloc(selectiontracker, dive_table.nr * sizeof(int)); + st_size = dive_table.nr; + } + selectiontracker[amount_selected] = idx; + amount_selected++; + if (amount_selected == 1) + selected_dive = idx; +#if DEBUG_SELECTION_TRACKING + printf("increased amount_selected to %d\n", amount_selected); + dump_selection(); +#endif +} + +void track_unselect(int idx) +{ + if (idx < 0) + return; + +#if DEBUG_SELECTION_TRACKING + printf("remove %d from selection of %d entries\n", idx, amount_selected); +#endif + int atpos; + + if (! is_in_st(idx, &atpos)) + return; + memmove(selectiontracker + atpos, + selectiontracker + atpos + 1, + (amount_selected - atpos - 1) * sizeof(int)); + amount_selected--; +#if DEBUG_SELECTION_TRACKING + printf("removed %d at pos %d and decreased amount_selected to %d\n", idx, atpos, amount_selected); + dump_selection(); +#endif +} + +void clear_tracker(void) +{ + amount_selected = 0; +} /* when subsurface starts we want to have the last dive selected. So we simply walk to the first leaf (and skip the summary entries - which have negative @@ -106,25 +183,48 @@ static void select_children(GtkTreeModel *model, GtkTreeSelection * selection, GtkTreeIter *iter, gboolean was_selected) { int i, nr_children; + gboolean expanded = FALSE; GtkTreeIter parent; GtkTreePath *tpath; memcpy(&parent, iter, sizeof(parent)); tpath = gtk_tree_model_get_path(model, &parent); - if(!gtk_tree_view_row_expanded(GTK_TREE_VIEW(dive_list.tree_view), tpath)) - gtk_tree_view_expand_row(GTK_TREE_VIEW(dive_list.tree_view), tpath, FALSE); - + expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(dive_list.tree_view), tpath); nr_children = gtk_tree_model_iter_n_children(model, &parent); for (i = 0; i < nr_children; i++) { gtk_tree_model_iter_nth_child(model, iter, &parent, i); - if (was_selected) - gtk_tree_selection_unselect_iter(selection, iter); - else - gtk_tree_selection_select_iter(selection, iter); + + /* if the parent is expanded, just (un)select the children and we'll + track their selection status in the callback + otherwise just change the selection status directly without + bothering gtk */ + if (expanded) { + if (was_selected) + gtk_tree_selection_unselect_iter(selection, iter); + else + gtk_tree_selection_select_iter(selection, iter); + } else { + int idx; + gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, -1); + if (was_selected) + track_unselect(idx); + else + track_select(idx); + } } } +/* make sure that if we expand a summary row that is selected, the children show + up as selected, too */ +void row_expanded_cb(GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *path, gpointer data) +{ + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view)); + + if (gtk_tree_selection_path_is_selected(selection, path)) + select_children(GTK_TREE_MODEL(dive_list.model), selection, iter, FALSE); +} + /* this is called _before_ the selection is changed, for every single entry; * we simply have it call down the tree to make sure that summary items toggle * their children */ @@ -134,9 +234,29 @@ gboolean modify_selection_cb(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreeIter iter; int dive_idx; + /* if gtk thinks nothing is selected we should clear out our + tracker as well - otherwise hidden selected rows can stay + "stuck". The down side is that we now have a different bug: + If you select a dive, collapse the dive trip and ctrl-click + another dive trip, the initial dive is no longer selected. + Just don't do that, ok? */ + if (gtk_tree_selection_count_selected_rows(selection) == 0) + clear_tracker(); + if (gtk_tree_model_get_iter(model, &iter, path)) { gtk_tree_model_get(model, &iter, DIVE_INDEX, &dive_idx, -1); - if (dive_idx < 0) { + /* turns out we need to move the selectiontracker here */ + +#if DEBUG_SELECTION_TRACKING + printf("modify_selection_cb with idx %d (according to gtk was %sselected)\n", + dive_idx, was_selected ? "" : "un"); +#endif + if (dive_idx >= 0) { + if (was_selected) + track_unselect(dive_idx); + else + track_select(dive_idx); + } else { select_children(model, selection, &iter, was_selected); } } @@ -147,49 +267,8 @@ gboolean modify_selection_cb(GtkTreeSelection *selection, GtkTreeModel *model, /* this is called when gtk thinks that the selection has changed */ static void selection_cb(GtkTreeSelection *selection, gpointer userdata) { - GtkTreeIter iter; - GtkTreePath *path; - - int nr_selected = gtk_tree_selection_count_selected_rows(selection); - - if (selected_dives) { - g_list_foreach (selected_dives, (GFunc) gtk_tree_path_free, NULL); - g_list_free (selected_dives); - } - selected_dives = gtk_tree_selection_get_selected_rows(selection, NULL); - selectiontracker = realloc(selectiontracker, nr_selected * sizeof(int)); - - switch (nr_selected) { - case 0: /* there is no clear way to figure out which dive to show */ - amount_selected = 0; - selected_dive = -1; - return; - case 1: - /* just pick that dive as selected */ - amount_selected = 1; - path = g_list_nth_data(selected_dives, 0); - if (gtk_tree_model_get_iter(GTK_TREE_MODEL(dive_list.model), &iter, path)) { - gtk_tree_model_get(GTK_TREE_MODEL(dive_list.model), &iter, DIVE_INDEX, &selected_dive, -1); - /* due to the way this callback gets invoked it is possible that - in the process of unselecting a summary dive we get here with - just one summary dive selected - ignore that case */ - if (selected_dive < 0) { - amount_selected = 0; - return; - } - selectiontracker[0] = selected_dive; - repaint_dive(); - } - return; - default: /* multiple selections - what now? - * We don't change the selected dive unless there is exactly one dive selected; not sure this - * is the most intuitive solution. - * The dives that have been selected are processed */ - amount_selected = g_list_length(selected_dives); - process_selected_dives(selected_dives, selectiontracker, GTK_TREE_MODEL(dive_list.model)); - repaint_dive(); - return; - } + process_selected_dives(selected_dives, selectiontracker, GTK_TREE_MODEL(dive_list.model)); + repaint_dive(); } const char *star_strings[] = { @@ -227,12 +306,12 @@ static void date_data_func(GtkTreeViewColumn *col, GtkTreeIter *iter, gpointer data) { - int val, idx; + int val, idx, nr; struct tm *tm; time_t when; char buffer[40]; - gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_DATE, &val, -1); + gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_DATE, &val, DIVE_NR, &nr, -1); /* 2038 problem */ when = val; @@ -241,10 +320,11 @@ static void date_data_func(GtkTreeViewColumn *col, switch(idx) { case -NEW_TRIP: snprintf(buffer, sizeof(buffer), - "Trip %s, %s %d, %d", + "Trip %s, %s %d, %d (%d dive%s)", weekday(tm->tm_wday), monthname(tm->tm_mon), - tm->tm_mday, tm->tm_year + 1900); + tm->tm_mday, tm->tm_year + 1900, + nr, nr > 1 ? "s" : ""); break; default: snprintf(buffer, sizeof(buffer), @@ -813,12 +893,12 @@ static int new_group(struct dive *dive, struct dive **last_dive, time_t *tm_date static void fill_dive_list(void) { - int i; + int i, group_size; GtkTreeIter iter, parent_iter; GtkTreeStore *liststore, *treestore; struct dive *last_dive = NULL; - struct dive *first_trip_dive = NULL; struct dive *last_trip_dive = NULL; + const char *last_location = NULL; time_t dive_date; treestore = GTK_TREE_STORE(dive_list.treemodel); @@ -831,24 +911,29 @@ static void fill_dive_list(void) if (new_group(dive, &last_dive, &dive_date)) { /* make sure we display the first date of the trip in previous summary */ - if (first_trip_dive && last_trip_dive && last_trip_dive->when < first_trip_dive->when) + if (last_trip_dive) gtk_tree_store_set(treestore, &parent_iter, - DIVE_DATE, last_trip_dive->when, - DIVE_LOCATION, last_trip_dive->location, - -1); - first_trip_dive = dive; + DIVE_NR, group_size, + DIVE_DATE, last_trip_dive->when, + DIVE_LOCATION, last_location, + -1); gtk_tree_store_append(treestore, &parent_iter, NULL); gtk_tree_store_set(treestore, &parent_iter, DIVE_INDEX, -NEW_TRIP, - DIVE_NR, -NEW_TRIP, - DIVE_DATE, dive_date, - DIVE_LOCATION, dive->location, + DIVE_NR, 1, DIVE_TEMPERATURE, 0, DIVE_SAC, 0, -1); + + group_size = 0; + /* This might be NULL */ + last_location = dive->location; } + group_size++; last_trip_dive = dive; + if (dive->location) + last_location = dive->location; update_cylinder_related_info(dive); gtk_tree_store_append(treestore, &iter, &parent_iter); gtk_tree_store_set(treestore, &iter, @@ -878,6 +963,14 @@ static void fill_dive_list(void) -1); } + /* make sure we display the first date of the trip in previous summary */ + if (last_trip_dive) + gtk_tree_store_set(treestore, &parent_iter, + DIVE_NR, group_size, + DIVE_DATE, last_trip_dive->when, + DIVE_LOCATION, last_location, + -1); + update_dive_list_units(); if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(dive_list.model), &iter)) { GtkTreeSelection *selection; @@ -887,8 +980,6 @@ static void fill_dive_list(void) first_leaf(GTK_TREE_MODEL(dive_list.model), &iter, &selected_dive); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view)); gtk_tree_selection_select_iter(selection, &iter); - selectiontracker = realloc(selectiontracker, sizeof(int)); - *selectiontracker = selected_dive; } } @@ -958,6 +1049,20 @@ static void realize_cb(GtkWidget *tree_view, gpointer userdata) gtk_widget_grab_focus(tree_view); } +/* + * Double-clicking on a group entry will expand a collapsed group + * and vice versa. + */ +static void collapse_expand(GtkTreeView *tree_view, GtkTreePath *path) +{ + if (!gtk_tree_view_row_expanded(tree_view, path)) + gtk_tree_view_expand_row(tree_view, path, FALSE); + else + gtk_tree_view_collapse_row(tree_view, path); + +} + +/* Double-click on a dive list */ static void row_activated_cb(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, @@ -968,10 +1073,14 @@ static void row_activated_cb(GtkTreeView *tree_view, if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(dive_list.model), &iter, path)) return; + gtk_tree_model_get(GTK_TREE_MODEL(dive_list.model), &iter, DIVE_INDEX, &index, -1); /* a negative index is special for the "group by date" entries */ - if (index >= 0) - edit_dive_info(get_dive(index)); + if (index < 0) { + collapse_expand(tree_view, path); + return; + } + edit_dive_info(get_dive(index)); } void add_dive_cb(GtkWidget *menuitem, gpointer data) @@ -994,11 +1103,13 @@ void edit_dive_cb(GtkWidget *menuitem, gpointer data) static void popup_divelist_menu(GtkTreeView *tree_view, GtkTreeModel *model, int button) { - GtkWidget *menu, *menuitem; + GtkWidget *menu, *menuitem, *image; char editlabel[] = "Edit dives"; menu = gtk_menu_new(); - menuitem = gtk_menu_item_new_with_label("Add dive"); + menuitem = gtk_image_menu_item_new_with_label("Add dive"); + image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); g_signal_connect(menuitem, "activate", G_CALLBACK(add_dive_cb), NULL); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); if (amount_selected) { @@ -1198,6 +1309,7 @@ GtkWidget *dive_list_create(void) g_signal_connect_after(dive_list.tree_view, "realize", G_CALLBACK(realize_cb), NULL); g_signal_connect(dive_list.tree_view, "row-activated", G_CALLBACK(row_activated_cb), NULL); + g_signal_connect(dive_list.tree_view, "row-expanded", G_CALLBACK(row_expanded_cb), NULL); g_signal_connect(dive_list.tree_view, "button-press-event", G_CALLBACK(button_press_cb), NULL); g_signal_connect(dive_list.tree_view, "popup-menu", G_CALLBACK(popup_menu_cb), NULL); g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), NULL);