X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=e84e3a10de084590f377be1f602247db556e2190;hb=f459c2ec22839a4a208ea833bdb1e0b87a6799b4;hp=641e3c8b31a22a5d9ee8558112df6ddbf0589363;hpb=f627dde02305f0bee1183ed8a968dc7ad041dab5;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index 641e3c8..e84e3a1 100644
--- a/divelist.c
+++ b/divelist.c
@@ -7,6 +7,8 @@
  * 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>
@@ -24,6 +26,7 @@ struct DiveList {
 	GtkListStore *model;
 	GtkTreeViewColumn *date, *depth, *duration, *location;
 	GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac;
+	int changed;
 };
 
 static struct DiveList dive_list;
@@ -45,9 +48,6 @@ enum {
 	DIVELIST_COLUMNS
 };
 
-/* the global dive list that we maintain */
-static struct DiveList dive_list;
-
 static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 {
 	GtkTreeIter iter;
@@ -364,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";
@@ -473,9 +473,9 @@ 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.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();
@@ -492,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;
+}