X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fparamdesc.cpp;h=a8691a005b5768328402c080bc0b9265906d1b81;hb=464e1f22b4481c2e6a08c601ef9b4ca0531ab267;hp=07347826ea3b5ce40e1856b64b61411687a0a6ce;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/paramdesc.cpp b/synfig-core/trunk/src/synfig/paramdesc.cpp index 0734782..a8691a0 100644 --- a/synfig-core/trunk/src/synfig/paramdesc.cpp +++ b/synfig-core/trunk/src/synfig/paramdesc.cpp @@ -1,20 +1,22 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file paramdesc.cpp ** \brief Template File ** -** $Id: paramdesc.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2008 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -37,7 +39,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -47,7 +49,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -ParamDesc::ParamDesc(sinfg::Color::BlendMethod, const String &a): +ParamDesc::ParamDesc(synfig::Color::BlendMethod, const String &a): name_ (a), local_name_ (a), scalar_ (1.0), @@ -80,8 +82,8 @@ ParamDesc::ParamDesc(sinfg::Color::BlendMethod, const String &a): .add_enum_value(Color::BLEND_LUMINANCE,"luminance",_("Luminance")) // These are deprecated .add_enum_value(Color::BLEND_ALPHA_OVER,"alphaover",_("Alpha Over")) -// .add_enum_value(Color::BLEND_ALPHA_BRIGHTEN,"alphabrighten",_("Alpha Brighten")) -// .add_enum_value(Color::BLEND_ALPHA_DARKEN,"alphadarken",_("Alpha Darken")) + .add_enum_value(Color::BLEND_ALPHA_BRIGHTEN,"alphabrighten",_("Alpha Brighten")) + .add_enum_value(Color::BLEND_ALPHA_DARKEN,"alphadarken",_("Alpha Darken")) ; // end of enums }