X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=2692185180b11e479b55d1dd597d9e432eff871e;hb=8197d7f4d4702d18df5b2121b5e0126c61e1b7ea;hp=b748f693b5f1dfec00ae8b27360fc0dabc92905c;hpb=1117cd37d71e294069a670bdf0851041575e0d5f;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index b748f69..2692185 100644
--- a/main.c
+++ b/main.c
@@ -134,7 +134,7 @@ static void quit(GtkWidget *w, gpointer data)
 }
 
 static GtkActionEntry menu_items[] = {
-	{ "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
+	{ "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) },
 	{ "Quit",           GTK_STOCK_QUIT, NULL,   "<control>Q", NULL, G_CALLBACK(quit) },
@@ -147,6 +147,7 @@ static const gchar* ui_string = " \
 			<menu name=\"FileMenu\" action=\"FileMenuAction\"> \
 				<menuitem name=\"Open\" action=\"OpenFile\" /> \
 				<menuitem name=\"Save\" action=\"SaveFile\" /> \
+				<separator name=\"Seperator\"/> \
 				<menuitem name=\"Quit\" action=\"Quit\" /> \
 			</menu> \
 		</menubar> \
@@ -178,6 +179,7 @@ int main(int argc, char **argv)
 	GtkWidget *info_box;
 	GtkWidget *notebook;
 	GtkWidget *frame;
+	GtkWidget *dive_info;
 	GtkWidget *menubar;
 	GtkWidget *vbox;
 
@@ -211,30 +213,29 @@ int main(int argc, char **argv)
 	paned = gtk_hpaned_new();
 	gtk_box_pack_end(GTK_BOX(vbox), paned, TRUE, TRUE, 0);
 
-	/* Create the atual divelist */
+	/* Create the actual divelist */
 	divelist = create_dive_list();
 	gtk_paned_add1(GTK_PANED(paned), divelist);
 
 	/* VBox for dive info, and tabs */
-	info_box = gtk_vbox_new(FALSE, 5);
+	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, 5);
+	gtk_box_pack_start(GTK_BOX(info_box), frame, FALSE, TRUE, 6);
 
 	/* Notebook for dive info vs profile vs .. */
 	notebook = gtk_notebook_new();
-	gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 6);
 
 	/* Frame for dive profile */
-	frame = dive_profile_frame();
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Profile"));
-	dive_profile = frame;
+	dive_profile = dive_profile_widget();
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_profile, gtk_label_new("Dive Profile"));
 
 	/* Frame for extended dive info */
-	frame = extended_dive_info_frame();
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Extended dive Info"));
+	dive_info = extended_dive_info_widget();
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_info, gtk_label_new("Extended Dive Info"));
 
 	gtk_widget_set_app_paintable(win, TRUE);
 	gtk_widget_show_all(win);