Update values from stylesheet editor

6 files changed, 300 insertions, 214 deletions

diff --git a/data/stylesheeteditor.ui b/data/stylesheeteditor.ui
index bfe08b6..3e64d3d 100644
--- a/data/stylesheeteditor.ui
+++ b/data/stylesheeteditor.ui
@@ -253,7 +253,7 @@
                           <item id="vert" translatable="yes">Vertical gradient</item>
                           <item id="none" translatable="yes">None</item>
                         </items>
-                        <signal name="changed" handler="narrative_bggrad_sig" swapped="no"/>
+                        <signal name="changed" handler="narrative_bg_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -266,7 +266,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <signal name="color-set" handler="narrative_bgcol_sig" swapped="no"/>
+                        <signal name="color-set" handler="narrative_bg_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -279,7 +279,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <signal name="color-set" handler="narrative_bgcol2_sig" swapped="no"/>
+                        <signal name="color-set" handler="narrative_bg_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -372,7 +372,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment1</property>
-                                <signal name="change-value" handler="narrative_paraspace_sig" swapped="no"/>
+                                <signal name="value-changed" handler="narrative_paraspace_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -384,7 +384,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment2</property>
-                                <signal name="change-value" handler="narrative_paraspace_sig" swapped="no"/>
+                                <signal name="value-changed" handler="narrative_paraspace_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -396,7 +396,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment3</property>
-                                <signal name="change-value" handler="narrative_paraspace_sig" swapped="no"/>
+                                <signal name="value-changed" handler="narrative_paraspace_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -408,7 +408,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment4</property>
-                                <signal name="change-value" handler="narrative_paraspace_sig" swapped="no"/>
+                                <signal name="value-changed" handler="narrative_paraspace_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -511,7 +511,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment5</property>
-                                <signal name="change-value" handler="narrative_padding_sig" swapped="no"/>
+                                <signal name="value-changed" handler="narrative_padding_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -523,7 +523,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment6</property>
-                                <signal name="change-value" handler="narrative_padding_sig" swapped="no"/>
+                                <signal name="value-changed" handler="narrative_padding_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -535,7 +535,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment7</property>
-                                <signal name="change-value" handler="narrative_padding_sig" swapped="no"/>
+                                <signal name="value-changed" handler="narrative_padding_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -547,7 +547,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment8</property>
-                                <signal name="change-value" handler="narrative_padding_sig" swapped="no"/>
+                                <signal name="value-changed" handler="narrative_padding_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -622,7 +622,7 @@
                         <property name="adjustment">adjustment17</property>
                         <property name="numeric">True</property>
                         <property name="value">1024</property>
-                        <signal name="change-value" handler="slide_size_sig" swapped="no"/>
+                        <signal name="value-changed" handler="slide_size_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -650,7 +650,7 @@
                         <property name="adjustment">adjustment18</property>
                         <property name="numeric">True</property>
                         <property name="value">768</property>
-                        <signal name="change-value" handler="slide_size_sig" swapped="no"/>
+                        <signal name="value-changed" handler="slide_size_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -704,7 +704,7 @@
                           <item id="horiz" translatable="yes">Horizontal gradient</item>
                           <item id="vert" translatable="yes">Vertical gradient</item>
                         </items>
-                        <signal name="changed" handler="slide_bggrad_sig" swapped="no"/>
+                        <signal name="changed" handler="slide_bg_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -717,7 +717,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <signal name="color-set" handler="slide_bgcol_sig" swapped="no"/>
+                        <signal name="color-set" handler="slide_bg_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -730,7 +730,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <signal name="color-set" handler="slide_bgcol2_sig" swapped="no"/>
+                        <signal name="color-set" handler="slide_bg_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -865,7 +865,7 @@
                           <item id="vert" translatable="yes">Vertical gradient</item>
                           <item id="none" translatable="yes">None</item>
                         </items>
