This shows the number of dives in the grup in the divelist header field,
and also picks the location from the first dive that *had* a location,
so that if any dive in the group has a valid location, the group will
have a location.
It also makes double-clicking a dive group expand/collapse that group.
Requested-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
GtkTreeIter *iter,
gpointer data)
{
GtkTreeIter *iter,
gpointer data)
{
struct tm *tm;
time_t when;
char buffer[40];
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;
/* 2038 problem */
when = val;
switch(idx) {
case -NEW_TRIP:
snprintf(buffer, sizeof(buffer),
switch(idx) {
case -NEW_TRIP:
snprintf(buffer, sizeof(buffer),
+ "Trip %s, %s %d, %d (%d dive%s)",
weekday(tm->tm_wday),
monthname(tm->tm_mon),
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),
break;
default:
snprintf(buffer, sizeof(buffer),
static void fill_dive_list(void)
{
static void fill_dive_list(void)
{
GtkTreeIter iter, parent_iter;
GtkTreeStore *liststore, *treestore;
struct dive *last_dive = NULL;
GtkTreeIter iter, parent_iter;
GtkTreeStore *liststore, *treestore;
struct dive *last_dive = NULL;
- struct dive *first_trip_dive = NULL;
struct dive *last_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);
time_t dive_date;
treestore = GTK_TREE_STORE(dive_list.treemodel);
if (new_group(dive, &last_dive, &dive_date))
{
/* make sure we display the first date of the trip in previous summary */
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)
gtk_tree_store_set(treestore, &parent_iter,
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,
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_TEMPERATURE, 0,
DIVE_SAC, 0,
-1);
DIVE_TEMPERATURE, 0,
DIVE_SAC, 0,
-1);
+
+ group_size = 0;
+ /* This might be NULL */
+ last_location = dive->location;
+ 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,
update_cylinder_related_info(dive);
gtk_tree_store_append(treestore, &iter, &parent_iter);
gtk_tree_store_set(treestore, &iter,
+ /* 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;
update_dive_list_units();
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(dive_list.model), &iter)) {
GtkTreeSelection *selection;
gtk_widget_grab_focus(tree_view);
}
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,
static void row_activated_cb(GtkTreeView *tree_view,
GtkTreePath *path,
GtkTreeViewColumn *column,
if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(dive_list.model), &iter, path))
return;
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 */
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)
}
void add_dive_cb(GtkWidget *menuitem, gpointer data)