summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter/text.cpp
diff options
context:
space:
mode:
authorJabiertxof <jtx@jtx>2017-04-28 19:42:36 +0000
committerJabiertxof <jtx@jtx>2017-04-28 19:42:36 +0000
commit52054e24f8b98c07753588c726a1e777bad7245b (patch)
tree69b39b96cef271d0bb9acbf2d75f7329bee6c2d9 /src/live_effects/parameter/text.cpp
parentUpdate to trunk (diff)
downloadinkscape-52054e24f8b98c07753588c726a1e777bad7245b.tar.gz
inkscape-52054e24f8b98c07753588c726a1e777bad7245b.zip
Reset
(bzr r15620.1.9)
Diffstat (limited to 'src/live_effects/parameter/text.cpp')
-rw-r--r--src/live_effects/parameter/text.cpp18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 5c56e8447..5c4cdf4c6 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -50,9 +50,9 @@ TextParam::param_set_default()
}
void
-TextParam::param_update_default(const gchar * default_value)
+TextParam::param_update_default(Glib::ustring default_value)
{
- defvalue = (Glib::ustring)default_value;
+ defvalue = default_value;
}
void
@@ -119,18 +119,8 @@ TextParam::param_getSVGValue() const
Gtk::Widget *
TextParam::param_newWidget()
{
- Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
- Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
- effectkey +
- (Glib::ustring)"/" +
- (Glib::ustring)param_key;
- Glib::ustring label = param_label;
- if(prefs->getEntry(pref_path).isValid()){
- label = (Glib::ustring)"* " + param_label;
- }
Inkscape::UI::Widget::RegisteredText *rsu = Gtk::manage(new Inkscape::UI::Widget::RegisteredText(
- label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc()));
+ param_label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc()));
rsu->setText(value);
rsu->setProgrammatically = false;
@@ -140,7 +130,7 @@ TextParam::param_newWidget()
}
void
-TextParam::param_setValue(Glib::ustring newvalue)
+TextParam::param_setValue(const Glib::ustring newvalue)
{
param_effect->upd_params = true;
value = newvalue;