X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescset.cpp;h=01f38aee1f58b74c6f445f7a161d78368d5e8973;hb=828216f2051e31236e9edbc79be2cf7833abbc7e;hp=3bad05303ff603434238ca74e1f4e95959704000;hpb=a476f0956a7d1f23936a55a2ad3ea9bcd013d178;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
index 3bad053..01f38ae 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
@@ -6,6 +6,7 @@
 **
 **	\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
@@ -41,6 +42,8 @@
 #include <synfig/valuenode_reference.h>
 #include <synfigapp/main.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -50,13 +53,10 @@ using namespace synfigapp;
 using namespace Action;
 
 /* === M A C R O S ========================================================= */
-#define ACTION_INIT2(class) \
-	Action::Base* class::create() { return new class(); }	\
-	synfig::String class::get_name()const { return name__; }
 
-ACTION_INIT2(Action::ValueDescSet);
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescSet);
 ACTION_SET_NAME(Action::ValueDescSet,"value_desc_set");
-ACTION_SET_LOCAL_NAME(Action::ValueDescSet,"Set ValueDesc");
+ACTION_SET_LOCAL_NAME(Action::ValueDescSet,N_("Set ValueDesc"));
 ACTION_SET_TASK(Action::ValueDescSet,"set");
 ACTION_SET_CATEGORY(Action::ValueDescSet,Action::CATEGORY_VALUEDESC);
 ACTION_SET_PRIORITY(Action::ValueDescSet,0);
@@ -83,31 +83,28 @@ Action::ValueDescSet::get_local_name()const
 	{
 	}
 	else if(value_desc.parent_is_layer_param())
-	{
-		if(value_desc.get_layer()->get_description().empty())
-			name=value_desc.get_layer()->get_local_name();
-		else
-			name=value_desc.get_layer()->get_description();
-		name+="->"+value_desc.get_param_name();
-	}
+		name = strprintf(_("'%s' -> %s"),
+						 (value_desc.get_layer()->get_description().empty()
+						  ? value_desc.get_layer()->get_local_name()
+						  : value_desc.get_layer()->get_description()).c_str(),
+						 value_desc.get_param_name().c_str());
 	else if(value_desc.parent_is_value_node())
 	{
 		synfig::LinkableValueNode::Handle value_node(synfig::LinkableValueNode::Handle::cast_reinterpret(value_desc.get_parent_value_node()));
-		name=value_node->link_local_name(value_desc.get_index());
-
 		synfig::Node* node;
 		for(node=value_node.get();!node->parent_set.empty() && !dynamic_cast<Layer*>(node);node=*node->parent_set.begin());
 		Layer::Handle parent_layer(dynamic_cast<Layer*>(node));
 		if(parent_layer)
-		{
-			if(parent_layer->get_description().empty())
-				name=parent_layer->get_local_name()+"=>"+name;
-			else
-				name=parent_layer->get_description()+"=>"+name;
-		}
+			name = strprintf(_("'%s' => %s"),
+							 (parent_layer->get_description().empty()
+							  ? parent_layer->get_local_name()
+							  : parent_layer->get_description()).c_str(),
+							 value_node->link_local_name(value_desc.get_index()).c_str()); 
+		else
+			name = value_node->link_local_name(value_desc.get_index());
 	}
 
-	return strprintf(_("Set %s"),name.c_str());
+	return strprintf(_("Set %s"), name.c_str());
 }
 
 Action::ParamVocab
@@ -291,7 +288,7 @@ Action::ValueDescSet::prepare()
 			break;
 		}
 		default:
-			throw Error("Bad type for composite (%s)",ValueBase::type_name(value.get_type()).c_str());
+			throw Error(_("Bad type for composite (%s)"),ValueBase::type_local_name(value.get_type()).c_str());
 			break;
 		}
 
@@ -331,9 +328,14 @@ Action::ValueDescSet::prepare()
 		{
 		case ValueBase::TYPE_VECTOR:
 		{
+			Angle old_angle = (*(ValueNode_RadialComposite::Handle::cast_dynamic(
+									 value_desc.get_value_node())->get_link_vfunc(1)))(time).get(Angle());
 			Vector vect(value.get(Vector()));
 			components[0]=vect.mag();
-			components[1]=Angle(Angle::tan(vect[1],vect[0]));
+			Angle change = Angle(Angle::tan(vect[1],vect[0])) - old_angle;
+			while (change < Angle::deg(-180)) change += Angle::deg(360);
+			while (change > Angle::deg(180)) change -= Angle::deg(360);
+			components[1]=old_angle + change;
 			n_components=2;
 		}
 			break;
@@ -345,7 +347,7 @@ Action::ValueDescSet::prepare()
 			n_components=4;
 			break;
 		default:
-			throw Error("Bad type for radial composite (%s)",ValueBase::type_name(value.get_type()).c_str());
+			throw Error(_("Bad type for radial composite (%s)"),ValueBase::type_local_name(value.get_type()).c_str());
 			break;
 		}
 		for(int i=0;i<n_components;i++)