-                        <signal name="changed" handler="frame_bggrad_sig" swapped="no"/>
+                        <signal name="changed" handler="frame_bg_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -878,7 +878,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <signal name="color-set" handler="frame_bgcol_sig" swapped="no"/>
+                        <signal name="color-set" handler="frame_bg_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -891,7 +891,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <signal name="color-set" handler="frame_bgcol2_sig" swapped="no"/>
+                        <signal name="color-set" handler="frame_bg_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -984,7 +984,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment9</property>
-                                <signal name="change-value" handler="frame_paraspace_sig" swapped="no"/>
+                                <signal name="value-changed" handler="frame_paraspace_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -996,7 +996,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment10</property>
-                                <signal name="change-value" handler="frame_paraspace_sig" swapped="no"/>
+                                <signal name="value-changed" handler="frame_paraspace_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1008,7 +1008,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment11</property>
-                                <signal name="change-value" handler="frame_paraspace_sig" swapped="no"/>
+                                <signal name="value-changed" handler="frame_paraspace_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -1020,7 +1020,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment12</property>
-                                <signal name="change-value" handler="frame_paraspace_sig" swapped="no"/>
+                                <signal name="value-changed" handler="frame_paraspace_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -1123,7 +1123,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment13</property>
-                                <signal name="change-value" handler="frame_padding_sig" swapped="no"/>
+                                <signal name="value-changed" handler="frame_padding_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1135,7 +1135,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment14</property>
-                                <signal name="change-value" handler="frame_padding_sig" swapped="no"/>
+                                <signal name="value-changed" handler="frame_padding_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1147,7 +1147,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment15</property>
-                                <signal name="change-value" handler="frame_padding_sig" swapped="no"/>
+                                <signal name="value-changed" handler="frame_padding_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -1159,7 +1159,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment16</property>
-                                <signal name="change-value" handler="frame_padding_sig" swapped="no"/>
+                                <signal name="value-changed" handler="frame_padding_sig" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
diff --git a/src/sc_interp.c b/src/sc_interp.c
index 73fc263..91775f5 100644
--- a/src/sc_interp.c
+++ b/src/sc_interp.c
@@ -464,38 +464,22 @@ static void set_bggrad(SCInterpreter *scin, const char *options,
 {
 	struct sc_state *st = &scin->state[scin->j];
 	GdkRGBA col1, col2;
-	char *n2;
-	char *optcopy = strdup(options);
 
-	if ( options == NULL ) {
-		fprintf(stderr, _("Invalid bg gradient spec '%s'\n"), options);
-		return;
-	}
-
-	n2 = strchr(optcopy, ',');
-	if ( n2 == NULL ) {
-		fprintf(stderr, _("Invalid bg gradient spec '%s'\n"), options);
-		return;
-	}
-
-	n2[0] = '\0';
+	if ( parse_colour_duo(options, &col1, &col2) == 0 ) {
 
-	gdk_rgba_parse(&col1, optcopy);
-	gdk_rgba_parse(&col2, &n2[1]);
+		st->bgcol[0] = col1.red;
+		st->bgcol[1] = col1.green;
+		st->bgcol[2] = col1.blue;
+		st->bgcol[3] = col1.alpha;
 
-	st->bgcol[0] = col1.red;
-	st->bgcol[1] = col1.green;
-	st->bgcol[2] = col1.blue;
-	st->bgcol[3] = col1.alpha;
+		st->bgcol2[0] = col2.red;
+		st->bgcol2[1] = col2.green;
+		st->bgcol2[2] = col2.blue;
+		st->bgcol2[3] = col2.alpha;
 
-	st->bgcol2[0] = col2.red;
-	st->bgcol2[1] = col2.green;
-	st->bgcol2[2] = col2.blue;
-	st->bgcol2[3] = col2.alpha;
+		st->bggrad = grad;
 
-	st->bggrad = grad;
-
-	free(optcopy);
+	}
 }
 
 
diff --git a/src/stylesheet.c b/src/stylesheet.c
index dc0f5dd..b5dce52 100644
--- a/src/stylesheet.c
+++ b/src/stylesheet.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <gio/gio.h>
+#include <gdk/gdk.h>
 
 #include "stylesheet.h"
 #include "utils.h"
@@ -40,6 +41,50 @@ struct _stylesheet {
 };
 
 
+static int find_comma(const char *a)
+{
+	int i = 0;
+	int in_brackets = 0;
+	size_t len = strlen(a);
+
+	do {
+		if ( (a[i] == ',') && !in_brackets ) return i;
+		if ( a[i] == '(' ) in_brackets++;
+		if ( a[i] == ')' ) in_brackets--;
+		i++;
+	} while ( i < len );
+	return 0;
+}
+
+
+int parse_colour_duo(const char *a, GdkRGBA *col1, GdkRGBA *col2)
+{
+	char *acopy;
+	int cpos;
+
+	acopy = strdup(a);
+	if ( acopy == NULL ) return 1;
+
+	cpos = find_comma(acopy);
+	if ( cpos == 0 ) {
+		fprintf(stderr, _("Invalid bg gradient spec '%s'\n"), a);
+		return 1;
+	}
+
+	acopy[cpos] = '\0';
+
+	if ( gdk_rgba_parse(col1, acopy) != TRUE ) {
+		fprintf(stderr, _("Failed to parse colour: %s\n"), acopy);
+	}
+	if ( gdk_rgba_parse(col2, &acopy[cpos+1]) != TRUE ) {
+		fprintf(stderr, _("Failed to parse colour: %s\n"), &acopy[cpos+1]);
+	}
+
+	free(acopy);
+	return 0;
+}
+
+
 Stylesheet *stylesheet_load(GFile *file)
 {
 	JsonParser *parser;
@@ -75,13 +120,13 @@ Stylesheet *stylesheet_load(GFile *file)
 }
 
 
-char *stylesheet_lookup(Stylesheet *ss, const char *path, const char *key)
+static JsonObject *find_stylesheet_object(Stylesheet *ss, const char *path,
+                                          JsonNode **freeme)
 {
 	JsonNode *node;
 	JsonObject *obj;
 	JsonArray *array;
 	GError *err = NULL;
-	char *ret = NULL;
 
 	node = json_path_query(path, ss->root, &err);
 	array = json_node_get_array(node);
@@ -95,9 +140,23 @@ char *stylesheet_lookup(Stylesheet *ss, const char *path, const char *key)
 	obj = json_array_get_object_element(array, 0);
 	if ( obj == NULL ) {
 		printf("%s not a JSON object\n", path);
+		json_node_unref(node);
 		return NULL;
 	}
 
+	*freeme = node;
+	return obj;
+}
+
+
+char *stylesheet_lookup(Stylesheet *ss, const char *path, const char *key)
+{
+	JsonObject *obj;
+	char *ret = NULL;
+	JsonNode *node = NULL;
+
+	obj = find_stylesheet_object(ss, path, &node);
+
 	if ( json_object_has_member(obj, key) ) {
 
 		const gchar *v;
@@ -110,12 +169,48 @@ char *stylesheet_lookup(Stylesheet *ss, const char *path, const char *key)
 
 	} /* else not found, too bad */
 
-	json_node_unref(node);
-
+	if ( node != NULL ) json_node_unref(node);
 	return ret;
 }
 
 
+int stylesheet_set(Stylesheet *ss, const char *path, const char *key,
+                    const char *new_val)
+{
+	JsonObject *obj;
+	JsonNode *node = NULL;
+	int r = 1;
+
+	obj = find_stylesheet_object(ss, path, &node);
+	if ( obj != NULL ) {
+		json_object_set_string_member(obj, key, new_val);
+		r = 0;
+	} /* else most likely the object (e.g. "$.slide", "$.slide.frame",
+	   * "$.narrative" etc doesn't exist */
+
+	if ( node != NULL ) json_node_unref(node);
+	return r;
+}
+
+
+int stylesheet_delete(Stylesheet *ss, const char *path, const char *key)
+{
+	JsonObject *obj;
+	JsonNode *node = NULL;
+	int r = 1;
+
+	obj = find_stylesheet_object(ss, path, &node);
+	if ( obj != NULL ) {
+		json_object_remove_member(obj, key);
+		r = 0;
+	} /* else most likely the object (e.g. "$.slide", "$.slide.frame",
+	   * "$.narrative" etc doesn't exist */
+
+	if ( node != NULL ) json_node_unref(node);
+	return r;
+}
+
+
 void stylesheet_free(Stylesheet *ss)
 {
 	g_object_unref(ss->root);
diff --git a/src/stylesheet.h b/src/stylesheet.h
index 15584b1..c24c62c 100644
--- a/src/stylesheet.h
+++ b/src/stylesheet.h
@@ -28,13 +28,21 @@
 #endif
 
 #include <gio/gio.h>
+#include <gdk/gdk.h>
 
 typedef struct _stylesheet Stylesheet;
 
 extern Stylesheet *stylesheet_load(GFile *file);
 
+extern int parse_colour_duo(const char *a, GdkRGBA *col1, GdkRGBA *col2);
+
 extern char *stylesheet_lookup(Stylesheet *ss, const char *path, const char *key);
 
+extern int stylesheet_set(Stylesheet *ss, const char *path, const char *key,
+                          const char *new_val);
+
+extern int stylesheet_delete(Stylesheet *ss, const char *path, const char *key);
+
 extern void stylesheet_free(Stylesheet *ss);
 
 #endif	/* STYLESHEET_H */
diff --git a/src/stylesheet_editor.c b/src/stylesheet_editor.c
index a508ea6..bab784a 100644
--- a/src/stylesheet_editor.c
+++ b/src/stylesheet_editor.c
@@ -47,34 +47,6 @@ struct _sspriv
 };
 
 
-static int colour_duo_parse(const char *a, GdkRGBA *col1, GdkRGBA *col2)
-{
-	char *acopy;
-	char *n2;
-
-	acopy = strdup(a);
-	if ( acopy == NULL ) return 1;
-
-	n2 = strchr(acopy, ',');
-	if ( n2 == NULL ) {
-		fprintf(stderr, _("Invalid bg gradient spec '%s'\n"), a);
-		return 1;
-	}
-
-	n2[0] = '\0';
-
-	if ( gdk_rgba_parse(col1, acopy) != TRUE ) {
-		fprintf(stderr, _("Failed to parse colour: %s\n"), acopy);
-	}
-	if ( gdk_rgba_parse(col2, &n2[1]) != TRUE ) {
-		fprintf(stderr, _("Failed to parse colour: %s\n"), &n2[1]);
-	}
-
-	free(acopy);
-	return 0;
-}
-
-
 static void set_font_from_ss(Stylesheet *ss, const char *path, GtkWidget *w)
 {
 	char *result = stylesheet_lookup(ss, path, "font");
@@ -164,7 +136,7 @@ static void set_bg_from_ss(Stylesheet *ss, const char *path, GtkWidget *wcol,
 	if ( result != NULL ) {
 		GdkRGBA rgba1, rgba2;
 		found = 1;
-		if ( colour_duo_parse(result, &rgba1, &rgba2) == 0 ) {
+		if ( parse_colour_duo(result, &rgba1, &rgba2) == 0 ) {
 			gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(wcol), &rgba1);
 			gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(wcol2), &rgba2);
 			gtk_combo_box_set_active_id(GTK_COMBO_BOX(wgrad), "vert");
@@ -177,7 +149,7 @@ static void set_bg_from_ss(Stylesheet *ss, const char *path, GtkWidget *wcol,
 	if ( result != NULL ) {
 		GdkRGBA rgba1, rgba2;
 		found = 1;
-		if ( colour_duo_parse(result, &rgba1, &rgba2) == 0 ) {
+		if ( parse_colour_duo(result, &rgba1, &rgba2) == 0 ) {
 			gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(wcol), &rgba1);
 			gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(wcol2), &rgba2);
 			gtk_combo_box_set_active_id(GTK_COMBO_BOX(wgrad), "horiz");
@@ -237,36 +209,109 @@ static void set_values_from_presentation(StylesheetEditor *se)
 }
 
 
+static GradientType id_to_gradtype(const gchar *id)
+{
+	assert(id != NULL);
+	if ( strcmp(id, "flat") == 0 ) return GRAD_NONE;
+	if ( strcmp(id, "horiz") == 0 ) return GRAD_HORIZ;
+	if ( strcmp(id, "vert") == 0 ) return GRAD_VERT;
+	if ( strcmp(id, "none") == 0 ) return GRAD_NOBG;
+	return GRAD_NONE;
+}
+
+
 static void update_bg(struct presentation *p, const char *style_name,
-                      GradientType bggrad, GdkRGBA col1, GdkRGBA col2)
+                      GtkWidget *bggradw, GtkWidget *col1w, GtkWidget*col2w)
 {
-	/* FIXME: set in JSON */
+	GradientType g;
+	const gchar *id;
+	GdkRGBA rgba;
+	gchar *col1;
+	gchar *col2;
+	gchar *gradient;
+
+	id = gtk_combo_box_get_active_id(GTK_COMBO_BOX(bggradw));
+	g = id_to_gradtype(id);
+
+	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(col1w), &rgba);
+	col1 = gdk_rgba_to_string(&rgba);
+
+	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(col2w), &rgba);
+	col2 = gdk_rgba_to_string(&rgba);
+
+	gradient = g_strconcat(col1, ",", col2, NULL);
+
+	switch ( g ) {
+
+		case GRAD_NOBG :
+		stylesheet_set(p->stylesheet, style_name, "bgcol",
+		               "rgba(0,0,0,0)");
+		stylesheet_delete(p->stylesheet, style_name, "bggradv");
+		stylesheet_delete(p->stylesheet, style_name, "bggradh");
+		break;
+
+		case GRAD_NONE :
+		stylesheet_set(p->stylesheet, style_name, "bgcol",
+		               col1);
+		stylesheet_delete(p->stylesheet, style_name, "bggradv");
+		stylesheet_delete(p->stylesheet, style_name, "bggradh");
+		break;
+
+		case GRAD_HORIZ :
+		stylesheet_set(p->stylesheet, style_name, "bggradh",
+		               gradient);
+		stylesheet_delete(p->stylesheet, style_name, "bggradv");
+		stylesheet_delete(p->stylesheet, style_name, "bgcol");
+		break;
+
+		case GRAD_VERT :
+		stylesheet_set(p->stylesheet, style_name, "bggradv",
+		               gradient);
+		stylesheet_delete(p->stylesheet, style_name, "bggradh");
+		stylesheet_delete(p->stylesheet, style_name, "bgcol");
+		break;
+
+	}
+
+	g_free(gradient);
+	g_free(col1);
+	g_free(col2);
 }
 
 
-static void revert_sig(GtkButton *button, StylesheetEditor *widget)
+static void update_spacing(struct presentation *p, const char *style_name,
+                           const char *key, GtkWidget *wl, GtkWidget *wr,
+                           GtkWidget *wt, GtkWidget *wb)
 {
-	printf("click revert!\n");
+	int v[4];
+	char tmp[256];
+
+	v[0] = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(wl));
+	v[1] = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(wr));
+	v[2] = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(wt));
+	v[3] = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(wb));
+
+	if ( snprintf(tmp, 256, "%i,%i,%i,%i", v[0], v[1], v[2], v[3]) >= 256 ) {
+		fprintf(stderr, _("Spacing too long\n"));
+	} else {
+		stylesheet_set(p->stylesheet, style_name, key, tmp);
+	}
 }
 
 
