#include <glib.h>
#include <glib/gi18n.h>
+#include <glib/gstdio.h>
#include <gtk/gtk.h>
+/* Use a custom GSettings backend for our preferences file */
+#define G_SETTINGS_ENABLE_BACKEND
+#include <gio/gsettingsbackend.h>
+
#include "error.h"
#include <libchimara/chimara-glk.h>
#include <libchimara/chimara-if.h>
GtkWidget *aboutwindow = NULL;
GtkWidget *prefswindow = NULL;
GtkWidget *toolbar = NULL;
+GSettings *prefs_settings = NULL;
+GSettings *state_settings = NULL;
GObject *
load_object(const gchar *name)
g_free(title);
}
-static void
+static gboolean
create_window(void)
{
GError *error = NULL;
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 */
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();
#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();
#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");
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);
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
textdomain(GETTEXT_PACKAGE);
#endif
- if( !g_thread_supported() )
- g_thread_init(NULL);
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) );
projects / projects / chimara / chimara.git / blobdiff