diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js index 83bacabc6..971da62bd 100644 --- a/apps/common/main/lib/util/define.js +++ b/apps/common/main/lib/util/define.js @@ -789,6 +789,11 @@ define(function(){ 'use strict'; textOut: 'Out', textWedge: 'Wedge', textFlip: 'Flip', + textLines: 'Lines', + textArcs: 'Arcs', + textTurns: 'Turns', + textShapes: 'Shapes', + textLoops: 'Loops', getEffectGroupData: function () { return [ @@ -807,10 +812,7 @@ define(function(){ 'use strict'; {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLOAT, iconCls: 'animation-entrance-float_in', displayValue: this.textFloatIn}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_SPLIT, iconCls: 'animation-entrance-split', displayValue: this.textSplit}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WIPE_FROM, iconCls: 'animation-entrance-wipe', displayValue: this.textWipe}, - {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_BOX, iconCls: 'animation-entrance-shape', displayValue: this.textBox}, - {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_CIRCLE, iconCls: 'animation-entrance-shape', displayValue: this.textCircle}, - {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_PLUS, iconCls: 'animation-entrance-shape', displayValue: this.textPlus}, - {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_DIAMOND, iconCls: 'animation-entrance-shape', displayValue: this.textDiamond}, + {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_BOX, iconCls: 'animation-entrance-shape', displayValue: this.textShape, familyEffect: 'entrshape'}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WHEEL, iconCls: 'animation-entrance-wheel', displayValue: this.textWheel}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_RANDOM_BARS, iconCls: 'animation-entrance-random_bars', displayValue: this.textRandomBars}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_GROW_AND_TURN, iconCls: 'animation-entrance-grow_turn', displayValue: this.textGrowTurn}, @@ -836,42 +838,19 @@ define(function(){ 'use strict'; {group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLOAT, iconCls: 'animation-exit-float_out', displayValue: this.textFloatOut}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_SPLIT, iconCls: 'animation-exit-split', displayValue: this.textSplit}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_WIPE_FROM, iconCls: 'animation-exit-wipe', displayValue: this.textWipe}, - {group: 'menu-effect-group-exit', value: AscFormat.EXIT_BOX, iconCls: 'animation-exit-shape', displayValue: this.textBox}, - {group: 'menu-effect-group-exit', value: AscFormat.EXIT_CIRCLE, iconCls: 'animation-exit-shape', displayValue: this.textCircle}, - {group: 'menu-effect-group-exit', value: AscFormat.EXIT_PLUS, iconCls: 'animation-exit-shape', displayValue: this.textPlus}, - {group: 'menu-effect-group-exit', value: AscFormat.EXIT_DIAMOND, iconCls: 'animation-exit-shape', displayValue: this.textDiamond}, + {group: 'menu-effect-group-exit', value: AscFormat.EXIT_BOX, iconCls: 'animation-exit-shape', displayValue: this.textShape, familyEffect: 'shape'}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_WHEEL, iconCls: 'animation-exit-wheel', displayValue: this.textWheel}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_RANDOM_BARS, iconCls: 'animation-exit-random_bars', displayValue: this.textRandomBars}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_SHRINK_AND_TURN, iconCls: 'animation-exit-shrink_turn', displayValue: this.textShrinkTurn}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_ZOOM, iconCls: 'animation-exit-zoom', displayValue: this.textZoom}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_BASIC_SWIVEL, iconCls: 'animation-exit-swivel', displayValue: this.textSwivel}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_BOUNCE, iconCls: 'animation-exit-bounce', displayValue: this.textBounce}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_DOWN, iconCls: 'animation-motion_paths-lines', displayValue: this.textDown}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_LEFT, iconCls: 'animation-motion_paths-lines', displayValue: this.textLeft}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_RIGHT, iconCls: 'animation-motion_paths-lines', displayValue: this.textRight}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_UP, iconCls: 'animation-motion_paths-lines', displayValue: this.textUp}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_DOWN, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcDown}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_LEFT, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcLeft}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_RIGHT, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcRight}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_UP, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcUp}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnDown}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN_RIGHT, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnDownRight}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_UP, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnUp}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_UP_RIGHT, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnUpRight}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_CIRCLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textCircle}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_DIAMOND, iconCls: 'animation-motion_paths-shapes', displayValue: this.textDiamond}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_EQUAL_TRIANGLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textEqualTriangle}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_HEXAGON, iconCls: 'animation-motion_paths-shapes', displayValue: this.textHexagon}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_OCTAGON, iconCls: 'animation-motion_paths-shapes', displayValue: this.textOctagon}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_PARALLELOGRAM, iconCls: 'animation-motion_paths-shapes', displayValue: this.textParallelogram}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_PENTAGON, iconCls: 'animation-motion_paths-shapes', displayValue: this.textPentagon}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_RIGHT_TRIANGLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textRightTriangle}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_SQUARE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textSquare}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_TRAPEZOID, iconCls: 'animation-motion_paths-shapes', displayValue: this.textTrapezoid}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, iconCls: 'animation-motion_paths-loops', displayValue: this.textHorizontalFigure}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_VERTICAL_FIGURE_8, iconCls: 'animation-motion_paths-loops', displayValue: this.textVerticalFigure}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_LOOP_DE_LOOP, iconCls: 'animation-motion_paths-loops', displayValue: this.textLoopDeLoop}//, - //{group: 'menu-effect-group-path', value: AscFormat.MOTION_CUSTOM_PATH, iconCls: 'animation-motion_paths-custom_path', displayValue: this.textCustomPath} + {group: 'menu-effect-group-path', value: AscFormat.MOTION_DOWN, iconCls: 'animation-motion_paths-lines', displayValue: this.textLines, familyEffect: 'pathlines'}, + {group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_DOWN, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcs, familyEffect: 'patharcs'}, + {group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurns, familyEffect: 'pathturns'}, + {group: 'menu-effect-group-path', value: AscFormat.MOTION_CIRCLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textShapes, familyEffect: 'pathshapes'}, + {group: 'menu-effect-group-path', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, iconCls: 'animation-motion_paths-loops', displayValue: this.textLoops, familyEffect: 'pathloops'}//, + //{group: 'menu-effect-group-path', value: AscFormat.MOTION_CUSTOM_PATH, iconCls: 'animation-motion_paths-custom_path', displayValue: this.textCustomPath} ]; }, @@ -896,14 +875,14 @@ define(function(){ 'use strict'; return [ {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_APPEAR, displayValue: this.textAppear}, {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_BLINDS, displayValue: this.textBlinds}, - {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_BOX, displayValue: this.textBox}, + {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_BOX, displayValue: this.textBox, familyEffect: 'entrshape'}, {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_CHECKERBOARD, displayValue: this.textCheckerboard}, - {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_CIRCLE, displayValue: this.textCircle}, - {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_DIAMOND, displayValue: this.textDiamond}, + {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_CIRCLE, displayValue: this.textCircle, familyEffect: 'entrshape'}, + {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_DIAMOND, displayValue: this.textDiamond, familyEffect: 'entrshape'}, {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_DISSOLVE_IN, displayValue: this.textDissolveIn}, {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_FLY_IN_FROM, displayValue: this.textFlyIn}, {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_PEEK_IN_FROM, displayValue: this.textPeekIn}, - {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_PLUS, displayValue: this.textPlus}, + {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_PLUS, displayValue: this.textPlus, familyEffect: 'entrshape'}, {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_RANDOM_BARS, displayValue: this.textRandomBars}, {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_SPLIT, displayValue: this.textSplit}, {group: 'menu-effect-group-entrance', level: 'menu-effect-level-basic', value: AscFormat.ENTRANCE_STRIPS, displayValue: this.textStrips}, @@ -943,7 +922,7 @@ define(function(){ 'use strict'; {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR_2, displayValue: this.textComplementaryColor2}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_CONTRASTING_COLOR, displayValue: this.textContrastingColor}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_CONTRASTING_DARKEN, displayValue: this.textDarken}, - {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_DESATURAT, displayValue: this.textDesaturate}, + {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_DESATURATE, displayValue: this.textDesaturate}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_LIGHTEN, displayValue: this.textLighten}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_OBJECT_COLOR, displayValue: this.textObjectColor}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_PULSE, displayValue: this.textPulse}, @@ -953,15 +932,15 @@ define(function(){ 'use strict'; {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-moderate', value: AscFormat.EMPHASIS_TEETER, displayValue: this.textTeeter}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-exciting', value: AscFormat.EMPHASIS_BLINK, displayValue: this.textBlink}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_BLINDS, displayValue: this.textBlinds}, - {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_BOX, displayValue: this.textBox}, + {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_BOX, displayValue: this.textBox, familyEffect: 'shape'}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_CHECKERBOARD, displayValue: this.textCheckerboard}, - {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_CIRCLE, displayValue: this.textCircle}, - {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_DIAMOND, displayValue: this.textDiamond}, + {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_CIRCLE, displayValue: this.textCircle, familyEffect: 'shape'}, + {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_DIAMOND, displayValue: this.textDiamond, familyEffect: 'shape'}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_DISAPPEAR, displayValue: this.textDisappear}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_DISSOLVE_OUT, displayValue: this.textDissolveOut}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_FLY_OUT_TO, displayValue: this.textFlyOut}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_PEEK_OUT_TO, displayValue: this.textPeekOut}, - {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_PLUS, displayValue: this.textPlus}, + {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_PLUS, displayValue: this.textPlus, familyEffect: 'shape'}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_RANDOM_BARS, displayValue: this.textRandomBars}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_SPLIT, displayValue: this.textSplit}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-basic', value: AscFormat.EXIT_STRIPS, displayValue: this.textStrips}, @@ -978,7 +957,7 @@ define(function(){ 'use strict'; {group: 'menu-effect-group-exit', level: 'menu-effect-level-moderate', value: AscFormat.EXIT_FLOAT_DOWN, displayValue: this.textFloatDown}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-moderate', value: AscFormat.EXIT_FLOAT_UP, displayValue: this.textFloatUp}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-moderate', value: AscFormat.EXIT_SHRINK_AND_TURN, displayValue: this.textShrinkTurn}, - {group: 'menu-effect-group-exit', level: 'menu-effect-level-moderate', value: AscFormat.EXIT_SINK_DOWN, displayValue: this.textSinkDown}, //sink down- EXIT_SHRINK_DOWN? + {group: 'menu-effect-group-exit', level: 'menu-effect-level-moderate', value: AscFormat.EXIT_SINK_DOWN, displayValue: this.textSinkDown}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-moderate', value: AscFormat.EXIT_SPINNER, displayValue: this.textSpinner}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-moderate', value: AscFormat.EXIT_STRETCHY, displayValue: this.textStretch}, {group: 'menu-effect-group-exit', level: 'menu-effect-level-exciting', value: AscFormat.EXIT_BASIC_SWIVEL, displayValue: this.textBasicSwivel}, @@ -996,24 +975,24 @@ define(function(){ 'use strict'; {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_PATH_5_POINT_STAR, displayValue: this.textPointStar5}, {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_PATH_6_POINT_STAR, displayValue: this.textPointStar6}, {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_PATH_8_POINT_STAR, displayValue: this.textPointStar8}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_CIRCLE, displayValue: this.textCircle}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_CIRCLE, displayValue: this.textCircle, familyEffect: 'pathshapes'}, {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_CRESCENT_MOON, displayValue: this.textCrescentMoon}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_DIAMOND, displayValue: this.textDiamond}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_EQUAL_TRIANGLE, displayValue: this.textEqualTriangle}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_DIAMOND, displayValue: this.textDiamond, familyEffect: 'pathshapes'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_EQUAL_TRIANGLE, displayValue: this.textEqualTriangle, familyEffect: 'pathshapes'}, {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_FOOTBALL, displayValue: this.textFootball}, {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_HEART, displayValue: this.textHeart}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_HEXAGON, displayValue: this.textHexagon}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_OCTAGON, displayValue: this.textOctagon}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_PARALLELOGRAM, displayValue: this.textParallelogram}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_PENTAGON, displayValue: this.textPentagon}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_RIGHT_TRIANGLE, displayValue: this.textRightTriangle}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_SQUARE, displayValue: this.textSquare}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_HEXAGON, displayValue: this.textHexagon, familyEffect: 'pathshapes'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_OCTAGON, displayValue: this.textOctagon, familyEffect: 'pathshapes'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_PARALLELOGRAM, displayValue: this.textParallelogram, familyEffect: 'pathshapes'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_PENTAGON, displayValue: this.textPentagon, familyEffect: 'pathshapes'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_RIGHT_TRIANGLE, displayValue: this.textRightTriangle, familyEffect: 'pathshapes'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_SQUARE, displayValue: this.textSquare, familyEffect: 'pathshapes'}, {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_TEARDROP, displayValue: this.textTeardrop}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_TRAPEZOID, displayValue: this.textTrapezoid}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_ARC_DOWN, displayValue: this.textArcDown}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_ARC_LEFT, displayValue: this.textArcLeft}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_ARC_RIGHT, displayValue: this.textArcRight}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_ARC_UP, displayValue: this.textArcUp}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-basic', value: AscFormat.MOTION_TRAPEZOID, displayValue: this.textTrapezoid, familyEffect: 'pathshapes'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_ARC_DOWN, displayValue: this.textArcDown, familyEffect: 'patharcs'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_ARC_LEFT, displayValue: this.textArcLeft, familyEffect: 'patharcs'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_ARC_RIGHT, displayValue: this.textArcRight, familyEffect: 'patharcs'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_ARC_UP, displayValue: this.textArcUp, familyEffect: 'patharcs'}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_BOUNCE_LEFT, displayValue: this.textBounceLeft}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_BOUNCE_RIGHT, displayValue: this.textBounceRight}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_CURVY_LEFT, displayValue: this.textCurvyLeft}, @@ -1021,10 +1000,11 @@ define(function(){ 'use strict'; {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_DECAYING_WAVE, displayValue: this.textDecayingWave}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_DIAGONAL_DOWN_RIGHT, displayValue: this.textDiagonalDownRight}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_DIAGONAL_UP_RIGHT, displayValue: this.textDiagonalUpRight}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_DOWN, displayValue: this.textDown}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_DOWN, displayValue: this.textDown, familyEffect: 'pathlines'}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_FUNNEL, displayValue: this.textFunnel}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_HEARTBEAT, displayValue: this.textHeartbeat}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_LEFT, displayValue: this.textLeft}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_LEFT, displayValue: this.textLeft, familyEffect: 'pathlines'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_RIGHT, displayValue: this.textRight, familyEffect: 'pathlines'}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_S_CURVE_1, displayValue: this.textSCurve1}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_S_CURVE_2, displayValue: this.textSCurve2}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_SINE_WAVE, displayValue: this.textSineWave}, @@ -1032,11 +1012,11 @@ define(function(){ 'use strict'; {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_SINE_SPIRAL_RIGHT, displayValue: this.textSpiralRight}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_SPRING, displayValue: this.textSpring}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_STAIRS_DOWN, displayValue: this.textStairsDown}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_TURN_DOWN, displayValue: this.textTurnDown}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_TURN_DOWN_RIGHT, displayValue: this.textTurnDownRight}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_TURN_UP, displayValue: this.textTurnUp}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_TURN_UP_RIGHT, displayValue: this.textTurnUpRight}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_UP, displayValue: this.textUp}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_TURN_DOWN, displayValue: this.textTurnDown, familyEffect: 'pathturns'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_TURN_DOWN_RIGHT, displayValue: this.textTurnDownRight, familyEffect: 'pathturns'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_TURN_UP, displayValue: this.textTurnUp, familyEffect: 'pathturns'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_TURN_UP_RIGHT, displayValue: this.textTurnUpRight, familyEffect: 'pathturns'}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_UP, displayValue: this.textUp, familyEffect: 'pathlines'}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_WAVE, displayValue: this.textWave}, {group: 'menu-effect-group-path', level: 'menu-effect-level-lines_curves', value: AscFormat.MOTION_ZIGZAG, displayValue: this.textZigzag}, {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_BEAN, displayValue: this.textBean}, @@ -1044,15 +1024,15 @@ define(function(){ 'use strict'; {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_CURVED_X, displayValue: this.textCurvedX}, {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_CURVY_STAR, displayValue: this.textCurvyStar}, {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_FIGURE_8_FOUR, displayValue: this.textFigureFour}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, displayValue: this.textHorizontalFigure}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, displayValue: this.textHorizontalFigure, familyEffect: 'pathloops'}, {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_INVERTED_SQUARE, displayValue: this.textInvertedSquare}, {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_INVERTED_TRIANGLE, displayValue: this.textInvertedTriangle}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_LOOP_DE_LOOP, displayValue: this.textLoopDeLoop}, + {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_LOOP_DE_LOOP, displayValue: this.textLoopDeLoop, familyEffect: 'pathloops'}, {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_NEUTRON, displayValue: this.textNeutron}, {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_PEANUT, displayValue: this.textPeanut}, {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_POINTY_STAR, displayValue: this.textPointStar}, {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_SWOOSH, displayValue: this.textSwoosh}, - {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_VERTICAL_FIGURE_8, displayValue: this.textVerticalFigure} + {group: 'menu-effect-group-path', level: 'menu-effect-level-special', value: AscFormat.MOTION_VERTICAL_FIGURE_8, displayValue: this.textVerticalFigure, familyEffect: 'pathloops'} ]; }, @@ -1294,6 +1274,67 @@ define(function(){ 'use strict'; default: return undefined; } + }, + getSimilarEffectsArray: function (group, familyEffect) { + switch (familyEffect){ + case 'shape': + return [ + {value: AscFormat.EXIT_BOX, caption: this.textBox}, + {value: AscFormat.EXIT_CIRCLE, caption: this.textCircle}, + {value: AscFormat.EXIT_PLUS, caption: this.textPlus}, + {value: AscFormat.EXIT_DIAMOND, caption: this.textDiamond} + ]; + case 'entrshape': + return [ + {value: AscFormat.ENTRANCE_BOX, caption: this.textBox}, + {value: AscFormat.ENTRANCE_CIRCLE, caption: this.textCircle}, + {value: AscFormat.ENTRANCE_PLUS, caption: this.textPlus}, + {value: AscFormat.ENTRANCE_DIAMOND, caption: this.textDiamond} + ]; + case 'pathlines': + return[ + {value: AscFormat.MOTION_DOWN, caption: this.textDown}, + {value: AscFormat.MOTION_LEFT, caption: this.textLeft}, + {value: AscFormat.MOTION_RIGHT, caption: this.textRight}, + {value: AscFormat.MOTION_UP, caption: this.textUp} + ]; + case 'patharcs': + return [ + {value: AscFormat.MOTION_ARC_DOWN, caption: this.textArcDown}, + {value: AscFormat.MOTION_ARC_LEFT, caption: this.textArcLeft}, + {value: AscFormat.MOTION_ARC_RIGHT, caption: this.textArcRight}, + {value: AscFormat.MOTION_ARC_UP, caption: this.textArcUp} + ]; + case 'pathturns': + return [ + {value: AscFormat.MOTION_TURN_DOWN, caption: this.textTurnDown}, + {value: AscFormat.MOTION_TURN_DOWN_RIGHT, caption: this.textTurnDownRight}, + {value: AscFormat.MOTION_TURN_UP, caption: this.textTurnUp}, + {value: AscFormat.MOTION_TURN_UP_RIGHT, caption: this.textTurnUpRight} + ]; + case 'pathshapes': + return [ + {value: AscFormat.MOTION_CIRCLE, caption: this.textCircle}, + {value: AscFormat.MOTION_DIAMOND, caption: this.textDiamond}, + {value: AscFormat.MOTION_EQUAL_TRIANGLE, caption: this.textEqualTriangle}, + {value: AscFormat.MOTION_HEXAGON, caption: this.textHexagon}, + {value: AscFormat.MOTION_OCTAGON, caption: this.textOctagon}, + {value: AscFormat.MOTION_PARALLELOGRAM, caption: this.textParallelogram}, + {value: AscFormat.MOTION_PENTAGON, caption: this.textPentagon}, + {value: AscFormat.MOTION_RIGHT_TRIANGLE, caption: this.textRightTriangle}, + {value: AscFormat.MOTION_SQUARE, caption: this.textSquare}, + {value: AscFormat.MOTION_TRAPEZOID, caption: this.textTrapezoid} + + ]; + case 'pathloops': + return [ + {value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, caption: this.textHorizontalFigure}, + {value: AscFormat.MOTION_VERTICAL_FIGURE_8, caption: this.textVerticalFigure}, + {value: AscFormat.MOTION_LOOP_DE_LOOP, caption: this.textLoopDeLoop} + ]; + default: + return []; + } } } })(), Common.define.effectData || {}); diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js index 75b9da10c..0da847d72 100644 --- a/apps/presentationeditor/main/app/controller/Animation.js +++ b/apps/presentationeditor/main/app/controller/Animation.js @@ -149,10 +149,16 @@ define([ this.view.btnPreview.setIconCls('toolbar__icon animation-preview-start'); }, - onParameterClick: function (value) { + onParameterClick: function (value, toggleGroup) { if(this.api && this.AnimationProperties) { - this.AnimationProperties.asc_putSubtype(value); - this.api.asc_SetAnimationProperties(this.AnimationProperties); + if(toggleGroup=='animateeffects') { + this.AnimationProperties.asc_putSubtype(value); + this.api.asc_SetAnimationProperties(this.AnimationProperties); + } + else { + var groupName = _.findWhere(this.EffectGroups, {value: this._state.EffectGroup}).id; + this.addNewEffect(value, this._state.EffectGroup, groupName,true, this._state.EffectOption); + } } }, @@ -181,12 +187,10 @@ define([ this.addNewEffect(type, group, record.get('group'), false); }, - addNewEffect: function (type, group, groupName, replace) { + addNewEffect: function (type, group, groupName, replace, parametr) { if (this._state.Effect == type && this._state.EffectGroup == group && replace) return; - var parameter = this.view.setMenuParameters(type, groupName, undefined); + var parameter = this.view.setMenuParameters(type, groupName, parametr); this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace, !Common.Utils.InternalSettings.get("pe-animation-no-preview")); - this._state.EffectGroup = group; - this._state.Effect = type; }, onDurationChange: function(before,combo, record, e) { @@ -374,18 +378,21 @@ define([ this._state.EffectGroup = group; this.setViewRepeatAndDuration(this._state.EffectGroup, this._state.Effect); group = view.listEffects.groups.findWhere({value: this._state.EffectGroup}); - item = store.findWhere(group ? {group: group.get('id'), value: this._state.Effect} : {value: this._state.Effect}); + var effect =_.findWhere(view.allEffects, group ? {group: group.get('id'), value: this._state.Effect} : {value: this._state.Effect}); + var familyEffect = (effect) ? effect.familyEffect : undefined; + item = (!familyEffect) ? store.findWhere(group ? {group: group.get('id'), value: value} : {value: value}) + : store.findWhere(group ? {group: group.get('id'), familyEffect: familyEffect} : {familyEffect: familyEffect}); if (item) { var forceFill = false; if (!item.get('isCustom')) { // remove custom effect from list if not-custom is selected var rec = store.findWhere({isCustom: true}); forceFill = !!rec; - store.remove(rec); + rec && store.remove(rec); } if (this._state.Effect!==AscFormat.ANIM_PRESET_MULTIPLE) { // remove "multiple" item if one effect is selected var rec = fieldStore.findWhere({value: AscFormat.ANIM_PRESET_MULTIPLE}); forceFill = forceFill || !!rec; - fieldStore.remove(rec); + rec && fieldStore.remove(rec); } view.listEffects.selectRecord(item); view.listEffects.fillComboView(item, true, forceFill); @@ -394,7 +401,7 @@ define([ store.remove(store.findWhere({isCustom: true})); // remove custom effects if (this._state.Effect==AscFormat.ANIM_PRESET_MULTIPLE) { // add and select "multiple" item view.listEffects.fillComboView(store.at(0), false, true); - fieldStore.remove(fieldStore.at(fieldStore.length-1)); + fieldStore.reset(fieldStore.slice(0, fieldStore.length-1)); view.listEffects.fieldPicker.selectRecord(fieldStore.add(new Common.UI.DataViewModel({ group: 'none', value: AscFormat.ANIM_PRESET_MULTIPLE, @@ -402,6 +409,7 @@ define([ displayValue: view.textMultiple }), {at:1})); view.listEffects.menuPicker.deselectAll(); + view.btnParameters.setIconCls('toolbar__icon icon animation-none'); } else { // add custom effect to appropriate group if (group) { var items = store.where({group: group.get('id')}); @@ -420,6 +428,7 @@ define([ } else { view.listEffects.fieldPicker.deselectAll(); view.listEffects.menuPicker.deselectAll(); + view.btnParameters.setIconCls('toolbar__icon icon animation-none'); } } } @@ -428,7 +437,8 @@ define([ this._state.EffectOption = this.AnimationProperties.asc_getSubtype(); if (this._state.EffectOption !== null && this._state.Effect !== AscFormat.ANIM_PRESET_MULTIPLE && this._state.Effect !== AscFormat.ANIM_PRESET_NONE) { var rec = _.findWhere(this.EffectGroups,{value: this._state.EffectGroup}); - this._state.noAnimationParam = view.setMenuParameters(this._state.Effect, rec ? rec.id : undefined, this._state.EffectOption)===undefined; + view.setMenuParameters(this._state.Effect, rec ? rec.id : undefined, this._state.EffectOption); + this._state.noAnimationParam = view.btnParameters.menu.items.length === 0; } value = this.AnimationProperties.asc_getDuration(); diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js index 3c40d3120..0fdeba5b0 100644 --- a/apps/presentationeditor/main/app/view/Animation.js +++ b/apps/presentationeditor/main/app/view/Animation.js @@ -89,7 +89,7 @@ define([ if (me.btnParameters) { me.btnParameters.menu.on('item:click', function (menu, item, e) { - me.fireEvent('animation:parameters', [item.value]); + me.fireEvent('animation:parameters', [item.value, item.toggleGroup]); }); } @@ -182,9 +182,10 @@ define([ this.$el = this.toolbar.toolbar.$el.find('#animation-panel'); var _set = PE.enumLock; this.lockedControls = []; - this._arrEffectName = [{group:'none', value: AscFormat.ANIM_PRESET_NONE, iconCls: 'animation-none', displayValue: this.textNone}].concat(Common.define.effectData.getEffectData()); - _.forEach(this._arrEffectName,function (elm){elm.tip = elm.displayValue;}); + _.forEach(this._arrEffectName,function (elm){ + elm.tip = elm.displayValue; + }); this._arrEffectOptions = []; var itemWidth = 88, itemHeight = 40; @@ -541,34 +542,56 @@ define([ setMenuParameters: function (effectId, effectGroup, option) // option = undefined - for add new effect or when selected 2 equal effects with different option (subtype) { - var arrEffectOptions; - var effect = _.findWhere(this.allEffects, {group: effectGroup, value: effectId}); - if(effect) + var arrEffectOptions,selectedElement; + var effect = _.findWhere(this.allEffects, {group: effectGroup, value: effectId}), + updateFamilyEffect = true; + if (effect) { arrEffectOptions = Common.define.effectData.getEffectOptionsData(effect.group, effect.value); - if(!arrEffectOptions) { + updateFamilyEffect = this._familyEffect !== effect.familyEffect || !this._familyEffect; // family of effects are different or both of them = undefined (null) + } + if((this._effectId != effectId && updateFamilyEffect) || (this._groupName != effectGroup)) { this.btnParameters.menu.removeAll(); - this._effectId = effectId - return undefined; } - var selectedElement; - if (this._effectId != effectId) { - this.btnParameters.menu.removeAll(); - arrEffectOptions.forEach(function (opt, index) { - opt.checkable = true; - opt.toggleGroup ='animateeffects'; - this.btnParameters.menu.addItem(opt); - (opt.value==option) && (selectedElement = this.btnParameters.menu.items[index]); - }, this); + if (arrEffectOptions){ + if (this.btnParameters.menu.items.length == 0) { + arrEffectOptions.forEach(function (opt, index) { + opt.checkable = true; + opt.toggleGroup = 'animateeffects'; + this.btnParameters.menu.addItem(opt); + (opt.value == option) && (selectedElement = this.btnParameters.menu.items[index]); + }, this); + (effect && effect.familyEffect) && this.btnParameters.menu.addItem({caption: '--'}); + } else { + this.btnParameters.menu.clearAll(); + this.btnParameters.menu.items.forEach(function (opt) { + if(opt.toggleGroup == 'animateeffects' && opt.value == option) + selectedElement = opt; + },this); + } + selectedElement && selectedElement.setChecked(true); } - else { - this.btnParameters.menu.clearAll(); - this.btnParameters.menu.items.forEach(function (opt) { - (opt.value == option) && (selectedElement = opt); - }); + if (effect && effect.familyEffect){ + if (this._familyEffect != effect.familyEffect) { + var effectsArray = Common.define.effectData.getSimilarEffectsArray(effectGroup, effect.familyEffect); + effectsArray.forEach(function (opt) { + opt.checkable = true; + opt.toggleGroup = 'animatesimilareffects' + this.btnParameters.menu.addItem(opt); + (opt.value == effectId) && this.btnParameters.menu.items[this.btnParameters.menu.items.length - 1].setChecked(true); + }, this); + } + else { + this.btnParameters.menu.items.forEach(function (opt) { + if(opt.toggleGroup == 'animatesimilareffects' && opt.value == effectId) + opt.setChecked(true); + }); + } } - selectedElement && selectedElement.setChecked(true); + this._effectId = effectId; - return selectedElement ? selectedElement.value : this.btnParameters.menu.items[0].value; + this._groupName = effectGroup; + this._familyEffect = effect ? effect.familyEffect : undefined; + return selectedElement ? selectedElement.value : undefined; }, diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index df3295d47..71ccf227d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -52,6 +52,7 @@ "Common.define.effectData.textArcDown": "Arc Down", "Common.define.effectData.textArcLeft": "Arc Left", "Common.define.effectData.textArcRight": "Arc Right", + "Common.define.effectData.textArcs": "Arcs", "Common.define.effectData.textArcUp": "Arc Up", "Common.define.effectData.textBasic": "Basic", "Common.define.effectData.textBasicSwivel": "Basic Swivel", @@ -147,8 +148,10 @@ "Common.define.effectData.textLeftUp": " Left Up", "Common.define.effectData.textLighten": "Lighten", "Common.define.effectData.textLineColor": "Line Color", + "Common.define.effectData.textLines": "Lines", "Common.define.effectData.textLinesCurves": "Lines Curves", "Common.define.effectData.textLoopDeLoop": "Loop de Loop", + "Common.define.effectData.textLoops": "Loops", "Common.define.effectData.textModerate": "Moderate", "Common.define.effectData.textNeutron": "Neutron", "Common.define.effectData.textObjectCenter": "Object Center", @@ -180,6 +183,7 @@ "Common.define.effectData.textSCurve1": "S Curve 1", "Common.define.effectData.textSCurve2": "S Curve 2", "Common.define.effectData.textShape": "Shape", + "Common.define.effectData.textShapes": "Shapes", "Common.define.effectData.textShimmer": "Shimmer", "Common.define.effectData.textShrinkTurn": "Shrink & Turn", "Common.define.effectData.textSineWave": "Sine Wave", @@ -221,6 +225,7 @@ "Common.define.effectData.textTrapezoid": "Trapezoid", "Common.define.effectData.textTurnDown": "Turn Down", "Common.define.effectData.textTurnDownRight": "Turn Down Right", + "Common.define.effectData.textTurns": "Turns", "Common.define.effectData.textTurnUp": "Turn Up", "Common.define.effectData.textTurnUpRight": "Turn Up Right", "Common.define.effectData.textUnderline": "Underline",