index 0522b7a9970652a29678397275677b02436cd48a..3fb9a46fb89568d19c140269cd5ae6a3a8b0f2c8 100644 (file)
#include "sp-filter.h"
#include "ui/widget/combo-enums.h"
#include "ui/widget/spin-slider.h"
+#include "xml/helper-observer.h"
using namespace Inkscape::UI::Widget;
protected:
virtual void show_all_vfunc();
private:
- class SignalObserver;
class FilterModifier : public Gtk::VBox
{
};
static void on_activate_desktop(Application*, SPDesktop*, FilterModifier*);
+ static void on_deactivate_desktop(Application*, SPDesktop*, FilterModifier*);
void on_document_replaced(SPDesktop*, SPDocument*)
{
update_filters();
Gtk::Button _add;
Glib::RefPtr<Gtk::Menu> _menu;
sigc::signal<void> _signal_filter_changed;
- std::auto_ptr<SignalObserver> _observer;
+ std::auto_ptr<Inkscape::XML::SignalObserver> _observer;
};
class PrimitiveColumns : public Gtk::TreeModel::ColumnRecord
}
Gtk::TreeModelColumn<SPFilterPrimitive*> primitive;
- Gtk::TreeModelColumn<NR::FilterPrimitiveType> type_id;
+ Gtk::TreeModelColumn<Inkscape::Filters::FilterPrimitiveType> type_id;
Gtk::TreeModelColumn<Glib::ustring> type;
Gtk::TreeModelColumn<Glib::ustring> id;
};
sigc::signal<void> _signal_primitive_changed;
sigc::connection _scroll_connection;
int _autoscroll;
- std::auto_ptr<SignalObserver> _observer;
+ std::auto_ptr<Inkscape::XML::SignalObserver> _observer;
};
void init_settings_widgets();
// View/add primitives
Gtk::VBox _primitive_box;
- UI::Widget::ComboBoxEnum<NR::FilterPrimitiveType> _add_primitive_type;
+ UI::Widget::ComboBoxEnum<Inkscape::Filters::FilterPrimitiveType> _add_primitive_type;
Gtk::Button _add_primitive;
// Bottom pane (filter effect primitive settings)