Code

Filter effects dialog:
[inkscape.git] / src / ui / dialog / filter-effects-dialog.cpp
index 1d14d69f43e76665ac4bb9e43c1d7bd055882e1e..a233a0ed408f7760dfaffc8ed85f1c9db30959ec 100644 (file)
 #include "filter-chemistry.h"
 #include "filter-effects-dialog.h"
 #include "inkscape.h"
+#include "sp-feblend.h"
+#include "sp-fecomposite.h"
+#include "sp-fedisplacementmap.h"
+#include "sp-femerge.h"
 #include "sp-filter-primitive.h"
 #include "sp-gaussian-blur.h"
 #include "sp-feoffset.h"
@@ -89,8 +93,8 @@ FilterEffectsDialog::FilterModifier::FilterModifier()
     sw->set_shadow_type(Gtk::SHADOW_IN);
     show_all_children();
     _add.signal_clicked().connect(sigc::mem_fun(*this, &FilterModifier::add_filter));
-    _list.signal_button_press_event().connect_notify(
-        sigc::mem_fun(*this, &FilterModifier::filter_list_button_press));
+    _list.signal_button_release_event().connect_notify(
+        sigc::mem_fun(*this, &FilterModifier::filter_list_button_release));
     _menu = create_popup_menu(*this, sigc::mem_fun(*this, &FilterModifier::duplicate_filter),
                               sigc::mem_fun(*this, &FilterModifier::remove_filter));
 
@@ -127,9 +131,9 @@ void FilterEffectsDialog::FilterModifier::select_filter(const SPFilter* filter)
     }
 }
 
