index b573161d99d0d1fade8d1a609d60c01c3ebee2db..37aa4ccc885dbf53c87fa4094d1e304cb4248ba7 100644 (file)
#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;
namespace UI {
namespace Dialog {
-class FillAndStroke : public Dialog {
+class FillAndStroke : public UI::Widget::Panel {
public:
FillAndStroke();
virtual ~FillAndStroke();
- static FillAndStroke *create() { return new FillAndStroke(); }
+ static FillAndStroke &getInstance() { return *new FillAndStroke(); }
void selectionChanged(Inkscape::Application *inkscape,
Inkscape::Selection *selection);
+ void showPageFill();
+ void showPageStrokePaint();
+ void showPageStrokeStyle();
+
protected:
Gtk::Notebook _notebook;
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);