X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=a76b0024a1c431dfdfdf12c51a31cfd7b3ac6146;hb=d8c8ada6c7f3952394989b6a705624d94e956d7a;hp=679b1e4dbd41f969d38584797831491a694e4441;hpb=d4b0ce1c86d420a308770a598a07c3815778dc57;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index 679b1e4..a76b002 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -609,24 +609,27 @@ static void view_info(GtkWidget *w, gpointer data)
 	gtk_paned_set_position(GTK_PANED(hpane), 65535);
 }
 
-/* Ooh. I don't know how to get the half-way size. So I'm just using random numbers */
 static void view_three(GtkWidget *w, gpointer data)
 {
-	gtk_paned_set_position(GTK_PANED(hpane), 400);
-	gtk_paned_set_position(GTK_PANED(vpane), 200);
+	GtkAllocation alloc;
+	gtk_widget_get_allocation(hpane, &alloc);
+	gtk_paned_set_position(GTK_PANED(hpane), alloc.width/2);
+	gtk_widget_get_allocation(vpane, &alloc);
+	gtk_paned_set_position(GTK_PANED(vpane), alloc.height/2);
 }
 
 static GtkActionEntry menu_items[] = {
-	{ "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
-	{ "LogMenuAction",  GTK_STOCK_FILE, "Log", NULL, NULL, NULL},
-	{ "ViewMenuAction",  GTK_STOCK_FILE, "View", NULL, NULL, NULL},
-	{ "FilterMenuAction",  GTK_STOCK_FILE, "Filter", NULL, NULL, NULL},
-	{ "HelpMenuAction", GTK_STOCK_HELP, "Help", NULL, NULL, NULL},
+	{ "FileMenuAction", NULL, "File", NULL, NULL, NULL},
+	{ "LogMenuAction",  NULL, "Log", NULL, NULL, NULL},
+	{ "ViewMenuAction",  NULL, "View", NULL, NULL, NULL},
+	{ "FilterMenuAction",  NULL, "Filter", NULL, NULL, NULL},
+	{ "HelpMenuAction", NULL, "Help", NULL, NULL, NULL},
 	{ "OpenFile",       GTK_STOCK_OPEN, NULL,   CTRLCHAR "O", NULL, G_CALLBACK(file_open) },
 	{ "SaveFile",       GTK_STOCK_SAVE, NULL,   CTRLCHAR "S", NULL, G_CALLBACK(file_save) },
 	{ "Print",          GTK_STOCK_PRINT, NULL,  CTRLCHAR "P", NULL, G_CALLBACK(do_print) },
 	{ "Import",         NULL, "Import", NULL, NULL, G_CALLBACK(import_dialog) },
-	{ "Preferences",    NULL, "Preferences", PREFERENCE_ACCEL, NULL, G_CALLBACK(preferences_dialog) },
+	{ "AddDive",        GTK_STOCK_ADD, "Add Dive", NULL, NULL, G_CALLBACK(add_dive_cb) },
+	{ "Preferences",    GTK_STOCK_PREFERENCES, "Preferences", PREFERENCE_ACCEL, NULL, G_CALLBACK(preferences_dialog) },
 	{ "Renumber",       NULL, "Renumber", NULL, NULL, G_CALLBACK(renumber_dialog) },
 	{ "SelectEvents",   NULL, "SelectEvents", NULL, NULL, G_CALLBACK(selectevents_dialog) },
 	{ "Quit",           GTK_STOCK_QUIT, NULL,   CTRLCHAR "Q", NULL, G_CALLBACK(quit) },
@@ -652,6 +655,7 @@ static const gchar* ui_string = " \
 			</menu> \
 			<menu name=\"LogMenu\" action=\"LogMenuAction\"> \
 				<menuitem name=\"Import\" action=\"Import\" /> \
+				<menuitem name=\"Add Dive\" action=\"AddDive\" /> \
 				<separator name=\"Separator\"/> \
 				<menuitem name=\"Renumber\" action=\"Renumber\" /> \
 				<menu name=\"View\" action=\"ViewMenuAction\"> \