X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_layers.cpp;h=0402c3c364bd4908e31e728bbca9d5588a190379;hb=3e502bc758467118bbac795b5d1d1dc943d046c2;hp=3cfa16685ba8740d7df1ca4ab55ed6ab443425fc;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp index 3cfa166..0402c3c 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file dock_layers.cpp ** \brief Template File ** ** $Id: dock_layers.cpp,v 1.2 2005/01/12 07:03:42 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 */ /* ========================================================================= */ @@ -50,7 +51,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -61,13 +62,13 @@ using namespace studio; /*static void do_nothing(reference_counter x) { - sinfg::info(__FILE__":%d:ref_count.count()=%d",__LINE__,x.count()); + synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,x.count()); }*/ /* === M E T H O D S ======================================================= */ Dock_Layers::Dock_Layers(): - Dock_CanvasSpecific("layers",_("Layers"),Gtk::StockID("sinfg-layer")), + Dock_CanvasSpecific("layers",_("Layers"),Gtk::StockID("synfig-layer")), // layer_action_manager(0) layer_action_manager(new LayerActionManager) { @@ -76,13 +77,13 @@ Dock_Layers::Dock_Layers(): action_group_new_layers=Gtk::ActionGroup::create(); action_group_layer_ops=Gtk::ActionGroup::create(); - std::map category_map; + std::map category_map; // Build layer creation actions - sinfg::Layer::Book::iterator iter; - for(iter=sinfg::Layer::book().begin();iter!=sinfg::Layer::book().end();++iter) + synfig::Layer::Book::iterator iter; + for(iter=synfig::Layer::book().begin();iter!=synfig::Layer::book().end();++iter) { - sinfg::Layer::Book::value_type lyr(*iter); + synfig::Layer::Book::value_type lyr(*iter); if(lyr.second.category==_("Do Not Use")) continue; @@ -108,11 +109,11 @@ Dock_Layers::Dock_Layers(): { Glib::RefPtr action_group_categories(Gtk::ActionGroup::create("layer-category")); - sinfg::String layer_ui_info; + synfig::String layer_ui_info; layer_ui_info+=""; - std::map::iterator iter; + std::map::iterator iter; for(iter=category_map.begin();iter!=category_map.end();++iter) { layer_ui_info+=strprintf("%s",iter->first.c_str(),iter->second.c_str()); @@ -157,7 +158,7 @@ Dock_Layers::Dock_Layers(): /* reference_counter ref_count; - sinfg::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); + synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); { sigc::signal tmp_signal; @@ -169,24 +170,24 @@ Dock_Layers::Dock_Layers(): ) ); - sinfg::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); + synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); tmp_signal(); - sinfg::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); + synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); tmp_signal.clear(); - sinfg::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); + synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); tmp_signal(); - sinfg::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); + synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); tmp_signal.connect( sigc::bind( sigc::ptr_fun(do_nothing), ref_count ) ); - sinfg::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); + synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); } - sinfg::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); + synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count()); assert(ref_count.count()==1); */ } @@ -211,7 +212,7 @@ Dock_Layers::init_canvas_view_vfunc(etl::loose_handle canvas_view) layer_tree->signal_edited_value().connect( sigc::hide_return( - sigc::mem_fun(*canvas_view->canvas_interface(), &sinfgapp::CanvasInterface::change_value) + sigc::mem_fun(*canvas_view->canvas_interface(), &synfigapp::CanvasInterface::change_value) ) ); @@ -265,7 +266,7 @@ Dock_Layers::changed_canvas_view_vfunc(etl::loose_handle canvas_view } void -Dock_Layers::add_layer(sinfg::String id) +Dock_Layers::add_layer(synfig::String id) { etl::loose_handle canvas_view(get_canvas_view()); if(canvas_view)