Finished preferred interpreters list

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

diff --git a/player/main.c b/player/main.c
index 70bad3b3941ae4062058548fec4631e0a942cccc..5ed1d0e9df2049d19e4031549a9aedfaa88f7a66 100644 (file)
--- a/player/main.c
+++ b/player/main.c
@@ -38,6 +38,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <gtk/gtk.h>
 
 /* Use a custom GSettings backend for our preferences file */
@@ -117,7 +118,13 @@ create_window(void)
        aboutwindow = GTK_WIDGET(load_object("aboutwindow"));
        prefswindow = GTK_WIDGET(load_object("prefswindow"));
        GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
+
+       /* Set the default value of the "View/Toolbar" menu item upon creation of a
+        new window to the "show-toolbar-default" setting, but bind the setting
+        one-way only - we don't want toolbars to disappear suddenly */
        GtkToggleAction *toolbar_action = GTK_TOGGLE_ACTION(load_object("toolbar"));
+       gtk_toggle_action_set_active(toolbar_action, g_settings_get_boolean(state_settings, "show-toolbar-default"));
+       g_settings_bind(state_settings, "show-toolbar-default", toolbar_action, "active", G_SETTINGS_BIND_SET);
 
        const gchar **ptr;
        GtkRecentFilter *filter = gtk_recent_filter_new();
@@ -163,24 +170,6 @@ 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
@@ -231,11 +220,24 @@ main(int argc, char *argv[])
        gdk_threads_init();
        gtk_init(&argc, &argv);
 
-       /* Initialize settings file */
-       gchar *keyfile = g_build_filename(g_get_home_dir(), ".chimara", NULL);
+       /* Create configuration dir ~/.chimara */
+       gchar *configdir = g_build_filename(g_get_home_dir(), ".chimara", NULL);
+       if(!g_file_test(configdir, G_FILE_TEST_IS_DIR)
+               && g_mkdir(configdir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0)
+               g_error(_("Cannot create configuration directory ~/.chimara"));
+       g_free(configdir);
+
+       /* Initialize settings file; it can be overridden by a "chimara-config" file
+        in the current directory */
+       gchar *keyfile;
+       if(g_file_test("chimara-config", G_FILE_TEST_IS_REGULAR))
+               keyfile = g_strdup("chimara-config");
+       else
+               keyfile = g_build_filename(g_get_home_dir(), ".chimara", "config", NULL);
        GSettingsBackend *backend = g_keyfile_settings_backend_new(keyfile, "/org/chimara-if/player/", NULL);
        prefs_settings = g_settings_new_with_backend("org.chimara-if.player.preferences", backend);
        state_settings = g_settings_new_with_backend("org.chimara-if.player.state", backend);
+       g_free(keyfile);
 
        create_window();
        gtk_widget_show_all(window);