From f3b39e2e128f666292ae448740900748e3fe19a2 Mon Sep 17 00:00:00 2001 From: dooglus Date: Tue, 18 Sep 2007 01:18:13 +0000 Subject: [PATCH] Revert r590. Use the same names for PasteCanvas, SolidColor, and MotionBlur as in previous releases. Recognise the lower_case names, and convert them back to the previous names on save. git-svn-id: http://svn.voria.com/code@705 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/layer.cpp | 8 ++++---- synfig-core/trunk/src/synfig/layer_motionblur.cpp | 2 +- synfig-core/trunk/src/synfig/layer_pastecanvas.cpp | 2 +- synfig-core/trunk/src/synfig/layer_solidcolor.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index 0d4f398..d8676d9 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -98,10 +98,10 @@ Layer::subsys_init() #define INCLUDE_LAYER(class) synfig::Layer::book()[synfig::String(class::name__)]=BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__) #define LAYER_ALIAS(class,alias) synfig::Layer::book()[synfig::String(alias)]=synfig::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__); - INCLUDE_LAYER(Layer_SolidColor); LAYER_ALIAS(Layer_SolidColor,"SolidColor"); - INCLUDE_LAYER(Layer_PasteCanvas); LAYER_ALIAS(Layer_PasteCanvas,"PasteCanvas"); - INCLUDE_LAYER(Layer_Polygon); LAYER_ALIAS(Layer_Polygon,"Polygon"); - INCLUDE_LAYER(Layer_MotionBlur); LAYER_ALIAS(Layer_MotionBlur,"MotionBlur"); + INCLUDE_LAYER(Layer_SolidColor); LAYER_ALIAS(Layer_SolidColor, "solid_color"); + INCLUDE_LAYER(Layer_PasteCanvas); LAYER_ALIAS(Layer_PasteCanvas, "paste_canvas"); + INCLUDE_LAYER(Layer_Polygon); LAYER_ALIAS(Layer_Polygon, "Polygon"); + INCLUDE_LAYER(Layer_MotionBlur); LAYER_ALIAS(Layer_MotionBlur, "motion_blur"); #undef INCLUDE_LAYER diff --git a/synfig-core/trunk/src/synfig/layer_motionblur.cpp b/synfig-core/trunk/src/synfig/layer_motionblur.cpp index 6230de9..bf1a261 100644 --- a/synfig-core/trunk/src/synfig/layer_motionblur.cpp +++ b/synfig-core/trunk/src/synfig/layer_motionblur.cpp @@ -51,7 +51,7 @@ using namespace std; /* === G L O B A L S ======================================================= */ SYNFIG_LAYER_INIT(Layer_MotionBlur); -SYNFIG_LAYER_SET_NAME(Layer_MotionBlur,"motion_blur"); +SYNFIG_LAYER_SET_NAME(Layer_MotionBlur,"MotionBlur"); // todo: use motion_blur SYNFIG_LAYER_SET_LOCAL_NAME(Layer_MotionBlur,_("Motion Blur")); SYNFIG_LAYER_SET_CATEGORY(Layer_MotionBlur,_("Blurs")); SYNFIG_LAYER_SET_VERSION(Layer_MotionBlur,"0.1"); diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index bc6fb44..2dd4eb0 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -69,7 +69,7 @@ public: /* === G L O B A L S ======================================================= */ SYNFIG_LAYER_INIT(Layer_PasteCanvas); -SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"paste_canvas"); +SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); // todo: use paste_canvas SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas")); SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Other")); SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1"); diff --git a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp index 7d2881b..a0358f9 100644 --- a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp +++ b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp @@ -50,7 +50,7 @@ using namespace synfig; /* === G L O B A L S ======================================================= */ SYNFIG_LAYER_INIT(Layer_SolidColor); -SYNFIG_LAYER_SET_NAME(Layer_SolidColor,"solid_color"); +SYNFIG_LAYER_SET_NAME(Layer_SolidColor,"SolidColor"); // todo: use solid_color SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SolidColor,_("Solid Color")); SYNFIG_LAYER_SET_CATEGORY(Layer_SolidColor,_("Geometry")); SYNFIG_LAYER_SET_VERSION(Layer_SolidColor,"0.1"); -- 2.7.4