diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-12-13 17:58:37 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2017-12-13 17:58:37 +0000 |
| commit | ec9c3cbbe5439595a3a51a32f367ba7750cf5fe0 (patch) | |
| tree | b008bca0e4b46562c6e7c6adeb1654223b4ec5dd | |
| parent | Fix scrollbar overlapping palette. (diff) | |
| download | inkscape-ec9c3cbbe5439595a3a51a32f367ba7750cf5fe0.tar.gz inkscape-ec9c3cbbe5439595a3a51a32f367ba7750cf5fe0.zip | |
Minor header cleanup. Add a few class names.
| -rw-r--r-- | src/ui/dialog/filter-effects-dialog.h | 2 | ||||
| -rw-r--r-- | src/ui/dialog/objects.h | 2 | ||||
| -rw-r--r-- | src/ui/dialog/tags.h | 1 | ||||
| -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 |
6 files changed, 8 insertions, 7 deletions
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index 1c9f75e6f..73d23bd37 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -20,7 +20,7 @@ #include "ui/widget/panel.h" #include "sp-filter.h" #include "ui/widget/combo-enums.h" -#include "ui/widget/spin-slider.h" + #include "ui/widget/spin-scale.h" #include "xml/helper-observer.h" #include "ui/dialog/desktop-tracker.h" diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h index 8ad1b15ef..73a0f0643 100644 --- a/src/ui/dialog/objects.h +++ b/src/ui/dialog/objects.h @@ -20,10 +20,10 @@ #include <gtkmm/treeview.h> #include <gtkmm/treestore.h> #include <gtkmm/scrolledwindow.h> +#include <gtkmm/scale.h> #include <gtkmm/dialog.h> #include "ui/widget/spinbutton.h" #include "ui/widget/panel.h" -#include "ui/widget/object-composite-settings.h" #include "desktop-tracker.h" #include "ui/widget/style-subject.h" #include "selection.h" diff --git a/src/ui/dialog/tags.h b/src/ui/dialog/tags.h index bdda22dd4..cc791b927 100644 --- a/src/ui/dialog/tags.h +++ b/src/ui/dialog/tags.h @@ -19,7 +19,6 @@ #include <gtkmm/dialog.h> #include "ui/widget/spinbutton.h" #include "ui/widget/panel.h" -#include "ui/widget/object-composite-settings.h" #include "desktop-tracker.h" #include "ui/widget/style-subject.h" #include "selection.h" 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); |
