X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=c9cda2b472ec56db5398b2aa729e768ed4cb8bc3;hb=f12382c66f2b3deddf38f7d51fda3a2c75a0c5fa;hp=96eca191f092e46d0d660af0297bd72d08f19942;hpb=1155ad3f0fb2471163335d1d7c6856a81f495e49;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index 96eca19..c9cda2b 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <time.h>
 
@@ -25,7 +26,32 @@ static int sortfn(const void *_a, const void *_b)
  */
 static void report_dives(void)
 {
+	int i;
+
 	qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
+
+	for (i = 1; i < dive_table.nr; i++) {
+		struct dive **pp = &dive_table.dives[i-1];
+		struct dive *prev = pp[0];
+		struct dive *dive = pp[1];
+		struct dive *merged;
+
+		if (prev->when + prev->duration.seconds < dive->when)
+			continue;
+
+		merged = try_to_merge(prev, dive);
+		if (!merged)
+			continue;
+
+		free(prev);
+		free(dive);
+		*pp = merged;
+		dive_table.nr--;
+		memmove(pp+1, pp+2, sizeof(*pp)*(dive_table.nr - i));
+
+		/* Redo the new 'i'th dive */
+		i--;
+	}
 }
 
 static void parse_argument(const char *arg)
@@ -102,25 +128,45 @@ static void file_save(GtkWidget *w, gpointer data)
 	gtk_widget_destroy(dialog);
 }
 
-static GtkItemFactoryEntry menu_items[] = {
-	{ "/_File",		NULL,		NULL,		0, "<Branch>" },
-	{ "/File/_Open",	"<control>O",	file_open,	0, "<StockItem>", GTK_STOCK_OPEN },
-	{ "/File/_Save",	"<control>S",	file_save,	0, "<StockItem>", GTK_STOCK_SAVE },
+static void quit(GtkWidget *w, gpointer data)
+{
+	gtk_main_quit();
+}
+
+static GtkActionEntry menu_items[] = {
+	{ "FileMenuAction", GTK_STOCK_FILE, "File", 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) },
 };
 static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
 
-/* This is just directly from the gtk menubar tutorial. */
+static const gchar* ui_string = " \
+	<ui> \
+		<menubar name=\"MainMenu\"> \
+			<menu name=\"FileMenu\" action=\"FileMenuAction\"> \
+				<menuitem name=\"Open\" action=\"OpenFile\" /> \
+				<menuitem name=\"Save\" action=\"SaveFile\" /> \
+				<menuitem name=\"Quit\" action=\"Quit\" /> \
+			</menu> \
+		</menubar> \
+	</ui> \
+";
+
 static GtkWidget *get_menubar_menu(GtkWidget *window)
 {
-	GtkItemFactory *item_factory;
-	GtkAccelGroup *accel_group;
+	GtkActionGroup *action_group = gtk_action_group_new("Menu");
+	gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0);
+
+	GtkUIManager *ui_manager = gtk_ui_manager_new();
+	gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
+	GError* error = 0;
+	gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ui_manager), ui_string, -1, &error);
 
-	accel_group = gtk_accel_group_new();
-	item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group);
+	gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ui_manager));
+	GtkWidget* menu = gtk_ui_manager_get_widget(ui_manager, "/MainMenu");
 
-	gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
-	gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
-	return gtk_item_factory_get_widget(item_factory, "<main>");
+	return menu;
 }
 
 int main(int argc, char **argv)
@@ -151,7 +197,7 @@ int main(int argc, char **argv)
 	report_dives();
 
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	g_signal_connect(G_OBJECT(win), "destroy",      G_CALLBACK(on_destroy), NULL);
+	g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
 	main_window = win;
 
 	vbox = gtk_vbox_new(FALSE, 0);