From dd77396ef0832460e05b4ce99a5e9f552424d9e2 Mon Sep 17 00:00:00 2001 From: dooglus Date: Tue, 4 Sep 2007 15:56:59 +0000 Subject: [PATCH] Use lower_case instead of UpperCase in .sif files for layer types for these 3: SolidColor -> solid_color; PasteCanvas -> paste_canvas; MotionBlur -> motion_blur. Added aliases so old .sif files will be silently converted. [introduced a bug that was fixed in r597] git-svn-id: http://svn.voria.com/code@590 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/layer.cpp | 9 ++++----- 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(+), 8 deletions(-) diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index 4b99ed0..b7d8307 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -98,11 +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); - INCLUDE_LAYER(Layer_PasteCanvas); - INCLUDE_LAYER(Layer_Polygon); - LAYER_ALIAS(Layer_Polygon,"Polygon"); - INCLUDE_LAYER(Layer_MotionBlur); + 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"); #undef INCLUDE_LAYER diff --git a/synfig-core/trunk/src/synfig/layer_motionblur.cpp b/synfig-core/trunk/src/synfig/layer_motionblur.cpp index 977f4bd..e60cdee 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,"MotionBlur"); +SYNFIG_LAYER_SET_NAME(Layer_MotionBlur,"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 19399f0..bc6fb44 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,"PasteCanvas"); +SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"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 81243c9..7d2881b 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,"SolidColor"); +SYNFIG_LAYER_SET_NAME(Layer_SolidColor,"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