-static GradientType id_to_gradtype(const gchar *id)
+static void revert_sig(GtkButton *button, StylesheetEditor *widget)
 {
-	assert(id != NULL);
-	if ( strcmp(id, "flat") == 0 ) return GRAD_NONE;
-	if ( strcmp(id, "horiz") == 0 ) return GRAD_HORIZ;
-	if ( strcmp(id, "vert") == 0 ) return GRAD_VERT;
-	if ( strcmp(id, "none") == 0 ) return GRAD_NOBG;
-	return GRAD_NONE;
+	printf("click revert!\n");
 }
 
 
 static void set_font(GtkFontButton *widget, StylesheetEditor *se,
                      const char *style_name)
 {
-//	const gchar *font;
-//	font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget));
-	/* FIXME: set in JSON */
+	const gchar *font;
+	font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget));
+
+	stylesheet_set(se->priv->p->stylesheet, style_name, "font", font);
 	set_values_from_presentation(se);
 	g_signal_emit_by_name(se, "changed");
 }
@@ -279,7 +324,7 @@ static void set_col(GtkColorButton *widget, StylesheetEditor *se,
 	gchar *col;
 	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &rgba);
 	col = gdk_rgba_to_string(&rgba);
-	/* FIXME: Set in JSON */
+	stylesheet_set(se->priv->p->stylesheet, style_name, "fgcol", col);
 	g_free(col);
 	set_values_from_presentation(se);
 	g_signal_emit_by_name(se, "changed");
