Libdivecomputer: start actually importing the dive data

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 367d3ada4e54912ab868926dc5fc7a28a0c43389..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;
 
@@ -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)
        {
@@ -367,6 +367,7 @@ 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) },
@@ -380,9 +381,11 @@ static const gchar* ui_string = " \
                                <menuitem name=\"Open\" action=\"OpenFile\" /> \
                                <menuitem name=\"Save\" action=\"SaveFile\" /> \
                                <separator name=\"Separator1\"/> \
+                               <menuitem name=\"Import\" action=\"Import\" /> \
+                               <separator name=\"Separator2\"/> \
                                <menuitem name=\"Units\" action=\"Units\" /> \
                                <menuitem name=\"Renumber\" action=\"Renumber\" /> \
-                               <separator name=\"Separator2\"/> \
+                               <separator name=\"Separator3\"/> \
                                <menuitem name=\"Quit\" action=\"Quit\" /> \
                        </menu> \
                </menubar> \