X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvastreestore.cpp;h=3a4c994576f8b2571a40a21e0374621c18ff28c6;hb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;hp=4a4ea6f45a74e7274ed7b1e2085be95bd8131744;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp index 4a4ea6f..3a4c994 100644 --- a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvastreestore.cpp ** \brief Template File ** ** $Id: canvastreestore.cpp,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $ ** ** \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 */ /* ========================================================================= */ @@ -29,12 +30,12 @@ #endif #include "canvastreestore.h" -#include +#include #include "iconcontroler.h" -#include -#include +#include +#include #include -#include +#include #include "cellrenderer_value.h" #include "cellrenderer_timetrack.h" #include @@ -45,7 +46,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -63,7 +64,7 @@ static CanvasTreeStore::Model& ModelHack() return *model; } -CanvasTreeStore::CanvasTreeStore(etl::loose_handle canvas_interface_): +CanvasTreeStore::CanvasTreeStore(etl::loose_handle canvas_interface_): Gtk::TreeStore(ModelHack()), canvas_interface_ (canvas_interface_) { @@ -78,9 +79,9 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu { if(column==model.value.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); - Glib::Value x; + Glib::Value x; g_value_init(x.gobj(),x.value_type()); if(!value_desc) @@ -95,7 +96,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu x.set((*value_desc.get_value_node())(canvas_interface()->get_time())); else { - sinfg::error(__FILE__":%d: Unable to figure out value",__LINE__); + synfig::error(__FILE__":%d: Unable to figure out value",__LINE__); return; } @@ -105,7 +106,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_value_node.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -118,7 +119,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_shared.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -131,7 +132,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_exported.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -144,7 +145,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_canvas.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -157,7 +158,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.id.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -175,12 +176,12 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_editable.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); - x.set(!value_desc.is_value_node() || sinfgapp::is_editable(value_desc.get_value_node())); + x.set(!value_desc.is_value_node() || synfigapp::is_editable(value_desc.get_value_node())); g_value_init(value.gobj(),x.value_type()); g_value_copy(x.gobj(),value.gobj()); @@ -188,7 +189,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.type.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -217,7 +218,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.label.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -258,7 +259,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.icon.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); if(!value_desc) return Gtk::TreeStore::get_value_vfunc(iter,column,value); @@ -275,7 +276,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu } bool -CanvasTreeStore::find_first_value_desc(const sinfgapp::ValueDesc& value_desc, Gtk::TreeIter& iter) +CanvasTreeStore::find_first_value_desc(const synfigapp::ValueDesc& value_desc, Gtk::TreeIter& iter) { iter=children().begin(); while(iter && value_desc!=(*iter)[model.value_desc]) @@ -299,7 +300,7 @@ CanvasTreeStore::find_first_value_desc(const sinfgapp::ValueDesc& value_desc, Gt } bool -CanvasTreeStore::find_next_value_desc(const sinfgapp::ValueDesc& value_desc, Gtk::TreeIter& iter) +CanvasTreeStore::find_next_value_desc(const synfigapp::ValueDesc& value_desc, Gtk::TreeIter& iter) { if(!iter) return find_first_value_desc(value_desc,iter); @@ -382,7 +383,7 @@ CanvasTreeStore::find_next_value_node(const ValueNode::Handle& value_node, Gtk:: } void -CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool do_children) +CanvasTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc, bool do_children) { Gtk::TreeModel::Children children = row.children(); while(!children.empty() && erase(children.begin())); @@ -401,7 +402,7 @@ CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool d row[model.value_node] = value_node; //row[model.is_canvas] = false; //row[model.is_value_node] = true; - //row[model.is_editable] = sinfgapp::is_editable(value_node); + //row[model.is_editable] = synfigapp::is_editable(value_node); //row[model.id]=value_node->get_id(); // Set the canvas @@ -422,7 +423,7 @@ CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool d child_row[model.link_id] = i; child_row[model.canvas] = static_cast(row[model.canvas]); child_row[model.name] = linkable->link_local_name(i); - set_row(child_row,sinfgapp::ValueDesc(linkable,i)); + set_row(child_row,synfigapp::ValueDesc(linkable,i)); } } return; @@ -435,9 +436,9 @@ CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool d return; } } - catch(sinfg::Exception::IDNotFound x) + catch(synfig::Exception::IDNotFound x) { - sinfg::error(__FILE__":%d: IDNotFound thrown",__LINE__); + synfig::error(__FILE__":%d: IDNotFound thrown",__LINE__); erase(row); return; } @@ -449,7 +450,7 @@ CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool d void CanvasTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool do_children) { - sinfgapp::ValueDesc value_desc=row[model.value_desc]; + synfigapp::ValueDesc value_desc=row[model.value_desc]; if(value_desc) { @@ -517,7 +518,7 @@ CanvasTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool do_children) void CanvasTreeStore::rebuild_row(Gtk::TreeModel::Row &row, bool do_children) { - sinfgapp::ValueDesc value_desc=(sinfgapp::ValueDesc)row[model.value_desc]; + synfigapp::ValueDesc value_desc=(synfigapp::ValueDesc)row[model.value_desc]; if(value_desc && value_desc.get_value_node()) {