![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 31c44d9d4bb2c52cb45f98e0f144655e4af6b75f..a101b9eeb32bb159671d8d8fa03d1ec04719975e 100644 (file)
/*
* Copyright (C) Lauris Kaplinski 2002
* bulia byak <buliabyak@users.sf.net>
+ * John Cliff <simarilius@yahoo.com>
*/
#define noSP_PS_VERBOSE
# include "config.h"
#endif
-
+#include <cstring>
+#include <string>
#include <gtk/gtkhbox.h>
#include <gtk/gtkradiobutton.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtktooltips.h>
#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkseparatormenuitem.h>
#include "../sp-pattern.h"
#include <glibmm/i18n.h>
#include "../widgets/icon.h"
-#include "../inkscape-stock.h"
#include "widgets/widget-sizes.h"
#include "xml/repr.h"
#include <style.h>
#include "svg/svg-color.h"
#include "svg/css-ostringstream.h"
+#include "path-prefix.h"
+#include "io/sys.h"
+#include "helper/stock-items.h"
+#include "ui/icon-names.h"
#include "paint-selector.h"
+#ifdef SP_PS_VERBOSE
+#include "svg/svg-icc-color.h"
+#endif // SP_PS_VERBOSE
+
enum {
MODE_CHANGED,
GRABBED,
@@ -78,20 +88,23 @@ static void sp_paint_selector_set_style_buttons(SPPaintSelector *psel, GtkWidget
static GtkVBoxClass *parent_class;
static guint psel_signals[LAST_SIGNAL] = {0};
-GtkType
-sp_paint_selector_get_type(void)
+GType sp_paint_selector_get_type(void)
{
static GtkType type = 0;
if (!type) {
- GtkTypeInfo info = {
- "SPPaintSelector",
- sizeof(SPPaintSelector),
+ GTypeInfo info = {
sizeof(SPPaintSelectorClass),
- (GtkClassInitFunc) sp_paint_selector_class_init,
- (GtkObjectInitFunc) sp_paint_selector_init,
- NULL, NULL, NULL
+ 0, // base_init
+ 0, // base_finalize
+ (GClassInitFunc)sp_paint_selector_class_init,
+ 0, // class_finalize
+ 0, // class_data
+ sizeof(SPPaintSelector),
+ 0, // n_preallocs
+ (GInstanceInitFunc)sp_paint_selector_init,
+ 0 // value_table
};
- type = gtk_type_unique(GTK_TYPE_VBOX, &info);
+ type = g_type_register_static(GTK_TYPE_VBOX, "SPPaintSelector", &info, static_cast<GTypeFlags>(0));
}
return type;
}
gtk_box_pack_start(GTK_BOX(psel), psel->style, FALSE, FALSE, 0);
/* Buttons */
- psel->none = sp_paint_selector_style_button_add(psel, INKSCAPE_STOCK_FILL_NONE,
+ psel->none = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_NONE,
SP_PAINT_SELECTOR_MODE_NONE, tt, _("No paint"));
- psel->solid = sp_paint_selector_style_button_add(psel, INKSCAPE_STOCK_FILL_SOLID,
+ psel->solid = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_SOLID,
SP_PAINT_SELECTOR_MODE_COLOR_RGB, tt, _("Flat color"));
- psel->gradient = sp_paint_selector_style_button_add(psel, INKSCAPE_STOCK_FILL_GRADIENT,
+ psel->gradient = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_GRADIENT_LINEAR,
SP_PAINT_SELECTOR_MODE_GRADIENT_LINEAR, tt, _("Linear gradient"));
- psel->radial = sp_paint_selector_style_button_add(psel, INKSCAPE_STOCK_FILL_RADIAL,
+ psel->radial = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_GRADIENT_RADIAL,
SP_PAINT_SELECTOR_MODE_GRADIENT_RADIAL, tt, _("Radial gradient"));
- psel->pattern = sp_paint_selector_style_button_add(psel, INKSCAPE_STOCK_FILL_PATTERN,
+ psel->pattern = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_PATTERN,
SP_PAINT_SELECTOR_MODE_PATTERN, tt, _("Pattern"));
- psel->unset = sp_paint_selector_style_button_add(psel, INKSCAPE_STOCK_FILL_UNSET,
+ psel->unset = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_UNKNOWN,
SP_PAINT_SELECTOR_MODE_UNSET, tt, _("Unset paint (make it undefined so it can be inherited)"));
/* Fillrule */
// TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty
gtk_tooltips_set_tip(tt, psel->evenodd, _("Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)"), NULL);
gtk_object_set_data(GTK_OBJECT(psel->evenodd), "mode", GUINT_TO_POINTER(SP_PAINT_SELECTOR_FILLRULE_EVENODD));
- w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, "fillrule_evenodd");
+ w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_FILL_RULE_EVEN_ODD);
gtk_container_add(GTK_CONTAINER(psel->evenodd), w);
gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->evenodd, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(psel->evenodd), "toggled", GTK_SIGNAL_FUNC(sp_paint_selector_fillrule_toggled), psel);
// TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty
gtk_tooltips_set_tip(tt, psel->nonzero, _("Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)"), NULL);
gtk_object_set_data(GTK_OBJECT(psel->nonzero), "mode", GUINT_TO_POINTER(SP_PAINT_SELECTOR_FILLRULE_NONZERO));
- w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, "fillrule_nonzero");
+ w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_FILL_RULE_NONZERO);
gtk_container_add(GTK_CONTAINER(psel->nonzero), w);
gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->nonzero, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(psel->nonzero), "toggled", GTK_SIGNAL_FUNC(sp_paint_selector_fillrule_toggled), psel);
gtk_box_pack_start(GTK_BOX(psel), psel->frame, TRUE, TRUE, 0);
/* Last used color */
- sp_color_set_rgb_float(&psel->color, 0.0, 0.0, 0.0);
+ psel->color.set( 0.0, 0.0, 0.0 );
psel->alpha = 1.0;
}
@@ -363,6 +376,7 @@ sp_paint_selector_set_color_alpha(SPPaintSelector *psel, SPColor const *color, f
SPColorSelector *csel;
guint32 rgba;
+/*
if ( sp_color_get_colorspace_type(color) == SP_COLORSPACE_TYPE_CMYK )
{
#ifdef SP_PS_VERBOSE
@@ -371,6 +385,7 @@ sp_paint_selector_set_color_alpha(SPPaintSelector *psel, SPColor const *color, f
sp_paint_selector_set_mode(psel, SP_PAINT_SELECTOR_MODE_COLOR_CMYK);
}
else
+*/
{
#ifdef SP_PS_VERBOSE
g_print("PaintSelector set RGBA\n");
@@ -379,7 +394,7 @@ sp_paint_selector_set_color_alpha(SPPaintSelector *psel, SPColor const *color, f
}
csel = (SPColorSelector*)gtk_object_get_data(GTK_OBJECT(psel->selector), "color-selector");
- rgba = sp_color_get_rgba32_falpha( &*color, alpha );
+ rgba = color->toRGBA32( alpha );
csel->base->setColorAlpha( *color, alpha );
}
static void
sp_paint_selector_color_grabbed(SPColorSelector *csel, SPPaintSelector *psel)
{
+ (void)csel;
gtk_signal_emit(GTK_OBJECT(psel), psel_signals[GRABBED]);
}
static void
sp_paint_selector_color_dragged(SPColorSelector *csel, SPPaintSelector *psel)
{
+ (void)csel;
gtk_signal_emit(GTK_OBJECT(psel), psel_signals[DRAGGED]);
}
static void
sp_paint_selector_color_released(SPColorSelector *csel, SPPaintSelector *psel)
{
+ (void)csel;
gtk_signal_emit(GTK_OBJECT(psel), psel_signals[RELEASED]);
}
static void
sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelectorMode mode)
{
+ (void)mode;
GtkWidget *csel;
sp_paint_selector_set_style_buttons(psel, psel->solid);
@@ -597,7 +616,7 @@ sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelectorMode mode
gtk_widget_show(vb);
/* Color selector */
- csel = sp_color_selector_new(SP_TYPE_COLOR_NOTEBOOK, SP_COLORSPACE_TYPE_NONE);
+ csel = sp_color_selector_new( SP_TYPE_COLOR_NOTEBOOK );
gtk_widget_show(csel);
gtk_object_set_data(GTK_OBJECT(vb), "color-selector", csel);
gtk_box_pack_start(GTK_BOX(vb), csel, TRUE, TRUE, 0);
@@ -625,24 +644,28 @@ sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelectorMode mode
static void
sp_paint_selector_gradient_grabbed(SPColorSelector *csel, SPPaintSelector *psel)
{
+ (void)csel;
gtk_signal_emit(GTK_OBJECT(psel), psel_signals[GRABBED]);
}
static void
sp_paint_selector_gradient_dragged(SPColorSelector *csel, SPPaintSelector *psel)
{
+ (void)csel;
gtk_signal_emit(GTK_OBJECT(psel), psel_signals[DRAGGED]);
}
static void
sp_paint_selector_gradient_released(SPColorSelector *csel, SPPaintSelector *psel)
{
+ (void)csel;
gtk_signal_emit(GTK_OBJECT(psel), psel_signals[RELEASED]);
}
static void
sp_paint_selector_gradient_changed(SPColorSelector *csel, SPPaintSelector *psel)
{
+ (void)csel;
gtk_signal_emit(GTK_OBJECT(psel), psel_signals[CHANGED]);
}
@@ -678,7 +701,7 @@ sp_paint_selector_set_mode_gradient(SPPaintSelector *psel, SPPaintSelectorMode m
gtk_object_set_data(GTK_OBJECT(psel->selector), "gradient-selector", gsel);
}
- /* Actually we have to set optiomenu history here */
+ /* Actually we have to set option menu history here */
if (mode == SP_PAINT_SELECTOR_MODE_GRADIENT_LINEAR) {
sp_gradient_selector_set_mode(SP_GRADIENT_SELECTOR(gsel), SP_GRADIENT_SELECTOR_MODE_LINEAR);
gtk_frame_set_label(GTK_FRAME(psel->frame), _("Linear gradient"));
static void
sp_psel_pattern_destroy(GtkWidget *widget, SPPaintSelector *psel)
{
+ (void)psel;
// drop our reference to the pattern menu widget
g_object_unref( G_OBJECT(widget) );
}
static void
sp_psel_pattern_change(GtkWidget *widget, SPPaintSelector *psel)
{
+ (void)widget;
gtk_signal_emit(GTK_OBJECT(psel), psel_signals[CHANGED]);
}
-static GtkWidget*
-ink_pattern_menu(GtkWidget *mnu)
+
+
+/**
+ * Returns a list of patterns in the defs of the given source document as a GSList object
+ * Returns NULL if there are no patterns in the document.
+ */
+GSList *
+ink_pattern_list_get (SPDocument *source)
{
- /* Create new menu widget */
- GtkWidget *m = gtk_menu_new();
- gtk_widget_show(m);
+ if (source == NULL)
+ return NULL;
- /* Pick up all patterns */
- SPDocument *doc = SP_ACTIVE_DOCUMENT;
GSList *pl = NULL;
- GSList const *patterns = sp_document_get_resource_list(doc, "pattern");
+ GSList const *patterns = sp_document_get_resource_list(source, "pattern");
for (GSList *l = (GSList *) patterns; l != NULL; l = l->next) {
if (SP_PATTERN(l->data) == pattern_getroot(SP_PATTERN(l->data))) { // only if this is a root pattern
pl = g_slist_prepend(pl, l->data);
}
pl = g_slist_reverse(pl);
+ return pl;
+}
- if (!doc) {
- GtkWidget *i;
- i = gtk_menu_item_new_with_label(_("No document selected"));
- gtk_widget_show(i);
- gtk_menu_append(GTK_MENU(m), i);
- gtk_widget_set_sensitive(mnu, FALSE);
- } else if (!pl) {
- GtkWidget *i;
- i = gtk_menu_item_new_with_label(_("No patterns in document"));
- gtk_widget_show(i);
- gtk_menu_append(GTK_MENU(m), i);
- gtk_widget_set_sensitive(mnu, FALSE);
- } else {
- for (; pl != NULL; pl = pl->next){
- if (SP_IS_PATTERN(pl->data)){
- SPPattern *pat = SP_PATTERN(pl->data);
+/**
+ * Adds menu items for pattern list - derived from marker code, left hb etc in to make addition of previews easier at some point.
+ */
+static void
+sp_pattern_menu_build (GtkWidget *m, GSList *pattern_list, SPDocument */*source*/)
+{
+
+ for (; pattern_list != NULL; pattern_list = pattern_list->next) {
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR((SPItem *) pattern_list->data);
GtkWidget *i = gtk_menu_item_new();
gtk_widget_show(i);
- g_object_set_data(G_OBJECT(i), "pattern", pat);
+
+ if (repr->attribute("inkscape:stockid"))
+ g_object_set_data (G_OBJECT(i), "stockid", (void *) "true");
+ else
+ g_object_set_data (G_OBJECT(i), "stockid", (void *) "false");
+
+ gchar const *patid = repr->attribute("id");
+ g_object_set_data (G_OBJECT(i), "pattern", (void *) patid);
+
GtkWidget *hb = gtk_hbox_new(FALSE, 4);
gtk_widget_show(hb);
- Inkscape::XML::Node *repr = SP_OBJECT_REPR((SPItem *) pl->data);
- GtkWidget *l = gtk_label_new(repr->attribute("id"));
+
+ // create label
+ GtkWidget *l;
+ if (repr->attribute("inkscape:stockid"))
+ l = gtk_label_new(_(repr->attribute("inkscape:stockid")));
+ else
+ l = gtk_label_new(_(repr->attribute("id")));
gtk_widget_show(l);
- gtk_misc_set_alignment(GTK_MISC(l), 1.0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(l), 0.0, 0.5);
+
gtk_box_pack_start(GTK_BOX(hb), l, TRUE, TRUE, 0);
+
gtk_widget_show(hb);
gtk_container_add(GTK_CONTAINER(i), hb);
+
gtk_menu_append(GTK_MENU(m), i);
}
}
+/**
+ * sp_pattern_list_from_doc()
+ *
+ * \brief Pick up all patterns from source, except those that are in
+ * current_doc (if non-NULL), and add items to the pattern menu
+ *
+ */
+static void
+sp_pattern_list_from_doc (GtkWidget *m, SPDocument *current_doc, SPDocument *source, SPDocument *pattern_doc)
+{
+ (void)current_doc;
+ (void)pattern_doc;
+ GSList *pl = ink_pattern_list_get(source);
+ GSList *clean_pl = NULL;
+
+ for (; pl != NULL; pl = pl->next) {
+ if (!SP_IS_PATTERN(pl->data))
+ continue;
+
+ // Add to the list of patterns we really do wish to show
+ clean_pl = g_slist_prepend (clean_pl, pl->data);
+ }
+
+ sp_pattern_menu_build (m, clean_pl, source);
+
+ g_slist_free (pl);
+ g_slist_free (clean_pl);
+}
+
+
+
+
+static void
+ink_pattern_menu_populate_menu(GtkWidget *m, SPDocument *doc)
+{
+ static SPDocument *patterns_doc = NULL;
+
+ // find and load patterns.svg
+ if (patterns_doc == NULL) {
+ char *patterns_source = g_build_filename(INKSCAPE_PATTERNSDIR, "patterns.svg", NULL);
+ if (Inkscape::IO::file_test(patterns_source, G_FILE_TEST_IS_REGULAR)) {
+ patterns_doc = sp_document_new(patterns_source, FALSE);
+ }
+ g_free(patterns_source);
+ }
+
+ // suck in from current doc
+ sp_pattern_list_from_doc ( m, NULL, doc, patterns_doc );
+
+ // add separator
+ {
+ GtkWidget *i = gtk_separator_menu_item_new();
+ gchar const *patid = "";
+ g_object_set_data (G_OBJECT(i), "pattern", (void *) patid);
+ gtk_widget_show(i);
+ gtk_menu_append(GTK_MENU(m), i);
+ }
+
+ // suck in from patterns.svg
+ if (patterns_doc) {
+ sp_document_ensure_up_to_date(doc);
+ sp_pattern_list_from_doc ( m, doc, patterns_doc, NULL );
+ }
+
+}
+
+
+static GtkWidget*
+ink_pattern_menu(GtkWidget *mnu)
+{
+ /* Create new menu widget */
+ GtkWidget *m = gtk_menu_new();
+ gtk_widget_show(m);
+ SPDocument *doc = SP_ACTIVE_DOCUMENT;
+
+ if (!doc) {
+ GtkWidget *i;
+ i = gtk_menu_item_new_with_label(_("No document selected"));
+ gtk_widget_show(i);
+ gtk_menu_append(GTK_MENU(m), i);
+ gtk_widget_set_sensitive(mnu, FALSE);
+ } else {
+
+ ink_pattern_menu_populate_menu(m, doc);
gtk_widget_set_sensitive(mnu, TRUE);
+
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(mnu), m);
/* Set history */
- //gtk_option_menu_set_history(GTK_OPTION_MENU(mnu), 0);
-
- g_slist_free(pl);
+ gtk_option_menu_set_history(GTK_OPTION_MENU(mnu), 0);
return mnu;
}
gchar *patname = (gchar *) SP_OBJECT_REPR(pattern)->attribute("id");
GtkMenu *m = GTK_MENU(gtk_option_menu_get_menu(GTK_OPTION_MENU(mnu)));
+
GList *kids = GTK_MENU_SHELL(m)->children;
int patpos = 0;
int i = 0;
for (; kids != NULL; kids = kids->next) {
- gchar *men_pat = (gchar *) SP_OBJECT_REPR(g_object_get_data(G_OBJECT(kids->data), "pattern"))->attribute("id");
+
+ gchar *men_pat = (gchar *) g_object_get_data(G_OBJECT(kids->data), "pattern");
if ( strcmp(men_pat, patname) == 0 ) {
patpos = i;
}
i++;
}
+
gtk_option_menu_set_history(GTK_OPTION_MENU(mnu), patpos);
gtk_object_set_data(GTK_OBJECT(mnu), "update", GINT_TO_POINTER(FALSE));
}
@@ -856,7 +981,7 @@ sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSelectorMode mo
{
GtkWidget *hb = gtk_hbox_new(FALSE, 0);
GtkWidget *l = gtk_label_new(NULL);
- gtk_label_set_markup(GTK_LABEL(l), _("Use <b>Edit > Object(s) to Pattern</b> to create a new pattern from selection."));
+ gtk_label_set_markup(GTK_LABEL(l), _("Use the <b>Node tool</b> to adjust position, scale, and rotation of the pattern on canvas. Use <b>Object > Pattern > Objects to Pattern</b> to create a new pattern from selection."));
gtk_label_set_line_wrap(GTK_LABEL(l), true);
gtk_widget_set_size_request(l, 180, -1);
gtk_box_pack_start(GTK_BOX(hb), l, TRUE, TRUE, AUX_BETWEEN_BUTTON_GROUPS);
sp_paint_selector_get_pattern(SPPaintSelector *psel)
{
SPPattern *pat;
-
g_return_val_if_fail((psel->mode == SP_PAINT_SELECTOR_MODE_PATTERN) , NULL);
GtkWidget *patmnu = (GtkWidget *) g_object_get_data(G_OBJECT(psel), "patternmenu");
GtkMenu *m = GTK_MENU(gtk_option_menu_get_menu(GTK_OPTION_MENU(patmnu)));
+ /* Get Pattern */
+ if (!g_object_get_data(G_OBJECT(gtk_menu_get_active(m)), "pattern"))
+ {
+ return NULL;
+ }
+ gchar *patid = (gchar *) g_object_get_data(G_OBJECT(gtk_menu_get_active(m)),
+ "pattern");
+ //gchar *pattern = "";
+ if (strcmp(patid, "none")){
+
+ gchar *stockid = (gchar *) g_object_get_data(G_OBJECT(gtk_menu_get_active(m)),
+ "stockid");
+ gchar *paturn = patid;
+ if (!strcmp(stockid,"true")) paturn = g_strconcat("urn:inkscape:pattern:",patid,NULL);
+ SPObject *pat_obj = get_stock_item(paturn);
+ if (pat_obj) {
+ pat = SP_PATTERN(pat_obj);
+ }
+ } else {
pat = pattern_getroot(SP_PATTERN(g_object_get_data(G_OBJECT(gtk_menu_get_active(m)), "pattern")));
+ }
- return pat;
+ if SP_IS_PATTERN(pat) return pat;
+ return NULL;
}
void
@@ -902,12 +1047,18 @@ sp_paint_selector_set_flat_color(SPPaintSelector *psel, SPDesktop *desktop, gcha
SPColor color;
gfloat alpha;
sp_paint_selector_get_color_alpha(psel, &color, &alpha);
- guint32 rgba = sp_color_get_rgba32_falpha(&color, alpha);
- gchar b[64];
- sp_svg_write_color(b, 64, rgba);
+ std::string colorStr = color.toString();
- sp_repr_css_set_property(css, color_property, b);
+#ifdef SP_PS_VERBOSE
+ guint32 rgba = color.toRGBA32( alpha );
+ g_message("sp_paint_selector_set_flat_color() to '%s' from 0x%08x::%s",
+ colorStr.c_str(),
+ rgba,
+ (color.icc?color.icc->colorProfile.c_str():"<null>") );
+#endif // SP_PS_VERBOSE
+
+ sp_repr_css_set_property(css, color_property, colorStr.c_str());
Inkscape::CSSOStringStream osalpha;
osalpha << alpha;
sp_repr_css_set_property(css, opacity_property, osalpha.str().c_str());
@@ -920,47 +1071,34 @@ sp_paint_selector_set_flat_color(SPPaintSelector *psel, SPDesktop *desktop, gcha
SPPaintSelectorMode
sp_style_determine_paint_selector_mode(SPStyle *style, bool isfill)
{
- unsigned set = isfill? style->fill.set : style->stroke.set;
- if (!set)
- return SP_PAINT_SELECTOR_MODE_UNSET;
-
- unsigned type = isfill? style->fill.type : style->stroke.type;
- switch (type) {
-
- case SP_PAINT_TYPE_NONE:
- {
- return SP_PAINT_SELECTOR_MODE_NONE;
- }
-
- case SP_PAINT_TYPE_COLOR:
- {
- return SP_PAINT_SELECTOR_MODE_COLOR_RGB; // so far only rgb can be read from svg
- }
-
- case SP_PAINT_TYPE_PAINTSERVER:
- {
- SPPaintServer *server = isfill? SP_STYLE_FILL_SERVER(style) : SP_STYLE_STROKE_SERVER(style);
-
- if (SP_IS_LINEARGRADIENT(server)) {
- return SP_PAINT_SELECTOR_MODE_GRADIENT_LINEAR;
- } else if (SP_IS_RADIALGRADIENT(server)) {
- return SP_PAINT_SELECTOR_MODE_GRADIENT_RADIAL;
- } else if (SP_IS_PATTERN(server)) {
- return SP_PAINT_SELECTOR_MODE_PATTERN;
- }
-
- g_warning( "file %s: line %d: Unknown paintserver",
- __FILE__, __LINE__ );
- return SP_PAINT_SELECTOR_MODE_NONE;
+ SPPaintSelectorMode mode = SP_PAINT_SELECTOR_MODE_UNSET;
+ SPIPaint& target = isfill ? style->fill : style->stroke;
+
+ if ( !target.set ) {
+ mode = SP_PAINT_SELECTOR_MODE_UNSET;
+ } else if ( target.isPaintserver() ) {
+ SPPaintServer *server = isfill? SP_STYLE_FILL_SERVER(style) : SP_STYLE_STROKE_SERVER(style);
+
+ if (SP_IS_LINEARGRADIENT(server)) {
+ mode = SP_PAINT_SELECTOR_MODE_GRADIENT_LINEAR;
+ } else if (SP_IS_RADIALGRADIENT(server)) {
+ mode = SP_PAINT_SELECTOR_MODE_GRADIENT_RADIAL;
+ } else if (SP_IS_PATTERN(server)) {
+ mode = SP_PAINT_SELECTOR_MODE_PATTERN;
+ } else {
+ g_warning( "file %s: line %d: Unknown paintserver", __FILE__, __LINE__ );
+ mode = SP_PAINT_SELECTOR_MODE_NONE;
}
-
- default:
- g_warning( "file %s: line %d: Unknown paint type %d",
- __FILE__, __LINE__, type );
- break;
+ } else if ( target.isColor() ) {
+ mode = SP_PAINT_SELECTOR_MODE_COLOR_RGB; // so far only rgb can be read from svg
+ } else if ( target.isNone() ) {
+ mode = SP_PAINT_SELECTOR_MODE_NONE;
+ } else {
+ g_warning( "file %s: line %d: Unknown paint type", __FILE__, __LINE__ );
+ mode = SP_PAINT_SELECTOR_MODE_NONE;
}
- return SP_PAINT_SELECTOR_MODE_NONE;
+ return mode;
}
/*