Merged.

(bzr r15369.1.19)

1 files changed, 39 insertions, 27 deletions

diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index 07aaa07cc..7cf818280 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -16,6 +16,7 @@
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <glibmm/i18n.h>
+#include <glibmm/markup.h>
 
 #include "xml/node.h"
 #include "extension/extension.h"
@@ -26,17 +27,19 @@ namespace Extension {
 
 
 /** \brief  Initialize the object, to do that, copy the data. */
-ParamDescription::ParamDescription (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(NULL), _mode(mode), _indent(0)
+ParamDescription::ParamDescription(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,
+                                   AppearanceMode mode)
+    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    , _value(NULL)
+    , _mode(mode)
 {
     // printf("Building Description\n");
     const char * defaultval = NULL;
@@ -50,11 +53,6 @@ ParamDescription::ParamDescription (const gchar * name,
 
     _context = xml->attribute("msgctxt");
 
-    const char * indent = xml->attribute("indent");
-    if (indent != NULL) {
-        _indent = atoi(indent) * 12;
-    }
-
     return;
 }
 
@@ -76,23 +74,37 @@ ParamDescription::get_widget (SPDocument * /*doc*/, Inkscape::XML::Node * /*node
     } else {
         newguitext = _(_value);
     }
-    
-    Gtk::Label * label;
-    int padding = 12 + _indent;
+
+    Gtk::Label * label = Gtk::manage(new Gtk::Label());
     if (_mode == HEADER) {
-        label = Gtk::manage(new Gtk::Label(Glib::ustring("<b>") +newguitext + Glib::ustring("</b>"), Gtk::ALIGN_START));
-	label->set_margin_top(5);
-	label->set_margin_bottom(5);
-        label->set_use_markup(true);
-        padding = _indent;
+        label->set_markup(Glib::ustring("<b>") + Glib::Markup::escape_text(newguitext) + Glib::ustring("</b>"));
+        label->set_margin_top(5);
+        label->set_margin_bottom(5);
+    } else if (_mode == URL) {
+        Glib::ustring escaped_url = Glib::Markup::escape_text(newguitext);
+        label->set_markup(Glib::ustring::compose("<a href='%1'>%1</a>", escaped_url));
     } else {
-        label = Gtk::manage(new Gtk::Label(newguitext, Gtk::ALIGN_START));
+        label->set_text(newguitext);
     }
     label->set_line_wrap();
+    //label->set_xalign(0); // requires gtkmm 3.16
+    label->set_alignment(Gtk::ALIGN_START);
+
+    // TODO: Ugly "fix" for gtk3 width/height calculation of labels.
+    //   - If not applying any limits long labels will make the window grow horizontally until it uses up
+    //     most of the available space (i.e. most of the screen area) which is ridicously wide
+    //   - By using "set_default_size(0,0)" in prefidalog.cpp we tell the window to shrink as much as possible,
+    //     however this can result in a much to narrow dialog instead and much unnecessary wrapping
+    //   - Here we set a lower limit of GUI_MAX_LINE_LENGTH characters per line that long texts will always use
+    //     This means texts can not shrink anymore (they can still grow, though) and it's also necessary
+    //     to prevent https://bugzilla.gnome.org/show_bug.cgi?id=773572
+    int len = newguitext.length();
+    label->set_width_chars(len > Parameter::GUI_MAX_LINE_LENGTH ? Parameter::GUI_MAX_LINE_LENGTH : len);
+
     label->show();
 
-    Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
-    hbox->pack_start(*label, true, true, padding);
+    Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox());
+    hbox->pack_start(*label, true, true);
     hbox->show();
 
     return hbox;