X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fchildrentreestore.cpp;h=7814161b724ddddb4c399f1b3954e3d76ccc5bbf;hb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;hp=dadf8ee63c3318ce9042ab74334412467d2d8f3c;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp index dadf8ee..7814161 100644 --- a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -30,11 +31,13 @@ #endif #include "childrentreestore.h" -#include "iconcontroler.h" +#include "iconcontroller.h" #include #include #include +#include "general.h" + class Profiler : private etl::clock { const std::string name; @@ -83,6 +86,7 @@ ChildrenTreeStore::ChildrenTreeStore(etl::loose_handlesignal_value_node_changed().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_changed)); + canvas_interface()->signal_value_node_renamed().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_renamed)); canvas_interface()->signal_value_node_added().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_added)); canvas_interface()->signal_value_node_deleted().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_deleted)); canvas_interface()->signal_value_node_replaced().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_replaced)); @@ -169,7 +173,7 @@ ChildrenTreeStore::refresh_canvases() } void -ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool do_children) +ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool /*do_children*/) { CanvasTreeStore::refresh_row(row,false); @@ -181,7 +185,7 @@ ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool do_children) } void -ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas) +ChildrenTreeStore::on_canvas_added(synfig::Canvas::Handle canvas) { Gtk::TreeRow row = *(prepend(canvas_row.children())); @@ -204,13 +208,13 @@ ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas) } void -ChildrenTreeStore::on_canvas_removed(Canvas::Handle canvas) +ChildrenTreeStore::on_canvas_removed(synfig::Canvas::Handle /*canvas*/) { rebuild_canvases(); } void -ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node) +ChildrenTreeStore::on_value_node_added(synfig::ValueNode::Handle value_node) { // if(value_node->get_id().find("Unnamed")!=String::npos) // return; @@ -221,7 +225,7 @@ ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node) } void -ChildrenTreeStore::on_value_node_deleted(etl::handle value_node) +ChildrenTreeStore::on_value_node_deleted(synfig::ValueNode::Handle value_node) { Gtk::TreeIter iter; //int i(0); @@ -294,10 +298,10 @@ ChildrenTreeStore::execute_changed_value_nodes() } void -ChildrenTreeStore::on_value_node_changed(etl::handle value_node) +ChildrenTreeStore::on_value_node_changed(synfig::ValueNode::Handle value_node) { - if(value_node->get_name()=="constant" || !value_node->is_exported()) + if(!value_node->is_exported()) return; changed_connection.disconnect(); // if(!execute_changed_queued()) @@ -329,7 +333,13 @@ ChildrenTreeStore::on_value_node_changed(etl::handle value_node) } void -ChildrenTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle new_value_node) +ChildrenTreeStore::on_value_node_renamed(synfig::ValueNode::Handle value_node) +{ + rebuild_value_nodes(); +} + +void +ChildrenTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle /*new_value_node*/) { changed_connection.disconnect(); //if(!execute_changed_queued())