index 4d5a7fc12c1315ae2001ca3b18fce25ffbded40f..e5e8d5d78065738fa43b7625118c983c55f3aab0 100644 (file)
SS_STROKE
};
-static void style_swatch_attr_changed(Inkscape::XML::Node *repr, gchar const *name,
- gchar const *old_value, gchar const *new_value,
- bool is_interactive, gpointer data)
+static void style_swatch_attr_changed( Inkscape::XML::Node *repr, gchar const *name,
+ gchar const */*old_value*/, gchar const */*new_value*/,
+ bool /*is_interactive*/, gpointer data)
{
Inkscape::UI::Widget::StyleSwatch *ss = (Inkscape::UI::Widget::StyleSwatch *) data;
};
-static void style_swatch_tool_attr_changed(Inkscape::XML::Node *repr, gchar const *name,
- gchar const *old_value, gchar const *new_value,
- bool is_interactive, gpointer data)
+static void style_swatch_tool_attr_changed( Inkscape::XML::Node */*repr*/, gchar const *name,
+ gchar const */*old_value*/, gchar const *new_value,
+ bool /*is_interactive*/, gpointer data)
{
Inkscape::UI::Widget::StyleSwatch *ss = (Inkscape::UI::Widget::StyleSwatch *) data;
-
+
if (!strcmp (name, "usecurrent")) { // FIXME: watching only for the style attr, no CSS attrs
if (!strcmp (new_value, "1")) {
ss->setWatched (inkscape_get_repr(INKSCAPE, "desktop"), inkscape_get_repr(INKSCAPE, ss->_tool_path));
}
// UGLY HACK: we have to reconnect to the watched tool repr again, retrieving it from the stored
// tool_path, because the actual repr keeps shifting with each change, no idea why
- ss->setWatchedTool(ss->_tool_path, false);
+ ss->setWatchedTool(ss->_tool_path, false);
}
}
namespace Widget {
StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
- :
+ :
_tool_path(NULL),
_css (NULL),
_desktop = desktop;
}
-bool
-StyleSwatch::on_click(GdkEventButton *event)
+bool
+StyleSwatch::on_click(GdkEventButton */*event*/)
{
if (this->_desktop && this->_verb_t != SP_VERB_NONE) {
Inkscape::Verb *verb = Inkscape::Verb::get(this->_verb_t);
StyleSwatch::~StyleSwatch()
{
- if (_css)
+ if (_css)
sp_repr_css_attr_unref (_css);
for (int i = SS_FILL; i <= SS_STROKE; i++) {
void
StyleSwatch::setStyle(SPCSSAttr *css)
{
- if (_css)
+ if (_css)
sp_repr_css_attr_unref (_css);
if (!css)
}
} else if (paint->set && paint->isColor()) {
- guint32 color = sp_color_get_rgba32_falpha (&(paint->value.color),
- SP_SCALE24_TO_FLOAT ((i == SS_FILL)? query->fill_opacity.value : query->stroke_opacity.value));
+ guint32 color = paint->value.color.toRGBA32( SP_SCALE24_TO_FLOAT ((i == SS_FILL)? query->fill_opacity.value : query->stroke_opacity.value) );
((Inkscape::UI::Widget::ColorPreview*)_color_preview[i])->setRgba32 (color);
_color_preview[i]->show_all();
place->add(*_color_preview[i]);
g_free (str);
}
{
- gchar *str = g_strdup_printf(_("Stroke width: %.5g%s"),
- w,
+ gchar *str = g_strdup_printf(_("Stroke width: %.5g%s"),
+ w,
_sw_unit? sp_unit_get_abbreviation(_sw_unit) : "px");
_tooltips.set_tip(_stroke_width_place, str);
g_free (str);
gchar *str;
if (op == 0)
str = g_strdup_printf(_("O:%.3g"), op);
- else
+ else
str = g_strdup_printf(_("O:.%d"), (int) (op*10));
_opacity_value.set_markup (str);
g_free (str);
} // namespace UI
} // namespace Inkscape
-/*
+/*
Local Variables:
mode:c++
c-file-style:"stroustrup"