From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Tue, 18 Sep 2007 11:02:19 +0000 (+0000)
Subject: Renaming the PasteCanvas layer in r705 missed the other references to the name elsewh... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=05903bd0db81b0db98639258d32cfcde302e4a9b;p=synfig.git

Renaming the PasteCanvas layer in r705 missed the other references to the name elsewhere in the code.  This fixes it.  We should use a #define'd value so it only needs to be changed in one place, really.  See also r590 and r597.


git-svn-id: http://svn.voria.com/code@706 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index f56393d..e98b301 100644
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -1036,7 +1036,7 @@ synfig::optimize_layers(Context context, Canvas::Handle op_canvas)
 			continue;
 
 		Layer_PasteCanvas* paste_canvas(static_cast<Layer_PasteCanvas*>(layer.get()));
-		if(layer->get_name()=="paste_canvas" && paste_canvas->get_time_offset()==0)
+		if(layer->get_name()=="PasteCanvas" && paste_canvas->get_time_offset()==0)
 		{
 			Canvas::Handle sub_canvas(Canvas::create_inline(op_canvas));
 			Canvas::Handle paste_sub_canvas = paste_canvas->get_sub_canvas();
@@ -1076,7 +1076,7 @@ synfig::optimize_layers(Context context, Canvas::Handle op_canvas)
 				continue;
 			}catch(int) { }
 #endif
-			Layer::Handle new_layer(Layer::create("paste_canvas"));
+			Layer::Handle new_layer(Layer::create("PasteCanvas"));
 			dynamic_cast<Layer_PasteCanvas*>(new_layer.get())->set_muck_with_time(false);
 			Layer::ParamList param_list(paste_canvas->get_param_list());
 			//param_list.erase("canvas");
diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 15608e9..93381d4 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1718,7 +1718,7 @@ CanvasView::popup_layer_menu(synfig::Layer::Handle layer)
 
 	//parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New Layer"),*newlayers));
 
-	if(layer->get_name()=="paste_canvas")
+	if(layer->get_name()=="PasteCanvas")
 	{
 		menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"),
 			sigc::bind(
@@ -2146,7 +2146,7 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col
 				build_new_layer_menu(*newlayers);
 
 				parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New Layer",*newlayers));
-				if(!multiple_selected && layer->get_name()=="paste_canvas")
+				if(!multiple_selected && layer->get_name()=="PasteCanvas")
 				{
 					parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"),
 						sigc::bind(
@@ -2626,7 +2626,7 @@ CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, Canvas
 
 		// If this is a paste canvas layer, then we need to
 		// descend into it
-		if(layer_name=="paste_canvas")
+		if(layer_name=="PasteCanvas")
 		{
 			Vector scale;
 			scale[0]=scale[1]=exp(layer->get_param("zoom").get(Real()));
diff --git a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
index d601b78..80b91b9 100644
--- a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
@@ -280,7 +280,7 @@ LayerActionManager::refresh()
 				}
 			}
 
-			if(!multiple_selected && layer->get_name()=="paste_canvas")
+			if(!multiple_selected && layer->get_name()=="PasteCanvas")
 			{
 				action_group_->add(Gtk::Action::create(
 					"select-all-child-layers",
diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp
index cf799ce..7860f6c 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp
@@ -135,7 +135,7 @@ Action::LayerEncapsulate::prepare()
 	if(!child_canvas)
 		child_canvas=Canvas::create_inline(get_canvas());
 
-	Layer::Handle new_layer(Layer::create("paste_canvas"));
+	Layer::Handle new_layer(Layer::create("PasteCanvas"));
 
 	new_layer->set_param("canvas",child_canvas);
 
diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index 4521c01..0aa2e35 100644
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@ -487,7 +487,7 @@ CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
 		if(!outside_canvas)
 			throw String(_("Unable to open this composition"));
 
-		Layer::Handle layer(add_layer_to("paste_canvas",get_canvas()));
+		Layer::Handle layer(add_layer_to("PasteCanvas",get_canvas()));
 		if(!layer)
 			throw String(_("Unable to create \"Paste Canvas\" layer"));
 		if(!layer->set_param("canvas",ValueBase(outside_canvas)))