-/* === 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 $
+** $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
*/
/* ========================================================================= */
using namespace std;
using namespace etl;
-using namespace sinfg;
+using namespace synfig;
using namespace studio;
/* === M A C R O S ========================================================= */
/*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)
{
action_group_new_layers=Gtk::ActionGroup::create();
action_group_layer_ops=Gtk::ActionGroup::create();
-
- std::map<sinfg::String,sinfg::String> category_map;
+
+ std::map<synfig::String,synfig::String> 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;
-
+
action_group_new_layers->add(Gtk::Action::create(
strprintf("layer-new-%s",lyr.first.c_str()),
layer_icon(lyr.first.c_str()),
);
category_map[lyr.second.category]+=strprintf("<menuitem action='layer-new-%s' />",lyr.first.c_str());
-
+
//(*category_map)[lyr.second.category]->items().push_back(Gtk::Menu_Helpers::MenuElem(lyr.second.local_name,
//));
}
-
+
{
Glib::RefPtr<Gtk::ActionGroup> action_group_categories(Gtk::ActionGroup::create("layer-category"));
- sinfg::String layer_ui_info;
-
+ synfig::String layer_ui_info;
+
layer_ui_info+="<ui><menubar action='menu-main'><menu action='menu-layer'><menu action='menu-layer-new'>";
- std::map<sinfg::String,sinfg::String>::iterator iter;
+ std::map<synfig::String,synfig::String>::iterator iter;
for(iter=category_map.begin();iter!=category_map.end();++iter)
{
layer_ui_info+=strprintf("<menu action='%s'>%s</menu>",iter->first.c_str(),iter->second.c_str());
}
layer_ui_info+="</menu></menu></menubar></ui>";
-
+
App::ui_manager()->insert_action_group(action_group_categories);
App::ui_manager()->insert_action_group(action_group_new_layers);
App::ui_manager()->add_ui_from_string(layer_ui_info);
}
-
-
+
+
action_group_layer_ops->add( Gtk::Action::create("toolbar-layer", "Layer Ops") );
App::ui_manager()->insert_action_group(action_group_layer_ops);
action_group_new_layers->set_sensitive(false);
- set_toolbar(*dynamic_cast<Gtk::Toolbar*>(App::ui_manager()->get_widget("/toolbar-layer")));
+ set_toolbar(*dynamic_cast<Gtk::Toolbar*>(App::ui_manager()->get_widget("/toolbar-layer")));
/*
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<void> tmp_signal;
-
+
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());
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());
- assert(ref_count.count()==1);
+ synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count());
+ assert(ref_count.count()==1);
*/
}
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)
)
);
if(canvas_view)
{
Gtk::Widget* tree_view(canvas_view->get_ext_widget(get_name()));
-
+
add(*tree_view);
tree_view->show();
action_group_new_layers->set_sensitive(true);
layer_action_manager->set_canvas_interface(0);
layer_action_manager->set_layer_tree(0);
}
-
- clear_previous();
+
+ clear_previous();
}
}
void
-Dock_Layers::add_layer(sinfg::String id)
+Dock_Layers::add_layer(synfig::String id)
{
etl::loose_handle<CanvasView> canvas_view(get_canvas_view());
if(canvas_view)