mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
7bbcf2fabd
Just iterate over the dive list entries, updating them one by one. This avoids the "selection destroyed" when the dive units are changed. And it's cleaner anyway. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
199 lines
5.5 KiB
C
199 lines
5.5 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
#include "divelist.h"
|
|
#include "dive.h"
|
|
#include "display.h"
|
|
|
|
static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
|
|
{
|
|
GtkTreeIter iter;
|
|
GValue value = {0, };
|
|
|
|
if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
|
|
return;
|
|
|
|
gtk_tree_model_get_value(model, &iter, 6, &value);
|
|
selected_dive = g_value_get_int(&value);
|
|
repaint_dive();
|
|
}
|
|
|
|
static gboolean set_one_dive(GtkTreeModel *model,
|
|
GtkTreePath *path,
|
|
GtkTreeIter *iter,
|
|
gpointer data)
|
|
{
|
|
int len;
|
|
GValue value = {0, };
|
|
struct dive *dive;
|
|
char buffer[256], *datestr, *depth, *duration;
|
|
struct tm *tm;
|
|
int integer, frac;
|
|
|
|
/* Get the dive number */
|
|
gtk_tree_model_get_value(model, iter, 6, &value);
|
|
dive = get_dive(g_value_get_int(&value));
|
|
if (!dive)
|
|
return TRUE;
|
|
|
|
tm = gmtime(&dive->when);
|
|
len = snprintf(buffer, sizeof(buffer),
|
|
"%02d.%02d.%02d %02d:%02d",
|
|
tm->tm_mday, tm->tm_mon+1, tm->tm_year % 100,
|
|
tm->tm_hour, tm->tm_min);
|
|
datestr = malloc(len+1);
|
|
memcpy(datestr, buffer, len+1);
|
|
|
|
switch (output_units.length) {
|
|
unsigned int depth;
|
|
case METERS:
|
|
depth = (dive->maxdepth.mm + 49) / 100;
|
|
integer = depth / 10;
|
|
frac = depth % 10;
|
|
if (integer < 20)
|
|
break;
|
|
frac = -1;
|
|
/* Rounding? */
|
|
break;
|
|
case FEET:
|
|
integer = to_feet(dive->maxdepth);
|
|
frac = -1;
|
|
}
|
|
len = snprintf(buffer, sizeof(buffer),
|
|
"%d", integer);
|
|
if (frac >= 0)
|
|
len += snprintf(buffer+len, sizeof(buffer)-len,
|
|
".%d", frac);
|
|
depth = malloc(len + 1);
|
|
memcpy(depth, buffer, len+1);
|
|
|
|
len = snprintf(buffer, sizeof(buffer),
|
|
"%d", dive->duration.seconds / 60);
|
|
duration = malloc(len + 1);
|
|
memcpy(duration, buffer, len+1);
|
|
|
|
gtk_list_store_set(GTK_LIST_STORE(model), iter,
|
|
0, datestr,
|
|
2, depth,
|
|
4, duration,
|
|
-1);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
void update_dive_list_units(struct DiveList *dive_list)
|
|
{
|
|
const char *unit;
|
|
GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model);
|
|
|
|
switch (output_units.length) {
|
|
case METERS:
|
|
unit = "m";
|
|
break;
|
|
case FEET:
|
|
unit = "ft";
|
|
break;
|
|
}
|
|
gtk_tree_view_column_set_title(dive_list->depth, unit);
|
|
|
|
gtk_tree_model_foreach(model, set_one_dive, NULL);
|
|
}
|
|
|
|
static void fill_dive_list(struct DiveList *dive_list)
|
|
{
|
|
int i;
|
|
GtkTreeIter iter;
|
|
GtkListStore *store;
|
|
|
|
store = GTK_LIST_STORE(dive_list->model);
|
|
|
|
for (i = 0; i < dive_table.nr; i++) {
|
|
struct dive *dive = dive_table.dives[i];
|
|
|
|
gtk_list_store_append(store, &iter);
|
|
gtk_list_store_set(store, &iter,
|
|
0, "date",
|
|
1, dive->when,
|
|
2, "depth",
|
|
3, dive->maxdepth,
|
|
4, "duration",
|
|
5, dive->duration.seconds,
|
|
6, i,
|
|
-1);
|
|
}
|
|
|
|
update_dive_list_units(dive_list);
|
|
}
|
|
|
|
void dive_list_update_dives(struct DiveList dive_list)
|
|
{
|
|
gtk_list_store_clear(GTK_LIST_STORE(dive_list.model));
|
|
fill_dive_list(&dive_list);
|
|
repaint_dive();
|
|
}
|
|
|
|
struct DiveList dive_list_create(void)
|
|
{
|
|
struct DiveList dive_list;
|
|
GtkTreeSelection *selection;
|
|
GtkCellRenderer *renderer;
|
|
GtkTreeViewColumn *col;
|
|
|
|
dive_list.model = gtk_list_store_new(7,
|
|
G_TYPE_STRING, G_TYPE_INT,
|
|
G_TYPE_STRING, G_TYPE_INT,
|
|
G_TYPE_STRING, G_TYPE_INT,
|
|
G_TYPE_INT);
|
|
dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model));
|
|
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, 100);
|
|
|
|
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, 1);
|
|
gtk_tree_view_column_set_resizable (col, TRUE);
|
|
gtk_tree_view_column_pack_start(col, renderer, TRUE);
|
|
gtk_tree_view_column_add_attribute(col, renderer, "text", 0);
|
|
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, 3);
|
|
gtk_tree_view_column_pack_start(col, renderer, FALSE);
|
|
gtk_tree_view_column_add_attribute(col, renderer, "text", 2);
|
|
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, 5);
|
|
gtk_tree_view_column_pack_start(col, renderer, FALSE);
|
|
gtk_tree_view_column_add_attribute(col, renderer, "text", 4);
|
|
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);
|
|
|
|
g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE,
|
|
"search-column", 0,
|
|
"rules-hint", TRUE,
|
|
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_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
|
|
|
|
return dive_list;
|
|
}
|