**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** 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
#include "layeractionmanager.h"
//#include <ETL/ref_count>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
{
synfig::Layer::Book::value_type lyr(*iter);
- if(lyr.second.category==_("Do Not Use"))
+ if(lyr.second.category==CATEGORY_DO_NOT_USE)
continue;
action_group_new_layers->add(Gtk::Action::create(
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());
- action_group_categories->add(Gtk::Action::create(iter->first.c_str(),iter->first.c_str()));
+ action_group_categories->add(Gtk::Action::create(iter->first.c_str(),dgettext("synfig", iter->first.c_str())));
}
layer_ui_info+="</menu></menu></popup></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);
+
+ try
+ {
+ App::ui_manager()->add_ui_from_string(layer_ui_info);
+ }
+ catch(Glib::MarkupError x)
+ {
+ error("%s:%d caught MarkupError code %d: %s", __FILE__, __LINE__, x.code(), x.what().c_str());
+ error("%s:%d with markup: \"%s\"", __FILE__, __LINE__, layer_ui_info.c_str());
+ exit(1);
+ }
}
+ if(layer_action_manager)
+ action_group_layer_ops->add(layer_action_manager->get_action_select_all_child_layers());
- action_group_layer_ops->add( Gtk::Action::create("toolbar-layer", "Layer Ops") );
+ action_group_layer_ops->add( Gtk::Action::create("toolbar-layer", _("Layer Ops")) );
App::ui_manager()->insert_action_group(action_group_layer_ops);
-
Glib::ustring ui_info =
"<ui>"
" <toolbar action='toolbar-layer'>"
" <toolitem action='action-layer_raise' />"
" <toolitem action='action-layer_lower' />"
+ " <separator />"
" <toolitem action='action-layer_duplicate' />"
+ " <toolitem action='action-layer_encapsulate' />"
+ " <toolitem action='select-all-child-layers' />"
" <toolitem action='action-layer_remove' />"
+ " <separator />"
" <toolitem action='cut' />"
" <toolitem action='copy' />"
" <toolitem action='paste' />"
canvas_view->set_tree_model(get_name(),layer_tree_store);
LayerTree* layer_tree(new LayerTree());
- layer_tree->set_model(layer_tree_store);
layer_tree->set_time_adjustment(canvas_view->time_adjustment());
layer_tree->signal_edited_value().connect(
)
);
- canvas_view->set_ext_widget(get_name()+"_cmp",layer_tree);
+ // (a) should be before (b), (b) should be before (c)
+ canvas_view->set_ext_widget(get_name()+"_cmp",layer_tree); // (a)
canvas_view->set_ext_widget(get_name(),&layer_tree->get_layer_tree_view());
canvas_view->set_ext_widget("params",&layer_tree->get_param_tree_view());
- canvas_view->set_tree_model("params",layer_tree->get_param_tree_view().get_model());
+
+ layer_tree->set_model(layer_tree_store); // (b)
+ canvas_view->set_tree_model("params",layer_tree->get_param_tree_view().get_model()); // (c)
/*
canvas_view->layermenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-delete"),Gtk::AccelKey("Delete"),