**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 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(
Glib::RefPtr<Gtk::ActionGroup> action_group_categories(Gtk::ActionGroup::create("layer-category"));
synfig::String layer_ui_info;
- layer_ui_info+="<ui><menubar action='menu-main'><menu action='menu-layer'><menu action='menu-layer-new'>";
+ layer_ui_info+="<ui><popup action='menu-main'><menu action='menu-layer'><menu action='menu-layer-new'>";
std::map<synfig::String,synfig::String>::iterator iter;
for(iter=category_map.begin();iter!=category_map.end();++iter)
action_group_categories->add(Gtk::Action::create(iter->first.c_str(),iter->first.c_str()));
}
- layer_ui_info+="</menu></menu></menubar></ui>";
+ 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);
+ }
}
- 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);