X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayerparamtreestore.cpp;h=6e098e5a9234448def8e9528435c45aee85b15fa;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=c36abad8054742eb8e03d230a6acee238f46828b;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp index c36abad..6e098e5 100644 --- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ -/*! \file childrentreestore.cpp +/* === S Y N F I G ========================================================= */ +/*! \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 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -31,10 +32,10 @@ #include "layerparamtreestore.h" #include "iconcontroler.h" #include -#include +#include #include "layertree.h" -#include -#include +#include +#include #include "app.h" #include @@ -44,7 +45,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -54,7 +55,7 @@ class Profiler : private etl::clock const std::string name; public: Profiler(const std::string& name):name(name) { reset(); } - ~Profiler() { float time(operator()()); sinfg::info("%s: took %f msec",name.c_str(),time*1000); } + ~Profiler() { float time(operator()()); synfig::info("%s: took %f msec",name.c_str(),time*1000); } }; /* === G L O B A L S ======================================================= */ @@ -70,7 +71,7 @@ static LayerParamTreeStore::Model& ModelHack() return *model; } -LayerParamTreeStore::LayerParamTreeStore(etl::loose_handle canvas_interface_,LayerTree* layer_tree): +LayerParamTreeStore::LayerParamTreeStore(etl::loose_handle canvas_interface_,LayerTree* layer_tree): Gtk::TreeStore (ModelHack()), CanvasTreeStore (canvas_interface_), layer_tree (layer_tree) @@ -85,10 +86,10 @@ LayerParamTreeStore::LayerParamTreeStore(etl::loose_handlesignal_value_node_child_added().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_child_added)); canvas_interface()->signal_value_node_child_removed().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_child_removed)); - - + + layer_tree->get_selection()->signal_changed().connect(sigc::mem_fun(*this,&LayerParamTreeStore::queue_rebuild)); - + signal_changed().connect(sigc::mem_fun(*this,&LayerParamTreeStore::queue_refresh)); rebuild(); } @@ -100,11 +101,11 @@ LayerParamTreeStore::~LayerParamTreeStore() changed_connection_list.back().disconnect(); changed_connection_list.pop_back(); } - sinfg::info("LayerParamTreeStore::~LayerParamTreeStore(): Deleted"); + synfig::info("LayerParamTreeStore::~LayerParamTreeStore(): Deleted"); } Glib::RefPtr -LayerParamTreeStore::create(etl::loose_handle canvas_interface_, LayerTree*layer_tree) +LayerParamTreeStore::create(etl::loose_handle canvas_interface_, LayerTree*layer_tree) { return Glib::RefPtr(new LayerParamTreeStore(canvas_interface_,layer_tree)); } @@ -116,13 +117,13 @@ LayerParamTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int { if(column<0) { - sinfg::error("LayerParamTreeStore::get_value_vfunc(): Bad column!"); + synfig::error("LayerParamTreeStore::get_value_vfunc(): Bad column!"); return; } - + /* if(column==model.label.index()) { - sinfg::Layer::Handle layer((*iter)[model.layer]); + synfig::Layer::Handle layer((*iter)[model.layer]); if(!layer)return; @@ -134,7 +135,7 @@ LayerParamTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int x.set(layer->get_description()); else x.set(layer->get_local_name()); - + g_value_init(value.gobj(),x.value_type()); g_value_copy(x.gobj(),value.gobj()); } @@ -142,25 +143,25 @@ LayerParamTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int */ if(column==model.label.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::ustring label; - + if(!(*iter)[model.is_toplevel]) return CanvasTreeStore::get_value_vfunc(iter,column,value); - sinfg::ParamDesc param_desc((*iter)[model.param_desc]); + synfig::ParamDesc param_desc((*iter)[model.param_desc]); label=param_desc.get_local_name(); - + if(!(*iter)[model.is_inconsistent]) if(value_desc.is_value_node() && value_desc.get_value_node()->is_exported()) { label+=strprintf(" (%s)",value_desc.get_value_node()->get_id().c_str()); } - + Glib::Value x; g_value_init(x.gobj(),x.value_type()); x.set(label); - + g_value_init(value.gobj(),x.value_type()); g_value_copy(x.gobj(),value.gobj()); } @@ -171,9 +172,9 @@ LayerParamTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int g_value_init(x.gobj(),x.value_type()); TreeModel::Path path(get_path(iter)); - + x.set(path.get_depth()<=1); - + g_value_init(value.gobj(),x.value_type()); g_value_copy(x.gobj(),value.gobj()); } @@ -185,12 +186,12 @@ LayerParamTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int CanvasTreeStore::get_value_vfunc(iter,column,value); return; } - + Glib::Value x; g_value_init(x.gobj(),x.value_type()); x.set(false); - + g_value_init(value.gobj(),x.value_type()); g_value_copy(x.gobj(),value.gobj()); } @@ -222,26 +223,26 @@ LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co { if(column==model.value.index()) { - Glib::Value x; + Glib::Value x; g_value_init(x.gobj(),model.value.type()); g_value_copy(value.gobj(),x.gobj()); - + if((bool)(*iter)[model.is_toplevel]) { - sinfgapp::Action::PassiveGrouper group(canvas_interface()->get_instance().get(),_("Set Layer Params")); + synfigapp::Action::PassiveGrouper group(canvas_interface()->get_instance().get(),_("Set Layer Params")); - sinfg::ParamDesc param_desc((*iter)[model.param_desc]); + synfig::ParamDesc param_desc((*iter)[model.param_desc]); LayerList::iterator iter2(layer_list.begin()); - + for(;iter2!=layer_list.end();++iter2) { - if(!canvas_interface()->change_value(sinfgapp::ValueDesc(*iter2,param_desc.get_name()),x.get())) + if(!canvas_interface()->change_value(synfigapp::ValueDesc(*iter2,param_desc.get_name()),x.get())) { // ERROR! group.cancel(); App::dialog_error_blocking(_("Error"),_("Unable to set all layer parameters.")); - + return; } } @@ -256,24 +257,24 @@ LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co /* if(column==model.active.index()) { - sinfg::Layer::Handle layer((*iter)[model.layer]); - + synfig::Layer::Handle layer((*iter)[model.layer]); + if(!layer)return; Glib::Value x; g_value_init(x.gobj(),model.active.type()); g_value_copy(value.gobj(),x.gobj()); - - sinfgapp::Action::Handle action(sinfgapp::Action::create("layer_activate")); - + + synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate")); + if(!action) return; - + action->set_param("canvas",canvas_interface()->get_canvas()); action->set_param("canvas_interface",canvas_interface()); action->set_param("layer",layer); action->set_param("new_status",bool(x.get())); - + canvas_interface()->get_instance()->perform_action(action); return; } @@ -284,7 +285,7 @@ LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co catch(std::exception x) { g_warning(x.what()); - } + } } @@ -303,10 +304,10 @@ LayerParamTreeStore::rebuild() if(queued)queued=false; clear(); layer_list=layer_tree->get_selected_layers(); - + if(layer_list.size()<=0) return; - + // Get rid of all the connections, // and clear the connection map. //while(!connection_map.empty())connection_map.begin()->second.disconnect(),connection_map.erase(connection_map.begin()); @@ -320,20 +321,20 @@ LayerParamTreeStore::rebuild() { ParamVocab vocab; - static ParamVocab::iterator find_param_desc(ParamVocab& vocab, const sinfg::String& x) + static ParamVocab::iterator find_param_desc(ParamVocab& vocab, const synfig::String& x) { ParamVocab::iterator iter; - + for(iter=vocab.begin();iter!=vocab.end();++iter) if(iter->get_name()==x) break; return iter; } - + void process_vocab(ParamVocab x) { ParamVocab::iterator iter; - + for(iter=vocab.begin();iter!=vocab.end();++iter) { ParamVocab::iterator iter2(find_param_desc(x,iter->get_name())); @@ -347,14 +348,14 @@ LayerParamTreeStore::rebuild() } } } - + } rebuild_helper; - + { LayerList::iterator iter(layer_list.begin()); rebuild_helper.vocab=(*iter)->get_param_vocab(); - + for(++iter;iter!=layer_list.end();++iter) { rebuild_helper.process_vocab((*iter)->get_param_vocab()); @@ -368,13 +369,13 @@ LayerParamTreeStore::rebuild() ); } } - + ParamVocab::iterator iter; for(iter=rebuild_helper.vocab.begin();iter!=rebuild_helper.vocab.end();++iter) { if(iter->get_hidden()) continue; - + /* if(iter->get_animation_only()) { @@ -384,7 +385,7 @@ LayerParamTreeStore::rebuild() } */ Gtk::TreeRow row(*(append())); - sinfgapp::ValueDesc value_desc(layer_list.front(),iter->get_name()); + synfigapp::ValueDesc value_desc(layer_list.front(),iter->get_name()); CanvasTreeStore::set_row(row,value_desc); if(value_desc.is_value_node()) { @@ -399,8 +400,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 @@ -424,9 +426,9 @@ LayerParamTreeStore::rebuild() row[model.is_inconsistent] = true; while(!row.children().empty() && erase(row.children().begin())); break; - } + } } - } + } } void @@ -465,11 +467,11 @@ void LayerParamTreeStore::refresh() { if(queued)queued=false; - + Gtk::TreeModel::Children children_(children()); - + Gtk::TreeModel::Children::iterator iter; - + if(!children_.empty()) for(iter = children_.begin(); iter && iter != children_.end(); ++iter) { @@ -485,7 +487,7 @@ LayerParamTreeStore::refresh_row(Gtk::TreeModel::Row &row) { row[model.is_inconsistent] = false; ParamDesc param_desc(row[model.param_desc]); - + LayerList::iterator iter2(layer_list.begin()); ValueBase value((*iter2)->get_param(param_desc.get_name())); for(++iter2;iter2!=layer_list.end();++iter2) @@ -495,7 +497,7 @@ LayerParamTreeStore::refresh_row(Gtk::TreeModel::Row &row) row[model.is_inconsistent] = true; while(!row.children().empty() && erase(row.children().begin())); return; - } + } } } @@ -508,7 +510,7 @@ LayerParamTreeStore::refresh_row(Gtk::TreeModel::Row &row) } void -LayerParamTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc) +LayerParamTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc) { Gtk::TreeModel::Children children = row.children(); while(!children.empty() && erase(children.begin())); @@ -517,43 +519,43 @@ LayerParamTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc) } void -LayerParamTreeStore::on_value_node_added(ValueNode::Handle value_node) +LayerParamTreeStore::on_value_node_added(ValueNode::Handle /*value_node*/) { // queue_refresh(); } void -LayerParamTreeStore::on_value_node_deleted(etl::handle value_node) +LayerParamTreeStore::on_value_node_deleted(etl::handle /*value_node*/) { // queue_refresh(); } void -LayerParamTreeStore::on_value_node_child_added(sinfg::ValueNode::Handle value_node,sinfg::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(sinfg::ValueNode::Handle value_node,sinfg::ValueNode::Handle child) +LayerParamTreeStore::on_value_node_child_removed(synfig::ValueNode::Handle /*value_node*/,synfig::ValueNode::Handle /*child*/) { - queue_rebuild(); + rebuild(); } void -LayerParamTreeStore::on_value_node_changed(etl::handle value_node) +LayerParamTreeStore::on_value_node_changed(etl::handle /*value_node*/) { queue_refresh(); } void -LayerParamTreeStore::on_value_node_replaced(sinfg::ValueNode::Handle replaced_value_node,sinfg::ValueNode::Handle new_value_node) +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(sinfg::Layer::Handle handle,sinfg::String param_name) +LayerParamTreeStore::on_layer_param_changed(synfig::Layer::Handle /*handle*/,synfig::String /*param_name*/) { queue_refresh(); }