From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 Oct 2011 15:37:14 +0000 (-0700)
Subject: For a manual renumber, default to the existing first dive number
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=8605d68824042390b858c4ee9b9afdc6844ab312;p=ext%2Fsubsurface.git

For a manual renumber, default to the existing first dive number

If renumbering a list of dives, default the start number to the existing
first dive number.  That way, if you do need to renumber (overlapping
import or whatever), but your at least had your really old dives already
numbered, we start off with a sane default.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/gtk-gui.c b/gtk-gui.c
index cecfb72..be5adb9 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -388,6 +388,7 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 static void renumber_dialog(GtkWidget *w, gpointer data)
 {
 	int result;
+	struct dive *dive;
 	GtkWidget *dialog, *frame, *button, *vbox;
 
 	dialog = gtk_dialog_new_with_buttons("Renumber",
@@ -405,6 +406,14 @@ static void renumber_dialog(GtkWidget *w, gpointer data)
 	button = gtk_spin_button_new_with_range(1, 50000, 1);
 	gtk_container_add(GTK_CONTAINER(frame), button);
 
+	/*
+	 * Do we have a number for the first dive already? Use that
+	 * as the default.
+	 */
+	dive = get_dive(0);
+	if (dive && dive->number)
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(button), dive->number);
+
 	gtk_widget_show_all(dialog);
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
 	if (result == GTK_RESPONSE_ACCEPT) {