diff options
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/attr-widget.h | 4 | ||||
| -rw-r--r-- | src/ui/widget/spin-slider.cpp | 12 | ||||
| -rw-r--r-- | src/ui/widget/spin-slider.h | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/src/ui/widget/attr-widget.h b/src/ui/widget/attr-widget.h index 34aae7db9..66a903a0b 100644 --- a/src/ui/widget/attr-widget.h +++ b/src/ui/widget/attr-widget.h @@ -16,6 +16,7 @@ #include "attributes.h" #include "sp-object.h" #include "xml/node.h" +#include <gtkmm/tooltips.h> namespace Inkscape { namespace UI { @@ -142,6 +143,9 @@ protected: return 0; } +protected: + Gtk::Tooltips _tt; + private: const SPAttributeEnum _attr; DefaultValueHolder _default; diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp index 799f5c3fb..c4c78dd85 100644 --- a/src/ui/widget/spin-slider.cpp +++ b/src/ui/widget/spin-slider.cpp @@ -20,7 +20,7 @@ namespace UI { namespace Widget { SpinSlider::SpinSlider(double value, double lower, double upper, double step_inc, - double climb_rate, int digits, const SPAttributeEnum a) + double climb_rate, int digits, const SPAttributeEnum a, char* tip_text) : AttrWidget(a, value), _adjustment(value, lower, upper, step_inc), _scale(_adjustment), _spin(_adjustment, climb_rate, digits) { @@ -28,6 +28,10 @@ SpinSlider::SpinSlider(double value, double lower, double upper, double step_inc pack_start(_scale); pack_start(_spin, false, false); + if (tip_text){ + _tt.set_tip(_scale, tip_text); + _tt.set_tip(_spin, tip_text); + } _scale.set_draw_value(false); @@ -106,10 +110,10 @@ void SpinSlider::remove_scale() } DualSpinSlider::DualSpinSlider(double value, double lower, double upper, double step_inc, - double climb_rate, int digits, const SPAttributeEnum a) + double climb_rate, int digits, const SPAttributeEnum a, char* tip_text1, char* tip_text2) : AttrWidget(a), - _s1(value, lower, upper, step_inc, climb_rate, digits), - _s2(value, lower, upper, step_inc, climb_rate, digits), + _s1(value, lower, upper, step_inc, climb_rate, digits, SP_ATTR_INVALID, tip_text1), + _s2(value, lower, upper, step_inc, climb_rate, digits, SP_ATTR_INVALID, tip_text2), _link(_("Link")) { signal_value_changed().connect(signal_attr_changed().make_slot()); diff --git a/src/ui/widget/spin-slider.h b/src/ui/widget/spin-slider.h index 2779be029..a4d0aa9d6 100644 --- a/src/ui/widget/spin-slider.h +++ b/src/ui/widget/spin-slider.h @@ -26,7 +26,7 @@ class SpinSlider : public Gtk::HBox, public AttrWidget { public: SpinSlider(double value, double lower, double upper, double step_inc, - double climb_rate, int digits, const SPAttributeEnum a = SP_ATTR_INVALID); + double climb_rate, int digits, const SPAttributeEnum a = SP_ATTR_INVALID, char* tip_text = NULL); virtual Glib::ustring get_as_attribute() const; virtual void set_from_attribute(SPObject*); @@ -60,7 +60,7 @@ class DualSpinSlider : public Gtk::HBox, public AttrWidget { public: DualSpinSlider(double value, double lower, double upper, double step_inc, - double climb_rate, int digits, const SPAttributeEnum); + double climb_rate, int digits, const SPAttributeEnum, char* tip_text1, char* tip_text2); virtual Glib::ustring get_as_attribute() const; virtual void set_from_attribute(SPObject*); |