Libdivecomputer: start actually importing the dive data

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 5367571ad6e6520c5b2fc6db21ee2c3907916f90..5157c54e3e595ee0d792b9bc150830354c3f0d81 100644 (file)
--- a/main.c
+++ b/main.c
@@ -37,7 +37,7 @@ static int sortfn(const void *_a, const void *_b)
  * This doesn't really report anything at all. We just sort the
  * dives, the GUI does the reporting
  */
-static void report_dives(void)
+void report_dives(void)
 {
        int i;
 
@@ -100,10 +100,10 @@ void update_dive(struct dive *new_dive)
                flush_dive_equipment_changes(old_dive);
        }
        if (new_dive) {
-               buffered_dive = new_dive;
                show_dive_info(new_dive);
                show_dive_equipment(new_dive);
        }
+       buffered_dive = new_dive;
 }
 
 void repaint_dive(void)
@@ -124,7 +124,7 @@ static void on_info_bar_response(GtkWidget *widget, gint response,
        }
 }
 
-static void report_error(GError* error)
+void report_error(GError* error)
 {
        if (error == NULL)
        {
@@ -312,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();
@@ -323,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]);
 
@@ -339,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> \