Re-enable loading CSS file from preferences
[projects/chimara/chimara.git] / player / preferences.c
index b5f2583e2bf3dc6a997a6bc2b3948d06592f244f..df1edc62789d17bcce9df607a90cf360dce6ebe7 100644 (file)
@@ -1,26 +1,26 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * callbacks.c
- * Copyright (C) Philip en Marijn 2008 <>
- * 
- * preferences.c is free software copyrighted by Philip en Marijn.
- * 
+ * Copyright (C) 2008, 2009, 2010, 2011 Philip Chimento and Marijn van Vliet.
+ * All rights reserved.
+ *
+ * Chimara is free software copyrighted by Philip Chimento and Marijn van Vliet.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name ``Philip en Marijn'' nor the name of any other
- *    contributor may be used to endorse or promote products derived
+ * 3. Neither of the names Philip Chimento or Marijn van Vliet, nor the name of
+ *    any other contributor may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
- * 
- * preferences.c IS PROVIDED BY Philip en Marijn ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Philip en Marijn OR ANY OTHER CONTRIBUTORS
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h>
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <libchimara/chimara-glk.h>
 #include <libchimara/chimara-if.h>
-#include <config.h>
 #include "error.h"
 #include "app.h"
 #include "preferences.h"
@@ -60,9 +58,6 @@ static void style_tree_select_callback(GtkTreeSelection *selection);
 static void
 chimara_prefs_finalize(GObject *self)
 {
-       //CHIMARA_APP_USE_PRIVATE;
-       //g_object_unref(priv->action_group);
-       
        /* Chain up */
        G_OBJECT_CLASS(chimara_prefs_parent_class)->finalize(self);
 }
@@ -72,13 +67,7 @@ chimara_prefs_class_init(ChimaraPrefsClass *klass)
 {
        /* Override methods of parent classes */
        GObjectClass *object_class = G_OBJECT_CLASS(klass);
-       //object_class->set_property = chimara_if_set_property;
-       //object_class->get_property = chimara_if_get_property;
        object_class->finalize = chimara_prefs_finalize;
-       
-       /* Signals */
-
-       /* Properties */
 
        /* Private data */
        g_type_class_add_private(klass, sizeof(ChimaraPrefsPrivate));
@@ -177,7 +166,6 @@ interpreter_to_display_string(ChimaraIFInterpreter interp)
 static void
 chimara_prefs_init(ChimaraPrefs *self)
 {
-       GError *error = NULL;
        ChimaraApp *theapp = chimara_app_get();
 
        /* Set parent properties */
@@ -214,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") );
@@ -241,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") );
@@ -423,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