X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayertree.cpp;h=4a498529fbff6ce35a8e04c3d8d7e1047be750e0;hb=c0fe9fb5226976a93b1a147338a3722869fcdd13;hp=0e6b2cfc4c0d2abd0480b8a887ed17adeaf0aedd;hpb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp
index 0e6b2cf..4a49852 100644
--- a/synfig-studio/trunk/src/gtkmm/layertree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layertree.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
@@ -126,21 +126,25 @@ LayerTree::LayerTree():
 	SMALL_BUTTON(button_raise,"gtk-go-up","Raise");
 	SMALL_BUTTON(button_lower,"gtk-go-down","Lower");
 	SMALL_BUTTON(button_duplicate,"synfig-duplicate","Duplicate");
+	SMALL_BUTTON(button_encapsulate,"synfig-encapsulate","Encapsulate");
 	SMALL_BUTTON(button_delete,"gtk-delete","Delete");
 
 	hbox->pack_start(*button_raise,Gtk::PACK_SHRINK);
 	hbox->pack_start(*button_lower,Gtk::PACK_SHRINK);
 	hbox->pack_start(*button_duplicate,Gtk::PACK_SHRINK);
+	hbox->pack_start(*button_encapsulate,Gtk::PACK_SHRINK);
 	hbox->pack_start(*button_delete,Gtk::PACK_SHRINK);
 
-	button_raise->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_raise_pressed));
-	button_lower->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_lower_pressed));
-	button_duplicate->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_duplicate_pressed));
-	button_delete->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_delete_pressed));
-
+	// button_raise->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_raise_pressed));
+	// button_lower->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_lower_pressed));
+	// button_duplicate->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_duplicate_pressed));
+	// button_encapsulate->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_encapsulate_pressed));
+	// button_delete->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_delete_pressed));
+	
 	button_raise->set_sensitive(false);
 	button_lower->set_sensitive(false);
 	button_duplicate->set_sensitive(false);
+	button_encapsulate->set_sensitive(false);
 	button_delete->set_sensitive(false);
 
 	get_selection()->signal_changed().connect(sigc::mem_fun(*this, &studio::LayerTree::on_selection_changed));
@@ -618,6 +622,7 @@ LayerTree::on_selection_changed()
 		button_raise->set_sensitive(false);
 		button_lower->set_sensitive(false);
 		button_duplicate->set_sensitive(false);
+		button_encapsulate->set_sensitive(false);
 		button_delete->set_sensitive(false);
 		layer_amount_hscale->set_sensitive(false);
 		blend_method_widget.set_sensitive(false);
@@ -627,6 +632,7 @@ LayerTree::on_selection_changed()
 	button_raise->set_sensitive(true);
 	button_lower->set_sensitive(true);
 	button_duplicate->set_sensitive(true);
+	button_encapsulate->set_sensitive(true);
 	button_delete->set_sensitive(true);
 
 	if(layer_list.size()==1 && (*layer_list.begin())->get_param("amount").is_valid()&& (*layer_list.begin())->get_param("amount").same_type_as(Real()))
@@ -960,88 +966,109 @@ LayerTree::on_param_tree_event(GdkEvent *event)
 	return false;
 }
 
-void
-LayerTree::on_raise_pressed()
-{
-	synfigapp::Action::ParamList param_list;
-	param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
-	param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
-	param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
-
-	{
-		synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
-		synfigapp::SelectionManager::LayerList::iterator iter;
-
-		for(iter=layer_list.begin();iter!=layer_list.end();++iter)
-			param_list.add("layer",Layer::Handle(*iter));
-	}
-	synfigapp::Action::Handle action(synfigapp::Action::create("layer_raise"));
-	action->set_param_list(param_list);
-	layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
-}
-
-void
-LayerTree::on_lower_pressed()
-{
-	synfigapp::Action::ParamList param_list;
-	param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
-	param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
-	param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
-
-	{
-		synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
-		synfigapp::SelectionManager::LayerList::iterator iter;
-
-		for(iter=layer_list.begin();iter!=layer_list.end();++iter)
-			param_list.add("layer",Layer::Handle(*iter));
-	}
-
-	synfigapp::Action::Handle action(synfigapp::Action::create("layer_lower"));
-	action->set_param_list(param_list);
-	layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
-}
-
-void
-LayerTree::on_duplicate_pressed()
-{
-	synfigapp::Action::ParamList param_list;
-	param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
-	param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
-	param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
-
-	{
-		synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
-		synfigapp::SelectionManager::LayerList::iterator iter;
-
-		for(iter=layer_list.begin();iter!=layer_list.end();++iter)
-			param_list.add("layer",Layer::Handle(*iter));
-	}
-
-	synfigapp::Action::Handle action(synfigapp::Action::create("layer_duplicate"));
-	action->set_param_list(param_list);
-	layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
-}
-
-void
-LayerTree::on_delete_pressed()
-{
-	synfigapp::Action::ParamList param_list;
-	param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
-	param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
-	param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
-
-	{
-		synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
-		synfigapp::SelectionManager::LayerList::iterator iter;
-
-		for(iter=layer_list.begin();iter!=layer_list.end();++iter)
-			param_list.add("layer",Layer::Handle(*iter));
-	}
-
-	synfigapp::Action::Handle action(synfigapp::Action::create("layer_remove"));
-	action->set_param_list(param_list);
-	layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
-}
+// void
+// LayerTree::on_raise_pressed()
+// {
+// 	synfigapp::Action::ParamList param_list;
+// 	param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// 	param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// 	param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// 	{
+// 		synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// 		synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// 		for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// 			param_list.add("layer",Layer::Handle(*iter));
+// 	}
+// 	synfigapp::Action::Handle action(synfigapp::Action::create("layer_raise"));
+// 	action->set_param_list(param_list);
+// 	layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
+
+// void
+// LayerTree::on_lower_pressed()
+// {
+// 	synfigapp::Action::ParamList param_list;
+// 	param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// 	param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// 	param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// 	{
+// 		synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// 		synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// 		for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// 			param_list.add("layer",Layer::Handle(*iter));
+// 	}
+//
+// 	synfigapp::Action::Handle action(synfigapp::Action::create("layer_lower"));
+// 	action->set_param_list(param_list);
+// 	layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
+
+// void
+// LayerTree::on_duplicate_pressed()
+// {
+// 	synfigapp::Action::ParamList param_list;
+// 	param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// 	param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// 	param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// 	{
+// 		synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// 		synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// 		for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// 			param_list.add("layer",Layer::Handle(*iter));
+// 	}
+//
+// 	synfigapp::Action::Handle action(synfigapp::Action::create("layer_duplicate"));
+// 	action->set_param_list(param_list);
+// 	layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
+
+// void
+// LayerTree::on_encapsulate_pressed()
+// {
+// 	synfigapp::Action::ParamList param_list;
+// 	param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// 	param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// 	param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// 	{
+// 		synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// 		synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// 		for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// 			param_list.add("layer",Layer::Handle(*iter));
+// 	}
+//
+// 	synfigapp::Action::Handle action(synfigapp::Action::create("layer_encapsulate"));
+// 	action->set_param_list(param_list);
+// 	layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
+
+// void
+// LayerTree::on_delete_pressed()
+// {
+// 	synfigapp::Action::ParamList param_list;
+// 	param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// 	param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// 	param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// 	{
+// 		synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// 		synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// 		for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// 			param_list.add("layer",Layer::Handle(*iter));
+// 	}
+//
+// 	synfigapp::Action::Handle action(synfigapp::Action::create("layer_remove"));
+// 	action->set_param_list(param_list);
+// 	layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
 
 /*
 void