Filter effects dialog:

* Added a column of checkboxes to the filter selection list. Setting the checkbox will set that filter to all selected objects. Clearing the checkbox unsets the filter from all selected objects.

diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index abdf45f69fd123f6a4b9b22276df87e0ad5036e4..c6479d48f58bba42103a91c6fe13a37be5b79fd3 100644 (file)
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -902,18 +902,20 @@ FilterEffectsDialog::FilterModifier::FilterModifier(FilterEffectsDialog& d)
 
     _model = Gtk::ListStore::create(_columns);
     _list.set_model(_model);
-    const int selcol = _list.append_column("", _cell_sel);
+    _cell_toggle.set_active(true);
+    const int selcol = _list.append_column("", _cell_toggle);
     Gtk::TreeViewColumn* col = _list.get_column(selcol - 1);
     if(col)
-       col->add_attribute(_cell_sel.property_sel(), _columns.sel);
+       col->add_attribute(_cell_toggle.property_active(), _columns.sel);
     _list.append_column(_("_Filter"), _columns.label);
 
     sw->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
     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));
+    _cell_toggle.signal_toggled().connect(sigc::mem_fun(*this, &FilterModifier::on_selection_toggled));
+    //_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),
@@ -940,42 +942,6 @@ FilterEffectsDialog::FilterModifier::~FilterModifier()
    _doc_replaced.disconnect();
 }
 
-FilterEffectsDialog::FilterModifier::CellRendererSel::CellRendererSel()
-    : Glib::ObjectBase(typeid(CellRendererSel)),
-      _size(10),
-      _sel(*this, "sel", 0)
-{}
-
-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);
-    }
-}
-
 void FilterEffectsDialog::FilterModifier::on_activate_desktop(Application*, SPDesktop* desktop, FilterModifier* me)
 {
     me->update_filters();
@@ -1000,6 +966,10 @@ void FilterEffectsDialog::FilterModifier::on_inkscape_change_selection(Applicati
         fm->update_selection(sel);
 }
 
+// Update each filter's sel property based on the current object selection;
+//  If the filter is not used by any selected object, sel = 0,
+//  otherwise sel is set to the total number of filters in use by selected objects
+//  If only one filter is in use, it is selected
 void FilterEffectsDialog::FilterModifier::update_selection(Selection *sel)
 {
     std::set<SPObject*> used;
@@ -1036,6 +1006,40 @@ void FilterEffectsDialog::FilterModifier::on_filter_selection_changed()
     signal_filter_changed()();
 }
 
+void FilterEffectsDialog::FilterModifier::on_selection_toggled(const Glib::ustring& path)
+{
+    Gtk::TreeIter iter = _model->get_iter(path);
+
+    if(iter) {
+        SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+        SPDocument *doc = sp_desktop_document(desktop);
+        SPFilter* filter = (*iter)[_columns.filter];
+        Inkscape::Selection *sel = sp_desktop_selection(desktop);
+
+        /* If this filter is the only one used in the selection, unset it */
+        if((*iter)[_columns.sel] == 1)
+            filter = 0;
+
+        GSList const *items = sel->itemList();
+            
+        for (GSList const *i = items; i != NULL; i = i->next) {
+            SPItem * item = SP_ITEM(i->data);
+            SPStyle *style = SP_OBJECT_STYLE(item);
+            g_assert(style != NULL);
+                
+            if(filter)
+                sp_style_set_property_url(SP_OBJECT(item), "filter", SP_OBJECT(filter), false);
+            else
+                ::remove_filter(item, false);
+
+            SP_OBJECT(item)->requestDisplayUpdate((SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG ));
+        }
+    
+        update_selection(sel);
+        sp_document_done(doc, SP_VERB_DIALOG_FILTER_EFFECTS,  _("Apply filter"));
+    }
+}
+
 /* Add all filters in the document to the combobox.
    Keeps the same selection if possible, otherwise selects the first element */
 void FilterEffectsDialog::FilterModifier::update_filters()
@@ -1083,31 +1087,6 @@ void FilterEffectsDialog::FilterModifier::select_filter(const SPFilter* filter)
     }
 }
 
-void FilterEffectsDialog::FilterModifier::filter_list_button_press(GdkEventButton* e)
-{
-    // Double-click
-    if(e->type == GDK_2BUTTON_PRESS) {
-        SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-        SPDocument *doc = sp_desktop_document(desktop);
-        SPFilter* filter = get_selected_filter();
-        Inkscape::Selection *sel = sp_desktop_selection(desktop);
-
-        GSList const *items = sel->itemList();
-
-        for (GSList const *i = items; i != NULL; i = i->next) {
-            SPItem * item = SP_ITEM(i->data);
-            SPStyle *style = SP_OBJECT_STYLE(item);
-            g_assert(style != NULL);
-            
-            sp_style_set_property_url(SP_OBJECT(item), "filter", SP_OBJECT(filter), false);
-            SP_OBJECT(item)->requestDisplayUpdate((SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG ));
-        }
-
-        update_selection(sel);
-        sp_document_done(doc, SP_VERB_DIALOG_FILTER_EFFECTS,  _("Apply filter"));
-    }
-}
-
 void FilterEffectsDialog::FilterModifier::filter_list_button_release(GdkEventButton* event)
 {
     if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {

diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 743ce02395784cb6ebbed8950366a7e6c6fdd18a..56a1e2ca18c240785abc7bcbaed7b5d6bfbf9490 100644 (file)
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -80,26 +80,6 @@ private:
             Gtk::TreeModelColumn<int> sel;
         };
 
-        class CellRendererSel : public Gtk::CellRenderer
-        {
-        public:
-            CellRendererSel();
-
-            Glib::PropertyProxy<int> property_sel()
-            {
-                return _sel.get_proxy();
-            }
-        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_activate_desktop(Application*, SPDesktop*, FilterModifier*);
         void on_document_replaced(SPDesktop*, SPDocument*)
         {
@@ -110,9 +90,9 @@ private:
         
         void update_selection(Selection *);
         void on_filter_selection_changed();
+        void on_selection_toggled(const Glib::ustring&);
 
         void update_filters();
-        void filter_list_button_press(GdkEventButton*);
         void filter_list_button_release(GdkEventButton*);
         void add_filter();
         void remove_filter();
@@ -126,7 +106,7 @@ private:
         Gtk::TreeView _list;
         Glib::RefPtr<Gtk::ListStore> _model;
         Columns _columns;
-        CellRendererSel _cell_sel;
+        Gtk::CellRendererToggle _cell_toggle;
         Gtk::Button _add;
         Glib::RefPtr<Gtk::Menu> _menu;
         sigc::signal<void> _signal_filter_changed;