Merge branch 'master' into powerpencil

4 files changed, 27 insertions, 13 deletions

diff --git a/src/live_effects/parameter/message.cpp b/src/live_effects/parameter/message.cpp
index 39d8f12c7..0e19c07e1 100644
--- a/src/live_effects/parameter/message.cpp
+++ b/src/live_effects/parameter/message.cpp
@@ -20,7 +20,8 @@ MessageParam::MessageParam( const Glib::ustring& label, const Glib::ustring& tip
       message(g_strdup(default_message)),
       defmessage(g_strdup(default_message))
 {
-
+    _label  = NULL;
+    _min_height = -1;
 }
 
 void
@@ -54,6 +55,16 @@ MessageParam::param_getDefaultSVGValue() const
     return defmessage;
 }
 
+void
+MessageParam::param_set_min_height(int height)
+{
+    _min_height = height;
+    if (_label) {
+        _label->set_size_request(-1, _min_height);
+    }
+}
+
+
 Gtk::Widget *
 MessageParam::param_newWidget()
 {
@@ -61,11 +72,12 @@ MessageParam::param_newWidget()
     Gtk::Widget * widg_frame = frame->get_label_widget();
     widg_frame->set_margin_right(5);
     widg_frame->set_margin_left(5);
-    Gtk::Label * label = new Gtk::Label (message, Gtk::ALIGN_END);
-    label->set_use_underline (true);
-    label->set_use_markup();
-    label->set_line_wrap(true);
-    Gtk::Widget * widg_label = dynamic_cast<Gtk::Widget *> (label);
+    _label = new Gtk::Label (message, Gtk::ALIGN_END);
+    _label->set_use_underline (true);
+    _label->set_use_markup();
+    _label->set_line_wrap(true);
+    _label->set_size_request(-1, _min_height);
+    Gtk::Widget* widg_label = dynamic_cast<Gtk::Widget *> (_label);
     widg_label->set_margin_top(8);
     widg_label->set_margin_bottom(10);
     widg_label->set_margin_right(6);
diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h
index 63075cf96..2ac2c791a 100644
--- a/src/live_effects/parameter/message.h
+++ b/src/live_effects/parameter/message.h
@@ -33,10 +33,12 @@ public:
     void param_setValue(const gchar * message);
     
     virtual void param_set_default();
-
+    void param_set_min_height(int height);
     const gchar *  get_value() const { return message; };
 
 private:
+    Gtk::Label * _label;
+    int _min_height;
     MessageParam(const MessageParam&);
     MessageParam& operator=(const MessageParam&);
     gchar *  message;
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index bd6608737..f89fad3ee 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -343,7 +343,7 @@ PathParam::set_new_value (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & newpa
  *
  * If write_to_svg = true :
  *          The new path data is written to SVG. In this case the signal_path_changed signal
- *          is not directly emited in this method, because writing to SVG
+ *          is not directly emitted in this method, because writing to SVG
  *          triggers the LPEObject to which this belongs to call Effect::setParameter which calls
  *          PathParam::readSVGValue, which finally emits the signal_path_changed signal.
  * If write_to_svg = false :
diff --git a/src/live_effects/parameter/satellitesarray.h b/src/live_effects/parameter/satellitesarray.h
index 5ae372ac2..3039eb432 100644
--- a/src/live_effects/parameter/satellitesarray.h
+++ b/src/live_effects/parameter/satellitesarray.h
@@ -5,14 +5,14 @@
  * Inkscape::LivePathEffectParameters
  * Copyright (C) Jabiertxo Arraiza Cenoz <jabier.arraiza@marker.es>
  * Special thanks to Johan Engelen for the base of the effect -powerstroke-
- * Also to ScislaC for point me to the idea
- * Also su_v for his construvtive feedback and time
+ * Also to ScislaC for pointing me to the idea
+ * Also su_v for his constructive feedback and time
  * To Nathan Hurst for his review and help on refactor
- * and finaly to Liam P. White for his big help on coding, that save me a lot of
- * hours
+ * and finally to Liam P. White for his big help on coding, 
+ * that saved me a lot of hours
  *
  *
- * This parameter act as bridge from pathVectorSatellites class to serialize it as a LPE
+ * This parameter acts as a bridge from pathVectorSatellites class to serialize it as a LPE
  * parameter
  *
  * Released under GNU GPL, read the file 'COPYING' for more information