@@ -288,48 +333,22 @@ static void set_col(GtkColorButton *widget, StylesheetEditor *se,
 
 static void narrative_font_sig(GtkFontButton *widget, StylesheetEditor *se)
 {
-	set_font(widget, se, "narrative");
+	set_font(widget, se, "$.narrative");
 }
 
 
 static void narrative_fgcol_sig(GtkColorButton *widget, StylesheetEditor *se)
 {
-	set_col(widget, se, "narrative", "fgcol");
-}
-
-
-static void narrative_bgcol_sig(GtkColorButton *widget, StylesheetEditor *se)
-{
-	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget),
-	                           &se->narrative_bgcol);
-	update_bg(se->priv->p, "narrative", se->narrative_bggrad,
-	          se->narrative_bgcol, se->narrative_bgcol2);
-
-	set_values_from_presentation(se);
-	g_signal_emit_by_name(se, "changed");
-}
-
-
-static void narrative_bgcol2_sig(GtkColorButton *widget, StylesheetEditor *se)
-{
-	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget),
-	                           &se->narrative_bgcol2);
-	update_bg(se->priv->p, "narrative", se->narrative_bggrad,
-	          se->narrative_bgcol, se->narrative_bgcol2);
-
-	set_values_from_presentation(se);
-	g_signal_emit_by_name(se, "changed");
+	set_col(widget, se, "$.narrative", "fgcol");
 }
 
 
