X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayerparamtreestore.cpp;h=8fe850af01bda1c277cb4366b2fd3127dc9927ed;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=d9a18fe44e4b6bf5bbb5ea798fad0c5b7a8dcb42;hpb=c6af6e1c3816eb3b15c573089b32e6ae65cd2f49;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp index d9a18fe..8fe850a 100644 --- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp @@ -2,10 +2,11 @@ /*! \file layerparamtreestore.cpp ** \brief Template File ** -** $Id: layerparamtreestore.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 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,7 +31,7 @@ #endif #include "layerparamtreestore.h" -#include "iconcontroler.h" +#include "iconcontroller.h" #include #include #include "layertree.h" @@ -39,6 +40,8 @@ #include "app.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -76,9 +79,10 @@ 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)); @@ -101,7 +105,9 @@ LayerParamTreeStore::~LayerParamTreeStore() changed_connection_list.back().disconnect(); changed_connection_list.pop_back(); } - synfig::info("LayerParamTreeStore::~LayerParamTreeStore(): Deleted"); + + if (getenv("SYNFIG_DEBUG_DESTRUCTORS")) + synfig::info("LayerParamTreeStore::~LayerParamTreeStore(): Deleted"); } Glib::RefPtr @@ -130,11 +136,7 @@ LayerParamTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int Glib::Value x; g_value_init(x.gobj(),x.value_type()); - - if(!layer->get_description().empty()) - x.set(layer->get_description()); - else - x.set(layer->get_local_name()); + x.set(layer->get_non_empty_description()); g_value_init(value.gobj(),x.value_type()); g_value_copy(x.gobj(),value.gobj()); @@ -265,7 +267,7 @@ LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co g_value_init(x.gobj(),model.active.type()); g_value_copy(value.gobj(),x.gobj()); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerActivate")); if(!action) return; @@ -284,7 +286,7 @@ LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co } catch(std::exception x) { - g_warning(x.what()); + g_warning("%s", x.what()); } } @@ -300,8 +302,8 @@ LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co void LayerParamTreeStore::rebuild() { - Profiler profiler("LayerParamTreeStore::rebuild()"); - if(queued)queued=false; + // Profiler profiler("LayerParamTreeStore::rebuild()"); + if(queued)queued=0; clear(); layer_list=layer_tree->get_selected_layers(); @@ -320,6 +322,7 @@ LayerParamTreeStore::rebuild() struct REBUILD_HELPER { ParamVocab vocab; + Layer::Handle layer_0; static ParamVocab::iterator find_param_desc(ParamVocab& vocab, const synfig::String& x) { @@ -331,14 +334,17 @@ LayerParamTreeStore::rebuild() return iter; } - void process_vocab(ParamVocab x) + void process_vocab(synfig::Layer::Handle layer_n) { + ParamVocab x = layer_n->get_param_vocab(); ParamVocab::iterator iter; for(iter=vocab.begin();iter!=vocab.end();++iter) { - ParamVocab::iterator iter2(find_param_desc(x,iter->get_name())); - if(iter2==x.end()) + String name(iter->get_name()); + ParamVocab::iterator iter2(find_param_desc(x,name)); + if(iter2==x.end() || + layer_0->get_param(name).get_type() != layer_n->get_param(name).get_type()) { // remove it and start over vocab.erase(iter); @@ -355,10 +361,11 @@ LayerParamTreeStore::rebuild() { LayerList::iterator iter(layer_list.begin()); rebuild_helper.vocab=(*iter)->get_param_vocab(); + rebuild_helper.layer_0=*iter; for(++iter;iter!=layer_list.end();++iter) { - rebuild_helper.process_vocab((*iter)->get_param_vocab()); + rebuild_helper.process_vocab(*iter); changed_connection_list.push_back( (*iter)->signal_changed().connect( sigc::mem_fun( @@ -400,8 +407,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 @@ -423,7 +431,8 @@ LayerParamTreeStore::rebuild() if(value!=((*iter2)->get_param(iter->get_name()))) { row[model.is_inconsistent] = true; - while(!row.children().empty() && erase(row.children().begin())); + while(!row.children().empty() && erase(row.children().begin())) + ; break; } } @@ -465,7 +474,7 @@ LayerParamTreeStore::queue_rebuild() void LayerParamTreeStore::refresh() { - if(queued)queued=false; + if(queued)queued=0; Gtk::TreeModel::Children children_(children()); @@ -494,7 +503,8 @@ LayerParamTreeStore::refresh_row(Gtk::TreeModel::Row &row) if(value!=((*iter2)->get_param(param_desc.get_name()))) { row[model.is_inconsistent] = true; - while(!row.children().empty() && erase(row.children().begin())); + while(!row.children().empty() && erase(row.children().begin())) + ; return; } } @@ -512,49 +522,56 @@ void LayerParamTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc) { Gtk::TreeModel::Children children = row.children(); - while(!children.empty() && erase(children.begin())); + while(!children.empty() && erase(children.begin())) + ; CanvasTreeStore::set_row(row,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(); }