diff options
author | Thomas White <taw@bitwiz.me.uk> | 2018-06-23 20:41:51 +0200 |
---|---|---|
committer | Thomas White <taw@bitwiz.me.uk> | 2018-06-24 15:47:46 +0200 |
commit | 2eb57179d684be7c7367a49e622fe1242c4bd274 (patch) | |
tree | 8629fd02497bde127b73a9c432b97142dc0cf7c0 /src | |
parent | c3411258c83c8d288d9c4d744705f029d25b1a6f (diff) |
Preparation for new style model
Diffstat (limited to 'src')
-rw-r--r-- | src/sc_interp.c | 3 | ||||
-rw-r--r-- | src/stylesheet_editor.c | 18 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/sc_interp.c b/src/sc_interp.c index 2e81dd9..88cd811 100644 --- a/src/sc_interp.c +++ b/src/sc_interp.c @@ -1438,6 +1438,9 @@ void sc_interp_run_stylesheet(SCInterpreter *scin, SCBlock *bl) } else if ( strcmp(name, "ss") == 0 ) { try_add_macro(scin, options, sc_block_child(bl)); + } else if ( strcmp(name, "def") == 0 ) { + try_add_macro(scin, options, sc_block_child(bl)); + } else if ( strcmp(name, "template") == 0 ) { try_add_template(scin, options, sc_block_child(bl)); diff --git a/src/stylesheet_editor.c b/src/stylesheet_editor.c index 6dee835..7d94f66 100644 --- a/src/stylesheet_editor.c +++ b/src/stylesheet_editor.c @@ -135,8 +135,6 @@ void stylesheet_editor_class_init(StylesheetEditorClass *klass) g_type_class_add_private(gobject_class, sizeof(StylesheetEditorPrivate)); gtk_widget_class_bind_template_child(widget_class, StylesheetEditor, - default_style_ss); - gtk_widget_class_bind_template_child(widget_class, StylesheetEditor, default_style_font); gtk_widget_class_bind_template_child(widget_class, StylesheetEditor, default_style_fgcol); @@ -157,9 +155,6 @@ static void set_values_from_presentation(StylesheetEditor *se) PangoFontDescription *fontdesc; double *col; GdkRGBA rgba; - GtkTextBuffer *buf; - char *sc; - SCBlock *ss; scin = sc_interp_new(NULL, NULL, NULL, NULL); sc_interp_run_stylesheet(scin, se->priv->p->stylesheet); /* NULL stylesheet is OK */ @@ -177,19 +172,6 @@ static void set_values_from_presentation(StylesheetEditor *se) rgba.alpha = col[3]; gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(se->default_style_fgcol), &rgba); - ss = se->priv->p->stylesheet; - if ( ss != NULL ) { - const char *name = sc_block_name(ss); - if ( (name != NULL) && (strcmp(name, "stylesheet")==0) ) { - ss = sc_block_child(ss); - } - - sc = serialise_sc_block_chain(ss); - buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(se->default_style_ss)); - gtk_text_buffer_set_text(GTK_TEXT_BUFFER(buf), sc, -1); - free(sc); - } - sc_interp_destroy(scin); } |