Clean up action group code

[projects/chimara/chimara.git] / player / main.c

diff --git a/player/main.c b/player/main.c
index 3586ca1b3654ae1ecd17b6ebe6b8a32f8ae51132..9722235c680309e32c785dffafeae4705c9d462d 100644 (file)
--- a/player/main.c
+++ b/player/main.c
@@ -110,51 +110,15 @@ create_window(void)
        aboutwindow = GTK_WIDGET(load_object("aboutwindow"));
        prefswindow = GTK_WIDGET(load_object("prefswindow"));
        GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
-       GtkActionGroup *style_actiongroup = GTK_ACTION_GROUP(load_object("style-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>O", 
-               "recent", "",
-               "stop", "",
-               "quit_chimara", NULL, /* NULL means use stock accelerator */
-               "command", "",
-               "undo", "<ctrl>Z",
-               "save", NULL, 
-               "restore", "<ctrl>R", 
-               "restart", "",
-               "quit", "",
-               "edit", "",
-               "copy", NULL,
-               "paste", NULL,
-               "preferences", "",
-               "help", "",
-               "about", "",
-               NULL
-       };
-       const gchar *style_actions[] = { 
-               "align-left",
-               "align-justify",
-               "align-right",
-               "bold",
-               "italic",
-               "underline",
-               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]);
-       for(ptr = style_actions; *ptr; ptr ++)
-               gtk_action_group_add_action(style_actiongroup, GTK_ACTION(load_object(*ptr)));
        GtkRecentFilter *filter = gtk_recent_filter_new();
        /* TODO: Use mimetypes and construct the filter dynamically depending on 
        what plugins are installed */
        const gchar *patterns[] = {
                "*.z[1-8]", "*.[zg]lb", "*.[zg]blorb", "*.ulx", "*.blb", "*.blorb", NULL
        };
+
        for(ptr = patterns; *ptr; ptr++)
                gtk_recent_filter_add_pattern(filter, *ptr);
        GtkRecentChooser *recent = GTK_RECENT_CHOOSER(load_object("recent"));
@@ -175,12 +139,15 @@ create_window(void)
        }
        
        glk = chimara_if_new();
-       g_object_set(glk, "ignore-errors", TRUE, NULL);
+       g_object_set(glk,
+           "ignore-errors", TRUE,
+           /*"interpreter-number", CHIMARA_IF_ZMACHINE_TANDY_COLOR,*/
+           NULL);
        if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_DATA_DIR "/style.css", &error) ) {
 #ifdef DEBUG
                g_error_free(error);
                error = NULL;
-               if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_SRC_DIR "/macstyle.css", &error) ) {
+               if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_SRC_DIR "/style.css", &error) ) {
 #endif /* DEBUG */
                        error_dialog(NULL, error, "Couldn't open CSS file: ");
                        return;
@@ -188,6 +155,24 @@ create_window(void)
                }
 #endif /* DEBUG */
        }
+       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+           CHIMARA_IF_FORMAT_Z5,
+           CHIMARA_IF_INTERPRETER_FROTZ);
+       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+           CHIMARA_IF_FORMAT_Z6,
+           CHIMARA_IF_INTERPRETER_NITFOL);
+       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+           CHIMARA_IF_FORMAT_Z8,
+           CHIMARA_IF_INTERPRETER_FROTZ);
+       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+           CHIMARA_IF_FORMAT_Z_BLORB,
+           CHIMARA_IF_INTERPRETER_FROTZ);
+       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+           CHIMARA_IF_FORMAT_GLULX,
+           CHIMARA_IF_INTERPRETER_GLULXE);
+       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
+           CHIMARA_IF_FORMAT_GLULX_BLORB,
+           CHIMARA_IF_INTERPRETER_GLULXE);
        
        /* DON'T UNCOMMENT THIS your eyes will burn
         but it is a good test of programmatically altering just one style
@@ -214,7 +199,7 @@ create_window(void)
        g_signal_connect(glk, "notify::story-name", G_CALLBACK(change_window_title), window);
        
        /* Create preferences window */
-       preferences_create(CHIMARA_GLK(glk));
+       //preferences_create(CHIMARA_GLK(glk));
 }
 
 int