Re-enable loading CSS file from preferences

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

diff --git a/player/preferences.c b/player/preferences.c
index cf485f7c3ca0115a36d57851dbd244ad846fde89..df1edc62789d17bcce9df607a90cf360dce6ebe7 100644 (file)
--- a/player/preferences.c
+++ b/player/preferences.c
@@ -202,15 +202,15 @@ chimara_prefs_init(ChimaraPrefs *self)
        gtk_tree_store_set(style_list, &buffer, 0, "Text buffer", -1);
        gtk_tree_store_set(style_list, &grid, 0, "Text grid", -1);
 
-       //int i;
-       //unsigned int num_tags;
-       //const gchar **tag_names = chimara_glk_get_tag_names(glk, &num_tags);
-       //for(i=0; i<num_tags; i++) {
-       //      gtk_tree_store_append(style_list, &buffer_child, &buffer);
-       //      gtk_tree_store_append(style_list, &grid_child, &grid);
-       //      gtk_tree_store_set(style_list, &buffer_child, 0, tag_names[i], -1);
-       //      gtk_tree_store_set(style_list, &grid_child, 0, tag_names[i], -1);
-       //}
+       int i;
+       unsigned int num_tags;
+       const gchar **tag_names = chimara_glk_get_tag_names(&num_tags);
+       for(i=0; i<num_tags; i++) {
+               gtk_tree_store_append(style_list, &buffer_child, &buffer);
+               gtk_tree_store_append(style_list, &grid_child, &grid);
+               gtk_tree_store_set(style_list, &buffer_child, 0, tag_names[i], -1);
+               gtk_tree_store_set(style_list, &grid_child, 0, tag_names[i], -1);
+       }
 
        /* Set selection mode to single select */
        GtkTreeView *view = GTK_TREE_VIEW( load_object(builder, "style-treeview") );
@@ -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