Make 'struct DiveList' entirely internal to divelist.c

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 5157c54e3e595ee0d792b9bc150830354c3f0d81..d125169e2898150bdddc46dd16a21a039ee0ee13 100644 (file)
--- a/main.c
+++ b/main.c
@@ -14,12 +14,11 @@ GtkWidget *main_vbox;
 GtkWidget *error_info_bar;
 GtkWidget *error_label;
 int        error_count;
-struct DiveList   dive_list;
 
 GConfClient *gconf;
 struct units output_units;
 
-#define GCONF_NAME(x) "/apps/diveclog/" #x
+#define GCONF_NAME(x) "/apps/subsurface/" #x
 
 static int sortfn(const void *_a, const void *_b)
 {
@@ -98,6 +97,7 @@ void update_dive(struct dive *new_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);
@@ -189,7 +189,7 @@ static void file_open(GtkWidget *w, gpointer data)
                }
                g_slist_free(filenames);
                report_dives();
-               dive_list_update_dives(dive_list);
+               dive_list_update_dives();
        }
        gtk_widget_destroy(dialog);
 }
@@ -315,7 +315,7 @@ static void unit_dialog(GtkWidget *w, gpointer data)
                /* 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);
+               update_dive_list_units();
                repaint_dive();
                gconf_client_set_bool(gconf, GCONF_NAME(feet), output_units.length == FEET, NULL);
                gconf_client_set_bool(gconf, GCONF_NAME(psi), output_units.pressure == PSI, NULL);
@@ -364,9 +364,11 @@ static void renumber_dialog(GtkWidget *w, gpointer data)
 }
 
 static GtkActionEntry menu_items[] = {
-       { "FileMenuAction", GTK_STOCK_FILE, "Log", NULL, NULL, NULL},
+       { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
+       { "LogMenuAction",  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) },
+       { "Print",          GTK_STOCK_PRINT, NULL,  "<control>P", NULL, G_CALLBACK(do_print) },
        { "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) },
@@ -380,13 +382,15 @@ static const gchar* ui_string = " \
                        <menu name=\"FileMenu\" action=\"FileMenuAction\"> \
                                <menuitem name=\"Open\" action=\"OpenFile\" /> \
                                <menuitem name=\"Save\" action=\"SaveFile\" /> \
+                               <menuitem name=\"Print\" action=\"Print\" /> \
                                <separator name=\"Separator1\"/> \
                                <menuitem name=\"Import\" action=\"Import\" /> \
                                <separator name=\"Separator2\"/> \
+                               <menuitem name=\"Quit\" action=\"Quit\" /> \
+                       </menu> \
+                       <menu name=\"LogMenu\" action=\"LogMenuAction\"> \
                                <menuitem name=\"Units\" action=\"Units\" /> \
                                <menuitem name=\"Renumber\" action=\"Renumber\" /> \
-                               <separator name=\"Separator3\"/> \
-                               <menuitem name=\"Quit\" action=\"Quit\" /> \
                        </menu> \
                </menubar> \
        </ui> \
@@ -408,6 +412,11 @@ static GtkWidget *get_menubar_menu(GtkWidget *window)
        return menu;
 }
 
+static void switch_page(GtkNotebook *notebook, gint arg1, gpointer user_data)
+{
+       repaint_dive();
+}
+
 int main(int argc, char **argv)
 {
        int i;
@@ -415,8 +424,8 @@ int main(int argc, char **argv)
        GtkWidget *paned;
        GtkWidget *info_box;
        GtkWidget *notebook;
-       GtkWidget *frame;
        GtkWidget *dive_info;
+       GtkWidget *dive_list;
        GtkWidget *equipment;
        GtkWidget *menubar;
        GtkWidget *vbox;
@@ -451,23 +460,20 @@ int main(int argc, char **argv)
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
 
        /* HPane for left the dive list, and right the dive info */
-       paned = gtk_hpaned_new();
+       paned = gtk_vpaned_new();
        gtk_box_pack_end(GTK_BOX(vbox), paned, TRUE, TRUE, 0);
 
        /* Create the actual divelist */
        dive_list = dive_list_create();
-       gtk_paned_add1(GTK_PANED(paned), dive_list.container_widget);
+       gtk_paned_add2(GTK_PANED(paned), dive_list);
 
        /* VBox for dive info, and tabs */
        info_box = gtk_vbox_new(FALSE, 6);
-       gtk_paned_add2(GTK_PANED(paned), info_box);
-
-       /* Frame for minimal dive info */
-       frame = dive_info_frame();
-       gtk_box_pack_start(GTK_BOX(info_box), frame, FALSE, TRUE, 6);
+       gtk_paned_add1(GTK_PANED(paned), info_box);
 
        /* Notebook for dive info vs profile vs .. */
        notebook = gtk_notebook_new();
+       g_signal_connect(notebook, "switch-page", G_CALLBACK(switch_page), NULL);
        gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 6);
 
        /* Frame for dive profile */
@@ -504,7 +510,7 @@ int main(int argc, char **argv)
        }
 
        report_dives();
-       dive_list_update_dives(dive_list);
+       dive_list_update_dives();
 
        gtk_main();
        return 0;