merged with trunk so I can build again...

(bzr r10092.1.36)

1 files changed, 83 insertions, 47 deletions

diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 62762b3bb..2b501a9a4 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -2,6 +2,7 @@
  * Copyright (C) 2005-2007 Authors:
  *   Ted Gould <ted@gould.cx>
  *   Johan Engelen <johan@shouraizou.nl> *
+ *   Jon A. Cruz <jon@joncruz.org>
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
@@ -11,7 +12,8 @@
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-#include <gtkmm/spinbutton.h>
+#include <gtkmm/scale.h>
+#include "ui/widget/spinbutton.h"
 
 #include "xml/node.h"
 #include "extension/extension.h"
@@ -22,29 +24,42 @@ namespace Inkscape {
 namespace Extension {
 
 
-/** \brief  Use the superclass' allocator and set the \c _value */
-ParamFloat::ParamFloat (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) :
-        Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), _value(0.0), _min(0.0), _max(10.0)
+/** Use the superclass' allocator and set the \c _value. */
+ParamFloat::ParamFloat (const gchar * name,
+                        const gchar * guitext,
+                        const gchar * desc,
+                        const Parameter::_scope_t scope,
+                        bool gui_hidden,
+                        const gchar * gui_tip,
+                        Inkscape::Extension::Extension * ext,
+                        Inkscape::XML::Node * xml,
+                        AppearanceMode mode) :
+        Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext),
+                  _value(0.0), _mode(mode), _indent(0), _min(0.0), _max(10.0)
 {
     const gchar * defaultval = NULL;
-    if (sp_repr_children(xml) != NULL)
+    if (sp_repr_children(xml) != NULL) {
         defaultval = sp_repr_children(xml)->content();
+    }
     if (defaultval != NULL) {
         _value = g_ascii_strtod (defaultval,NULL);
     }
 
     const char * maxval = xml->attribute("max");
-    if (maxval != NULL)
+    if (maxval != NULL) {
         _max = g_ascii_strtod (maxval,NULL);
+    }
 
     const char * minval = xml->attribute("min");
-    if (minval != NULL)
+    if (minval != NULL) {
         _min = g_ascii_strtod (minval,NULL);
+    }
 
     _precision = 1;
     const char * precision = xml->attribute("precision");
-    if (precision != NULL)
+    if (precision != NULL) {
         _precision = atoi(precision);
+    }
 
     /* We're handling this by just killing both values */
     if (_max < _min) {
@@ -52,6 +67,11 @@ ParamFloat::ParamFloat (const gchar * name, const gchar * guitext, const gchar *
         _min = 0.0;
     }
 
+    const char * indent = xml->attribute("indent");
+    if (indent != NULL) {
+        _indent = atoi(indent) * 12;
+    }
+
     gchar * pref_name = this->pref_name();
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     _value = prefs->getDouble(extension_pref_root + pref_name, _value);
@@ -59,27 +79,36 @@ ParamFloat::ParamFloat (const gchar * name, const gchar * guitext, const gchar *
 
     // std::cout << "New Float::  value: " << _value << "  max: " << _max << "  min: " << _min << std::endl;
 
-    if (_value > _max) _value = _max;
-    if (_value < _min) _value = _min;
+    if (_value > _max) {
+        _value = _max;
+    }
+    if (_value < _min) {
+        _value = _min;
+    }
 
     return;
 }
 
-/** \brief  A function to set the \c _value
-    \param  in   The value to set to
-    \param  doc  A document that should be used to set the value.
-    \param  node The node where the value may be placed
-
-    This function sets the internal value, but it also sets the value
-    in the preferences structure.  To put it in the right place, \c PREF_DIR
-    and \c pref_name() are used.
-*/
-float
-ParamFloat::set (float in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/)
+/**
+ * A function to set the \c _value.
+ *
+ * This function sets the internal value, but it also sets the value
+ * in the preferences structure.  To put it in the right place, \c PREF_DIR
+ * and \c pref_name() are used.
+ *
+ * @param  in   The value to set to.
+ * @param  doc  A document that should be used to set the value.
+ * @param  node The node where the value may be placed.
+ */
+float ParamFloat::set(float in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/)
 {
     _value = in;
-    if (_value > _max) _value = _max;
-    if (_value < _min) _value = _min;
+    if (_value > _max) {
+        _value = _max;
+    }
+    if (_value < _min) {
+        _value = _min;
+    }
 
     gchar * prefname = this->pref_name();
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -89,9 +118,7 @@ ParamFloat::set (float in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/)
     return _value;
 }
 
-/** \brief  Return the value as a string */
-void
-ParamFloat::string (std::string &string)
+void ParamFloat::string(std::string &string) const
 {
     char startstring[G_ASCII_DTOSTR_BUF_SIZE];
     g_ascii_dtostr(startstring, G_ASCII_DTOSTR_BUF_SIZE, _value);
@@ -99,18 +126,18 @@ ParamFloat::string (std::string &string)
     return;
 }
 
-/** \brief  A class to make an adjustment that uses Extension params */
+/** A class to make an adjustment that uses Extension params. */
 class ParamFloatAdjustment : public Gtk::Adjustment {
-    /** The parameter to adjust */
+    /** The parameter to adjust. */
     ParamFloat * _pref;
     SPDocument * _doc;
     Inkscape::XML::Node * _node;
     sigc::signal<void> * _changeSignal;
 public:
-    /** \brief  Make the adjustment using an extension and the string
+    /** Make the adjustment using an extension and the string
                 describing the parameter. */
     ParamFloatAdjustment (ParamFloat * param, SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) :
-            Gtk::Adjustment(0.0, param->min(), param->max(), 0.1, 0), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) {
+            Gtk::Adjustment(0.0, param->min(), param->max(), 0.1, 1.0, 0), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) {
         this->set_value(_pref->get(NULL, NULL) /* \todo fix */);
         this->signal_value_changed().connect(sigc::mem_fun(this, &ParamFloatAdjustment::val_changed));
         return;
@@ -119,14 +146,13 @@ public:
     void val_changed (void);
 }; /* class ParamFloatAdjustment */
 
-/** \brief  A function to respond to the value_changed signal from the
-            adjustment.
-
-    This function just grabs the value from the adjustment and writes
-    it to the parameter.  Very simple, but yet beautiful.
-*/
-void
-ParamFloatAdjustment::val_changed (void)
+/**
+ * A function to respond to the value_changed signal from the adjustment.
+ *
+ * This function just grabs the value from the adjustment and writes
+ * it to the parameter.  Very simple, but yet beautiful.
+ */
+void ParamFloatAdjustment::val_changed(void)
 {
     //std::cout << "Value Changed to: " << this->get_value() << std::endl;
     _pref->set(this->get_value(), _doc, _node);
@@ -137,23 +163,33 @@ ParamFloatAdjustment::val_changed (void)
 }
 
 /**
-    \brief  Creates a Float Adjustment for a float parameter
-
-    Builds a hbox with a label and a float adjustment in it.
-*/
-Gtk::Widget *
-ParamFloat::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
+ * Creates a Float Adjustment for a float parameter.
+ *
+ * Builds a hbox with a label and a float adjustment in it.
+ */
+Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
 {
-	if (_gui_hidden) return NULL;
+    if (_gui_hidden) {
+        return NULL;
+    }
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
 
     Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_LEFT));
     label->show();
-    hbox->pack_start(*label, true, true);
+    hbox->pack_start(*label, true, true, _indent);
 
     ParamFloatAdjustment * fadjust = Gtk::manage(new ParamFloatAdjustment(this, doc, node, changeSignal));
-    Gtk::SpinButton * spin = Gtk::manage(new Gtk::SpinButton(*fadjust, 0.1, _precision));
+    
+    if (_mode == FULL) {
+        Gtk::HScale * scale = Gtk::manage(new Gtk::HScale(*fadjust));
+        scale->set_draw_value(false);
+        scale->set_size_request(200, -1);
+        scale->show();
+        hbox->pack_start(*scale, false, false);
+    }
+ 
+    Inkscape::UI::Widget::SpinButton * spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(*fadjust, 0.1, _precision));
     spin->show();
     hbox->pack_start(*spin, false, false);