X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_layers.cpp;h=1a6ec00beb1f8f1529d540d1957922b6c2df8b33;hb=6bd801f5838b112a89ebdbc268629b7bf42ff740;hp=1df60b8394324e923bccaa79e3ceb51b6dcaebfa;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
index 1df60b8..1a6ec00 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
@@ -2,10 +2,11 @@
 /*!	\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-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
@@ -45,6 +46,8 @@
 #include "layeractionmanager.h"
 //#include <ETL/ref_count>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -85,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(
@@ -111,7 +114,7 @@ Dock_Layers::Dock_Layers():
 		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)
@@ -120,15 +123,25 @@ Dock_Layers::Dock_Layers():
 			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);