X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fwidget%2Fobject-composite-settings.h;h=725a8a42b18d2c121647f1da460a1a064b35c8f8;hb=fd5c8954a92eac9af9af21d2a3665e9c673203a2;hp=fa007685b4ce243c237b4d2a00773ac5ffbf62aa;hpb=526c8bf9bb41b582dc49f54ac192705de9e2edf2;p=inkscape.git diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h index fa007685b..725a8a42b 100644 --- a/src/ui/widget/object-composite-settings.h +++ b/src/ui/widget/object-composite-settings.h @@ -20,7 +20,10 @@ #include #include +#include + #include "ui/widget/filter-effect-chooser.h" +#include "ui/widget/style-subject.h" namespace Inkscape { namespace UI { @@ -28,10 +31,16 @@ namespace Widget { class ObjectCompositeSettings : public Gtk::VBox { public: - ObjectCompositeSettings(); + ObjectCompositeSettings(unsigned int verb_code, char const *history_prefix, int flags); ~ObjectCompositeSettings(); + void setSubject(StyleSubject *subject); + private: + unsigned int _verb_code; + Glib::ustring _blur_tag; + Glib::ustring _opacity_tag; + Gtk::VBox _opacity_vbox; Gtk::HBox _opacity_label_box; Gtk::HBox _opacity_hbox; @@ -40,30 +49,21 @@ private: Gtk::HScale _opacity_hscale; Gtk::SpinButton _opacity_spin_button; + StyleSubject *_subject; + SimpleFilterModifier _fe_cb; Gtk::VBox _fe_vbox; Gtk::Alignment _fe_alignment; - void selectionChanged(Inkscape::Application *inkscape, - Inkscape::Selection *selection); - - static void on_selection_changed(Inkscape::Application *inkscape, - Inkscape::Selection *selection, - ObjectCompositeSettings *w); - - static void on_selection_modified(Inkscape::Application *inkscape, - Inkscape::Selection *selection, - guint flags, - ObjectCompositeSettings *w); + static void _on_desktop_switch(Inkscape::Application *application, SPDesktop *desktop, ObjectCompositeSettings *w); + void _subjectChanged(); + sigc::connection _subject_changed; void _blendBlurValueChanged(); void _opacityValueChanged(); bool _blocked; - gulong _sel_changed; - gulong _subsel_changed; - gulong _sel_modified; gulong _desktop_activated; };