Filter effects dialog:

First commit of improvements to the dialog discussed on the dev list. The dialog now tracks the selection and selects the appropriate filter, as well as displaying a small icon to indicate what filter(s) are applied to the selection.

diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 9a0efc536d1b0684ebea8a1e13c470bc9a2afdc8..fbb4edcdad9a8d1fb7aece663ff2d3960df7dd9b 100644 (file)
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -31,6 +31,7 @@
 #include "filter-chemistry.h"
 #include "filter-effects-dialog.h"
 #include "inkscape.h"
+#include "selection.h"
 #include "sp-feblend.h"
 #include "sp-fecomposite.h"
 #include "sp-fedisplacementmap.h"
@@ -38,6 +39,7 @@
 #include "sp-filter-primitive.h"
 #include "sp-gaussian-blur.h"
 #include "sp-feoffset.h"
+#include "style.h"
 #include "verbs.h"
 #include "xml/node.h"
 #include "xml/repr.h"
@@ -301,8 +303,13 @@ FilterEffectsDialog::FilterModifier::FilterModifier()
     sw->add(_list);
 
     _list.set_model(_model);
+    const int selcol = _list.append_column("", _cell_sel);
+    Gtk::TreeViewColumn* col = _list.get_column(selcol - 1);
+    if(col)
+       col->add_attribute(_cell_sel.property_sel(), _columns.sel);
+
     _list.append_column_editable(_("_Filter"), _columns.id);
-    ((Gtk::CellRendererText*)_list.get_column(0)->get_first_cell_renderer())->
+    ((Gtk::CellRendererText*)_list.get_column(1)->get_first_cell_renderer())->
         signal_edited().connect(sigc::mem_fun(*this, &FilterEffectsDialog::FilterModifier::filter_name_edited));
 
     sw->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@@ -314,9 +321,86 @@ FilterEffectsDialog::FilterModifier::FilterModifier()
     _menu = create_popup_menu(*this, sigc::mem_fun(*this, &FilterModifier::duplicate_filter),
                               sigc::mem_fun(*this, &FilterModifier::remove_filter));
 
+    g_signal_connect(G_OBJECT(INKSCAPE), "change_selection",
+                     G_CALLBACK(&FilterModifier::on_inkscape_change_selection), this);
+
     update_filters();
 }
 
+FilterEffectsDialog::FilterModifier::CellRendererSel::CellRendererSel()
+    : Glib::ObjectBase(typeid(CellRendererSel)),
+      _size(10),
+      _sel(*this, "sel", 0)
+{}
+
+Glib::PropertyProxy<int> FilterEffectsDialog::FilterModifier::CellRendererSel::property_sel()
+{
+    return _sel.get_proxy();
+}
+
+void FilterEffectsDialog::FilterModifier::CellRendererSel::get_size_vfunc(
+    Gtk::Widget&, const Gdk::Rectangle*, int* x, int* y, int* w, int* h) const
+{
+    if(x)
+        (*x) = 0;
+    if(y)
+        (*y) = 0;
+    if(w)
+        (*w) = _size;
+    if(h)
+        (*h) = _size;
+}
+
+void FilterEffectsDialog::FilterModifier::CellRendererSel::render_vfunc(
+    const Glib::RefPtr<Gdk::Drawable>& win, Gtk::Widget& widget, const Gdk::Rectangle& bg_area,
+    const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags)
+{
+    const int sel = _sel.get_value();
+
+    if(sel > 0) {
+        const int s = _size - 2;
+        const int w = cell_area.get_width();
+        const int h = cell_area.get_height();
+        const int x = cell_area.get_x() + w / 2 - s / 2;
+        const int y = cell_area.get_y() + h / 2 - s / 2;
+
+        win->draw_rectangle(widget.get_style()->get_text_gc(Gtk::STATE_NORMAL), (sel == 1), x, y, s, s);
+    }
+}
+
+// When the selection changes, show the active filter(s) in the dialog
+void FilterEffectsDialog::FilterModifier::on_inkscape_change_selection(Inkscape::Application *inkscape,
+                                                                       Inkscape::Selection *sel,
+                                                                       FilterModifier* fm)
+{
+    std::set<SPObject*> used;
+
+    for(GSList const *i = sel->itemList(); i != NULL; i = i->next) {
+        SPObject *obj = SP_OBJECT (i->data);
+        SPStyle *style = SP_OBJECT_STYLE (obj);
+        if(!style || !SP_IS_ITEM(obj)) continue;
+
+        if(style->filter.set && style->getFilter())
+            used.insert(style->getFilter());
+        else
+            used.insert(0);
+    }
+
+    const int size = used.size();
+
+    for(Gtk::TreeIter iter = fm->_model->children().begin();
+        iter != fm->_model->children().end(); ++iter) {
+        if(used.find((*iter)[fm->_columns.filter]) != used.end()) {
+            // If only one filter is in use by the selection, select it
+            if(size == 1)
+                fm->_list.get_selection()->select(iter);
+            (*iter)[fm->_columns.sel] = size;
+        }
+        else
+            (*iter)[fm->_columns.sel] = 0;
+    }
+}
+
 Glib::SignalProxy0<void> FilterEffectsDialog::FilterModifier::signal_selection_changed()
 {
     return _list.get_selection()->signal_changed();

diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 1cb88e1f9f2f5386ee259694bd9f206d023254cc..3509e21ad63244d0d993ff508a7fa4e33235a24f 100644 (file)
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -54,6 +54,25 @@ private:
         virtual void select_filter(const SPFilter*);
         virtual Glib::SignalProxy0<void> signal_selection_changed();
     private:
+        class CellRendererSel : public Gtk::CellRenderer
+        {
+        public:
+            CellRendererSel();
+            Glib::PropertyProxy<int> property_sel();
+        protected:
+            virtual void get_size_vfunc(Gtk::Widget&, const Gdk::Rectangle*,
+                                    int*, int*, int*, int*) const;
+            virtual void render_vfunc(const Glib::RefPtr<Gdk::Drawable>& win, Gtk::Widget& w,
+                                      const Gdk::Rectangle& bg_area, const Gdk::Rectangle& cell_area,
+                                      const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags);
+        private:
+            const int _size;
+            Glib::Property<int> _sel;
+        };
+        
+        static void on_inkscape_change_selection(Inkscape::Application *, Inkscape::Selection *,
+                                                 FilterModifier*);
+
         void filter_list_button_release(GdkEventButton*);
         void add_filter();
         void remove_filter();
@@ -61,6 +80,7 @@ private:
         void filter_name_edited(const Glib::ustring& path, const Glib::ustring& text);
 
         Gtk::TreeView _list;
+        CellRendererSel _cell_sel;
         Gtk::Button _add;
         Glib::RefPtr<Gtk::Menu> _menu;
     };

diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h
index 3410e0146a9c2a13618f7a45ae8f62c77cb22390..9a49f523b3590195ac0862c66e059269e0c31631 100644 (file)
--- a/src/ui/widget/filter-effect-chooser.h
+++ b/src/ui/widget/filter-effect-chooser.h
@@ -45,10 +45,12 @@ protected:
         {
             add(filter);
             add(id);
+            add(sel);
         }
 
         Gtk::TreeModelColumn<SPFilter*> filter;
         Gtk::TreeModelColumn<Glib::ustring> id;
+        Gtk::TreeModelColumn<int> sel;
     };
 
     virtual void update_filters();