X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Ffilter-effects-dialog.h;h=9e272fbabf86097661cf50b96cb21becd1fb999e;hb=b34fba279abab0e9fdc3f9b05bb4e2be63a7e0b4;hp=79987079e6ab6e320960d82cf53173c386aa7aad;hpb=97aa2c127aec1580cca1fcbe303253df3029df39;p=inkscape.git

diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 79987079e..9e272fbab 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -16,7 +16,6 @@
 #include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/buttonbox.h>
-#include <gtkmm/cellrendererspin.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/frame.h>
@@ -28,7 +27,6 @@
 #include "attributes.h"
 #include "dialog.h"
 #include "sp-filter.h"
-#include "sp-feconvolvematrix.h"
 #include "ui/widget/filter-effect-chooser.h"
 #include "ui/widget/spin-slider.h"
 
@@ -38,6 +36,8 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
+class DualSpinButton;
+class MultiSpinButton;
 class FilterEffectsDialog : public Dialog {
 public:
     ~FilterEffectsDialog();
@@ -49,7 +49,7 @@ private:
     class FilterModifier : public Gtk::VBox, public FilterEffectChooser
     {
     public:
-        FilterModifier();
+        FilterModifier(FilterEffectsDialog&);
 
         virtual SPFilter* get_selected_filter();
         virtual void select_filter(const SPFilter*);
@@ -79,8 +79,9 @@ private:
         void add_filter();
         void remove_filter();
         void duplicate_filter();
-        void filter_name_edited(const Glib::ustring& path, const Glib::ustring& text);
+        void rename_filter();
 
+        FilterEffectsDialog& _dialog;
         Gtk::TreeView _list;
         CellRendererSel _cell_sel;
         Gtk::Button _add;
@@ -174,6 +175,7 @@ private:
     void convolve_order_changed();
 
     void set_attr_direct(const AttrWidget*);
+    void set_child_attr_direct(const AttrWidget*);
     void set_attr(SPObject*, const SPAttributeEnum, const gchar* val);
     void update_settings_view();
     void update_settings_sensitivity();
@@ -192,14 +194,16 @@ private:
     Gtk::Label _empty_settings;
 
     class Settings;
-    class ConvolveMatrix;
+    class MatrixAttr;
+    class ColorMatrixValues;
+    class LightSourceControl;
     Settings* _settings;
+    Glib::RefPtr<Gtk::SizeGroup> _sizegroup;
 
     // Convolve Matrix
-    ConvolveMatrix* _convolve_matrix;
-    DualSpinSlider* _convolve_order;
-    SpinSlider* _convolve_tx;
-    SpinSlider* _convolve_ty;
+    MatrixAttr* _convolve_matrix;
+    DualSpinButton* _convolve_order;
+    MultiSpinButton* _convolve_target;
 
     // For controlling setting sensitivity
     Gtk::Widget* _k1, *_k2, *_k3, *_k4;