X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fwidget%2Fspin-slider.cpp;h=b90895df8ec1802317968ca2fb006645b6eb8622;hb=fd5c8954a92eac9af9af21d2a3665e9c673203a2;hp=71c5921a944338e9e72d3a70ccfc6ef147372aa8;hpb=328fffb9854baed083286c6ff41b8a040298b340;p=inkscape.git

diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index 71c5921a9..b90895df8 100644
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -3,6 +3,7 @@
  *
  * Author:
  *   Nicholas Bishop <nicholasbishop@gmail.com>
+ *   Felipe C. da S. Sanches <felipe.sanches@gmail.com>
  *
  * Copyright (C) 2007 Author
  *
@@ -10,6 +11,7 @@
  */
 
 #include "glib/gstrfuncs.h"
+#include "glibmm/i18n.h"
 
 #include "spin-slider.h"
 
@@ -18,12 +20,18 @@ namespace UI {
 namespace Widget {
 
 SpinSlider::SpinSlider(double value, double lower, double upper, double step_inc,
-                       double climb_rate, int digits, const SPAttributeEnum a)
-    : AttrWidget(a), _adjustment(value, lower, upper, step_inc),
+                       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)
 {
+    signal_value_changed().connect(signal_attr_changed().make_slot());
+
     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);
 
@@ -45,6 +53,8 @@ void SpinSlider::set_from_attribute(SPObject* o)
     const gchar* val = attribute_value(o);
     if(val)
         _adjustment.set_value(Glib::Ascii::strtod(val));
+    else
+        _adjustment.set_value(get_default()->as_double());
 }
 
 Glib::SignalProxy0<void> SpinSlider::signal_value_changed()
@@ -100,17 +110,36 @@ void SpinSlider::remove_scale()
 }
 
 DualSpinSlider::DualSpinSlider(double value, double lower, double upper, double step_inc,
-                               double climb_rate, int digits, const SPAttributeEnum a)
-    : AttrWidget(a), _s1(value, lower, upper, step_inc, climb_rate, digits),
-      _s2(value, lower, upper, step_inc, climb_rate, digits)
+                               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, SP_ATTR_INVALID, tip_text1),
+      _s2(value, lower, upper, step_inc, climb_rate, digits, SP_ATTR_INVALID, tip_text2),
+      //TRANSLATORS: Only translate the word "Link" - means to _link_ two sliders together
+      _link(Q_("sliders|Link"))
 {
+    signal_value_changed().connect(signal_attr_changed().make_slot());
+
     _s1.get_adjustment().signal_value_changed().connect(_signal_value_changed.make_slot());
     _s2.get_adjustment().signal_value_changed().connect(_signal_value_changed.make_slot());
+    _s1.get_adjustment().signal_value_changed().connect(sigc::mem_fun(*this, &DualSpinSlider::update_linked));
+    _link.signal_toggled().connect(sigc::mem_fun(*this, &DualSpinSlider::link_toggled));
+
+    Gtk::VBox* vb = Gtk::manage(new Gtk::VBox);
+    vb->add(_s1);
+    vb->add(_s2);
+    pack_start(*vb);
+    pack_start(_link, false, false);
+    _link.set_active(true);
+
+    show_all();
 }
 
 Glib::ustring DualSpinSlider::get_as_attribute() const
 {
-    return _s1.get_as_attribute() + " " + _s2.get_as_attribute();
+    if(_link.get_active())
+        return _s1.get_as_attribute();
+    else
+        return _s1.get_as_attribute() + " " + _s2.get_as_attribute();
 }
 
 void DualSpinSlider::set_from_attribute(SPObject* o)
@@ -127,6 +156,8 @@ void DualSpinSlider::set_from_attribute(SPObject* o)
             if(toks[1])
                 v2 = Glib::Ascii::strtod(toks[1]);
 
+            _link.set_active(toks[1] == 0);
+
             _s1.get_adjustment().set_value(v1);
             _s2.get_adjustment().set_value(v2);
 
@@ -166,6 +197,24 @@ void DualSpinSlider::set_update_policy(const Gtk::UpdateType u)
     _s2.set_update_policy(u);
 }
 
+void DualSpinSlider::remove_scale()
+{
+    _s1.remove_scale();
+    _s2.remove_scale();
+}
+
+void DualSpinSlider::link_toggled()
+{
+    _s2.set_sensitive(!_link.get_active());
+    update_linked();
+}
+
+void DualSpinSlider::update_linked()
+{
+    if(_link.get_active())
+        _s2.set_value(_s1.get_value());
+}
+
 } // namespace Widget
 } // namespace UI
 } // namespace Inkscape