X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_filter%2Fhalftone2.cpp;h=177f6a0d0ddfd90d78f8c21e7ad9b0fdf252ec34;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=b6cad89a5204f547e0742aec013964ef5920baaf;hpb=37600b4b217caa5e316984ec0b035c5e8f9698af;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
index b6cad89..177f6a0 100644
--- a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
+++ b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
@@ -1,12 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file halftone2.cpp
-**	\brief blehh
+**	\brief Implementation of the "Halftone 2" layer
 **
 **	$Id$
 **
 **	\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
@@ -54,8 +54,8 @@ using namespace etl;
 
 SYNFIG_LAYER_INIT(Halftone2);
 SYNFIG_LAYER_SET_NAME(Halftone2,"halftone2");
-SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,_("Halftone 2"));
-SYNFIG_LAYER_SET_CATEGORY(Halftone2,_("Filters"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,N_("Halftone 2"));
+SYNFIG_LAYER_SET_CATEGORY(Halftone2,N_("Filters"));
 SYNFIG_LAYER_SET_VERSION(Halftone2,"0.0");
 SYNFIG_LAYER_SET_CVS_ID(Halftone2,"$Id$");
 
@@ -67,7 +67,7 @@ Halftone2::Halftone2():
 	color_dark(Color::black()),
 	color_light(Color::white())
 {
-	halftone.offset=(synfig::Point(0,0));
+	halftone.origin=(synfig::Point(0,0));
 	halftone.size=(synfig::Vector(0.25,0.25));
 	halftone.angle=(Angle::zero());
 	halftone.type=TYPE_SYMMETRIC;
@@ -114,7 +114,9 @@ Halftone2::set_param(const String & param, const ValueBase &value)
 	IMPORT_AS(halftone.size,"size");
 	IMPORT_AS(halftone.type,"type");
 	IMPORT_AS(halftone.angle,"angle");
-	IMPORT_AS(halftone.offset,"offset");
+	IMPORT_AS(halftone.origin,"origin");
+
+	IMPORT_AS(halftone.origin,"offset");
 
 	return Layer_Composite::set_param(param,value);
 }
@@ -125,7 +127,7 @@ Halftone2::get_param(const String & param)const
 	EXPORT_AS(halftone.size,"size");
 	EXPORT_AS(halftone.type,"type");
 	EXPORT_AS(halftone.angle,"angle");
-	EXPORT_AS(halftone.offset,"offset");
+	EXPORT_AS(halftone.origin,"origin");
 
 	EXPORT(color_dark);
 	EXPORT(color_light);
@@ -141,18 +143,18 @@ Halftone2::get_param_vocab()const
 {
 	Layer::Vocab ret(Layer_Composite::get_param_vocab());
 
-	ret.push_back(ParamDesc("offset")
-		.set_local_name(_("Mask Offset"))
+	ret.push_back(ParamDesc("origin")
+		.set_local_name(_("Mask Origin"))
 		.set_is_distance()
 	);
 	ret.push_back(ParamDesc("angle")
 		.set_local_name(_("Mask Angle"))
-		.set_origin("offset")
+		.set_origin("origin")
 	);
 	ret.push_back(ParamDesc("size")
 		.set_local_name(_("Mask Size"))
 		.set_is_distance()
-		.set_origin("offset")
+		.set_origin("origin")
 	);
 	ret.push_back(ParamDesc("color_light")
 		.set_local_name(_("Light Color"))