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

diff --git a/main.c b/main.c
index be52dbd..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)
 {
@@ -97,11 +92,16 @@ static void try_to_renumber(struct dive *last, int preexisting)
 	}
 }
 
+/*
+ * 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;
@@ -135,10 +135,15 @@ void report_dives(void)
 		i--;
 	}
 
-	/* Was the previous dive table state numbered? */
-	if (last && last->number)
-		try_to_renumber(last, preexisting);
+	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();
 }
@@ -152,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);
@@ -165,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;
 }
@@ -183,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)
@@ -194,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];
 
@@ -204,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);
@@ -214,8 +236,9 @@ int main(int argc, char **argv)
 		}
 	}
 
-	report_dives();
+	report_dives(imported);
 
 	run_ui();
+	exit_ui();
 	return 0;
 }