X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayerparamtreestore.cpp;h=bde9efea5b91936eb633344d09ba681ee002b63d;hb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;hp=8e0739af3d705a7777b6e92cdca549d84ed064f5;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp index 8e0739a..bde9efe 100644 --- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp @@ -30,7 +30,7 @@ #endif #include "layerparamtreestore.h" -#include "iconcontroler.h" +#include "iconcontroller.h" #include #include #include "layertree.h" @@ -39,6 +39,8 @@ #include "app.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -79,6 +81,7 @@ LayerParamTreeStore::LayerParamTreeStore(etl::loose_handlesignal_value_node_changed().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_changed)); + canvas_interface()->signal_value_node_renamed().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_renamed)); canvas_interface()->signal_value_node_added().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_added)); canvas_interface()->signal_value_node_deleted().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_deleted)); canvas_interface()->signal_value_node_replaced().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_replaced)); @@ -400,8 +403,9 @@ LayerParamTreeStore::rebuild() } if(value_desc.get_value_type()==ValueBase::TYPE_CANVAS) { - changed_connection_list.push_back( - value_desc.get_value().get(Canvas::Handle())->signal_changed().connect( + Canvas::Handle canvas_handle = value_desc.get_value().get(Canvas::Handle()); + if(canvas_handle) changed_connection_list.push_back( + canvas_handle->signal_changed().connect( sigc::mem_fun( this, &LayerParamTreeStore::changed @@ -518,43 +522,49 @@ LayerParamTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc) } void -LayerParamTreeStore::on_value_node_added(ValueNode::Handle value_node) +LayerParamTreeStore::on_value_node_added(synfig::ValueNode::Handle /*value_node*/) { // queue_refresh(); } void -LayerParamTreeStore::on_value_node_deleted(etl::handle value_node) +LayerParamTreeStore::on_value_node_deleted(synfig::ValueNode::Handle /*value_node*/) { // queue_refresh(); } void -LayerParamTreeStore::on_value_node_child_added(synfig::ValueNode::Handle value_node,synfig::ValueNode::Handle child) +LayerParamTreeStore::on_value_node_child_added(synfig::ValueNode::Handle /*value_node*/,synfig::ValueNode::Handle /*child*/) { queue_rebuild(); } void -LayerParamTreeStore::on_value_node_child_removed(synfig::ValueNode::Handle value_node,synfig::ValueNode::Handle child) +LayerParamTreeStore::on_value_node_child_removed(synfig::ValueNode::Handle /*value_node*/,synfig::ValueNode::Handle /*child*/) { rebuild(); } void -LayerParamTreeStore::on_value_node_changed(etl::handle value_node) +LayerParamTreeStore::on_value_node_changed(synfig::ValueNode::Handle /*value_node*/) { queue_refresh(); } void -LayerParamTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle new_value_node) +LayerParamTreeStore::on_value_node_renamed(synfig::ValueNode::Handle /*value_node*/) +{ + rebuild(); +} + +void +LayerParamTreeStore::on_value_node_replaced(synfig::ValueNode::Handle /*replaced_value_node*/,synfig::ValueNode::Handle /*new_value_node*/) { queue_rebuild(); } void -LayerParamTreeStore::on_layer_param_changed(synfig::Layer::Handle handle,synfig::String param_name) +LayerParamTreeStore::on_layer_param_changed(synfig::Layer::Handle /*handle*/,synfig::String /*param_name*/) { queue_refresh(); }