X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tests%2Fmain.c;h=d7f09bb52c1e236d00d20ab27f57510ef8202c08;hb=a3d91c0ef8fdc6165b4619790e133641036068ad;hp=0a03c3c535a93c0a9df444fc9b4297e01490fa24;hpb=b26eaa2eb5d2279da4212d21a19c299b80bdc90a;p=rodin%2Fchimara.git

diff --git a/tests/main.c b/tests/main.c
index 0a03c3c..d7f09bb 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -46,6 +46,7 @@
 
 /* Global pointers to widgets */
 GtkBuilder *builder = NULL;
+GtkUIManager *uimanager = NULL;
 GtkWidget *window = NULL;
 GtkWidget *glk = NULL;
 
@@ -61,14 +62,51 @@ on_stopped(ChimaraGlk *glk)
     g_printerr("Stopped!\n");
 }
 
+static GObject *
+load_object(const gchar *name)
+{
+	GObject *retval;
+	if( (retval = gtk_builder_get_object(builder, name)) == NULL) {
+		error_dialog(NULL, NULL, "Error while getting object '%s'", name);
+		g_error("Error while getting object '%s'", name);
+	}
+	return retval;
+}
+
 static void
 create_window(void)
 {
-	if( (window = GTK_WIDGET(gtk_builder_get_object(builder, "gargoyle-gtk"))) == NULL ) {
-		error_dialog(NULL, NULL, "Error while getting main window object");
+	GError *error = NULL;
+
+   	builder = gtk_builder_new();
+	if( !gtk_builder_add_from_file(builder, "chimara.ui", &error) ) {
+		error_dialog(NULL, error, "Error while building interface: ");	
 		return;
 	}
 
+	window = GTK_WIDGET(load_object("chimara"));
+	GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
+
+	/* Add all the actions to the action group. This for-loop is a temporary fix
+	and can be removed once Glade supports adding actions and accelerators to an
+	action group. */
+	const gchar *actions[] = { 
+		"game", "",
+		"open", "<ctrl>F7", 
+		"save", NULL, /* NULL means use stock accelerator */
+		"quit", NULL,
+		NULL
+	};
+	const gchar **ptr;
+	for(ptr = actions; *ptr; ptr += 2)
+		gtk_action_group_add_action_with_accel(actiongroup, GTK_ACTION(load_object(ptr[0])), ptr[1]);
+
+	GtkUIManager *uimanager = gtk_ui_manager_new();
+	if( !gtk_ui_manager_add_ui_from_file(uimanager, "chimara.menus", &error) ) {
+		error_dialog(NULL, error, "Error while building interface: ");
+		return;
+	}
+	
 	gtk_builder_connect_signals(builder, NULL);
 	
 	glk = chimara_glk_new();
@@ -85,7 +123,13 @@ create_window(void)
 		return;
 	}
 
+	gtk_ui_manager_insert_action_group(uimanager, actiongroup, 0);
+	GtkWidget *menubar = gtk_ui_manager_get_widget(uimanager, "/menubar");
+	GtkWidget *toolbar = gtk_ui_manager_get_widget(uimanager, "/toolbar");
+
 	gtk_box_pack_end(vbox, glk, TRUE, TRUE, 0);
+	gtk_box_pack_start(vbox, menubar, FALSE, FALSE, 0);
+	gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0);
 }
 
 int
@@ -107,12 +151,6 @@ main(int argc, char *argv[])
 	gtk_set_locale();
 	gtk_init(&argc, &argv);
 
-   	builder = gtk_builder_new();
-	if( !gtk_builder_add_from_file(builder, "chimara.ui", &error) ) {
-		error_dialog(NULL, error, "Error while building interface: ");	
-		return 1;
-	}
-
 	create_window();
 	gtk_widget_show_all(window);