X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=main.c;h=2489473b9c2f9fe43f65c4ce0405fba3b79e7cc6;hp=d259b388888214bf9b3defdb1f88dcbe8ad364e0;hb=b693bb3fb962c54767f8430058575441df243b13;hpb=f4820455e2019c1a9deba7e90ed7f06111a4cb39

diff --git a/main.c b/main.c
index d259b38..2489473 100644
--- a/main.c
+++ b/main.c
@@ -4,16 +4,11 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <gconf/gconf-client.h>
-
 #include "dive.h"
 #include "divelist.h"
 
-GConfClient *gconf;
 struct units output_units;
 
-#define GCONF_NAME(x) "/apps/subsurface/" #x
-
 /* random helper functions, used here or elsewhere */
 static int sortfn(const void *_a, const void *_b)
 {
@@ -44,13 +39,76 @@ const char *monthname(int mon)
 	return month_array[mon];
 }
 
+/*
+ * When adding dives to the dive table, we try to renumber
+ * the new dives based on any old dives in the dive table.
+ *
+ * But we only do it if:
+ *
+ *  - the last dive in the old dive table was numbered
+ *
+ *  - all the new dives are strictly at the end (so the
+ *    "last dive" is at the same location in the dive table
+ *    after re-sorting the dives.
+ *
+ *  - none of the new dives have any numbers
+ *
+ * This catches the common case of importing new dives from
+ * a dive computer, and gives them proper numbers based on
+ * your old dive list. But it tries to be very conservative
+ * and not give numbers if there is *any* question about
+ * what the numbers should be - in which case you need to do
+ * a manual re-numbering.
+ */
+static void try_to_renumber(struct dive *last, int preexisting)
+{
+	int i, nr;
+
+	/*
+	 * If the new dives aren't all strictly at the end,
+	 * we're going to expect the user to do a manual
+	 * renumbering.
+	 */
+	if (get_dive(preexisting-1) != last)
+		return;
+
+	/*
+	 * If any of the new dives already had a number,
+	 * we'll have to do a manual renumbering.
+	 */
+	for (i = preexisting; i < dive_table.nr; i++) {
+		struct dive *dive = get_dive(i);
+		if (dive->number)
+			return;
+	}
+
+	/*
+	 * Ok, renumber..
+	 */
+	nr = last->number;
+	for (i = preexisting; i < dive_table.nr; i++) {
+		struct dive *dive = get_dive(i);
+		dive->number = ++nr;
+	}
+}
+
+/*
+ * track whether we switched to importing dives
+ */
+static gboolean imported = FALSE;
+
 /*
  * This doesn't really report anything at all. We just sort the
  * dives, the GUI does the reporting
  */
-void report_dives(void)
+void report_dives(gboolean is_imported)
 {
 	int i;
+	int preexisting = dive_table.preexisting;
+	struct dive *last;
+
+	/* This does the right thing for -1: NULL */
+	last = get_dive(preexisting-1);
 
 	qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
 
@@ -77,6 +135,16 @@ void report_dives(void)
 		i--;
 	}
 
+	if (is_imported) {
+		/* Was the previous dive table state numbered? */
+		if (last && last->number)
+			try_to_renumber(last, preexisting);
+
+		/* did we have dives in the table and added more? */
+		if (last && preexisting != dive_table.nr)
+			mark_divelist_changed(TRUE);
+	}
+	dive_table.preexisting = dive_table.nr;
 	dive_list_update_dives();
 }
 
@@ -89,6 +157,22 @@ static void parse_argument(const char *arg)
 		case 'v':
 			verbose++;
 			continue;
+		case '-':
+			/* long options with -- */
+			if (strcmp(arg,"--import") == 0) {
+				/* mark the dives so far as the base,
+				 * everything after is imported */
+				report_dives(FALSE);
+				imported = TRUE;
+				return;
+			}
+			/* fallthrough */
+		case 'p':
+			/* ignore process serial number argument when run as native macosx app */
+			if (strncmp(arg, "-psn_", 5) == 0) {
+				return;
+			}
+			/* fallthrough */
 		default:
 			fprintf(stderr, "Bad argument '%s'\n", arg);
 			exit(1);
@@ -102,13 +186,12 @@ void update_dive(struct dive *new_dive)
 	struct dive *old_dive = buffered_dive;
 
 	if (old_dive) {
-		flush_dive_info_changes(old_dive);
-		flush_dive_equipment_changes(old_dive);
 		flush_divelist(old_dive);
 	}
 	if (new_dive) {
 		show_dive_info(new_dive);
-		show_dive_equipment(new_dive);
+		show_dive_equipment(new_dive, W_IDX_PRIMARY);
+		show_dive_stats(new_dive);
 	}
 	buffered_dive = new_dive;
 }
@@ -120,7 +203,9 @@ void renumber_dives(int nr)
 	for (i = 0; i < dive_table.nr; i++) {
 		struct dive *dive = dive_table.dives[i];
 		dive->number = nr + i;
+		flush_divelist(dive);
 	}
+	mark_divelist_changed(TRUE);
 }
 
 int main(int argc, char **argv)
@@ -131,8 +216,8 @@ int main(int argc, char **argv)
 
 	parse_xml_init();
 
-	init_ui(argc, argv);
-	
+	init_ui(&argc, &argv);
+
 	for (i = 1; i < argc; i++) {
 		const char *a = argv[i];
 
@@ -141,8 +226,8 @@ int main(int argc, char **argv)
 			continue;
 		}
 		GError *error = NULL;
-		parse_xml_file(a, &error);
-		
+		parse_file(a, &error);
+
 		if (error != NULL)
 		{
 			report_error(error);
@@ -151,8 +236,9 @@ int main(int argc, char **argv)
 		}
 	}
 
-	report_dives();
+	report_dives(imported);
 
 	run_ui();
+	exit_ui();
 	return 0;
 }