diff --git a/stuff/config/current.txt b/stuff/config/current.txt index 1bf60ccc..c72bd4b5 100644 --- a/stuff/config/current.txt +++ b/stuff/config/current.txt @@ -2,249 +2,249 @@ - "Background" "Background" + "Background" "Background" "Blur" "Blur" - "Distort" "Distort" - "Gradient" "Gradient" - "Image_Adjust" "Image Adjust" - "Layer_Blending" "Layer Blending" - "Layer_Blending_Ino" "Layer Blending (Ino)" + "Distort" "Distort" + "Gradient" "Gradient" + "Image_Adjust" "Image Adjust" + "Layer_Blending" "Layer Blending" + "Layer_Blending_Ino" "Layer Blending (Ino)" "Light" "Light" "Matte" "Matte" "Noise" "Noise" - "Render" "Render" - "Stylize" "Stylize" - "Toonz_Level" "Color Indexed" - "Shaders" "Shaders" - "Utility" "Utility" + "Render" "Render" + "Stylize" "Stylize" + "Toonz_Level" "Color Indexed" + "Shaders" "Shaders" + "Utility" "Utility" - "Add Ino" "Add Ino" - "Add" "Add" - "Adjust Exposure Iwa" "Adjust Exposure Iwa" - "Adjust Levels" "Adjust Levels" - "Alpha" "Alpha" - "Angle" "Angle" - "Animation" "Animation" - "Art Contour" "Art Contour" - "Backlit" "Backlit" - "Barrel Distort Iwa" "Barrel Distort Iwa" - "Base" "Base" - "Birth Color" "Birth Color" - "Birth Params" "Birth Params" - "Bloom Iwa" "Bloom Iwa" - "Blue" "Blue" - "Blur Ino" "Blur Ino" - "Blur" "Blur" - "Body Highlight" "Body Highlight" - "Bokeh Iwa" "Bokeh Iwa" - "Bokeh Ref Iwa" "Bokeh Ref Iwa" - "Brush Tip Geometry" "Brush Tip Geometry" - "Bubble Color" "Bubble Color" - "Calligraphic Line" "Calligraphic Line" - "Cast Shadow" "Cast Shadow" - "Caustics" "Caustics" - "Channel Mixer" "Channel Mixer" - "Channel Selector Ino" "Channel Selector Ino" - "Checkerboard" "Checkerboard" - "Clouds" "Clouds" - "Color and Shape" "Color and Shape" - "Color Blending" "Color Blending" - "Color Burn Ino" "Color Burn Ino" - "Color Card" "Color Card" - "Color Dodge Ino" "Color Dodge Ino" - "Color Emboss" "Color Emboss" - "Color Raylit" "Color Raylit" - "Colors" "Colors" - "Conical Transform" "Conical Transform" - "Contour" "Contour" - "Contrast" "Contrast" - "Corridor Gradient Iwa" "Corridor Gradient Iwa" - "Cross Dissolve Ino" "Cross Dissolve Ino" - "Cross Dissolve" "Cross Dissolve" - "Curves" "Curves" - "Darken Ino" "Darken Ino" - "Darken" "Darken" - "Darker Color Ino" "Darker Color Ino" - "Density Ino" "Density Ino" - "Despeckle" "Despeckle" - "Destination" "Destination" - "Diamond Grad" "Diamond Grad" - "Difference mode" "Difference mode" - "Directional Blur Iwa" "Directional Blur Iwa" - "Directional Blur" "Directional Blur" - "Dissolve" "Dissolve" - "Distortion Wave" "Distortion Wave" - "Distortion" "Distortion" - "Divide Ino" "Divide Ino" - "Ellipse" "Ellipse" - "Emboss" "Emboss" - "End" "End" - "Environment" "Environment" - "Erode/Dilate" "Erode/Dilate" - "Evolution Options" "Evolution Options" - "External Palette" "External Palette" - "Fade-in Color" "Fade-in Color" - "Fade-out Color" "Fade-out Color" - "Fireball" "Fireball" - "Flap Behavior" "Flap Behavior" - "Floor Bump Iwa" "Floor Bump Iwa" - "Flow Blur Iwa" "Flow Blur Iwa" - "Flow Paint Brush Iwa" "Flow Paint Brush Iwa" - "Fog Ino" "Fog Ino" - "Four Points" "Four Points" - "Fractal Noise Iwa" "Fractal Noise Iwa" - "Free Distort" "Free Distort" - "Friction" "Friction" - "Gamma" "Gamma" - "Glare Iwa" "Glare Iwa" - "Glitter" "Glitter" - "Glow" "Glow" - "GPU HSL Blend" "GPU HSL Blend" - "Gradient Warp Iwa" "Gradient Warp Iwa" - "Gravity" "Gravity" - "Green" "Green" - "Hard Light Ino" "Hard Light Ino" - "Hard Mix Ino" "Hard Mix Ino" - "HLS Add Ino" "HLS Add Ino" - "HLS Adjust Ino" "HLS Adjust Ino" - "HLS Noise Ino" "HLS Noise Ino" - "HSV Add Ino" "HSV Add Ino" - "HSV Adjust Ino" "HSV Adjust Ino" - "HSV Key" "HSV Key" - "HSV Noise Ino" "HSV Noise Ino" - "HSV Scale" "HSV Scale" - "Inner Shape" "Inner Shape" - "iwa Bokeh Advanced" "iwa Bokeh Advanced" - "Kaleido" "Kaleido" - "Level Auto Ino" "Level Auto Ino" - "Level Master Ino" "Level Master Ino" - "Level RGBA Ino" "Level RGBA Ino" - "Lifetime" "Lifetime" - "Light Direction" "Light Direction" - "Light Spot" "Light Spot" - "Lighten Ino" "Lighten Ino" - "Lighter Color Ino" "Lighter Color Ino" - "Limits" "Limits" - "Line Blur Ino" "Line Blur Ino" - "Linear Burn Ino" "Linear Burn Ino" - "Linear Dodge Ino" "Linear Dodge Ino" - "Linear Gradient (Classic)" "Linear Gradient (Classic)" - "Linear Gradient" "Linear Gradient" - "Linear Light Ino" "Linear Light Ino" - "Linear Wave" "Linear Wave" - "Local Blur" "Local Blur" - "Local Transp" "Local Transp" - "Max Min Ino" "Max Min Ino" - "Median Filter Ino" "Median Filter Ino" - "Median Ino" "Median Ino" - "Mosaic" "Mosaic" - "Motion Blur Ino" "Motion Blur Ino" - "Motion Blur Iwa" "Motion Blur Iwa" - "Motion Blur" "Motion Blur" - "Motion Flow Iwa" "Motion Flow Iwa" - "Motion Wind Ino" "Motion Wind Ino" - "Multi Linear" "Multi Linear" - "Multi Radial" "Multi Radial" - "Multiply Ino" "Multiply Ino" - "Multiply" "Multiply" - "Multitone" "Multitone" - "Negate Ino" "Negate Ino" - "Noise" "Noise" - "Nothing" "Nothing" - "Opacity" "Opacity" - "Outer Shape" "Outer Shape" - "OutLine" "OutLine" - "Over Ino" "Over Ino" - "Overlay Ino" "Overlay Ino" - "Palette Filter" "Palette Filter" - "Particle Generation" "Particle Generation" - "Particle" "Particle" - "Pattern" "Pattern" - "Perlin Noise" "Perlin Noise" - "Perspective Distort Iwa" "Perspective Distort Iwa" - "Pin Light Ino" "Pin Light Ino" - "Pivot" "Pivot" - "PN Clouds Ino" "PN Clouds Ino" - "PN Perspective Iwa" "PN Perspective Iwa" - "Posterize" "Posterize" - "Radial Blur GPU" "Radial Blur GPU" - "Radial Blur Ino" "Radial Blur Ino" - "Radial Blur" "Radial Blur" - "Radial Gradient" "Radial Gradient" - "Rainbow Iwa" "Rainbow Iwa" - "Random Wave" "Random Wave" - "Raylit" "Raylit" - "Red" "Red" - "Reference Frame" "Reference Frame" - "Reflection mode" "Reflection mode" - "Refraction mode" "Refraction mode" - "RGB Fade" "RGB Fade" - "RGB Key" "RGB Key" - "RGB" "RGB" - "RGBA Cut" "RGBA Cut" - "RGBA Scale" "RGBA Scale" - "Ripple" "Ripple" - "Ripples" "Ripples" - "Rotation" "Rotation" - "Salt Pepper Noise" "Salt Pepper Noise" - "Scale" "Scale" - "Scattering" "Scattering" - "Screen Ino" "Screen Ino" - "Shape" "Shape" - "Sharpen" "Sharpen" - "Shift" "Shift" - "Size Increase" "Size Increase" - "Size, Mass and Orientation" "Size, Mass and Orientation" - "Smudge" "Smudge" - "Soft Light Ino" "Soft Light Ino" - "Solarize" "Solarize" - "Source Area" "Source Area" - "Source Image" "Source Image" - "Source" "Source" - "Source1" "Source1" - "Source2" "Source2" - "Source3" "Source3" - "Source4" "Source4" - "Source5" "Source5" - "Spectrum Iwa" "Spectrum Iwa" - "Speed" "Speed" - "Spin Blur GPU" "Spin Blur GPU" - "Spin Blur Ino" "Spin Blur Ino" - "Spin Blur" "Spin Blur" - "Spin Gradient Iwa" "Spin Gradient Iwa" - "Spiral" "Spiral" - "Square Gradient" "Square Gradient" - "Starsky" "Starsky" - "Start" "Start" - "Sub Settings" "Sub Settings" - "Subtract Ino" "Subtract Ino" - "Subtract" "Subtract" - "Sunflare" "Sunflare" - "Tangent Flow Iwa" "Tangent Flow Iwa" - "Target Spot" "Target Spot" - "Text Iwa" "Text Iwa" - "Texture Offset" "Texture Offset" - "Texture" "Texture" - "Thickness variation" "Thickness variation" - "Tile Horizontally" "Tile Horizontally" - "Tile Iwa" "Tile Iwa" - "Tile Vertically" "Tile Vertically" - "Tile" "Tile" - "TimeCode Iwa" "TimeCode Iwa" - "Tip Placement" "Tip Placement" - "Top Layer" "Top Layer" - "Trail" "Trail" - "Transform" "Transform" - "Transparency" "Transparency" - "Transverse Wave" "Transverse Wave" - "Vector Control" "Vector Control" - "Vivid Light Ino" "Vivid Light Ino" - "Warp HV Ino" "Warp HV Ino" - "Warp" "Warp" - "Waves" "Waves" - "Wavy" "Wavy" - "Wind" "Wind" + "Add Ino" "Add Ino" + "Add" "Add" + "Adjust Exposure Iwa" "Adjust Exposure Iwa" + "Adjust Levels" "Adjust Levels" + "Alpha" "Alpha" + "Angle" "Angle" + "Animation" "Animation" + "Art Contour" "Art Contour" + "Backlit" "Backlit" + "Barrel Distort Iwa" "Barrel Distort Iwa" + "Base" "Base" + "Birth Color" "Birth Color" + "Birth Params" "Birth Params" + "Bloom Iwa" "Bloom Iwa" + "Blue" "Blue" + "Blur Ino" "Blur Ino" + "Blur" "Blur" + "Body Highlight" "Body Highlight" + "Bokeh Iwa" "Bokeh Iwa" + "Bokeh Ref Iwa" "Bokeh Ref Iwa" + "Brush Tip Geometry" "Brush Tip Geometry" + "Bubble Color" "Bubble Color" + "Calligraphic Line" "Calligraphic Line" + "Cast Shadow" "Cast Shadow" + "Caustics" "Caustics" + "Channel Mixer" "Channel Mixer" + "Channel Selector Ino" "Channel Selector Ino" + "Checkerboard" "Checkerboard" + "Clouds" "Clouds" + "Color and Shape" "Color and Shape" + "Color Blending" "Color Blending" + "Color Burn Ino" "Color Burn Ino" + "Color Card" "Color Card" + "Color Dodge Ino" "Color Dodge Ino" + "Color Emboss" "Color Emboss" + "Color Raylit" "Color Raylit" + "Colors" "Colors" + "Conical Transform" "Conical Transform" + "Contour" "Contour" + "Contrast" "Contrast" + "Corridor Gradient Iwa" "Corridor Gradient Iwa" + "Cross Dissolve Ino" "Cross Dissolve Ino" + "Cross Dissolve" "Cross Dissolve" + "Curves" "Curves" + "Darken Ino" "Darken Ino" + "Darken" "Darken" + "Darker Color Ino" "Darker Color Ino" + "Density Ino" "Density Ino" + "Despeckle" "Despeckle" + "Destination" "Destination" + "Diamond Grad" "Diamond Grad" + "Difference mode" "Difference mode" + "Directional Blur Iwa" "Directional Blur Iwa" + "Directional Blur" "Directional Blur" + "Dissolve" "Dissolve" + "Distortion Wave" "Distortion Wave" + "Distortion" "Distortion" + "Divide Ino" "Divide Ino" + "Ellipse" "Ellipse" + "Emboss" "Emboss" + "End" "End" + "Environment" "Environment" + "Erode/Dilate" "Erode/Dilate" + "Evolution Options" "Evolution Options" + "External Palette" "External Palette" + "Fade-in Color" "Fade-in Color" + "Fade-out Color" "Fade-out Color" + "Fireball" "Fireball" + "Flap Behavior" "Flap Behavior" + "Floor Bump Iwa" "Floor Bump Iwa" + "Flow Blur Iwa" "Flow Blur Iwa" + "Flow Paint Brush Iwa" "Flow Paint Brush Iwa" + "Fog Ino" "Fog Ino" + "Four Points" "Four Points" + "Fractal Noise Iwa" "Fractal Noise Iwa" + "Free Distort" "Free Distort" + "Friction" "Friction" + "Gamma" "Gamma" + "Glare Iwa" "Glare Iwa" + "Glitter" "Glitter" + "Glow" "Glow" + "GPU HSL Blend" "GPU HSL Blend" + "Gradient Warp Iwa" "Gradient Warp Iwa" + "Gravity" "Gravity" + "Green" "Green" + "Hard Light Ino" "Hard Light Ino" + "Hard Mix Ino" "Hard Mix Ino" + "HLS Add Ino" "HLS Add Ino" + "HLS Adjust Ino" "HLS Adjust Ino" + "HLS Noise Ino" "HLS Noise Ino" + "HSV Add Ino" "HSV Add Ino" + "HSV Adjust Ino" "HSV Adjust Ino" + "HSV Key" "HSV Key" + "HSV Noise Ino" "HSV Noise Ino" + "HSV Scale" "HSV Scale" + "Inner Shape" "Inner Shape" + "iwa Bokeh Advanced" "iwa Bokeh Advanced" + "Kaleido" "Kaleido" + "Level Auto Ino" "Level Auto Ino" + "Level Master Ino" "Level Master Ino" + "Level RGBA Ino" "Level RGBA Ino" + "Lifetime" "Lifetime" + "Light Direction" "Light Direction" + "Light Spot" "Light Spot" + "Lighten Ino" "Lighten Ino" + "Lighter Color Ino" "Lighter Color Ino" + "Limits" "Limits" + "Line Blur Ino" "Line Blur Ino" + "Linear Burn Ino" "Linear Burn Ino" + "Linear Dodge Ino" "Linear Dodge Ino" + "Linear Gradient (Classic)" "Linear Gradient (Classic)" + "Linear Gradient" "Linear Gradient" + "Linear Light Ino" "Linear Light Ino" + "Linear Wave" "Linear Wave" + "Local Blur" "Local Blur" + "Local Transp" "Local Transp" + "Max Min Ino" "Max Min Ino" + "Median Filter Ino" "Median Filter Ino" + "Median Ino" "Median Ino" + "Mosaic" "Mosaic" + "Motion Blur Ino" "Motion Blur Ino" + "Motion Blur Iwa" "Motion Blur Iwa" + "Motion Blur" "Motion Blur" + "Motion Flow Iwa" "Motion Flow Iwa" + "Motion Wind Ino" "Motion Wind Ino" + "Multi Linear" "Multi Linear" + "Multi Radial" "Multi Radial" + "Multiply Ino" "Multiply Ino" + "Multiply" "Multiply" + "Multitone" "Multitone" + "Negate Ino" "Negate Ino" + "Noise" "Noise" + "Nothing" "Nothing" + "Opacity" "Opacity" + "Outer Shape" "Outer Shape" + "OutLine" "OutLine" + "Over Ino" "Over Ino" + "Overlay Ino" "Overlay Ino" + "Palette Filter" "Palette Filter" + "Particle Generation" "Particle Generation" + "Particle" "Particle" + "Pattern" "Pattern" + "Perlin Noise" "Perlin Noise" + "Perspective Distort Iwa" "Perspective Distort Iwa" + "Pin Light Ino" "Pin Light Ino" + "Pivot" "Pivot" + "PN Clouds Ino" "PN Clouds Ino" + "PN Perspective Iwa" "PN Perspective Iwa" + "Posterize" "Posterize" + "Radial Blur GPU" "Radial Blur GPU" + "Radial Blur Ino" "Radial Blur Ino" + "Radial Blur" "Radial Blur" + "Radial Gradient" "Radial Gradient" + "Rainbow Iwa" "Rainbow Iwa" + "Random Wave" "Random Wave" + "Raylit" "Raylit" + "Red" "Red" + "Reference Frame" "Reference Frame" + "Reflection mode" "Reflection mode" + "Refraction mode" "Refraction mode" + "RGB Fade" "RGB Fade" + "RGB Key" "RGB Key" + "RGB" "RGB" + "RGBA Cut" "RGBA Cut" + "RGBA Scale" "RGBA Scale" + "Ripple" "Ripple" + "Ripples" "Ripples" + "Rotation" "Rotation" + "Salt Pepper Noise" "Salt Pepper Noise" + "Scale" "Scale" + "Scattering" "Scattering" + "Screen Ino" "Screen Ino" + "Shape" "Shape" + "Sharpen" "Sharpen" + "Shift" "Shift" + "Size Increase" "Size Increase" + "Size, Mass and Orientation" "Size, Mass and Orientation" + "Smudge" "Smudge" + "Soft Light Ino" "Soft Light Ino" + "Solarize" "Solarize" + "Source Area" "Source Area" + "Source Image" "Source Image" + "Source" "Source" + "Source1" "Source1" + "Source2" "Source2" + "Source3" "Source3" + "Source4" "Source4" + "Source5" "Source5" + "Spectrum Iwa" "Spectrum Iwa" + "Speed" "Speed" + "Spin Blur GPU" "Spin Blur GPU" + "Spin Blur Ino" "Spin Blur Ino" + "Spin Blur" "Spin Blur" + "Spin Gradient Iwa" "Spin Gradient Iwa" + "Spiral" "Spiral" + "Square Gradient" "Square Gradient" + "Starsky" "Starsky" + "Start" "Start" + "Sub Settings" "Sub Settings" + "Subtract Ino" "Subtract Ino" + "Subtract" "Subtract" + "Sunflare" "Sunflare" + "Tangent Flow Iwa" "Tangent Flow Iwa" + "Target Spot" "Target Spot" + "Text Iwa" "Text Iwa" + "Texture Offset" "Texture Offset" + "Texture" "Texture" + "Thickness variation" "Thickness variation" + "Tile Horizontally" "Tile Horizontally" + "Tile Iwa" "Tile Iwa" + "Tile Vertically" "Tile Vertically" + "Tile" "Tile" + "TimeCode Iwa" "TimeCode Iwa" + "Tip Placement" "Tip Placement" + "Top Layer" "Top Layer" + "Trail" "Trail" + "Transform" "Transform" + "Transparency" "Transparency" + "Transverse Wave" "Transverse Wave" + "Vector Control" "Vector Control" + "Vivid Light Ino" "Vivid Light Ino" + "Warp HV Ino" "Warp HV Ino" + "Warp" "Warp" + "Waves" "Waves" + "Wavy" "Wavy" + "Wind" "Wind" @@ -1966,5 +1966,64 @@ "STD_iwa_TiledParticlesFx.fadeout_color_fade" "Fade-out Intensity" "STD_iwa_TiledParticlesFx.source_gradation" "Use Control Image Gradation" "STD_iwa_TiledParticlesFx.pick_color_for_every_frame" "Pick Control Image's Color for Every Frame" + + + "Opacity" "Opacity" + "Opacity multiply" "Opacity multiply" + "Opacity linearize" "Opacity linearize" + "Radius" "Radius" + "Hardness" "Hardness" + "Pixel feather" "Pixel feather" + "Dabs per basic radius" "Dabs per basic radius" + "Dabs per actual radius" "Dabs per actual radius" + "Dabs per second" "Dabs per second" + "GridMap Scale" "GridMap Scale" + "GridMap Scale X" "GridMap Scale X" + "GridMap Scale Y" "GridMap Scale Y" + "Radius by random" "Radius by random" + "Fine speed filter" "Fine speed filter" + "Gross speed filter" "Gross speed filter" + "Fine speed gamma" "Fine speed gamma" + "Gross speed gamma" "Gross speed gamma" + "Jitter" "Jitter" + "Offset Y" "Offset Y" + "Offset X" "Offset X" + "Angular Offset: Direction" "Angular Offset: Direction" + "Angular Offset: Ascension" "Angular Offset: Ascension" + "Angular Offset Mirrored: Direction" "Angular Offset Mirrored: Direction" + "Angular Offset Mirrored: Ascension" "Angular Offset Mirrored: Ascension" + "Angular Offsets Adjustment" "Angular Offsets Adjustment" + "Offsets Multiplier" "Offsets Multiplier" + "Offset by speed" "Offset by speed" + "Offset by speed filter" "Offset by speed filter" + "Slow position tracking" "Slow position tracking" + "Slow tracking per dab" "Slow tracking per dab" + "Tracking noise" "Tracking noise" + "Color hue" "Color hue" + "Color saturation" "Color saturation" + "Color value" "Color value" + "Save color" "Save color" + "Change color hue" "Change color hue" + "Change color lightness (HSL)" "Change color lightness (HSL)" + "Change color satur. (HSL)" "Change color satur. (HSL)" + "Change color value (HSV)" "Change color value (HSV)" + "Change color satur. (HSV)" "Change color satur. (HSV)" + "Smudge" "Smudge" + "Smudge length" "Smudge length" + "Smudge radius" "Smudge radius" + "Eraser" "Eraser" + "Stroke threshold" "Stroke threshold" + "Stroke duration" "Stroke duration" + "Stroke hold time" "Stroke hold time" + "Custom input" "Custom input" + "Custom input filter" "Custom input filter" + "Elliptical dab: ratio" "Elliptical dab: ratio" + "Elliptical dab: angle" "Elliptical dab: angle" + "Direction filter" "Direction filter" + "Lock alpha" "Lock alpha" + "Colorize" "Colorize" + "Snap to pixel" "Snap to pixel" + "Pressure gain" "Pressure gain" + diff --git a/toonz/sources/toonzlib/mypaintbrushstyle.cpp b/toonz/sources/toonzlib/mypaintbrushstyle.cpp index 6d893d13..e2258420 100644 --- a/toonz/sources/toonzlib/mypaintbrushstyle.cpp +++ b/toonz/sources/toonzlib/mypaintbrushstyle.cpp @@ -16,6 +16,8 @@ #include "toonz/mypaintbrushstyle.h" +#include "tw/stringtable.h" + #include #include @@ -381,8 +383,8 @@ int TMyPaintBrushStyle::getParamCount() const { //----------------------------------------------------------------------------- QString TMyPaintBrushStyle::getParamNames(int index) const { - return QString::fromUtf8( - mypaint::Setting::byId((MyPaintBrushSetting)index).name.c_str()); + return QString::fromStdWString(TStringTable::translate( + mypaint::Setting::byId((MyPaintBrushSetting)index).name.c_str())); } //-----------------------------------------------------------------------------