mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge trips without modifying the GTK tree

Browse source 
This patch does 4 small divelist.c changes in the following
order of importance:

1) In find_trip_by_time() now there is a check if a trip is actually found
before looking at the "when" flag.

2) Make remember_tree_state() slighly safer. If for example we have recently
deleted a trip from the linked list, it may still exist in the GTK tree model,
thus we want to check when calling find_trip_by_time() if there is an actual
match before setting the "expanded" flag for a trip.

3) When merging two trips in merge_trips_cb(), only use the tree model
to retrieve the timestamps (DIVE_DATE) and then find matching trips with
find_matching_trip(). Once we have pointers to the two trips to be merged,
move dives from one to another iterating with add_dive_to_trip().

4) In merge_trips_cb() - remember the tree state, repopulate the tree and
restore tree state, since now we are not adding/removing rows directly.
tesdsad

Reported-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2012-12-04 22:48:32 +02:00 • committed by Dirk Hohndel
parent fb0d728973
commit b435166dc3
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
divelist.c
View file

@ -957,7 +957,7 @@ static dive_trip_t *find_trip_by_time(timestamp_t when)
while (trip && trip->when < when) while (trip && trip->when < when)
trip = trip->next; trip = trip->next;
if (trip->when == when) { if (trip && trip->when == when) {
#ifdef DEBUG_TRIP #ifdef DEBUG_TRIP
struct tm tm; struct tm tm;
utc_mkdate(trip->when, &tm); utc_mkdate(trip->when, &tm);
@ -1813,9 +1813,9 @@ void remove_trip_cb(GtkWidget *menuitem, GtkTreePath *trippath)
void merge_trips_cb(GtkWidget *menuitem, GtkTreePath *trippath) void merge_trips_cb(GtkWidget *menuitem, GtkTreePath *trippath)
{ {
GtkTreePath *prevpath; GtkTreePath *prevpath;
GtkTreeIter thistripiter, prevtripiter, newiter, iter; GtkTreeIter thistripiter, prevtripiter;
GtkTreeModel *tm = MODEL(dive_list); GtkTreeModel *tm = MODEL(dive_list);
dive_trip_t *prevtrip; dive_trip_t *thistrip, *prevtrip;
timestamp_t when; timestamp_t when;
/* this only gets called when we are on a trip and there is another trip right before */ /* this only gets called when we are on a trip and there is another trip right before */
@ -1823,17 +1823,16 @@ void merge_trips_cb(GtkWidget *menuitem, GtkTreePath *trippath)
gtk_tree_path_prev(prevpath); gtk_tree_path_prev(prevpath);
gtk_tree_model_get_iter(tm, &thistripiter, trippath); gtk_tree_model_get_iter(tm, &thistripiter, trippath);
gtk_tree_model_get(tm, &thistripiter, DIVE_DATE, &when, -1); gtk_tree_model_get(tm, &thistripiter, DIVE_DATE, &when, -1);
thistrip = find_matching_trip(when);
gtk_tree_model_get_iter(tm, &prevtripiter, prevpath); gtk_tree_model_get_iter(tm, &prevtripiter, prevpath);
gtk_tree_model_get(tm, &prevtripiter, DIVE_DATE, &when, -1); gtk_tree_model_get(tm, &prevtripiter, DIVE_DATE, &when, -1);
prevtrip = find_matching_trip(when); prevtrip = find_matching_trip(when);
while (gtk_tree_model_iter_children(tm, &iter, &thistripiter)) { remember_tree_state();
int idx; /* move dives from trip */
gtk_tree_store_insert_before(STORE(dive_list), &newiter, &prevtripiter, NULL); while (thistrip->dives)
idx = copy_tree_node(&iter, &newiter); add_dive_to_trip(thistrip->dives, prevtrip);
gtk_tree_store_remove(STORE(dive_list), &iter); dive_list_update_dives();
add_dive_to_trip(get_dive(idx), prevtrip); restore_tree_state();
}
gtk_tree_store_remove(STORE(dive_list), &thistripiter);
mark_divelist_changed(TRUE); mark_divelist_changed(TRUE);
} }
@ -1871,6 +1870,7 @@ void add_single_dive(int idx, struct dive *dive)
/* remember expanded state */ /* remember expanded state */
void remember_tree_state() void remember_tree_state()
{ {
dive_trip_t *trip;
GtkTreeIter iter; GtkTreeIter iter;
if (!gtk_tree_model_get_iter_first(TREEMODEL(dive_list), &iter)) if (!gtk_tree_model_get_iter_first(TREEMODEL(dive_list), &iter))
return; return;
@ -1884,8 +1884,11 @@ void remember_tree_state()
if (idx >= 0) if (idx >= 0)
continue; continue;
path = gtk_tree_model_get_path(TREEMODEL(dive_list), &iter); path = gtk_tree_model_get_path(TREEMODEL(dive_list), &iter);
if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(dive_list.tree_view), path)) if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(dive_list.tree_view), path)) {
find_trip_by_time(when)->expanded = TRUE; trip = find_trip_by_time(when);
if (trip)
trip->expanded = TRUE;
}
} while (gtk_tree_model_iter_next(TREEMODEL(dive_list), &iter)); } while (gtk_tree_model_iter_next(TREEMODEL(dive_list), &iter));
} }