From 466a46c0a35fb4f83ee25375af7f10ce93bb3bf1 Mon Sep 17 00:00:00 2001
From: "P. F. Chimento" <philip.chimento@gmail.com>
Date: Wed, 22 Jun 2011 20:43:01 +0200
Subject: [PATCH] Re-enable loading CSS file from preferences

---
 player/player.c      | 27 +++++++++++++++++++++++++++
 player/player.h      |  1 +
 player/preferences.c | 29 +++++++++--------------------
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/player/player.c b/player/player.c
index bedafea..10f45d5 100644
--- a/player/player.c
+++ b/player/player.c
@@ -69,6 +69,21 @@ change_window_title(ChimaraGlk *glk, GParamSpec *pspec, GtkWindow *window)
 	g_free(title);
 }
 
+static void
+on_css_changed(GSettings *prefs_settings, char *key, ChimaraPlayer *self)
+{
+	char *user_css;
+	g_settings_get(prefs_settings, "css-file", "ms", &user_css);
+	if(user_css) {
+		if(!chimara_glk_set_css_from_file(CHIMARA_GLK(self->glk), user_css, NULL)) {
+			/* If the setting didn't point to a CSS file, fail silently and
+			 null the setting */
+			g_settings_set(prefs_settings, "css-file", "ms", NULL);
+		}
+		g_free(user_css);
+	}
+}
+
 static void
 chimara_player_dispose(GObject *object)
 {
@@ -138,10 +153,14 @@ chimara_player_init(ChimaraPlayer *self)
 				 "ignore-errors", TRUE,
 				 /*"interpreter-number", CHIMARA_IF_ZMACHINE_TANDY_COLOR,*/
 				 NULL);
+
+	/* Set the CSS styles for the interpreter */
 	char *default_css = get_data_file_path("style.css");
 	if( !chimara_glk_set_css_from_file(CHIMARA_GLK(self->glk), default_css, &error) ) {
 		error_dialog(GTK_WINDOW(self), error, "Couldn't open default CSS file: ");
 	}
+	g_free(default_css);
+	on_css_changed(theapp->prefs_settings, "css-file", self);
 	
 	/* DON'T UNCOMMENT THIS your eyes will burn
 	 but it is a good test of programmatically altering just one style
@@ -174,6 +193,7 @@ chimara_player_init(ChimaraPlayer *self)
 	gtk_builder_connect_signals(builder, self);
 	g_signal_connect(self->glk, "notify::program-name", G_CALLBACK(change_window_title), self);
 	g_signal_connect(self->glk, "notify::story-name", G_CALLBACK(change_window_title), self);
+	g_signal_connect(theapp->prefs_settings, "changed::css-file", G_CALLBACK(on_css_changed), self);
 
 	g_object_unref(builder);
 	g_object_unref(uimanager);
@@ -189,6 +209,13 @@ chimara_player_new(void)
 		NULL));
 }
 
+void
+chimara_player_set_user_css_file(ChimaraPlayer *self, const char *filename)
+{
+	chimara_glk_set_css_to_default(CHIMARA_GLK(self->glk));
+	chimara_glk_set_css_from_file(CHIMARA_GLK(self->glk), filename, NULL);
+}
+
 /* GLADE CALLBACKS */
 
 #if 0
diff --git a/player/player.h b/player/player.h
index 4b6a604..f777b87 100644
--- a/player/player.h
+++ b/player/player.h
@@ -57,6 +57,7 @@ typedef struct _ChimaraPlayerClass {
 
 GType chimara_player_get_type(void) G_GNUC_CONST;
 GtkWidget *chimara_player_new(void);
+void chimara_player_set_user_css_file(ChimaraPlayer *player, const char *filename);
 
 G_END_DECLS
 
diff --git a/player/preferences.c b/player/preferences.c
index 03e171e..df1edc6 100644
--- a/player/preferences.c
+++ b/player/preferences.c
@@ -229,17 +229,12 @@ chimara_prefs_init(ChimaraPrefs *self)
 		gtk_file_chooser_set_filename(blorb_chooser, filename);
 		g_free(filename);
 	}
+
 	g_settings_get(theapp->prefs_settings, "css-file", "ms", &filename);
-	//if(filename) {
-	//	if(!chimara_glk_set_css_from_file(glk, filename, NULL)) {
-	//		/* If the setting didn't point to a CSS file, fail silently and
-	//		 null the setting */
-	//		g_settings_set(theapp->prefs_settings, "css-file", "ms", NULL);
-	//	} else {
-	//		gtk_file_chooser_set_filename(css_chooser, filename);
-	//	}
-	//	g_free(filename);
-	//}
+	if(filename) {
+		gtk_file_chooser_set_filename(css_chooser, filename);
+		g_free(filename);
+	}
 
 	/* Populate the list of available interpreters */
 	GtkListStore *interp_list = GTK_LIST_STORE( load_object(builder, "available_interpreters") );
@@ -411,16 +406,10 @@ on_font_set(GtkFontButton *button, ChimaraGlk *glk)
 void
 on_css_filechooser_file_set(GtkFileChooserButton *button, ChimaraGlk *glk)
 {
-	//GError *error = NULL;
-	//ChimaraApp *theapp = chimara_app_get();
-	//char *filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(button) );
-	//if(!chimara_glk_set_css_from_file(glk, filename, &error)) {
-	//	error_dialog(NULL, error, "There was a problem reading the CSS file: ");
-	//	g_settings_set(theapp->prefs_settings, "css-file", "ms", NULL);
-	//} else {
-	//	g_settings_set(theapp->prefs_settings, "css-file", "ms", filename);
-	//}
-	//g_free(filename);
+	ChimaraApp *theapp = chimara_app_get();
+	char *filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(button) );
+	g_settings_set(theapp->prefs_settings, "css-file", "ms", filename);
+	g_free(filename);
 }
 
 void
-- 
2.30.2