-static void narrative_bggrad_sig(GtkComboBox *widget, StylesheetEditor *se)
+static void narrative_bg_sig(GtkColorButton *widget, StylesheetEditor *se)
 {
-	const gchar *id;
-	id = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget));
-	se->narrative_bggrad = id_to_gradtype(id);
-	update_bg(se->priv->p, "narrative", se->narrative_bggrad,
-	          se->narrative_bgcol, se->narrative_bgcol2);
-
+	update_bg(se->priv->p, "$.narrative",
+	          se->narrative_style_bggrad,
+	          se->narrative_style_bgcol,
+	          se->narrative_style_bgcol2);
 	set_values_from_presentation(se);
 	g_signal_emit_by_name(se, "changed");
 }
@@ -337,42 +356,31 @@ static void narrative_bggrad_sig(GtkComboBox *widget, StylesheetEditor *se)
 
 static void slide_size_sig(GtkSpinButton *widget, StylesheetEditor *se)
 {
-}
+	int w, h;
+	char tmp[256];
 
+	w = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(se->slide_size_w));
+	h = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(se->slide_size_h));
 
-static void slide_bgcol_sig(GtkColorButton *widget, StylesheetEditor *se)
-{
-	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget),
-	                           &se->slide_bgcol);
-	update_bg(se->priv->p, "slide", se->slide_bggrad,
-	          se->slide_bgcol, se->slide_bgcol2);
+	if ( snprintf(tmp, 256, "%ix%i", w, h) >= 256 ) {
+		fprintf(stderr, _("Slide size too long\n"));
+	} else {
+		stylesheet_set(se->priv->p->stylesheet, "$.slide", "size", tmp);
+		se->priv->p->slide_width = w;
+		se->priv->p->slide_height = h;
+	}
 
 	set_values_from_presentation(se);
 	g_signal_emit_by_name(se, "changed");
 }
 
 
