X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=ab2948e46ba67962abedb59507aae3f613dfea00;hb=9cb60c910681b0fb3c04d22c77bcf9c2754bfa7f;hp=dc5453892c2585a6de6d22ab0a16f8a418c963fe;hpb=9437a6512a3b353197146c077c1816f0565e0981;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index dc54538..ab2948e 100644
--- a/main.c
+++ b/main.c
@@ -90,9 +90,25 @@ static void on_destroy(GtkWidget* w, gpointer data)
 
 static GtkWidget *dive_profile;
 
+void update_dive(struct dive *new_dive)
+{
+	static struct dive *buffered_dive;
+	struct dive *old_dive = buffered_dive;
+
+	if (old_dive) {
+		flush_dive_info_changes(old_dive);
+		flush_dive_equipment_changes(old_dive);
+	}
+	if (new_dive) {
+		show_dive_info(new_dive);
+		show_dive_equipment(new_dive);
+	}
+	buffered_dive = new_dive;
+}
+
 void repaint_dive(void)
 {
-	update_dive_info(current_dive);
+	update_dive(current_dive);
 	gtk_widget_queue_draw(dive_profile);
 }
 
@@ -296,6 +312,8 @@ static void unit_dialog(GtkWidget *w, gpointer data)
 	gtk_widget_show_all(dialog);
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
 	if (result == GTK_RESPONSE_ACCEPT) {
+		/* Make sure to flush any modified old dive data with old units */
+		update_dive(NULL);
 		output_units = menu_units;
 		update_dive_list_units(&dive_list);
 		repaint_dive();
@@ -307,12 +325,52 @@ static void unit_dialog(GtkWidget *w, gpointer data)
 	gtk_widget_destroy(dialog);
 }
 
+static void renumber_dives(int nr)
+{
+	int i;
+
+	for (i = 0; i < dive_table.nr; i++) {
+		struct dive *dive = dive_table.dives[i];
+		dive->number = nr + i;
+	}
+}
+
+static void renumber_dialog(GtkWidget *w, gpointer data)
+{
+	int result;
+	GtkWidget *dialog, *frame, *button;
+
+	dialog = gtk_dialog_new_with_buttons("Renumber",
+		GTK_WINDOW(main_window),
+		GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+		NULL);
+
+	frame = gtk_frame_new("New starting number");
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), frame);
+
+	button = gtk_spin_button_new_with_range(1, 50000, 1);
+	gtk_container_add(GTK_CONTAINER(frame), button);
+
+	gtk_widget_show_all(dialog);
+	result = gtk_dialog_run(GTK_DIALOG(dialog));
+	if (result == GTK_RESPONSE_ACCEPT) {
+		int nr = gtk_spin_button_get_value(GTK_SPIN_BUTTON(button));
+		renumber_dives(nr);
+		repaint_dive();
+	}
+	gtk_widget_destroy(dialog);
+}
+
 static GtkActionEntry menu_items[] = {
 	{ "FileMenuAction", GTK_STOCK_FILE, "Log", NULL, NULL, NULL},
 	{ "OpenFile",       GTK_STOCK_OPEN, NULL,   "<control>O", NULL, G_CALLBACK(file_open) },
 	{ "SaveFile",       GTK_STOCK_SAVE, NULL,   "<control>S", NULL, G_CALLBACK(file_save) },
+	{ "Import",         NULL, "Import", NULL, NULL, G_CALLBACK(import_dialog) },
+	{ "Units",          NULL, "Units",    NULL, NULL, G_CALLBACK(unit_dialog) },
+	{ "Renumber",       NULL, "Renumber", NULL, NULL, G_CALLBACK(renumber_dialog) },
 	{ "Quit",           GTK_STOCK_QUIT, NULL,   "<control>Q", NULL, G_CALLBACK(quit) },
-	{ "Units",          NULL, "Units", NULL, NULL, G_CALLBACK(unit_dialog) },
 };
 static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
 
@@ -323,8 +381,11 @@ static const gchar* ui_string = " \
 				<menuitem name=\"Open\" action=\"OpenFile\" /> \
 				<menuitem name=\"Save\" action=\"SaveFile\" /> \
 				<separator name=\"Separator1\"/> \
-				<menuitem name=\"Units\" action=\"Units\" /> \
+				<menuitem name=\"Import\" action=\"Import\" /> \
 				<separator name=\"Separator2\"/> \
+				<menuitem name=\"Units\" action=\"Units\" /> \
+				<menuitem name=\"Renumber\" action=\"Renumber\" /> \
+				<separator name=\"Separator3\"/> \
 				<menuitem name=\"Quit\" action=\"Quit\" /> \
 			</menu> \
 		</menubar> \
@@ -356,7 +417,7 @@ int main(int argc, char **argv)
 	GtkWidget *notebook;
 	GtkWidget *frame;
 	GtkWidget *dive_info;
-	GtkWidget *cylinder_management;
+	GtkWidget *equipment;
 	GtkWidget *menubar;
 	GtkWidget *vbox;
 
@@ -417,9 +478,9 @@ int main(int argc, char **argv)
 	dive_info = extended_dive_info_widget();
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_info, gtk_label_new("Dive Notes"));
 
-	/* Frame for extended dive info */
-	cylinder_management = cylinder_management_widget();
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), cylinder_management, gtk_label_new("Cylinders"));
+	/* Frame for dive equipment */
+	equipment = equipment_widget();
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), equipment, gtk_label_new("Equipment"));
 
 	gtk_widget_set_app_paintable(win, TRUE);
 	gtk_widget_show_all(win);