diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2017-04-26 09:16:33 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2017-04-26 09:16:33 +0000 |
| commit | b84137c431a7e236131f71a17f8f2c71e26c6162 (patch) | |
| tree | 04cbe26ab83d5a7ddf1fde8d2da153cc9039306b /src/extension/param/string.cpp | |
| parent | Allow set and reset default values of LPE parameters (diff) | |
| parent | Improve 0.92 support for Clone Original LPE (diff) | |
| download | inkscape-b84137c431a7e236131f71a17f8f2c71e26c6162.tar.gz inkscape-b84137c431a7e236131f71a17f8f2c71e26c6162.zip | |
Update to trunk
(bzr r15620.1.2)
Diffstat (limited to 'src/extension/param/string.cpp')
| -rw-r--r-- | src/extension/param/string.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp index 0c5238f99..51b5dfdf3 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/param/string.cpp @@ -77,15 +77,13 @@ void ParamString::string(std::string &string) const /** Initialize the object, to do that, copy the data. */ ParamString::ParamString(const gchar * name, - const gchar * guitext, - const gchar * desc, - const Parameter::_scope_t scope, - bool gui_hidden, - const gchar * gui_tip, + const gchar * text, + const gchar * description, + bool hidden, int indent, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) - : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext) + : Parameter(name, text, description, hidden, indent, ext) , _value(NULL) { const char * defaultval = NULL; @@ -164,12 +162,12 @@ void ParamStringEntry::changed_text(void) */ Gtk::Widget * ParamString::get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) { - if (_gui_hidden) { + if (_hidden) { return NULL; } Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, Parameter::GUI_PARAM_WIDGETS_SPACING)); - Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START)); + Gtk::Label * label = Gtk::manage(new Gtk::Label(_text, Gtk::ALIGN_START)); label->show(); hbox->pack_start(*label, false, false); |