-static void slide_bgcol2_sig(GtkColorButton *widget, StylesheetEditor *se)
+static void slide_bg_sig(GtkColorButton *widget, StylesheetEditor *se)
 {
-	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget),
-	                           &se->slide_bgcol2);
-	update_bg(se->priv->p, "slide", se->slide_bggrad,
-	          se->slide_bgcol, se->slide_bgcol2);
-
-	set_values_from_presentation(se);
-	g_signal_emit_by_name(se, "changed");
-}
-
-
-static void slide_bggrad_sig(GtkComboBox *widget, StylesheetEditor *se)
-{
-	const gchar *id;
-
-	id = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget));
-	se->slide_bggrad = id_to_gradtype(id);
-	update_bg(se->priv->p, "slide", se->slide_bggrad,
-	          se->slide_bgcol, se->slide_bgcol2);
-
+	update_bg(se->priv->p, "$.slide",
+	          se->slide_style_bggrad,
+	          se->slide_style_bgcol,
+	          se->slide_style_bgcol2);
 	set_values_from_presentation(se);
 	g_signal_emit_by_name(se, "changed");
 }
@@ -380,70 +388,72 @@ static void slide_bggrad_sig(GtkComboBox *widget, StylesheetEditor *se)
 
 static void frame_font_sig(GtkFontButton *widget, StylesheetEditor *se)
 {
-	set_font(widget, se, "frame");
+	set_font(widget, se, "$.slide.frame");
 }
 
 
 static void frame_fgcol_sig(GtkColorButton *widget, StylesheetEditor *se)
 {
-	set_col(widget, se, "frame", "fgcol");
+	set_col(widget, se, "$.slide.frame", "fgcol");
 }
 
 
