Author: Carlos Lopez <genet...@gmail.com>
Date: Wed Sep 14 19:22:29 2011 +0200
Remove underscores for shortcuts since they are not used anymore.
---
synfig-core/src/synfig/paramdesc.cpp | 45 ++++++++++-----------
synfig-studio/src/gui/widgets/widget_defaults.cpp | 8 ++--
2 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/synfig-core/src/synfig/paramdesc.cpp
b/synfig-core/src/synfig/paramdesc.cpp
index 8947f19..456dc74 100644
--- a/synfig-core/src/synfig/paramdesc.cpp
+++ b/synfig-core/src/synfig/paramdesc.cpp
@@ -61,29 +61,28 @@ ParamDesc::ParamDesc(synfig::Color::BlendMethod, const
String &a):
{
set_local_name(_("Blend Method"))
.set_hint("enum") // used shortcuts: A B C D E F
G H I K L M N O P R S T U V Y; free: J Q W X Z
- .add_enum_value(Color::BLEND_COMPOSITE,
"composite", _("_Composite" ))
- .add_enum_value(Color::BLEND_STRAIGHT,
"straight", _("_Straight" ))
- .add_enum_value(Color::BLEND_ONTO,
"onto", _("_Onto" ))
- .add_enum_value(Color::BLEND_STRAIGHT_ONTO,
"straightonto", _("S_traight Onto" ))
- .add_enum_value(Color::BLEND_BEHIND,
"behind", _("_Behind" ))
- .add_enum_value(Color::BLEND_SCREEN,
"screen", _("Sc_reen" ))
- .add_enum_value(Color::BLEND_OVERLAY,
"overlay", _("Overla_y" ))
- .add_enum_value(Color::BLEND_HARD_LIGHT,
"hard_light", _("_Hard Light" ))
- .add_enum_value(Color::BLEND_MULTIPLY,
"multiply", _("_Multiply" ))
- .add_enum_value(Color::BLEND_DIVIDE,
"divide", _("_Divide" ))
- .add_enum_value(Color::BLEND_ADD,
"add", _("_Add" ))
- .add_enum_value(Color::BLEND_SUBTRACT,
"subtract", _("S_ubtract" ))
- .add_enum_value(Color::BLEND_DIFFERENCE,
"difference", _("Di_fference" ))
- .add_enum_value(Color::BLEND_BRIGHTEN,
"brighten", _("Bri_ghten" ))
- .add_enum_value(Color::BLEND_DARKEN,
"darken", _("Dar_ken" ))
- .add_enum_value(Color::BLEND_COLOR,
"color", _("Co_lor" ))
- .add_enum_value(Color::BLEND_HUE,
"hue", _("Hu_e" ))
- .add_enum_value(Color::BLEND_SATURATION,
"saturation", _("Saturatio_n" ))
- .add_enum_value(Color::BLEND_LUMINANCE,
"luminance", _("Lum_inance" ))
- // These are deprecated
- .add_enum_value(Color::BLEND_ALPHA_OVER,
"alphaover", _("Alpha O_ver" ))
- .add_enum_value(Color::BLEND_ALPHA_BRIGHTEN,
"alphabrighten", _("Al_pha Brighten" ))
- .add_enum_value(Color::BLEND_ALPHA_DARKEN,
"alphadarken", _("Al_pha Darken" ))
+ .add_enum_value(Color::BLEND_COMPOSITE, "composite",
_("Composite"))
+ .add_enum_value(Color::BLEND_STRAIGHT, "straight",
_("Straight"))
+ .add_enum_value(Color::BLEND_ONTO, "onto",
_("Onto"))
+ .add_enum_value(Color::BLEND_STRAIGHT_ONTO, "straightonto",
_("Straight Onto"))
+ .add_enum_value(Color::BLEND_BEHIND, "behind",
_("Behind"))
+ .add_enum_value(Color::BLEND_SCREEN, "screen",
_("Screen"))
+ .add_enum_value(Color::BLEND_OVERLAY, "overlay",
_("Overlay"))
+ .add_enum_value(Color::BLEND_HARD_LIGHT, "hard_light",
_("Hard Light"))
+ .add_enum_value(Color::BLEND_MULTIPLY, "multiply",
_("Multiply"))
+ .add_enum_value(Color::BLEND_DIVIDE, "divide",
_("Divide"))
+ .add_enum_value(Color::BLEND_ADD, "add",
_("Add"))
+ .add_enum_value(Color::BLEND_SUBTRACT, "subtract",
_("Subtract"))
+ .add_enum_value(Color::BLEND_DIFFERENCE, "difference",
_("Difference"))
+ .add_enum_value(Color::BLEND_BRIGHTEN, "brighten",
_("Brighten"))
+ .add_enum_value(Color::BLEND_DARKEN, "darken",
_("Darken"))
+ .add_enum_value(Color::BLEND_COLOR, "color",
_("Color"))
+ .add_enum_value(Color::BLEND_HUE, "hue",
_("Hue"))
+ .add_enum_value(Color::BLEND_SATURATION, "saturation",
_("Saturation"))
+ .add_enum_value(Color::BLEND_LUMINANCE, "luminance",
_("Luminance"))
+ .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"))
; // end of enums
}
diff --git a/synfig-studio/src/gui/widgets/widget_defaults.cpp
b/synfig-studio/src/gui/widgets/widget_defaults.cpp
index d118689..b91fe0a 100644
--- a/synfig-studio/src/gui/widgets/widget_defaults.cpp
+++ b/synfig-studio/src/gui/widgets/widget_defaults.cpp
@@ -292,10 +292,10 @@ Widget_Defaults::Widget_Defaults()
widget_interpolation->set_param_desc(
ParamDesc("interpolation")
.set_hint("enum")
- .add_enum_value(INTERPOLATION_TCB,"auto",_("_TCB"))
-
.add_enum_value(INTERPOLATION_CONSTANT,"constant",_("_Constant"))
- .add_enum_value(INTERPOLATION_HALT,"ease",_("_Ease
In/Out"))
-
.add_enum_value(INTERPOLATION_LINEAR,"linear",_("_Linear"))
+ .add_enum_value(INTERPOLATION_TCB,"auto",_("TCB"))
+
.add_enum_value(INTERPOLATION_CONSTANT,"constant",_("Constant"))
+ .add_enum_value(INTERPOLATION_HALT,"ease",_("Ease
In/Out"))
+
.add_enum_value(INTERPOLATION_LINEAR,"linear",_("Linear"))
);
attach(*widget_interpolation,0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK|Gtk::FILL, 1, 1);
tooltips_.set_tip(*widget_interpolation,_("Default Interpolation"));
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
