Extensions: Harmonize appearance and try to simplify layouting a bit

(bzr r15509)

4 files changed, 23 insertions, 11 deletions

diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 2d020aa0e..8b5a687ef 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -694,8 +694,8 @@ public:
      */
     void addWidget(Gtk::Widget *widg, gchar const *tooltip, int indent) {
         if (widg) {
-            widg->set_margin_left(indent*12);
-            this->pack_start(*widg, false, false, 2);
+            widg->set_margin_left(indent * Parameter::GUI_INDENTATION);
+            this->pack_start(*widg, false, false, 0);
             if (tooltip) {
                 widg->set_tooltip_text(_(tooltip));
             } else {
@@ -722,6 +722,8 @@ Extension::autogui (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<v
     if (!_gui || param_visible_count() == 0) return NULL;
 
     AutoGUI * agui = Gtk::manage(new AutoGUI());
+    agui->set_border_width(Parameter::GUI_BOX_MARGIN);
+    agui->set_spacing(Parameter::GUI_BOX_SPACING);
 
     //go through the list of parameters to see if there are any non-hidden ones
     for (GSList * list = parameters; list != NULL; list = g_slist_next(list)) {
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index bfdff885a..8ef48926e 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -214,7 +214,8 @@ Gtk::Widget * ParamNotebookPage::get_widget(SPDocument * doc, Inkscape::XML::Nod
     }
 
     Gtk::VBox * vbox = Gtk::manage(new Gtk::VBox);
-    vbox->set_border_width(5);
+    vbox->set_border_width(Parameter::GUI_BOX_MARGIN);
+    vbox->set_spacing(Parameter::GUI_BOX_SPACING);
 
     // add parameters onto page (if any)
     for (GSList * list = parameters; list != NULL; list = g_slist_next(list)) {
@@ -222,8 +223,8 @@ Gtk::Widget * ParamNotebookPage::get_widget(SPDocument * doc, Inkscape::XML::Nod
         Gtk::Widget * widg = param->get_widget(doc, node, changeSignal);
         if (widg) {
             int indent = param->get_indent();
-            widg->set_margin_left(indent*12);
-            vbox->pack_start(*widg, false, false, 2);
+            widg->set_margin_left(indent * Parameter::GUI_INDENTATION);
+            vbox->pack_start(*widg, false, false, 0);
 
             gchar const * tip = param->get_tooltip();
             if (tip) {
diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h
index c787a7c97..edbd9ce08 100644
--- a/src/extension/param/parameter.h
+++ b/src/extension/param/parameter.h
@@ -159,6 +159,15 @@ public:
     /** All the code in Notebook::get_param to get the notebook content. */
     virtual Parameter *get_param(gchar const *name);
 
+
+    /** Recommended margin of boxes containing parameters */
+    const static int GUI_BOX_MARGIN = 10;
+    /** Recommended spacing between individual parameters when packing into boxes */
+    const static int GUI_BOX_SPACING = 4;
+    /** Recommended indentation width of parameters */
+    const static int GUI_INDENTATION = 12;
+
+
 protected:
     /** Description of the parameter. */
     gchar *       _desc;
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index fcc88853d..e98d88b2d 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -59,11 +59,10 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co
         controls = _effect->get_imp()->prefs_effect(_effect, SP_ACTIVE_DESKTOP, &_signal_param_change, NULL);
         _signal_param_change.connect(sigc::mem_fun(this, &PrefDialog::param_change));
     }
-
-    hbox->pack_start(*controls, true, true, 6);
+    hbox->pack_start(*controls, true, true, 0);
     hbox->show();
 
-    this->get_content_area()->pack_start(*hbox, true, true, 6);
+    this->get_content_area()->pack_start(*hbox, true, true, 0);
 
     /*
     Gtk::Button * help_button = add_button(Gtk::Stock::HELP, Gtk::RESPONSE_HELP);
@@ -88,15 +87,16 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co
         auto sep = Gtk::manage(new Gtk::Separator());
         sep->show();
 
-        this->get_content_area()->pack_start(*sep, true, true, 4);
+        this->get_content_area()->pack_start(*sep, false, false, Parameter::GUI_BOX_SPACING);
 
         hbox = Gtk::manage(new Gtk::HBox());
+        hbox->set_border_width(Parameter::GUI_BOX_MARGIN);
         _button_preview = _param_preview->get_widget(NULL, NULL, &_signal_preview);
         _button_preview->show();
-        hbox->pack_start(*_button_preview, true, true,6);
+        hbox->pack_start(*_button_preview, true, true, 0);
         hbox->show();
 
-        this->get_content_area()->pack_start(*hbox, true, true, 6);
+        this->get_content_area()->pack_start(*hbox, false, false, 0);
 
         Gtk::Box * hbox = dynamic_cast<Gtk::Box *>(_button_preview);
         if (hbox != NULL) {