Add "Apply"/"Cancel" buttons to dive equipment page

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index e6f58ce5bf6325dbc78792d32ccb9f64cbcb2c63..03957e1bdb780ca09214de64df72b3ee59d40507 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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);
@@ -364,7 +365,8 @@ 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) },
@@ -385,10 +387,11 @@ static const gchar* ui_string = " \
                                <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> \
@@ -422,7 +425,6 @@ int main(int argc, char **argv)
        GtkWidget *paned;
        GtkWidget *info_box;
        GtkWidget *notebook;
-       GtkWidget *frame;
        GtkWidget *dive_info;
        GtkWidget *equipment;
        GtkWidget *menubar;
@@ -458,20 +460,16 @@ 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();