X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=e84e3a10de084590f377be1f602247db556e2190;hb=a817f4b547b4193d31154fd0ff7f5190ccae76a5;hp=01ab1b11ad2c6b126b0e49a74c025b4b3c9b96e6;hpb=6ea513246363ba2df29b0dfa9bc752c7d40c0c38;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index 01ab1b1..e84e3a1 100644
--- a/divelist.c
+++ b/divelist.c
@@ -1,3 +1,15 @@
+/* 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)
+ * void mark_divelist_changed(int changed)
+ * int unsaved_changes()
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,6 +18,7 @@
 #include "divelist.h"
 #include "dive.h"
 #include "display.h"
+#include "display-gtk.h"
 
 struct DiveList {
 	GtkWidget    *tree_view;
@@ -13,6 +26,7 @@ struct DiveList {
 	GtkListStore *model;
 	GtkTreeViewColumn *date, *depth, *duration, *location;
 	GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac;
+	int changed;
 };
 
 static struct DiveList dive_list;
@@ -34,7 +48,6 @@ enum {
 	DIVELIST_COLUMNS
 };
 
-
 static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 {
 	GtkTreeIter iter;
@@ -48,23 +61,6 @@ 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,
@@ -368,10 +364,10 @@ void update_dive_list_units(void)
 
 	switch (output_units.temperature) {
 	case CELSIUS:
-		unit = "degC";
+		unit = UTF8_DEGREE "C";
 		break;
 	case FAHRENHEIT:
-		unit = "degF";
+		unit = UTF8_DEGREE "F";
 		break;
 	case KELVIN:
 		unit = "Kelvin";
@@ -432,7 +428,7 @@ static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const
 	col = gtk_tree_view_column_new();
 
 	gtk_tree_view_column_set_title(col, title);
-	gtk_tree_view_column_set_sort_column_id(col, DIVE_DATE);
+	gtk_tree_view_column_set_sort_column_id(col, index);
 	gtk_tree_view_column_set_resizable(col, TRUE);
 	gtk_tree_view_column_pack_start(col, renderer, TRUE);
 	if (data_func)
@@ -477,10 +473,10 @@ GtkWidget *dive_list_create(void)
 	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.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, UTF8_DEGREE "F", 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);
+	dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O" UTF8_SUBSCRIPT_2 "%", nitrox_data_func, 1, 0);
+	dive_list.sac = divelist_column(&dive_list, DIVE_SAC, "SAC", sac_data_func, 1, 0);
 
 	fill_dive_list();
 
@@ -496,5 +492,17 @@ GtkWidget *dive_list_create(void)
 			       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
 
+	dive_list.changed = 0;
+
 	return dive_list.container_widget;
 }
+
+void mark_divelist_changed(int changed)
+{
+	dive_list.changed = changed;
+}
+
+int unsaved_changes()
+{
+	return dive_list.changed;
+}