X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_layers.cpp;h=10cc043d8de1ac4c2960f5dd0d23fc68e73f3e19;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=0c596b286eef2e0a481c65b2b8b2fb0acc6e68dd;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
index 0c596b2..10cc043 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
@@ -2,19 +2,21 @@
 /*!	\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
+**	Copyright (c) 2007 Chris Moore
 **
-**	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
 */
 /* ========================================================================= */
@@ -75,7 +77,7 @@ Dock_Layers::Dock_Layers():
 
 	action_group_new_layers=Gtk::ActionGroup::create();
 	action_group_layer_ops=Gtk::ActionGroup::create();
-	
+
 	std::map<synfig::String,synfig::String> category_map;
 
 	// Build layer creation actions
@@ -83,10 +85,10 @@ Dock_Layers::Dock_Layers():
 	for(iter=synfig::Layer::book().begin();iter!=synfig::Layer::book().end();++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()),
@@ -101,16 +103,16 @@ Dock_Layers::Dock_Layers():
 		);
 
 		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"));
 		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)
@@ -119,14 +121,14 @@ 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);
 	}
-	
-	
+
+
 	action_group_layer_ops->add( Gtk::Action::create("toolbar-layer", "Layer Ops") );
 	App::ui_manager()->insert_action_group(action_group_layer_ops);
 
@@ -149,7 +151,7 @@ Dock_Layers::Dock_Layers():
 
 	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")));
 
 
 
@@ -161,21 +163,21 @@ Dock_Layers::Dock_Layers():
 
 	{
 		sigc::signal<void> tmp_signal;
-		
+
 		tmp_signal.connect(
 			sigc::bind(
 				sigc::ptr_fun(do_nothing),
 				ref_count
 			)
 		);
-		
+
 	synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count());
 		tmp_signal();
 	synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count());
-		
+
 		tmp_signal.clear();
 	synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count());
-		
+
 		tmp_signal();
 	synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count());
 		tmp_signal.connect(
@@ -187,7 +189,7 @@ Dock_Layers::Dock_Layers():
 	synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count());
 	}
 	synfig::info(__FILE__":%d:ref_count.count()=%d",__LINE__,ref_count.count());
-	assert(ref_count.count()==1);	
+	assert(ref_count.count()==1);
 	*/
 }
 
@@ -239,7 +241,7 @@ Dock_Layers::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
 	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);
@@ -259,8 +261,8 @@ Dock_Layers::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
 			layer_action_manager->set_canvas_interface(0);
 			layer_action_manager->set_layer_tree(0);
 		}
-		
-		clear_previous();		
+
+		clear_previous();
 	}
 }