Extensions: Make "indent" attribute a common attribute for all parameters that behaves more consistent and predictable than before.

- Every "Parameter" now has an "_indent" member variable (specifying the indentation level; set in "Parameter::make()", see parameter.cpp)
- Indentation is achieved by using "set_margin_left()" on the parameter's widget. This fixes bug #1662035 (comment #4 contains some more details about this patch).
- Specifying "indent" on a parameter will now work consistently for all parameters. Previously the "indent" attribute often had no effect at all, e.g. for notebooks but also for parameters with 'appearance="full"' which was reasonable in most cases but made the outcome of using this attribute often unpredictable and is unnecessarily restrictive.
- Most visible change: "description"s always used an indentation level of at least one (even if no indentation was specified). For the sake of consistency this discrepancy was dropped. Previous appearance can easily be restored by setting 'indent="1"'.

Fixed bugs:
  - https://launchpad.net/bugs/1662035

(bzr r15508)

1 files changed, 13 insertions, 10 deletions

diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 1d9205502..f7d3c9662 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -24,7 +24,7 @@
 
 namespace Inkscape {
 namespace Extension {
-    
+
 
 /** Free the allocated data. */
 ParamString::~ParamString(void)
@@ -76,20 +76,23 @@ void ParamString::string(std::string &string) const
 }
 
 /** Initialize the object, to do that, copy the data. */
-ParamString::ParamString (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(NULL), _indent(0)
+ParamString::ParamString(const gchar * name,
+                         const gchar * guitext,
+                         const gchar * desc,
+                         const Parameter::_scope_t scope,
+                         bool gui_hidden,
+                         const gchar * gui_tip,
+                         int indent,
+                         Inkscape::Extension::Extension * ext,
+                         Inkscape::XML::Node * xml)
+    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    , _value(NULL)
 {
     const char * defaultval = NULL;
     if (xml->firstChild() != NULL) {
         defaultval = xml->firstChild()->content();
     }
 
-    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();
     Glib::ustring paramval = prefs->getString(extension_pref_root + pref_name);
@@ -168,7 +171,7 @@ Gtk::Widget * ParamString::get_widget(SPDocument * doc, Inkscape::XML::Node * no
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
     Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
     label->show();
-    hbox->pack_start(*label, false, false, _indent);
+    hbox->pack_start(*label, false, false);
 
     ParamStringEntry * textbox = new ParamStringEntry(this, doc, node, changeSignal);
     textbox->show();