X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fmain.c;h=a4739f79f8ebd2d31d017690a4b612ddad486c53;hb=a03ca60f975be1f4636e42ca19f9e6eafc3fad12;hp=01de3982e1b8199815c8483dd43f776e1612f25d;hpb=06f2cc3823e21032a016dfdfd3e53ba558cea69f;p=projects%2Fchimara%2Fchimara.git diff --git a/player/main.c b/player/main.c index 01de398..a4739f7 100644 --- a/player/main.c +++ b/player/main.c @@ -38,6 +38,7 @@ #include #include +#include #include /* Use a custom GSettings backend for our preferences file */ @@ -60,7 +61,8 @@ GtkBuilder *builder = NULL; GtkWidget *aboutwindow = NULL; GtkWidget *prefswindow = NULL; GtkWidget *toolbar = NULL; -GSettings *settings = NULL; +GSettings *prefs_settings = NULL; +GSettings *state_settings = NULL; GObject * load_object(const gchar *name) @@ -93,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; @@ -105,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 */ @@ -116,7 +117,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(); @@ -136,13 +143,9 @@ 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(); @@ -154,44 +157,19 @@ 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"); @@ -202,6 +180,10 @@ create_window(void) 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); @@ -212,6 +194,8 @@ create_window(void) /* Create preferences window */ preferences_create(CHIMARA_GLK(glk)); + + return TRUE; } int @@ -225,17 +209,32 @@ main(int argc, char *argv[]) textdomain(GETTEXT_PACKAGE); #endif - if( !g_thread_supported() ) - g_thread_init(NULL); gdk_threads_init(); gtk_init(&argc, &argv); - /* Initialize settings file */ - gchar *keyfile = g_build_filename(g_get_home_dir(), ".chimara", NULL); - GSettingsBackend *backend = g_keyfile_settings_backend_new(keyfile, "/", "player"); - settings = g_settings_new_with_backend("org.chimara-if.chimara-player", backend); + /* 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); - create_window(); + /* 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) );