summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-07-31 15:48:39 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-07-31 15:48:39 +0000
commitd721b7766b0d39412d332e08bb629f0c5e08e946 (patch)
tree1804a128d7a01580a66ab5615bc80194eecf8ee6 /src
parentNew unit parameter for LPEs which lpe-ruler now uses (diff)
downloadinkscape-d721b7766b0d39412d332e08bb629f0c5e08e946.tar.gz
inkscape-d721b7766b0d39412d332e08bb629f0c5e08e946.zip
Remove UI stuff from internal text parameter
(bzr r6488)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-ruler.cpp2
-rw-r--r--src/live_effects/parameter/text.h16
2 files changed, 7 insertions, 11 deletions
diff --git a/src/live_effects/lpe-ruler.cpp b/src/live_effects/lpe-ruler.cpp
index 8b457da58..f60c7b9fa 100644
--- a/src/live_effects/lpe-ruler.cpp
+++ b/src/live_effects/lpe-ruler.cpp
@@ -27,7 +27,7 @@ LPERuler::LPERuler(LivePathEffectObject *lpeobject) :
mark_distance(_("Mark distance"), _("Distance between ruler marks"), "mark_distance", &wr, this, 20),
mark_length(_("Mark length"), _("Length of ruler marks"), "mark_length", &wr, this, 10),
scale(_("Scale factor"), _("Scale factor for ruler distance (only affects on-canvas display of ruler length)"), "scale", &wr, this, 1.0),
- info_text(_("Info text"), _("Parameter for text creation"), "info_text", &wr, this, ""),
+ info_text(this),
unit(_("Unit"), _("Unit"), "unit", &wr, this)
{
registerParameter(dynamic_cast<Parameter *>(&mark_distance));
diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h
index fafe9fe32..be42cffbc 100644
--- a/src/live_effects/parameter/text.h
+++ b/src/live_effects/parameter/text.h
@@ -60,19 +60,15 @@ private:
};
/*
- * This parameter does not display a widget in the LPE dialog; LPEs can use it to display text that
- * should not be settable by the user
+ * This parameter does not display a widget in the LPE dialog; LPEs can use it to display on-canvas
+ * text that should not be settable by the user. Note that since no widget is provided, the
+ * parameter must be initialized differently than usual (only with a pointer to the parent effect;
+ * no label, no tooltip, etc.).
*/
class TextParamInternal : public TextParam {
public:
- TextParamInternal(const Glib::ustring& label,
- const Glib::ustring& tip,
- const Glib::ustring& key,
- Inkscape::UI::Widget::Registry* wr,
- Effect* effect,
- const Glib::ustring default_value = "") :
- TextParam(label, tip, key, wr, effect, default_value) {}
- //virtual ~TextParamInternal() {}
+ TextParamInternal(Effect* effect) :
+ TextParam("", "", "", NULL, effect) {}
virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips) { return NULL; }
};