Minor tweaks to column headers

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 4e15de2b37b3d7a3ea2745dc97574cc1ab923e13..cc90e4235c667ab7aad2a0289e2d4198ea6fecef 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,7 +19,7 @@ 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 +98,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(&dive_list, old_dive);
        }
        if (new_dive) {
                show_dive_info(new_dive);
@@ -410,6 +411,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;
@@ -417,7 +423,6 @@ int main(int argc, char **argv)
        GtkWidget *paned;
        GtkWidget *info_box;
        GtkWidget *notebook;
-       GtkWidget *frame;
        GtkWidget *dive_info;
        GtkWidget *equipment;
        GtkWidget *menubar;
@@ -453,23 +458,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.container_widget);
 
        /* 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 */