X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fmain.c;h=b919203cae0aaf2dca1768a2faf203ab5b2b07f4;hb=65e1d2c57a697ba303bb7949fac5652a02450399;hp=9722235c680309e32c785dffafeae4705c9d462d;hpb=b30b05a569c24260332a746ed867a78730a19627;p=projects%2Fchimara%2Fchimara.git diff --git a/player/main.c b/player/main.c index 9722235..b919203 100644 --- a/player/main.c +++ b/player/main.c @@ -38,8 +38,13 @@ #include #include +#include #include +/* Use a custom GSettings backend for our preferences file */ +#define G_SETTINGS_ENABLE_BACKEND +#include + #include "error.h" #include #include @@ -55,6 +60,9 @@ static GtkWidget *glk = NULL; GtkBuilder *builder = NULL; GtkWidget *aboutwindow = NULL; GtkWidget *prefswindow = NULL; +GtkWidget *toolbar = NULL; +GSettings *prefs_settings = NULL; +GSettings *state_settings = NULL; GObject * load_object(const gchar *name) @@ -87,7 +95,7 @@ change_window_title(ChimaraGlk *glk, GParamSpec *pspec, GtkWindow *window) g_free(title); } -static void +static gboolean create_window(void) { GError *error = NULL; @@ -99,8 +107,7 @@ create_window(void) error = NULL; if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) { #endif /* DEBUG */ - error_dialog(NULL, error, "Error while building interface: "); - return; + return FALSE; #ifdef DEBUG } #endif /* DEBUG */ @@ -111,6 +118,13 @@ create_window(void) 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(); /* TODO: Use mimetypes and construct the filter dynamically depending on @@ -129,15 +143,11 @@ create_window(void) #ifdef DEBUG g_error_free(error); error = NULL; - if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) { -#endif /* DEBUG */ - error_dialog(NULL, error, "Error while building interface: "); - return; -#ifdef DEBUG - } + if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) #endif /* DEBUG */ + return FALSE; } - + glk = chimara_if_new(); g_object_set(glk, "ignore-errors", TRUE, @@ -147,59 +157,45 @@ create_window(void) #ifdef DEBUG g_error_free(error); error = NULL; - 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; -#ifdef DEBUG - } + if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_SRC_DIR "/style.css", &error) ) #endif /* DEBUG */ + return FALSE; } - 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 chimara_glk_set_css_from_string(CHIMARA_GLK(glk), - "buffer.normal { font-family: 'Comic Sans MS'; }");*/ + "buffer { font-family: 'Comic Sans MS'; }");*/ GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") ); if(vbox == NULL) - { - error_dialog(NULL, NULL, "Could not find vbox"); - return; - } + return FALSE; 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"); + toolbar = gtk_ui_manager_get_widget(uimanager, "/toolbar"); + gtk_widget_set_no_show_all(toolbar, TRUE); + if(gtk_toggle_action_get_active(toolbar_action)) + gtk_widget_show(toolbar); + else + gtk_widget_hide(toolbar); + + /* Connect the accelerators */ + GtkAccelGroup *accels = gtk_ui_manager_get_accel_group(uimanager); + gtk_window_add_accel_group(GTK_WINDOW(window), accels); 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); + gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0); gtk_builder_connect_signals(builder, glk); g_signal_connect(glk, "notify::program-name", G_CALLBACK(change_window_title), window); 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)); + + return TRUE; } int @@ -218,11 +214,36 @@ main(int argc, char *argv[]) gdk_threads_init(); gtk_init(&argc, &argv); - create_window(); + /* 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); + + if( !create_window() ) { + error_dialog(NULL, NULL, "Error while building interface."); + return 1; + } gtk_widget_show_all(window); g_object_unref( G_OBJECT(uimanager) ); + if(argc == 3) { + g_object_set(glk, "graphics-file", argv[2], NULL); + } if(argc >= 2) { if( !chimara_if_run_game(CHIMARA_IF(glk), argv[1], &error) ) { error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");