-static void frame_bgcol_sig(GtkColorButton *widget, StylesheetEditor *se)
+static void frame_bg_sig(GtkColorButton *widget, StylesheetEditor *se)
 {
-	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget),
-	                           &se->frame_bgcol);
-	update_bg(se->priv->p, "frame", se->frame_bggrad,
-	          se->frame_bgcol, se->frame_bgcol2);
-
+	update_bg(se->priv->p, "$.slide.frame",
+	          se->frame_style_bggrad,
+	          se->frame_style_bgcol,
+	          se->frame_style_bgcol2);
 	set_values_from_presentation(se);
 	g_signal_emit_by_name(se, "changed");
 }
 
 
-static void frame_bgcol2_sig(GtkColorButton *widget, StylesheetEditor *se)
+static void frame_padding_sig(GtkSpinButton *widget, StylesheetEditor *se)
 {
-	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget),
-	                           &se->frame_bgcol);
-	update_bg(se->priv->p, "frame", se->frame_bggrad,
-	          se->frame_bgcol, se->frame_bgcol2);
-
+	update_spacing(se->priv->p, "$.slide.frame", "pad",
+	               se->frame_style_padding_l,
+	               se->frame_style_padding_r,
+	               se->frame_style_padding_t,
+	               se->frame_style_padding_b);
 	set_values_from_presentation(se);
 	g_signal_emit_by_name(se, "changed");
 }
 
 
-static void frame_bggrad_sig(GtkComboBox *widget, StylesheetEditor *se)
+static void frame_paraspace_sig(GtkSpinButton *widget, StylesheetEditor *se)
 {
-	const gchar *id;
-	id = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget));
-	se->frame_bggrad = id_to_gradtype(id);
-	update_bg(se->priv->p, "frame", se->frame_bggrad,
-	          se->frame_bgcol, se->frame_bgcol2);
-
+	update_spacing(se->priv->p, "$.slide.frame", "paraspace",
+	               se->frame_style_paraspace_l,
+	               se->frame_style_paraspace_r,
+	               se->frame_style_paraspace_t,
+	               se->frame_style_paraspace_b);
 	set_values_from_presentation(se);
 	g_signal_emit_by_name(se, "changed");
 }
 
 
-static void frame_padding_sig(GtkSpinButton *widget, StylesheetEditor *se)
-{
-}
-
-
-static void frame_paraspace_sig(GtkSpinButton *widget, StylesheetEditor *se)
-{
-}
-
-
 static void narrative_padding_sig(GtkSpinButton *widget, StylesheetEditor *se)
 {
+	update_spacing(se->priv->p, "$.narrative", "pad",
+	               se->narrative_style_padding_l,
+	               se->narrative_style_padding_r,
+	               se->narrative_style_padding_t,
+	               se->narrative_style_padding_b);
+	set_values_from_presentation(se);
+	g_signal_emit_by_name(se, "changed");
 }
 
 
 static void narrative_paraspace_sig(GtkSpinButton *widget, StylesheetEditor *se)
 {
+	update_spacing(se->priv->p, "$.narrative", "paraspace",
+	               se->narrative_style_paraspace_l,
+	               se->narrative_style_paraspace_r,
+	               se->narrative_style_paraspace_t,
+	               se->narrative_style_paraspace_b);
+	set_values_from_presentation(se);
+	g_signal_emit_by_name(se, "changed");
 }
 
 
