diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-14 22:07:33 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-14 22:07:33 +0000 |
| commit | efe4e17c2e6664a761d3da24f113b8c57e05cfc7 (patch) | |
| tree | f7dc68a3660dedabe2a7c9ed9635dbed683ff43b /src/ui/widget | |
| parent | Merge branch 'master' into powerpencilII (diff) | |
| parent | Minor header cleanup. Add a few class names. (diff) | |
| download | inkscape-efe4e17c2e6664a761d3da24f113b8c57e05cfc7.tar.gz inkscape-efe4e17c2e6664a761d3da24f113b8c57e05cfc7.zip | |
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/filter-effect-chooser.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/spin-scale.h | 7 | ||||
| -rw-r--r-- | src/ui/widget/spin-slider.cpp | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp index eace494ed..7a9d512ac 100644 --- a/src/ui/widget/filter-effect-chooser.cpp +++ b/src/ui/widget/filter-effect-chooser.cpp @@ -24,6 +24,8 @@ SimpleFilterModifier::SimpleFilterModifier(int flags) _blend(BlendModeConverter, SP_ATTR_INVALID, false), _blur(_("Blur (%)"), 0, 0, 100, 1, 0.01, 1) { + set_name("SimpleFilterModifier"); + _flags = flags; if (flags & BLEND) { diff --git a/src/ui/widget/spin-scale.h b/src/ui/widget/spin-scale.h index d7030bed3..33731f256 100644 --- a/src/ui/widget/spin-scale.h +++ b/src/ui/widget/spin-scale.h @@ -15,7 +15,6 @@ #include <gtkmm/adjustment.h> #include <gtkmm/box.h> -#include <gtkmm/scale.h> #include <gtkmm/togglebutton.h> #include "spinbutton.h" #include "attr-widget.h" @@ -26,9 +25,9 @@ namespace Widget { /** * Wrap the gimpspinscale class - * A combo widget with label, scale slider, spinbutton and adjustment + * A combo widget with label, scale slider, spinbutton, and adjustment */ -class SpinScale : public Gtk::HBox, public AttrWidget +class SpinScale : public Gtk::Box, public AttrWidget { public: @@ -64,7 +63,7 @@ public: * * @see SpinScale */ -class DualSpinScale : public Gtk::HBox, public AttrWidget +class DualSpinScale : public Gtk::Box, public AttrWidget { public: DualSpinScale(const char* label1, const char* label2, double value, double lower, double upper, double step_inc, diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp index f17b9b26c..03981763d 100644 --- a/src/ui/widget/spin-slider.cpp +++ b/src/ui/widget/spin-slider.cpp @@ -23,6 +23,7 @@ SpinSlider::SpinSlider(double value, double lower, double upper, double step_inc _adjustment(Gtk::Adjustment::create(value, lower, upper, step_inc)), _scale(_adjustment), _spin(_adjustment, climb_rate, digits) { + set_name("SpinSlider"); signal_value_changed().connect(signal_attr_changed().make_slot()); pack_start(_scale); |