diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-01-07 23:20:21 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-01-07 23:20:21 +0000 |
| commit | 7eeeec76ef763358659089a0857063d8d34c1de0 (patch) | |
| tree | f93636506019017d382a05055724681df72a4b37 /src | |
| parent | Fix a problem with symbols when updating defs with current document set. Also... (diff) | |
| parent | Merge branch 'master' into fixBoolParamAmperandWarning (diff) | |
| download | inkscape-7eeeec76ef763358659089a0857063d8d34c1de0.tar.gz inkscape-7eeeec76ef763358659089a0857063d8d34c1de0.zip | |
Merge branch 'master' into fixSlowDefsOperationsWhithSymbols
Diffstat (limited to 'src')
| -rw-r--r-- | src/live_effects/lpe-envelope.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/registered-widget.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp index 688841617..b50efde34 100644 --- a/src/live_effects/lpe-envelope.cpp +++ b/src/live_effects/lpe-envelope.cpp @@ -20,8 +20,8 @@ LPEEnvelope::LPEEnvelope(LivePathEffectObject *lpeobject) : bend_path2(_("Right bend path:"), _("Right path along which to bend the original path"), "bendpath2", &wr, this, "M0,0 L1,0"), bend_path3(_("Bottom bend path:"), _("Bottom path along which to bend the original path"), "bendpath3", &wr, this, "M0,0 L1,0"), bend_path4(_("Left bend path:"), _("Left path along which to bend the original path"), "bendpath4", &wr, this, "M0,0 L1,0"), - xx(_("_Enable left & right paths"), _("Enable the left and right deformation paths"), "xx", &wr, this, true), - yy(_("_Enable top & bottom paths"), _("Enable the top and bottom deformation paths"), "yy", &wr, this, true) + xx(_("_Enable left & right paths"), _("Enable the left and right deformation paths"), "xx", &wr, this, true), + yy(_("_Enable top & bottom paths"), _("Enable the top and bottom deformation paths"), "yy", &wr, this, true) { registerParameter(&yy); registerParameter(&xx); diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index a3b87f89b..13d223752 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -52,7 +52,8 @@ RegisteredCheckButton::RegisteredCheckButton (const Glib::ustring& label, const setProgrammatically = false; set_tooltip_text (tip); - Gtk::Label *l = new Gtk::Label (label); + Gtk::Label *l = new Gtk::Label(); + l->set_markup(label); l->set_use_underline (true); add (*manage (l)); |