From d7ebcb3d030eeb458020b7d2d3da470ce003b9d0 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 15 Sep 2018 12:09:11 +0200
Subject: Improve message parameter and remove unecesary widgets from meassure
 segments LPE

---
 src/live_effects/parameter/message.cpp | 10 +++++++---
 src/live_effects/parameter/message.h   |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/live_effects/parameter')

diff --git a/src/live_effects/parameter/message.cpp b/src/live_effects/parameter/message.cpp
index da781a803..afb5f339f 100644
--- a/src/live_effects/parameter/message.cpp
+++ b/src/live_effects/parameter/message.cpp
@@ -15,16 +15,20 @@ namespace LivePathEffect {
 
 MessageParam::MessageParam( const Glib::ustring& label, const Glib::ustring& tip,
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
-                      Effect* effect, const gchar * default_message, Gtk::Align halign, 
-                      Gtk::Align valign, double marginstart, double marginend)
+                      Effect* effect, const gchar * default_message, const Glib::ustring& legend, 
+                      Gtk::Align halign, Gtk::Align valign, double marginstart, double marginend)
     : Parameter(label, tip, key, wr, effect),
       message(default_message),
       defmessage(default_message),
+      _legend(legend),
       _halign(halign),
       _valign(valign),
       _marginstart(marginstart),
       _marginend(marginend)
 {
+    if (_legend == Glib::ustring("Use Label")) {
+        _legend = label;
+    }
     _label  = nullptr;
     _min_height = -1;
 }
@@ -73,7 +77,7 @@ MessageParam::param_set_min_height(int height)
 Gtk::Widget *
 MessageParam::param_newWidget()
 {
-    Gtk::Frame * frame = new Gtk::Frame (param_label);
+    Gtk::Frame * frame = new Gtk::Frame (_legend);
     Gtk::Widget * widg_frame = frame->get_label_widget();
 
 #if GTKMM_CHECK_VERSION(3,12,0)
diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h
index fad60533f..28cd9642b 100644
--- a/src/live_effects/parameter/message.h
+++ b/src/live_effects/parameter/message.h
@@ -22,7 +22,8 @@ public:
                Inkscape::UI::Widget::Registry* wr,
                Effect* effect,
                const gchar * default_message = "Default message",
-               Gtk::Align halign = Gtk::ALIGN_END,
+               const Glib::ustring& legend = "Use Label",
+               Gtk::Align halign = Gtk::ALIGN_START,
                Gtk::Align valign = Gtk::ALIGN_CENTER,
                double marginstart = 6,
                double marginend = 6);
@@ -47,6 +48,7 @@ private:
     MessageParam& operator=(const MessageParam&) = delete;
     const gchar *  message;
     const gchar *  defmessage;
+    Glib::ustring _legend;
     Gtk::Align _halign;
     Gtk::Align _valign;
     double _marginstart;
-- 
cgit v1.2.3