More fixes to LPE

(bzr r15703.1.2)

7 files changed, 16 insertions, 20 deletions

diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index d9e8ecc90..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 is_visible)
-    : Parameter(label, tip, key, wr, effect), value(default_value), defvalue(default_value), widget_is_visible(is_visible)
+                      Effect* effect, bool default_value)
+    : Parameter(label, tip, key, wr, effect), value(default_value), defvalue(default_value)
 {
 }
 
diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h
index 86681e764..417752050 100644
--- a/src/live_effects/parameter/bool.h
+++ b/src/live_effects/parameter/bool.h
@@ -25,8 +25,7 @@ public:
                const Glib::ustring& key,
                Inkscape::UI::Widget::Registry* wr,
                Effect* effect,
-               bool default_value = false,
-               bool widget_is_visible = true);
+               bool default_value = false);
     virtual ~BoolParam();
 
     virtual Gtk::Widget * param_newWidget();
@@ -40,7 +39,6 @@ public:
     virtual void param_update_default(const gchar * default_value);
     bool get_value() const { return value; };
     inline operator bool() const { return value; };
-    bool widget_is_visible;
 
 private:
     BoolParam(const BoolParam&);
diff --git a/src/live_effects/parameter/hidden.cpp b/src/live_effects/parameter/hidden.cpp
index 95735d50f..6d0e7f58f 100644
--- a/src/live_effects/parameter/hidden.cpp
+++ b/src/live_effects/parameter/hidden.cpp
@@ -25,10 +25,9 @@ HiddenParam::HiddenParam( const Glib::ustring& label, const Glib::ustring& tip,
                       Effect* effect, const Glib::ustring default_value, bool is_visible)
     : Parameter(label, tip, key, wr, effect),
       value(default_value),
-      defvalue(default_value),
-      //This last is to allow set or unset default parameters on hidden ones
-      widget_is_visible(is_visible)
+      defvalue(default_value)
 {
+    param_widget_is_visible(is_visible);
 }
 
 void
diff --git a/src/live_effects/parameter/hidden.h b/src/live_effects/parameter/hidden.h
index f07dd9edc..387071e53 100644
--- a/src/live_effects/parameter/hidden.h
+++ b/src/live_effects/parameter/hidden.h
@@ -43,7 +43,7 @@ public:
     virtual void param_update_default(const gchar * default_value);
 
     const Glib::ustring get_value() const { return value; };
-    bool widget_is_visible;
+
 private:
     HiddenParam(const HiddenParam&);
     HiddenParam& operator=(const HiddenParam&);
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index cc7b476d7..2f73488aa 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -55,7 +55,7 @@ void Parameter::write_to_SVG(void)
  */
 ScalarParam::ScalarParam( const Glib::ustring& label, const Glib::ustring& tip,
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
-                      Effect* effect, gdouble default_value, bool is_visible)
+                      Effect* effect, gdouble default_value)
     : Parameter(label, tip, key, wr, effect),
       value(default_value),
       min(-SCALARPARAM_G_MAXDOUBLE),
@@ -66,8 +66,7 @@ ScalarParam::ScalarParam( const Glib::ustring& label, const Glib::ustring& tip,
       inc_step(0.1),
       inc_page(1),
       add_slider(false),
-      overwrite_widget(false),
-      widget_is_visible(is_visible)
+      _set_undo(true)
 {
 }
 
@@ -164,9 +163,9 @@ ScalarParam::param_make_integer(bool yes)
 }
 
 void
-ScalarParam::param_overwrite_widget(bool overwrite_widget)
+ScalarParam::param_set_undo(bool set_undo)
 {
-    this->overwrite_widget = overwrite_widget;
+    _set_undo = set_undo;
 }
 
 Gtk::Widget *
@@ -184,7 +183,7 @@ ScalarParam::param_newWidget()
         if (add_slider) {
             rsu->addSlider();
         }
-        if(!overwrite_widget){
+        if(_set_undo){
             rsu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change scalar parameter"));
         }
         return dynamic_cast<Gtk::Widget *> (rsu);
diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index bdba9f860..7ab7e30dd 100644
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -57,6 +57,7 @@ public:
 
     virtual bool param_readSVGValue(const gchar * strvalue) = 0;   // returns true if new value is valid / accepted.
     virtual gchar * param_getSVGValue() const = 0;
+    virtual void param_widget_is_visible(bool is_visible) {widget_is_visible = is_visible;}
     void write_to_SVG();
  
     virtual void param_set_default() = 0;
@@ -103,8 +104,7 @@ public:
                 const Glib::ustring& key,
                 Inkscape::UI::Widget::Registry* wr,
                 Effect* effect,
-                gdouble default_value = 1.0,
-                bool widget_is_visible = true);
+                gdouble default_value = 1.0);
     virtual ~ScalarParam();
 
     virtual bool param_readSVGValue(const gchar * strvalue);
@@ -121,11 +121,10 @@ public:
     void addSlider(bool add_slider_widget) { add_slider = add_slider_widget; };
     double param_get_max() { return max; };
     double param_get_min() { return min; };
-    void param_overwrite_widget(bool overwrite_widget);
+    void param_set_undo(bool set_undo);
     virtual Gtk::Widget * param_newWidget();
 
     inline operator gdouble() const { return value; };
-    bool widget_is_visible;
 
 protected:
     gdouble value;
@@ -137,7 +136,7 @@ protected:
     double inc_step;
     double inc_page;
     bool add_slider;
-    bool overwrite_widget;
+    bool _set_undo;
 
 private:
     ScalarParam(const ScalarParam&);
diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index 7626317a1..ce4da243e 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -37,6 +37,7 @@ SatellitesArrayParam::SatellitesArrayParam(const Glib::ustring &label,
     _current_zoom = 0;
     _effectType = FILLET_CHAMFER;
     _last_pathvector_satellites = NULL;
+    param_widget_is_visible(false);
 }