updated to latest trunk

(bzr r14876.2.4)

1 files changed, 18 insertions, 4 deletions

diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index 9ecadbdeb..954947cf4 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -21,8 +21,8 @@ namespace LivePathEffect {
 
 BoolParam::BoolParam( const Glib::ustring& label, const Glib::ustring& tip,
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
-                      Effect* effect, bool default_value , bool no_widget)
-    : Parameter(label, tip, key, wr, effect), value(default_value), defvalue(default_value), hide_widget(no_widget)
+                      Effect* effect, bool default_value)
+    : Parameter(label, tip, key, wr, effect), value(default_value), defvalue(default_value)
 {
 }
 
@@ -36,6 +36,18 @@ BoolParam::param_set_default()
     param_setValue(defvalue);
 }
 
+void 
+BoolParam::param_update_default(bool const default_value)
+{
+    defvalue = default_value;
+}
+
+void 
+BoolParam::param_update_default(const gchar * default_value)
+{
+    param_update_default(helperfns_read_bool(default_value, defvalue));
+}
+
 bool
 BoolParam::param_readSVGValue(const gchar * strvalue)
 {
@@ -53,7 +65,7 @@ BoolParam::param_getSVGValue() const
 Gtk::Widget *
 BoolParam::param_newWidget()
 {
-    if(!hide_widget){
+    if(widget_is_visible){
         Inkscape::UI::Widget::RegisteredCheckButton * checkwdg = Gtk::manage(
             new Inkscape::UI::Widget::RegisteredCheckButton( param_label,
                                                              param_tooltip,
@@ -66,7 +78,6 @@ BoolParam::param_newWidget()
         checkwdg->setActive(value);
         checkwdg->setProgrammatically = false;
         checkwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change bool parameter"));
-
         return dynamic_cast<Gtk::Widget *> (checkwdg);
     } else {
         return NULL;
@@ -76,6 +87,9 @@ BoolParam::param_newWidget()
 void
 BoolParam::param_setValue(bool newvalue)
 {
+    if (value != newvalue) {
+        param_effect->upd_params = true;
+    }
     value = newvalue;
 }