X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_layers.cpp;h=e2abf5259a137a14eefdff6b9a4631a2d6ed2ed9;hb=004105227d4dab3853d8b670193bde7734283010;hp=2df3b43ec6731c3ce217cf0f56b758d7cbf312f1;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp index 2df3b43..e2abf52 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp @@ -6,7 +6,7 @@ ** ** \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 @@ -88,7 +88,7 @@ Dock_Layers::Dock_Layers(): { 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( @@ -120,18 +120,28 @@ Dock_Layers::Dock_Layers(): for(iter=category_map.begin();iter!=category_map.end();++iter) { layer_ui_info+=strprintf("
",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+=""; 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); @@ -210,7 +220,6 @@ Dock_Layers::init_canvas_view_vfunc(etl::loose_handle