@@ -473,9 +483,9 @@ void stylesheet_editor_class_init(StylesheetEditorClass *klass)
 	/* Narrative style */
 	SE_BIND_CHILD(narrative_style_font, narrative_font_sig);
 	SE_BIND_CHILD(narrative_style_fgcol, narrative_fgcol_sig);
-	SE_BIND_CHILD(narrative_style_bgcol, narrative_bgcol_sig);
-	SE_BIND_CHILD(narrative_style_bgcol2, narrative_bgcol2_sig);
-	SE_BIND_CHILD(narrative_style_bggrad, narrative_bggrad_sig);
+	SE_BIND_CHILD(narrative_style_bgcol, narrative_bg_sig);
+	SE_BIND_CHILD(narrative_style_bgcol2, narrative_bg_sig);
+	SE_BIND_CHILD(narrative_style_bggrad, narrative_bg_sig);
 	SE_BIND_CHILD(narrative_style_paraspace_l, narrative_paraspace_sig);
 	SE_BIND_CHILD(narrative_style_paraspace_r, narrative_paraspace_sig);
 	SE_BIND_CHILD(narrative_style_paraspace_t, narrative_paraspace_sig);
@@ -488,16 +498,16 @@ void stylesheet_editor_class_init(StylesheetEditorClass *klass)
 	/* Slide style */
 	SE_BIND_CHILD(slide_size_w, slide_size_sig);
 	SE_BIND_CHILD(slide_size_h, slide_size_sig);
-	SE_BIND_CHILD(slide_style_bgcol, slide_bgcol_sig);
-	SE_BIND_CHILD(slide_style_bgcol2, slide_bgcol2_sig);
-	SE_BIND_CHILD(slide_style_bggrad, slide_bggrad_sig);
+	SE_BIND_CHILD(slide_style_bgcol, slide_bg_sig);
+	SE_BIND_CHILD(slide_style_bgcol2, slide_bg_sig);
+	SE_BIND_CHILD(slide_style_bggrad, slide_bg_sig);
 
 	/* Slide->frame style */
 	SE_BIND_CHILD(frame_style_font, frame_font_sig);
 	SE_BIND_CHILD(frame_style_fgcol, frame_fgcol_sig);
-	SE_BIND_CHILD(frame_style_bgcol, frame_bgcol_sig);
-	SE_BIND_CHILD(frame_style_bgcol2, frame_bgcol2_sig);
-	SE_BIND_CHILD(frame_style_bggrad, frame_bggrad_sig);
+	SE_BIND_CHILD(frame_style_bgcol, frame_bg_sig);
+	SE_BIND_CHILD(frame_style_bgcol2, frame_bg_sig);
+	SE_BIND_CHILD(frame_style_bggrad, frame_bg_sig);
 	SE_BIND_CHILD(frame_style_paraspace_l, frame_paraspace_sig);
 	SE_BIND_CHILD(frame_style_paraspace_r, frame_paraspace_sig);
 	SE_BIND_CHILD(frame_style_paraspace_t, frame_paraspace_sig);
diff --git a/src/stylesheet_editor.h b/src/stylesheet_editor.h
index 849a9f8..22856da 100644
--- a/src/stylesheet_editor.h
+++ b/src/stylesheet_editor.h
@@ -90,19 +90,8 @@ struct _stylesheeteditor
 	GtkWidget *frame_style_padding_t;
 	GtkWidget *frame_style_padding_b;
 	StylesheetEditorPrivate *priv;
-
-	GdkRGBA       narrative_bgcol;
-	GdkRGBA       narrative_bgcol2;
-	GradientType  narrative_bggrad;
-	GdkRGBA       slide_bgcol;
-	GdkRGBA       slide_bgcol2;
-	GradientType  slide_bggrad;
-	GdkRGBA       frame_bgcol;
-	GdkRGBA       frame_bgcol2;
-	GradientType  frame_bggrad;
 };
 
-
 struct _stylesheeteditorclass
 {
 	GtkDialogClass parent_class;