-void FilterEffectsDialog::FilterModifier::filter_list_button_press(GdkEventButton* event)
+void FilterEffectsDialog::FilterModifier::filter_list_button_release(GdkEventButton* event)
 {
-    if((event->type == GDK_BUTTON_PRESS) && (event->button == 3)) {
+    if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
         const bool sensitive = get_selected_filter() != NULL;
         _menu->items()[0].set_sensitive(sensitive);
         _menu->items()[1].set_sensitive(sensitive);
@@ -165,10 +169,12 @@ void FilterEffectsDialog::FilterModifier::remove_filter()
 
 void FilterEffectsDialog::FilterModifier::duplicate_filter()
 {
-    SPFilter *filter = get_selected_filter();
+    SPFilterfilter = get_selected_filter();
 
     if(filter) {
-        //SPFilter *dupfilter = filter_duplicate(sp_desktop_document(SP_ACTIVE_DESKTOP), filter);
+        Inkscape::XML::Node* repr = SP_OBJECT_REPR(filter), *parent = repr->parent();
+        repr = repr->duplicate(repr->document());
+        parent->appendChild(repr);
 
         sp_document_done(filter->document, SP_VERB_DIALOG_FILTER_EFFECTS, _("Duplicate filter"));
 
@@ -184,60 +190,721 @@ void FilterEffectsDialog::FilterModifier::filter_name_edited(const Glib::ustring
         try_id_change((SPObject*)(*i)[_columns.filter], text);
 }
 
-/*** SettingsFrame ***/
-FilterEffectsDialog::SettingsFrame::SettingsFrame()
-    : _where(0)
+FilterEffectsDialog::CellRendererConnection::CellRendererConnection()
+    : Glib::ObjectBase(typeid(CellRendererConnection)),
+      _primitive(*this, "primitive", 0)
+{}
+
+Glib::PropertyProxy<void*> FilterEffectsDialog::CellRendererConnection::property_primitive()
+{
+    return _primitive.get_proxy();
+}
+
+int FilterEffectsDialog::CellRendererConnection::input_count(const SPFilterPrimitive* prim)
+{
+    if(!prim)
+        return 0;
+    else if(SP_IS_FEBLEND(prim) || SP_IS_FECOMPOSITE(prim) || SP_IS_FEDISPLACEMENTMAP(prim))
+        return 2;
+    else if(SP_IS_FEMERGE(prim)) {
+        // Return the number of feMergeNode connections plus an extra one for adding a new input
+        int count = 1;
+        for(const SPObject* o = prim->firstChild(); o; o = o->next, ++count);
+        return count;
+    }
+    else
+        return 1;
+}
+
+void FilterEffectsDialog::CellRendererConnection::set_text_width(const int w)
+{
+    _text_width = w;
+}
+
+int FilterEffectsDialog::CellRendererConnection::get_text_width() const
+{
+    return _text_width;
+}
+
+void FilterEffectsDialog::CellRendererConnection::get_size_vfunc(
+    Gtk::Widget& widget, const Gdk::Rectangle* cell_area,
+    int* x_offset, int* y_offset, int* width, int* height) const
+{
+    PrimitiveList& primlist = dynamic_cast<PrimitiveList&>(widget);
+
+    if(x_offset)
+        (*x_offset) = 0;
+    if(y_offset)
+        (*y_offset) = 0;
+    if(width)
+        (*width) = size * primlist.primitive_count() + _text_width * 7;
+    if(height) {
+        // Scale the height depending on the number of inputs, unless it's
+        // the first primitive, in which case there are no connections
+        SPFilterPrimitive* prim = (SPFilterPrimitive*)_primitive.get_value();
+        (*height) = size * input_count(prim);
+    }
+}
+
+/*** PrimitiveList ***/
+FilterEffectsDialog::PrimitiveList::PrimitiveList(FilterEffectsDialog& d)
+    : _dialog(d),
+      _in_drag(0)
+{
+    add_events(Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
+    signal_expose_event().connect(sigc::mem_fun(*this, &PrimitiveList::on_expose_signal));
+
+    _model = Gtk::ListStore::create(_columns);
+
+    set_reorderable(true);
+
+    set_model(_model);
+    append_column(_("_Type"), _columns.type);
+
+    signal_selection_changed().connect(sigc::mem_fun(*this, &PrimitiveList::queue_draw));
+
+    _connection_cell.set_text_width(init_text());
+
+    int cols_count = append_column(_("Connections"), _connection_cell);
+    Gtk::TreeViewColumn* col = get_column(cols_count - 1);
+    if(col)
+       col->add_attribute(_connection_cell.property_primitive(), _columns.primitive);
+}
+
+// Sets up a vertical Pango context/layout, and returns the largest
+// width needed to render the FilterPrimitiveInput labels.
+int FilterEffectsDialog::PrimitiveList::init_text()
+{
+    // Set up a vertical context+layout
+    Glib::RefPtr<Pango::Context> context = create_pango_context();
+    const Pango::Matrix matrix = {0, -1, 1, 0, 0, 0};
+    context->set_matrix(matrix);
+    _vertical_layout = Pango::Layout::create(context);
+
+    int maxfont = 0;
+    for(int i = 0; i < FPInputConverter.end; ++i) {
+        _vertical_layout->set_text(FPInputConverter.get_label((FilterPrimitiveInput)i));
+        int fontw, fonth;
+        _vertical_layout->get_pixel_size(fontw, fonth);
+        if(fonth > maxfont)
+            maxfont = fonth;
+    }
+
+    return maxfont;
+}
+
+Glib::SignalProxy0<void> FilterEffectsDialog::PrimitiveList::signal_selection_changed()
+{
+    return get_selection()->signal_changed();
+}
+
+/* Add all filter primitives in the current to the list.
+   Keeps the same selection if possible, otherwise selects the first element */
+void FilterEffectsDialog::PrimitiveList::update()
+{
+    SPFilter* f = _dialog._filter_modifier.get_selected_filter();
+    const SPFilterPrimitive* active_prim = get_selected();
+    bool active_found = false;
+
+    _model->clear();
+
+    if(f) {
+        _dialog._primitive_box.set_sensitive(true);
+
+        for(SPObject *prim_obj = f->children;
+                prim_obj && SP_IS_FILTER_PRIMITIVE(prim_obj);
+                prim_obj = prim_obj->next) {
+            SPFilterPrimitive *prim = SP_FILTER_PRIMITIVE(prim_obj);
+            if(prim) {
+                Gtk::TreeModel::Row row = *_model->append();
+                row[_columns.primitive] = prim;
+                row[_columns.type_id] = FPConverter.get_id_from_key(prim->repr->name());
+                row[_columns.type] = FPConverter.get_label(row[_columns.type_id]);
+                row[_columns.id] = SP_OBJECT_ID(prim);
+
+                if(prim == active_prim) {
+                    get_selection()->select(row);
+                    active_found = true;
+                }
+            }
+        }
+
+        if(!active_found && _model->children().begin())
+            get_selection()->select(_model->children().begin());
+    }
+    else {
+        _dialog._primitive_box.set_sensitive(false);
+    }
+}
+
+void FilterEffectsDialog::PrimitiveList::set_menu(Glib::RefPtr<Gtk::Menu> menu)
 {
-     set_col_spacings(12);
-     show();
+    _primitive_menu = menu;
 }
 
-void FilterEffectsDialog::SettingsFrame::init(Gtk::VBox& box)
+SPFilterPrimitive* FilterEffectsDialog::PrimitiveList::get_selected()
 {
-    box.pack_start(*this, false, false);
+    if(_dialog._filter_modifier.get_selected_filter()) {
+        Gtk::TreeModel::iterator i = get_selection()->get_selected();
+        if(i)
+            return (*i)[_columns.primitive];
+    }
+
+    return 0;
 }
 
-void FilterEffectsDialog::SettingsFrame::add_setting(Gtk::Widget& w, const Glib::ustring& label)
+void FilterEffectsDialog::PrimitiveList::select(SPFilterPrimitive* prim)
 {
-    Gtk::Label *lbl = new Gtk::Label(label + ":", Gtk::ALIGN_LEFT);
+    for(Gtk::TreeIter i = _model->children().begin();
+        i != _model->children().end(); ++i) {
+        if((*i)[_columns.primitive] == prim)
+            get_selection()->select(i);
+    }
+}
 
-    attach(*Gtk::manage(lbl), 0, 1, _where, _where + 1, Gtk::FILL, Gtk::FILL);
-    attach(w, 1, 2, _where, _where + 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
 
+
+bool FilterEffectsDialog::PrimitiveList::on_expose_signal(GdkEventExpose* e)
+{
+    Gdk::Rectangle clip(e->area.x, e->area.y, e->area.width, e->area.height);
+    Glib::RefPtr<Gdk::Window> win = get_bin_window();
+    Glib::RefPtr<Gdk::GC> darkgc = get_style()->get_dark_gc(Gtk::STATE_NORMAL);
+
+    SPFilterPrimitive* prim = get_selected();
+    int row_count = get_model()->children().size();
+
+    int fheight = CellRendererConnection::size;
+    Gdk::Rectangle rct, vis;
+    Gtk::TreeIter row = get_model()->children().begin();
+    int text_start_x = 0;
+    if(row) {
+        get_cell_area(get_model()->get_path(row), *get_column(1), rct);
+        get_visible_rect(vis);
+        int vis_x, vis_y;
+        tree_to_widget_coords(vis.get_x(), vis.get_y(), vis_x, vis_y);
+
+        text_start_x = rct.get_x() + row_count * fheight;
+        for(int i = 0; i < FPInputConverter.end; ++i) {
+            _vertical_layout->set_text(FPInputConverter.get_label((FilterPrimitiveInput)i));
+            const int x = text_start_x + _connection_cell.get_text_width() * (i + 1);
+            get_bin_window()->draw_layout(get_style()->get_text_gc(Gtk::STATE_NORMAL), x, vis_y, _vertical_layout);
+            get_bin_window()->draw_line(darkgc, x, vis_y, x, vis_y + vis.get_height());
+        }
+    }
+
+    int row_index = 0;
+    for(; row != get_model()->children().end(); ++row, ++row_index) {
+        get_cell_area(get_model()->get_path(row), *get_column(1), rct);
+        const int x = rct.get_x(), y = rct.get_y(), h = rct.get_height();
+
+        // Check mouse state
+        int mx, my;
+        Gdk::ModifierType mask;
+        get_bin_window()->get_pointer(mx, my, mask);
+
+        // Outline the bottom of the connection area
+        const int outline_x = x + fheight * (row_count - row_index);
+        get_bin_window()->draw_line(darkgc, x, y + h, outline_x, y + h);
+
+        // Side outline
+        get_bin_window()->draw_line(darkgc, outline_x, y, outline_x, y + h);
+
+        std::vector<Gdk::Point> con_poly;
+        int con_drag_y;
+        bool inside;
+        const SPFilterPrimitive* row_prim = (*row)[_columns.primitive];
+        const int inputs = CellRendererConnection::input_count(row_prim);
+
+        if(SP_IS_FEMERGE(row_prim)) {
+            for(int i = 0; i < inputs; ++i) {
+                inside = do_connection_node(row, i, con_poly, mx, my);
+                get_bin_window()->draw_polygon(inside && mask & GDK_BUTTON1_MASK ?
+                                               darkgc : get_style()->get_dark_gc(Gtk::STATE_ACTIVE),
+                                               inside, con_poly);
+
+                // TODO: draw connections for each of the feMergeNodes
+            }
+        }
+        else {
+            // Draw "in" shape
+            inside = do_connection_node(row, 0, con_poly, mx, my);
+            con_drag_y = con_poly[2].get_y();
+            get_bin_window()->draw_polygon(inside && mask & GDK_BUTTON1_MASK ?
+                                           darkgc : get_style()->get_dark_gc(Gtk::STATE_ACTIVE),
+                                           inside, con_poly);
+            // Draw "in" connection
+            if(_in_drag != 1 || row_prim != prim)
+                draw_connection(row, SP_ATTR_IN, text_start_x, outline_x, con_poly[2].get_y(), row_count);
+
+            if(inputs == 2) {
+                // Draw "in2" shape
+                inside = do_connection_node(row, 1, con_poly, mx, my);
+                if(_in_drag == 2)
+                    con_drag_y = con_poly[2].get_y();
+                get_bin_window()->draw_polygon(inside && mask & GDK_BUTTON1_MASK ?
+                                               darkgc : get_style()->get_dark_gc(Gtk::STATE_ACTIVE),
+                                               inside, con_poly);
+                // Draw "in2" connection
+                if(_in_drag != 2 || row_prim != prim)
+                    draw_connection(row, SP_ATTR_IN2, text_start_x, outline_x, con_poly[2].get_y(), row_count);
+            }
+
+            // Draw drag connection
+            if(row_prim == prim && _in_drag) {
+                get_bin_window()->draw_line(get_style()->get_black_gc(), outline_x, con_drag_y,
+                                            mx, con_drag_y);
+                get_bin_window()->draw_line(get_style()->get_black_gc(), mx, con_drag_y, mx, my);
+            }
+        }
+    }
+
+    return true;
+}
+
+void FilterEffectsDialog::PrimitiveList::draw_connection(const Gtk::TreeIter& input, const SPAttributeEnum attr,
+                                                         const int text_start_x, const int x1, const int y1,
+                                                         const int row_count)
+{
+    const Gtk::TreeIter res = find_result(input, attr);
+    Glib::RefPtr<Gdk::GC> gc = get_style()->get_black_gc();
+    
+    if(res == input) {
+        // Draw straight connection to a standard input
+        const int tw = _connection_cell.get_text_width();
+        const int src = 1 + (int)FPInputConverter.get_id_from_key(
+            SP_OBJECT_REPR((*res)[_columns.primitive])->attribute((const gchar*)sp_attribute_name(attr)));
+        get_bin_window()->draw_line(gc, x1, y1, text_start_x + tw * src + (int)(tw * 0.5f), y1);
+    }
+    else if(res != _model->children().end()) {
+        Gdk::Rectangle rct;
+
+        get_cell_area(get_model()->get_path(_model->children().begin()), *get_column(1), rct);
+        const int fheight = CellRendererConnection::size;
+
+        get_cell_area(get_model()->get_path(res), *get_column(1), rct);
+        const int row_index = find_index(res);
+        const int x2 = rct.get_x() + fheight * (row_count - row_index) - fheight / 2;
+        const int y2 = rct.get_y() + rct.get_height();
+
+        // Draw an 'L'-shaped connection to another filter primitive
+        get_bin_window()->draw_line(gc, x1, y1, x2, y1);
+        get_bin_window()->draw_line(gc, x2, y1, x2, y2);
+    }
+}
+
+// Creates a triangle outline of the connection node and returns true if (x,y) is inside the node
+bool FilterEffectsDialog::PrimitiveList::do_connection_node(const Gtk::TreeIter& row, const int input,
+                                                            std::vector<Gdk::Point>& points,
+                                                            const int ix, const int iy)
+{
+    Gdk::Rectangle rct;
+    const int input_count = CellRendererConnection::input_count((*row)[_columns.primitive]);
+
+    get_cell_area(get_model()->get_path(_model->children().begin()), *get_column(1), rct);
+    const int fheight = CellRendererConnection::size;
+
+    get_cell_area(_model->get_path(row), *get_column(1), rct);
+    const float h = rct.get_height() / input_count;
+
+    const int x = rct.get_x() + fheight * (_model->children().size() - find_index(row));
+    const int con_w = (int)(fheight * 0.35f);
+    const int con_y = (int)(rct.get_y() + (h / 2) - con_w + (input * h));
+    points.clear();
+    points.push_back(Gdk::Point(x, con_y));
+    points.push_back(Gdk::Point(x, con_y + con_w * 2));
+    points.push_back(Gdk::Point(x - con_w, con_y + con_w));
+
+    return ix >= x - h && iy >= con_y && ix <= x && iy <= points[1].get_y();
+}
+
+const Gtk::TreeIter FilterEffectsDialog::PrimitiveList::find_result(const Gtk::TreeIter& start,
+                                                                    const SPAttributeEnum attr)
+{
+    SPFilterPrimitive* prim = (*start)[_columns.primitive];
+    Gtk::TreeIter target = _model->children().end();
+    int image;
+
+    if(attr == SP_ATTR_IN)
+        image = prim->image_in;
+    else if(attr == SP_ATTR_IN2) {
+        if(SP_IS_FEBLEND(prim))
+            image = SP_FEBLEND(prim)->in2;
+        else if(SP_IS_FECOMPOSITE(prim))
+            image = SP_FECOMPOSITE(prim)->in2;
+        /*else if(SP_IS_FEDISPLACEMENTMAP(prim))
+        image = SP_FEDISPLACEMENTMAP(prim)->in2;*/
+        else
+            return target;
+    }
+    else
+        return target;
+
+    if(image >= 0) {
+        for(Gtk::TreeIter i = _model->children().begin();
+            i != start; ++i) {
+            if(((SPFilterPrimitive*)(*i)[_columns.primitive])->image_out == image)
+                target = i;
+        }
+        return target;
+    }
+    else if(image < -1)
+        return start;
+
+    return target;
+}
+
+int FilterEffectsDialog::PrimitiveList::find_index(const Gtk::TreeIter& target)
+{
+    int i = 0;
+    for(Gtk::TreeIter iter = _model->children().begin();
+        iter != target; ++iter, ++i);
+    return i;
+}
+
+bool FilterEffectsDialog::PrimitiveList::on_button_press_event(GdkEventButton* e)
+{
+    Gtk::TreePath path;
+    Gtk::TreeViewColumn* col;
+    const int x = (int)e->x, y = (int)e->y;
+    int cx, cy;
+
+    _drag_prim = 0;
+    
+    if(get_path_at_pos(x, y, path, col, cx, cy)) {
+        Gtk::TreeIter iter = _model->get_iter(path);
+        std::vector<Gdk::Point> points;
+        if(do_connection_node(_model->get_iter(path), 0, points, x, y))
+            _in_drag = 1;
+        else if(do_connection_node(_model->get_iter(path), 1, points, x, y))
+            _in_drag = 2;
+        
+        queue_draw();
+        _drag_prim = (*iter)[_columns.primitive];
+    }
+
+    if(_in_drag) {
+        get_selection()->select(path);
+        return true;
+    }
+    else
+        return Gtk::TreeView::on_button_press_event(e);
+}
+
+bool FilterEffectsDialog::PrimitiveList::on_motion_notify_event(GdkEventMotion* e)
+{
+    queue_draw();
+
+    return Gtk::TreeView::on_motion_notify_event(e);
+}
+
+bool FilterEffectsDialog::PrimitiveList::on_button_release_event(GdkEventButton* e)
+{
+    SPFilterPrimitive *prim = get_selected(), *target;
+
+    if(_in_drag && prim) {
+        Gtk::TreePath path;
+        Gtk::TreeViewColumn* col;
+        int cx, cy;
+        
+        if(get_path_at_pos((int)e->x, (int)e->y, path, col, cx, cy)) {
+            const gchar *in_val = 0;
+            Glib::ustring result;
+            Gtk::TreeIter target_iter = _model->get_iter(path);
+            target = (*target_iter)[_columns.primitive];
+
+            const int sources_x = CellRendererConnection::size * _model->children().size() +
+                _connection_cell.get_text_width();
+
+            if(cx > sources_x) {
+                int src = (cx - sources_x) / _connection_cell.get_text_width();
+                if(src < 0)
+                    src = 1;
+                else if(src >= FPInputConverter.end)
+                    src = FPInputConverter.end - 1;
+                result = FPInputConverter.get_key((FilterPrimitiveInput)src);
+                in_val = result.c_str();
+            }
+            else {
+                // Ensure that the target comes before the selected primitive
+                for(Gtk::TreeIter iter = _model->children().begin();
+                    iter != get_selection()->get_selected(); ++iter) {
+                    if(iter == target_iter) {
+                        Inkscape::XML::Node *repr = SP_OBJECT_REPR(target);
+                        // Make sure the target has a result
+                        const gchar *gres = repr->attribute("result");
+                        if(!gres) {
+                            result = "result" + Glib::Ascii::dtostr(SP_FILTER(prim->parent)->_image_number_next);
+                            repr->setAttribute("result", result.c_str());
+                            in_val = result.c_str();
+                        }
+                        else
+                            in_val = gres;
+                        break;
+                    }
+                }
+            }
+
+            if(_in_drag == 1)
+                _dialog.set_attr(SP_ATTR_IN, in_val);
+            else if(_in_drag == 2)
+                _dialog.set_attr(SP_ATTR_IN2, in_val);
+        }
+
+        _in_drag = 0;
+        queue_draw();
+
+        _dialog.update_settings_view();
+    }
+
+    if((e->type == GDK_BUTTON_RELEASE) && (e->button == 3)) {
+        const bool sensitive = get_selected() != NULL;
+        _primitive_menu->items()[0].set_sensitive(sensitive);
+        _primitive_menu->items()[1].set_sensitive(sensitive);
+        _primitive_menu->popup(e->button, e->time);
+
+        return true;
+    }
+    else
+        return Gtk::TreeView::on_button_release_event(e);
+}
+
+// Checks all of prim's inputs, removes any that use result
+void check_single_connection(SPFilterPrimitive* prim, const int result)
+{
+    if(prim && result >= 0) {
+
+        if(prim->image_in == result)
+            SP_OBJECT_REPR(prim)->setAttribute("in", 0);
+
+        if(SP_IS_FEBLEND(prim)) {
+            if(SP_FEBLEND(prim)->in2 == result)
+                SP_OBJECT_REPR(prim)->setAttribute("in2", 0);
+        }
+        else if(SP_IS_FECOMPOSITE(prim)) {
+            if(SP_FECOMPOSITE(prim)->in2 == result)
+                SP_OBJECT_REPR(prim)->setAttribute("in2", 0);
+        }
+    }
+}
+
+// Remove any connections going to/from prim_iter that forward-reference other primitives
+void FilterEffectsDialog::PrimitiveList::sanitize_connections(const Gtk::TreeIter& prim_iter)
+{
+    SPFilterPrimitive *prim = (*prim_iter)[_columns.primitive];
+    bool before = true;
+
+    for(Gtk::TreeIter iter = _model->children().begin();
+        iter != _model->children().end(); ++iter) {
+        if(iter == prim_iter)
+            before = false;
+        else {
+            SPFilterPrimitive* cur_prim = (*iter)[_columns.primitive];
+            if(before)
+                check_single_connection(cur_prim, prim->image_out);
+            else
+                check_single_connection(prim, cur_prim->image_out);
+        }
+    }
+}
+
+// Reorder the filter primitives to match the list order
+void FilterEffectsDialog::PrimitiveList::on_drag_end(const Glib::RefPtr<Gdk::DragContext>&)
+{
+    SPFilter* filter = _dialog._filter_modifier.get_selected_filter();
+    int ndx = 0;
+
+    for(Gtk::TreeModel::iterator iter = _model->children().begin();
+        iter != _model->children().end(); ++iter, ++ndx) {
+        SPFilterPrimitive* prim = (*iter)[_columns.primitive];
+        if(prim) {
+            SP_OBJECT_REPR(prim)->setPosition(ndx);
+            if(_drag_prim == prim) {
+                sanitize_connections(iter);
+                get_selection()->select(iter);
+            }
+        }
+    }
+
+    filter->requestModified(SP_OBJECT_MODIFIED_FLAG);
+
+    sp_document_done(filter->document, SP_VERB_DIALOG_FILTER_EFFECTS, _("Reorder filter primitive"));
+}
+
+int FilterEffectsDialog::PrimitiveList::primitive_count() const
+{
+    return _model->children().size();
+}
+
+/*** SettingsGroup ***/
+FilterEffectsDialog::SettingsGroup::SettingsGroup()
+{
+    show();
+}
+
+void FilterEffectsDialog::SettingsGroup::init(FilterEffectsDialog* dlg, Glib::RefPtr<Gtk::SizeGroup> sg)
+{
+    _dialog = dlg;
+    _dialog->_settings.pack_start(*this, false, false);
+    _sizegroup = sg;
+}
+
+/* Adds a new settings widget using the specified label. The label will be formatted with a colon
+   and all widgets within the setting group are aligned automatically. */
+void FilterEffectsDialog::SettingsGroup::add_setting_generic(Gtk::Widget& w, const Glib::ustring& label)
+{
+    Gtk::Label *lbl = Gtk::manage(new Gtk::Label(label + (label == "" ? "" : ":"), Gtk::ALIGN_LEFT));
+    Gtk::HBox *hb = Gtk::manage(new Gtk::HBox);
+    hb->set_spacing(12);
+    hb->pack_start(*lbl, false, false);
+    hb->pack_start(w);
+    pack_start(*hb);
+
+    _sizegroup->add_widget(*lbl);
+
+    hb->show();
     lbl->show();
+
     w.show();
+}
 
-    ++_where;
+/* For SpinSlider settings */
+void FilterEffectsDialog::SettingsGroup::add_setting(SpinSlider& ss, const SPAttributeEnum attr,
+                                                     const Glib::ustring& label)
+{
+    add_setting_generic(ss, label);
+    ss.signal_value_changed().connect(
+        sigc::bind(sigc::mem_fun(_dialog, &FilterEffectsDialog::set_attr_spinslider), attr, &ss));
+}
+
+/* For subgroups of settings */
+void FilterEffectsDialog::SettingsGroup::add_setting(std::vector<Gtk::Widget*>& w, const Glib::ustring& label)
+{
+    Gtk::HBox *hb = Gtk::manage(new Gtk::HBox);
+    for(unsigned int i = 0; i < w.size(); ++i)
+        hb->pack_start(*w[i]);
+    hb->set_spacing(12);
+    add_setting_generic(*hb, label);
+}
+
+/*** ConvolveMatrix ***/
+FilterEffectsDialog::ConvolveMatrixColumns::ConvolveMatrixColumns()
+{
+    cols.resize(5);
+    for(unsigned i = 0; i < cols.size(); ++i)
+        add(cols[i]);
+}
+
+FilterEffectsDialog::ConvolveMatrix::ConvolveMatrix()
+{
+    _model = Gtk::ListStore::create(_columns);
+    set_model(_model);
+    set_headers_visible(false);
+}
+
+sigc::signal<void>& FilterEffectsDialog::ConvolveMatrix::signal_changed()
+{
+    return _signal_changed;
+}
+
+Glib::ustring FilterEffectsDialog::ConvolveMatrix::get_value() const
+{
+    std::ostringstream os;
+
+    for(Gtk::TreeIter iter = _model->children().begin();
+        iter != _model->children().end(); ++iter) {
+        for(unsigned c = 0; c < get_columns().size(); ++c) {
+            os << (*iter)[_columns.cols[c]] << " ";
+        }
+    }
+
+    return os.str();
+}
+
+void FilterEffectsDialog::ConvolveMatrix::update(SPFeConvolveMatrix* conv)
+{
+    if(conv) {
+        int cols, rows;
+
+        cols = (int)conv->order.getNumber();
+        if(cols > 5)
+            cols = 5;
+        rows = conv->order.optNumber_set ? (int)conv->order.getOptNumber() : cols;
+
+        update(conv, cols, rows);
+    }
+}
+
+void FilterEffectsDialog::ConvolveMatrix::update(SPFeConvolveMatrix* conv, const int rows, const int cols)
+{
+    _model->clear();
+
+    remove_all_columns();
+
+    if(conv) {
+        int ndx = 0;
+
+        for(int i = 0; i < cols; ++i) {
+            append_column_numeric_editable("", _columns.cols[i], "%.2f");
+            dynamic_cast<Gtk::CellRendererText*>(get_column(i)->get_first_cell_renderer())->signal_edited().connect(
+                sigc::mem_fun(*this, &ConvolveMatrix::rebind));
+        }
+
+        for(int r = 0; r < rows; ++r) {
+            Gtk::TreeRow row = *(_model->append());
+            for(int c = 0; c < cols; ++c, ++ndx)
+                row[_columns.cols[c]] = ndx < (int)conv->kernelMatrix.size() ? conv->kernelMatrix[ndx] : 0;
+        }
+    }
+}
+
+void FilterEffectsDialog::ConvolveMatrix::rebind(const Glib::ustring&, const Glib::ustring&)
+{
+    _signal_changed();
 }
 
 /*** FilterEffectsDialog ***/
 
 FilterEffectsDialog::FilterEffectsDialog() 
     : Dialog ("dialogs.filtereffects", SP_VERB_DIALOG_FILTER_EFFECTS),
+      _primitive_list(*this),
       _add_primitive_type(FPConverter),
       _add_primitive(Gtk::Stock::ADD),
-      _empty_settings("No primitive selected", Gtk::ALIGN_LEFT),
+      _settings_labels(Gtk::SizeGroup::create(Gtk::SIZE_GROUP_HORIZONTAL)),
+      _empty_settings(_("No primitive selected"), Gtk::ALIGN_LEFT),
+      // TODO: Find better range/climb-rate/digits values for the SpinSliders,
+      //       many of the current values are just guesses
       _blend_mode(BlendModeConverter),
+      _composite_operator(CompositeOperatorConverter),
+      _composite_k1(0, -10, 10, 1, 0.01, 1),
+      _composite_k2(0, -10, 10, 1, 0.01, 1),
+      _composite_k3(0, -10, 10, 1, 0.01, 1),
+      _composite_k4(0, -10, 10, 1, 0.01, 1),
+      _convolve_orderx(1, 0),
+      _convolve_ordery(1, 0),
+      _convolve_divisor(1, 0.01, 10, 1, 0.01, 1),
+      _convolve_bias(0, -10, 10, 1, 0.01, 1),
       _gaussianblur_stddeviation(1, 0, 100, 1, 0.01, 1),
       _morphology_radius(1, 0, 100, 1, 0.01, 1),
       _offset_dx(0, -100, 100, 1, 0.01, 1),
       _offset_dy(0, -100, 100, 1, 0.01, 1),
       _turbulence_basefrequency(1, 0, 100, 1, 0.01, 1),
-      _turbulence_numoctaves(1, 0, 100, 1, 0.01, 1),
-      _turbulence_seed(1, 0, 100, 1, 0.01, 1)
+      _turbulence_numoctaves(1, 1, 10, 1, 1, 0),
+      _turbulence_seed(1, 0, 100, 1, 0.01, 1),
+      _turbulence_stitchtiles(_("Stitch Tiles")),
+      _turbulence_fractalnoise(_turbulence_type, _("Fractal Noise")),
+      _turbulence_turbulence(_turbulence_type, _("Turbulence"))
 {
     // Initialize widget hierarchy
     Gtk::HPaned* hpaned = Gtk::manage(new Gtk::HPaned);
-    Gtk::VBox* vb_prims = Gtk::manage(new Gtk::VBox);
     Gtk::ScrolledWindow* sw_prims = Gtk::manage(new Gtk::ScrolledWindow);
     Gtk::HBox* hb_prims = Gtk::manage(new Gtk::HBox);
-    Gtk::Frame* fr_settings = Gtk::manage(new Gtk::Frame("<b>Settings</b>"));
+    Gtk::Frame* fr_settings = Gtk::manage(new Gtk::Frame(_("<b>Settings</b>")));
     Gtk::Alignment* al_settings = Gtk::manage(new Gtk::Alignment);
     get_vbox()->add(*hpaned);
     hpaned->pack1(_filter_modifier);
-    hpaned->pack2(*vb_prims);
-    vb_prims->pack_start(*sw_prims);
-    vb_prims->pack_start(*hb_prims, false, false);
+    hpaned->pack2(_primitive_box);
+    _primitive_box.pack_start(*sw_prims);
+    _primitive_box.pack_start(*hb_prims, false, false);
     sw_prims->add(_primitive_list);
     hb_prims->pack_end(_add_primitive, false, false);
     hb_prims->pack_end(_add_primitive_type, false, false);
@@ -245,36 +912,24 @@ FilterEffectsDialog::FilterEffectsDialog()
     fr_settings->add(*al_settings);
     al_settings->add(_settings);
 
-    // Primitive list
-    _primitive_model = Gtk::ListStore::create(_primitive_columns);
-    _primitive_list.set_reorderable(true);
-    _primitive_list.set_model(_primitive_model);
-    //_primitive_list.append_column_editable(_("_Primitive"), _primitive_columns.id);
-    _primitive_list.append_column("Type", _primitive_columns.type);
-    ((Gtk::CellRendererText*)_primitive_list.get_column(0)->get_first_cell_renderer())->
-        signal_edited().connect(sigc::mem_fun(*this, &FilterEffectsDialog::primitive_name_edited));
-    _filter_modifier.signal_selection_changed().connect(
-        sigc::mem_fun(*this, &FilterEffectsDialog::update_primitive_list));
-    _primitive_list.get_selection()->signal_changed().connect(
+    _primitive_list.signal_selection_changed().connect(
         sigc::mem_fun(*this, &FilterEffectsDialog::update_settings_view));
-    _primitive_list.signal_button_press_event().connect_notify(
-        sigc::mem_fun(*this, &FilterEffectsDialog::primitive_list_button_press));
-    _primitive_list.signal_drag_end().connect(
-        sigc::mem_fun(*this, &FilterEffectsDialog::primitive_list_drag_end));
+    _filter_modifier.signal_selection_changed().connect(
+        sigc::mem_fun(_primitive_list, &PrimitiveList::update));
 
-    // Other widgets
     sw_prims->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
     sw_prims->set_shadow_type(Gtk::SHADOW_IN);
     al_settings->set_padding(0, 0, 12, 0);
     fr_settings->set_shadow_type(Gtk::SHADOW_NONE);
     ((Gtk::Label*)fr_settings->get_label_widget())->set_use_markup();
     _add_primitive.signal_clicked().connect(sigc::mem_fun(*this, &FilterEffectsDialog::add_primitive));
-    _primitive_menu = create_popup_menu(*this, sigc::mem_fun(*this, &FilterEffectsDialog::duplicate_primitive),
-                                        sigc::mem_fun(*this, &FilterEffectsDialog::remove_primitive));
+    _primitive_list.set_menu(create_popup_menu(*this, sigc::mem_fun(*this, &FilterEffectsDialog::duplicate_primitive),
+                                               sigc::mem_fun(*this, &FilterEffectsDialog::remove_primitive)));
+    _settings_labels->set_ignore_hidden(true);
     
     show_all_children();
     init_settings_widgets();
-    update_primitive_list();
+    _primitive_list.update();
     update_settings_view();
 }
 
@@ -282,143 +937,92 @@ FilterEffectsDialog::~FilterEffectsDialog()
 {
 }
 
-void FilterEffectsDialog::primitive_list_button_press(GdkEventButton* event)
-{
-    if((event->type == GDK_BUTTON_PRESS) && (event->button == 3)) {
-        const bool sensitive = get_selected_primitive() != NULL;
-        _primitive_menu->items()[0].set_sensitive(sensitive);
-        _primitive_menu->items()[1].set_sensitive(sensitive);
-        _primitive_menu->popup(event->button, event->time);
-    }
-}
-
-// Reorder the filter primitives to match the list order
-void FilterEffectsDialog::primitive_list_drag_end(const Glib::RefPtr<Gdk::DragContext>&)
-{
-    int ndx = 0;
-    SPFilter* filter = _filter_modifier.get_selected_filter();
-
-    for(Gtk::TreeModel::iterator iter = _primitive_model->children().begin();
-        iter != _primitive_model->children().end(); ++iter) {
-        SPFilterPrimitive* prim = (*iter)[_primitive_columns.primitive];
-        if(prim)
-            ;//reorder_primitive(filter, prim->repr->position(), ndx); /* FIXME */
-        std::cout << prim->repr->position();
-    }
-
-    sp_document_done(filter->document, SP_VERB_DIALOG_FILTER_EFFECTS, _("Reorder filter primitive"));
-}
-
 void FilterEffectsDialog::init_settings_widgets()
 {
     _empty_settings.set_sensitive(false);
     _settings.pack_start(_empty_settings);
 
-    _blend.init(_settings);
-    _blend.add_setting(_blend_mode, "Mode");
-    _blend_mode.signal_changed().connect(
-        sigc::bind(sigc::mem_fun(*this, &FilterEffectsDialog::set_attr), SP_ATTR_MODE));
-
-    _colormatrix.init(_settings);
-    _colormatrix.add_setting(_colormatrix_type, "Type");
-
-    _componenttransfer.init(_settings);
-
-    _composite.init(_settings);
-
-    _convolvematrix.init(_settings);
+    _blend.init(this, _settings_labels);
+    _blend.add_setting(_blend_mode, SP_ATTR_MODE, _("Mode"));
+
+    _colormatrix.init(this, _settings_labels);
+    //_colormatrix.add_setting(_colormatrix_type, _("Type"));
+
+    _componenttransfer.init(this, _settings_labels);
+
+    _composite.init(this, _settings_labels);
+    _composite.add_setting(_composite_operator, SP_ATTR_OPERATOR, _("Operator"));
+    _composite.add_setting(_composite_k1, SP_ATTR_K1, _("K1"));
+    _composite.add_setting(_composite_k2, SP_ATTR_K2, _("K2"));
+    _composite.add_setting(_composite_k3, SP_ATTR_K3, _("K3"));
+    _composite.add_setting(_composite_k4, SP_ATTR_K4, _("K4"));
+
+    _convolvematrix.init(this, _settings_labels);
+    _convolvematrix.add_setting_generic(_convolve_orderx, _("Rows"));
+    _convolve_orderx.set_range(1, 5);
+    _convolve_orderx.get_adjustment()->set_step_increment(1);
+    _convolve_orderx.signal_value_changed().connect(
+        sigc::bind(sigc::mem_fun(*this, &FilterEffectsDialog::set_attr_special), SP_ATTR_ORDER));
+    _convolvematrix.add_setting_generic(_convolve_ordery, _("Columns"));
+    _convolve_ordery.set_range(1, 5);
+    _convolve_ordery.get_adjustment()->set_step_increment(1);
+    _convolve_ordery.signal_value_changed().connect(
+        sigc::bind(sigc::mem_fun(*this, &FilterEffectsDialog::set_attr_special), SP_ATTR_ORDER));
+    Gtk::ScrolledWindow* sw = Gtk::manage(new Gtk::ScrolledWindow);
+    sw->add(_convolve_kernelmatrix);
+    sw->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+    sw->set_shadow_type(Gtk::SHADOW_IN);
+    _convolvematrix.add_setting_generic(*sw, _("Kernel"));
+    _convolve_kernelmatrix.signal_changed().connect(
+        sigc::bind(sigc::mem_fun(*this, &FilterEffectsDialog::set_attr_special), SP_ATTR_KERNELMATRIX));
+    //_convolvematrix.add_setting(_convolve_divisor, SP_ATTR_DIVISOR, _("Divisor"));
+    //_convolvematrix.add_setting(_convolve_bias, SP_ATTR_BIAS, _("Bias"));
     
-    _diffuselighting.init(_settings);
+    _diffuselighting.init(this, _settings_labels);
 
-    _displacementmap.init(_settings);
+    _displacementmap.init(this, _settings_labels);
 
-    _flood.init(_settings);
+    _flood.init(this, _settings_labels);
 
-    _gaussianblur.init(_settings);
-    _gaussianblur.add_setting(_gaussianblur_stddeviation, "Standard Deviation");
-    _gaussianblur_stddeviation.signal_value_changed().connect(
-        sigc::bind(sigc::mem_fun(*this, &FilterEffectsDialog::set_attr), SP_ATTR_STDDEVIATION));
+    _gaussianblur.init(this, _settings_labels);
+    _gaussianblur.add_setting(_gaussianblur_stddeviation, SP_ATTR_STDDEVIATION, _("Standard Deviation"));
 
-    _image.init(_settings);
+    _image.init(this, _settings_labels);
     
-    _merge.init(_settings);
+    _merge.init(this, _settings_labels);
 
-    _morphology.init(_settings);
-    _morphology.add_setting(_morphology_operator, "Operator");
-    _morphology.add_setting(_morphology_radius, "Radius");
+    _morphology.init(this, _settings_labels);
+    //_morphology.add_setting(_morphology_operator, _("Operator"));
+    //_morphology.add_setting(_morphology_radius, _("Radius"));
 
-    _offset.init(_settings);
-    _offset.add_setting(_offset_dx, "Delta X");
-    _offset_dx.signal_value_changed().connect(
-        sigc::bind(sigc::mem_fun(*this, &FilterEffectsDialog::set_attr), SP_ATTR_DX));
-    _offset.add_setting(_offset_dy, "Delta Y");
-    _offset_dy.signal_value_changed().connect(
-        sigc::bind(sigc::mem_fun(*this, &FilterEffectsDialog::set_attr), SP_ATTR_DY));
+    _offset.init(this, _settings_labels);
+    _offset.add_setting(_offset_dx, SP_ATTR_DX, _("Delta X"));
+    _offset.add_setting(_offset_dy, SP_ATTR_DY, _("Delta Y"));
 
-    _specularlighting.init(_settings);
+    _specularlighting.init(this, _settings_labels);
 
-    _tile.init(_settings);
+    _tile.init(this, _settings_labels);
 
-    _turbulence.init(_settings);
-    _turbulence.add_setting(_turbulence_basefrequency, "Base Frequency");
-    _turbulence.add_setting(_turbulence_numoctaves, "Octaves");
-    _turbulence.add_setting(_turbulence_seed, "Seed");
-    _turbulence.add_setting(_turbulence_stitchtiles, "Stitch Tiles");
-    _turbulence.add_setting(_turbulence_type, "Type");    
+    _turbulence.init(this, _settings_labels);
+    std::vector<Gtk::Widget*> trb_grp;
+    trb_grp.push_back(&_turbulence_fractalnoise);
+    trb_grp.push_back(&_turbulence_turbulence);
+    _turbulence.add_setting(trb_grp);
+    /*_turbulence.add_setting(_turbulence_numoctaves, _("Octaves"));
+    _turbulence.add_setting(_turbulence_basefrequency, _("Base Frequency"));
+    _turbulence.add_setting(_turbulence_seed, _("Seed"));
+    _turbulence.add_setting(_turbulence_stitchtiles);*/
 }
 
 void FilterEffectsDialog::add_primitive()
 {
     SPFilter* filter = _filter_modifier.get_selected_filter();
-    const EnumData<NR::FilterPrimitiveType>* data = _add_primitive_type.get_active_data();
     
-    if(filter && data) {
-        SPFilterPrimitive* prim = filter_add_primitive(filter, data->name.c_str());
-
-        // Set default values
-        switch(data->id) {
-            case NR::NR_FILTER_BLEND:
-                sp_object_set(prim, SP_ATTR_MODE, BlendModeConverter.get_name(NR::BLEND_NORMAL).c_str());
-                break;
-            case NR::NR_FILTER_COLORMATRIX:
-                break;
-            case NR::NR_FILTER_COMPONENTTRANSFER:
-                break;
-            case NR::NR_FILTER_COMPOSITE:
-                break;
-            case NR::NR_FILTER_CONVOLVEMATRIX:
-                break;
-            case NR::NR_FILTER_DIFFUSELIGHTING:
-                break;
-            case NR::NR_FILTER_DISPLACEMENTMAP:
-                break;
-            case NR::NR_FILTER_FLOOD:
-                break;
-            case NR::NR_FILTER_GAUSSIANBLUR:
-                sp_object_set(prim, SP_ATTR_STDDEVIATION, "1");
-                break;
-            case NR::NR_FILTER_IMAGE:
-                break;
-            case NR::NR_FILTER_MERGE:
-                break;
-            case NR::NR_FILTER_MORPHOLOGY:
-                break;
-            case NR::NR_FILTER_OFFSET:
-                sp_object_set(prim, SP_ATTR_DX, "0");
-                sp_object_set(prim, SP_ATTR_DY, "0");
-                break;
-            case NR::NR_FILTER_SPECULARLIGHTING:
-                break;
-            case NR::NR_FILTER_TILE:
-                break;
-            case NR::NR_FILTER_TURBULENCE:
-                break;
-            default:
-                break;
-        }
+    if(filter) {
+        SPFilterPrimitive* prim = filter_add_primitive(filter, _add_primitive_type.get_active_data()->id);
 
-        update_primitive_list();
-        select_primitive(prim);
+        _primitive_list.update();
+        _primitive_list.select(prim);
 
         sp_document_done(filter->document, SP_VERB_DIALOG_FILTER_EFFECTS, _("Add filter primitive"));
     }
@@ -426,24 +1030,22 @@ void FilterEffectsDialog::add_primitive()
 
 void FilterEffectsDialog::remove_primitive()
 {
-    Gtk::TreeModel::iterator i = _primitive_list.get_selection()->get_selected();
+    SPFilterPrimitive* prim = _primitive_list.get_selected();
 
-    if(i) {
-        SPFilterPrimitive* prim = (*i)[_primitive_columns.primitive];
-       
+    if(prim) {
         sp_repr_unparent(prim->repr);
 
         sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_FILTER_EFFECTS,
                          _("Remove filter primitive"));
 
-        update_primitive_list();
+        _primitive_list.update();
     }
 }
 
 void FilterEffectsDialog::duplicate_primitive()
 {
     SPFilter* filter = _filter_modifier.get_selected_filter();
-    SPFilterPrimitive* origprim = get_selected_primitive();
+    SPFilterPrimitive* origprim = _primitive_list.get_selected();
 
     if(filter && origprim) {
         Inkscape::XML::Node *repr;
@@ -452,172 +1054,142 @@ void FilterEffectsDialog::duplicate_primitive()
 
         sp_document_done(filter->document, SP_VERB_DIALOG_FILTER_EFFECTS, _("Duplicate filter primitive"));
 
-        update_primitive_list();
+        _primitive_list.update();
     }
 }
 
-// Edits the id of the primitive at path
-void FilterEffectsDialog::primitive_name_edited(const Glib::ustring& path, const Glib::ustring& text)
+void FilterEffectsDialog::set_attr_spinslider(const SPAttributeEnum attr, const SpinSlider* input)
 {
-    Gtk::TreeModel::iterator i = _primitive_model->get_iter(path);
-
-    if(i)
-        try_id_change((*i)[_primitive_columns.primitive], text);
-}
-  
-void FilterEffectsDialog::set_attr(const SPAttributeEnum attr)
-{
-    Gtk::TreeModel::iterator i = _primitive_list.get_selection()->get_selected();
-
-    if(i) {
-        SPFilter *filter = _filter_modifier.get_selected_filter();
-        SPFilterPrimitive* prim = (*i)[_primitive_columns.primitive];
+    if(input->is_sensitive()) {
         std::ostringstream os;
-        Glib::ustring val;
+        os << input->get_value();
+        set_attr(attr, os.str().c_str());
+    }
+}
 
-        if(attr == SP_ATTR_MODE) {
-            val = _blend_mode.get_active_data()->name;
-        }
-        else if(attr == SP_ATTR_STDDEVIATION) {
-            os << _gaussianblur_stddeviation.get_value();
-            val = os.str();
-        }
-        else if(attr == SP_ATTR_DX) {
-            os << _offset_dx.get_value();
-            val = os.str();
-        }
-        else if(attr == SP_ATTR_DY) {
-            os << _offset_dy.get_value();
+void FilterEffectsDialog::set_attr_special(const SPAttributeEnum attr)
+{
+    Glib::ustring val;
+    std::ostringstream os;
+
+    switch(attr) {
+        case SP_ATTR_ORDER:
+        {
+            int x = (int)(_convolve_orderx.get_value() + 0.5f);
+            int y = (int)(_convolve_ordery.get_value() + 0.5f);
+            os << x << " " << y;
             val = os.str();
+            _convolve_kernelmatrix.update(SP_FECONVOLVEMATRIX(_primitive_list.get_selected()), x, y);
+            break;
         }
-
-        sp_object_set(prim, attr, val.c_str());
-        filter->requestModified(SP_OBJECT_MODIFIED_FLAG);
-
-        sp_document_done(filter->document, SP_VERB_DIALOG_FILTER_EFFECTS, _("Set filter primitive attribute"));
+        case SP_ATTR_KERNELMATRIX:
+            val = _convolve_kernelmatrix.get_value();
+            break;
+        default:
+            return;
     }
+
+    set_attr(attr, val.c_str());
 }
 
-/* Add all filter primitives in the current to the list.
-   Keeps the same selection if possible, otherwise selects the first element */
-void FilterEffectsDialog::update_primitive_list()
+void FilterEffectsDialog::set_attr(const SPAttributeEnum attr, const gchar* val)
 {
-    SPFilter* f = _filter_modifier.get_selected_filter();
-    const SPFilterPrimitive* active_prim = get_selected_primitive();
-    bool active_found = false;
+    SPFilter *filter = _filter_modifier.get_selected_filter();
+    SPFilterPrimitive* prim = _primitive_list.get_selected();
 
-    _primitive_model->clear();
+    if(filter && prim) {
+        update_settings_sensitivity();
 
-    if(f) {
-        _primitive_box.set_sensitive(true);
-
-        for(SPObject *prim_obj = f->children;
-                prim_obj && SP_IS_FILTER_PRIMITIVE(prim_obj);
-                prim_obj = prim_obj->next) {
-            SPFilterPrimitive *prim = SP_FILTER_PRIMITIVE(prim_obj);
-            if(prim) {
-                Gtk::TreeModel::Row row = *_primitive_model->append();
-                row[_primitive_columns.primitive] = prim;
-                row[_primitive_columns.type_id] = FPConverter.get_id_from_name(prim->repr->name());
-                row[_primitive_columns.type] = FPConverter.get_label(row[_primitive_columns.type_id]);
-                row[_primitive_columns.id] = SP_OBJECT_ID(prim);
-
-                if(prim == active_prim) {
-                    _primitive_list.get_selection()->select(row);
-                    active_found = true;
-                }
-            }
-        }
+        SP_OBJECT_REPR(prim)->setAttribute((gchar*)sp_attribute_name(attr), val);
+        filter->requestModified(SP_OBJECT_MODIFIED_FLAG);
 
-        if(!active_found && _primitive_model->children().begin())
-            _primitive_list.get_selection()->select(_primitive_model->children().begin());
-    }
-    else {
-        _primitive_box.set_sensitive(false);
+        sp_document_done(filter->document, SP_VERB_DIALOG_FILTER_EFFECTS, _("Set filter primitive attribute"));
     }
 }
 
 void FilterEffectsDialog::update_settings_view()
 {
-    SPFilterPrimitive* prim = get_selected_primitive();
+    SPFilterPrimitive* prim = _primitive_list.get_selected();
 
-    // Hide all the settings except for common
-    Glib::ListHandle<Widget*> c = _settings.get_children();
-    for(Glib::ListHandle<Widget*>::iterator iter = c.begin();
-        iter != c.end(); ++iter) {
-        (*iter)->hide();
-    }
+    // Hide all the settings
+    _settings.hide_all();
+    _settings.show();
 
     _settings.set_sensitive(false);
     _empty_settings.show();
 
     if(prim) {
-        const NR::FilterPrimitiveType tid = FPConverter.get_id_from_name(prim->repr->name());
+        const NR::FilterPrimitiveType tid = FPConverter.get_id_from_key(prim->repr->name());
+
         if(tid == NR::NR_FILTER_BLEND) {
-            _blend.show();
+            _blend.show_all();
             const gchar* val = prim->repr->attribute("mode");
             if(val)
-                _blend_mode.set_active(BlendModeConverter.get_id_from_name(val));
+                _blend_mode.set_active(BlendModeConverter.get_id_from_key(val));
         }
         else if(tid == NR::NR_FILTER_COLORMATRIX)
-            _colormatrix.show();
+            _colormatrix.show_all();
         else if(tid == NR::NR_FILTER_COMPONENTTRANSFER)
-            _componenttransfer.show();
-        else if(tid == NR::NR_FILTER_COMPOSITE)
-            _composite.show();
-        else if(tid == NR::NR_FILTER_CONVOLVEMATRIX)
-            _convolvematrix.show();
+            _componenttransfer.show_all();
+        else if(tid == NR::NR_FILTER_COMPOSITE) {
+            _composite.show_all();
+            SPFeComposite* comp = SP_FECOMPOSITE(prim);
+            _composite_operator.set_active(comp->composite_operator);
+            _composite_k1.set_value(comp->k1);
+            _composite_k2.set_value(comp->k2);
+            _composite_k3.set_value(comp->k3);
+            _composite_k4.set_value(comp->k4);
+        }
+        else if(tid == NR::NR_FILTER_CONVOLVEMATRIX) {
+            _convolvematrix.show_all();
+            SPFeConvolveMatrix* conv = SP_FECONVOLVEMATRIX(prim);
+            _convolve_orderx.set_value(conv->order.getNumber());
+            _convolve_ordery.set_value(conv->order.optNumber_set ? conv->order.getOptNumber() : conv->order.getNumber());
+            _convolve_kernelmatrix.update(conv);
+        }
         else if(tid == NR::NR_FILTER_DIFFUSELIGHTING)
-            _diffuselighting.show();
-        else if(tid == NR::NR_FILTER_DISPLACEMENTMAP)
-            _displacementmap.show();
+            _diffuselighting.show_all();
+        else if(tid == NR::NR_FILTER_DISPLACEMENTMAP) {
+            _displacementmap.show_all();
+        }
         else if(tid == NR::NR_FILTER_FLOOD)
-            _flood.show();
+            _flood.show_all();
         else if(tid == NR::NR_FILTER_GAUSSIANBLUR) {
-            _gaussianblur.show();
+            _gaussianblur.show_all();
             _gaussianblur_stddeviation.set_value(((SPGaussianBlur*)prim)->stdDeviation.getNumber());
         }
         else if(tid == NR::NR_FILTER_IMAGE)
-            _image.show();
+            _image.show_all();
         else if(tid == NR::NR_FILTER_MERGE)
-            _merge.show();
+            _merge.show_all();
         else if(tid == NR::NR_FILTER_MORPHOLOGY)
-            _morphology.show();
+            _morphology.show_all();
         else if(tid == NR::NR_FILTER_OFFSET) {
-            _offset.show();
+            _offset.show_all();
             _offset_dx.set_value(((SPFeOffset*)prim)->dx);
             _offset_dy.set_value(((SPFeOffset*)prim)->dy);
         }
         else if(tid == NR::NR_FILTER_SPECULARLIGHTING)
-            _specularlighting.show();
+            _specularlighting.show_all();
         else if(tid == NR::NR_FILTER_TILE)
-            _tile.show();
+            _tile.show_all();
         else if(tid == NR::NR_FILTER_TURBULENCE)
-            _turbulence.show();
+            _turbulence.show_all();
 
         _settings.set_sensitive(true);
         _empty_settings.hide();
     }
-}
 
-SPFilterPrimitive* FilterEffectsDialog::get_selected_primitive()
-{
-    if(_filter_modifier.get_selected_filter()) {
-        Gtk::TreeModel::iterator i = _primitive_list.get_selection()->get_selected();
-        if(i)
-            return (*i)[_primitive_columns.primitive];
-    }
-
-    return 0;
+    update_settings_sensitivity();
 }
 
-void FilterEffectsDialog::select_primitive(SPFilterPrimitive* prim)
+void FilterEffectsDialog::update_settings_sensitivity()
 {
-    for(Gtk::TreeIter i = _primitive_model->children().begin();
-        i != _primitive_model->children().end(); ++i) {
-        if((*i)[_primitive_columns.primitive] == prim)
-            _primitive_list.get_selection()->select(i);
-    }
+    const bool use_k = _composite_operator.get_active_data()->id == COMPOSITE_ARITHMETIC;
+    _composite_k1.set_sensitive(use_k);
+    _composite_k2.set_sensitive(use_k);
+    _composite_k3.set_sensitive(use_k);
+    _composite_k4.set_sensitive(use_k);
 }
 
 } // namespace Dialog