+/* 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)
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#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;
+};
+
+static struct DiveList dive_list;
/*
* The dive list has the dive data in both string format (for showing)
DIVELIST_COLUMNS
};
+/* the global dive list that we maintain */
+static struct DiveList dive_list;
static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
{
repaint_dive();
}
-const char *weekday(int wday)
-{
- static const char wday_array[7][4] = {
- "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
- };
- return wday_array[wday];
-}
-
-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,
sac = value / 1000.0;
switch (output_units.volume) {
case LITER:
- fmt = "%4.0f";
+ fmt = "%4.1f";
break;
case CUFT:
fmt = "%4.2f";
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;
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:
- unit = "m";
+ unit = "max/m";
break;
case FEET:
- unit = "ft";
+ unit = "max/ft";
+ break;
+ }
+ gtk_tree_view_column_set_title(dive_list.depth, unit);
+
+ switch (output_units.temperature) {
+ case CELSIUS:
+ unit = "degC";
+ break;
+ case FAHRENHEIT:
+ unit = "degF";
+ break;
+ case KELVIN:
+ unit = "Kelvin";
break;
}
- gtk_tree_view_column_set_title(dive_list->depth, unit);
+ 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];
-1);
}
- update_dive_list_units(dive_list);
+ update_dive_list_units();
}
-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();
}
gpointer data);
static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const char *title,
- data_func_t data_func, int align_right)
+ data_func_t data_func, int align_right, int expand)
{
GtkCellRenderer *renderer;
GtkTreeViewColumn *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);
}
+ gtk_tree_view_column_set_expand(col,expand);
+ if (expand)
+ gtk_tree_view_column_set_min_width(col,50);
gtk_tree_view_append_column(GTK_TREE_VIEW(dl->tree_view), col);
return col;
}
-struct DiveList dive_list_create(void)
+GtkWidget *dive_list_create(void)
{
- struct DiveList dive_list;
GtkTreeSelection *selection;
- PangoFontDescription *font_desc = pango_font_description_from_string("sans 8");
dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS,
G_TYPE_INT, /* index */
G_TYPE_INT /* SAC */
);
dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model));
- gtk_widget_modify_font(dive_list.tree_view, font_desc);
- pango_font_description_free(font_desc);
+ 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);
- dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0);
- dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "ft", depth_data_func, 1);
- dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1);
- dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0);
- dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "deg", temperature_data_func, 1);
- dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0);
- dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1);
- dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1);
+ dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0, 0);
+ dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "max/ft", depth_data_func, 1, 0);
+ dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1, 0);
+ dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0, 1);
+ dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "degF", temperature_data_func, 1, 0);
+ dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0, 0);
+ dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1, 0);
+ dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1, 0);
- fill_dive_list(&dive_list);
+ fill_dive_list();
g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE,
"search-column", 0,
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
- return dive_list;
+ return dive_list.container_widget;
}
projects / ext / subsurface.git / blobdiff