X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayeractionmanager.cpp;h=86addd6a684cb8250d5315d94ddbee3cf105afc2;hb=e3fc936cc46f22b68f18bc0a514835b329a88a70;hp=cc9177cf993fbf02945a7e5736a4353830854093;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
index cc9177c..86addd6 100644
--- a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file template.cpp
+/*!	\file layeractionmanager.cpp
 **	\brief Template File
 **
-**	$Id: layeractionmanager.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	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
@@ -35,6 +36,8 @@
 #include "instance.h"
 #include <synfigapp/selectionmanager.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -58,8 +61,8 @@ static const guint no_prev_popup((guint)-1);
 
 LayerActionManager::LayerActionManager():
 	action_group_(Gtk::ActionGroup::create()),
-	action_group_copy_paste(Gtk::ActionGroup::create()),
 	popup_id_(no_prev_popup),
+	action_group_copy_paste(Gtk::ActionGroup::create()),
 	queued(false)
 {
 	action_cut_=Gtk::Action::create(
@@ -228,7 +231,7 @@ LayerActionManager::refresh()
 	}
 
 
-	String ui_info;
+	String ui_info, ui_toolbar_info;
 
 	action_paste_->set_sensitive(!clipboard_.empty());
 	action_group_->add(action_paste_);
@@ -284,30 +287,38 @@ LayerActionManager::refresh()
 			{
 				action_group_->add(Gtk::Action::create(
 					"select-all-child-layers",
-					_("Select All Child Layers")
-				),
-					sigc::bind(
-						sigc::mem_fun(
-							*layer_tree_,
-							&studio::LayerTree::select_all_children_layers
-						),
-						Layer::LooseHandle(layer)
-					)
-				);
+					Gtk::StockID("synfig-select_all_child_layers"),
+					_("Select All Child Layers"),
+					_("Select All Child Layers")),
+					sigc::bind(sigc::mem_fun(*layer_tree_,
+											 &studio::LayerTree::select_all_children_layers),
+							   Layer::LooseHandle(layer)));
 				ui_info+="<menuitem action='select-all-child-layers'/>";
+				ui_toolbar_info+="<toolbar action='toolbar-layer'><toolitem action='select-all-child-layers'/></toolbar>";
 			}
 			handle<studio::Instance>::cast_static(get_canvas_interface()->get_instance())->
 				add_actions_to_group(action_group_, ui_info,   param_list, synfigapp::Action::CATEGORY_LAYER);
 		}
 	}
 
-	ui_info="<ui><menubar action='menu-main'><menu action='menu-layer'>"+ui_info+"<separator/><menuitem action='cut' /><menuitem action='copy' /><menuitem action='paste' /><separator/></menu></menubar></ui>";
+	ui_info=("<ui>"
+			   "<popup action='menu-main'>"
+			     "<menu action='menu-layer'>" +
+			 	   ui_info +
+				   "<separator/>"
+			       "<menuitem action='cut' />"
+			 	   "<menuitem action='copy' />"
+			 	   "<menuitem action='paste' />"
+			 	   "<separator/>"
+			     "</menu>"
+			   "</popup>" +
+			 ui_toolbar_info +
+			 "</ui>");
 	popup_id_=get_ui_manager()->add_ui_from_string(ui_info);
 #ifdef ONE_ACTION_GROUP
 #else
 	get_ui_manager()->insert_action_group(action_group_);
 #endif
-	DEBUGPOINT();
 }
 
 void
@@ -381,7 +392,8 @@ LayerActionManager::paste()
 			return;
 		}
 
-		synfig::info("DEPTH=%d",depth);
+		// synfig::info("DEPTH=%d",depth);
+
 		// Action to move the layer (if necessary)
 		if(depth>0)
 		{
@@ -411,6 +423,22 @@ LayerActionManager::paste()
 			}
 		}
 		depth++;
+
+		// automatically export the Index parameter of Duplicate layers when pasting
+		if (layer->get_name() == "duplicate")
+			for (int i = 1; ; i++)
+			{
+				String name = strprintf(_("Index %d"), i);
+				try
+				{
+					canvas->find_value_node(name);
+				}
+				catch (Exception::IDNotFound x)
+				{
+					get_canvas_interface()->add_value_node(layer->dynamic_param_list().find("index")->second, name);
+					break;
+				}
+			}
 	}
 	get_canvas_interface()->get_selection_manager()->clear_selected_layers();
 	get_canvas_interface()->get_selection_manager()->set_selected_layers(layer_selection);
@@ -432,7 +460,7 @@ LayerActionManager::amount_inc()
 	while(!layer_list.empty())
 	{
 		ValueBase value(layer_list.front()->get_param("amount"));
-		if(value.same_as(Real()))
+		if(value.same_type_as(Real()))
 		{
 			get_canvas_interface()->change_value(synfigapp::ValueDesc(layer_list.front(),"amount"),value.get(Real())+adjust);
 		}
@@ -456,7 +484,7 @@ LayerActionManager::amount_dec()
 	while(!layer_list.empty())
 	{
 		ValueBase value(layer_list.front()->get_param("amount"));
-		if(value.same_as(Real()))
+		if(value.same_type_as(Real()))
 		{
 			get_canvas_interface()->change_value(synfigapp::ValueDesc(layer_list.front(),"amount"),value.get(Real())+adjust);
 		}