X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Ffill-and-stroke.h;h=7dc892fea75e6d22a64ef069b1113197b917b847;hb=5ef6cb9428f2e6f5457e890a1c3b37f53730c07a;hp=8c27d6d0a1d835a917f895e951865b807354e664;hpb=f38286aa7d5f6b3c0ce20fa9ebf1a4d131a2c85a;p=inkscape.git

diff --git a/src/ui/dialog/fill-and-stroke.h b/src/ui/dialog/fill-and-stroke.h
index 8c27d6d0a..7dc892fea 100644
--- a/src/ui/dialog/fill-and-stroke.h
+++ b/src/ui/dialog/fill-and-stroke.h
@@ -1,8 +1,7 @@
-/**
- * \brief Fill and Stroke dialog
- * based on sp_object_properties_dialog
- *
- * Authors:
+/** @file
+ * @brief Fill and Stroke dialog
+ */
+/* Authors:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *   Gustav Broberg <broberg@kth.se>
  *
@@ -21,9 +20,9 @@
 #include <gtkmm/spinbutton.h>
 #include <glibmm/i18n.h>
 
-#include "dialog.h"
+#include "ui/widget/panel.h"
 #include "ui/widget/notebook-page.h"
-#include "ui/widget/filter-effect-chooser.h"
+#include "ui/widget/object-composite-settings.h"
 
 using namespace Inkscape::UI::Widget;
 
@@ -31,13 +30,12 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-class FillAndStroke : public Dialog {
+class FillAndStroke : public UI::Widget::Panel {
 public:
-    FillAndStroke(Behavior::BehaviorFactory behavior_factory);
+    FillAndStroke();
     virtual ~FillAndStroke();
 
-    static FillAndStroke *create(Behavior::BehaviorFactory behavior_factory)
-    { return new FillAndStroke(behavior_factory); }
+    static FillAndStroke &getInstance() { return *new FillAndStroke(); }
 
     void selectionChanged(Inkscape::Application *inkscape,
                           Inkscape::Selection *selection);
@@ -53,30 +51,16 @@ protected:
     NotebookPage    _page_stroke_paint;
     NotebookPage    _page_stroke_style;
 
-    Gtk::VBox       _fe_vbox;
-    Gtk::Alignment  _fe_alignment;
-
-    Gtk::VBox       _opacity_vbox;
-    Gtk::HBox       _opacity_label_box;
-    Gtk::HBox       _opacity_hbox;
-    Gtk::Label      _opacity_label;
-    Gtk::Adjustment _opacity_adjustment;
-    Gtk::HScale     _opacity_hscale;
-    Gtk::SpinButton _opacity_spin_button;
+    StyleSubject::Selection _subject;
+    ObjectCompositeSettings _composite_settings;
 
-    Gtk::HBox& _createPageTabLabel(const Glib::ustring& label, 
+    Gtk::HBox &_createPageTabLabel(const Glib::ustring &label, 
                                    const char *label_image);
-    SimpleFilterModifier _fe_cb;
 
     void _layoutPageFill();
     void _layoutPageStrokePaint();
     void _layoutPageStrokeStyle();
 
-    void _blendBlurValueChanged();
-    void _opacityValueChanged();
-
-    bool _blocked;
-
 private:
     FillAndStroke(FillAndStroke const &d);
     FillAndStroke& operator=(FillAndStroke const &d);