Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2010 from ONLYOFFICE/feature/smart-arts

Browse source 
Feature/smart arts
This commit is contained in:
JuliaSvinareva 2022-10-14 16:11:50 +03:00 committed by GitHub
parent c739605f27 b18d2731c5
commit adaf850a07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 1333 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

471
apps/common/main/lib/util/define.js
View file

@ -597,4 +597,475 @@ define(function(){ 'use strict';
textValue: 'Value is'
}
})(), Common.define.conditionalData || {});
Common.define.smartArt = _.extend( new(function() {
return {
textList: 'List',
textProcess: 'Process',
textCycle: 'Cycle',
textHierarchy: 'Hierarchy',
textRelationship: 'Relationship',
textMatrix: 'Matrix',
textPyramid: 'Pyramid',
textPicture: 'Picture',
textBasicBlockList: 'Basic Block List',
textAlternatingHexagons: 'Alternating Hexagons',
textPictureCaptionList: 'Picture Caption List',
textLinedList: 'Lined List',
textVerticalBulletList: 'Vertical Bullet List',
textVerticalBoxList: 'Vertical Box List',
textHorizontalBulletList: 'Horizontal Bullet List',
textSquareAccentList: 'Square Accent List',
textPictureAccentList: 'Picture Accent List',
textBendingPictureAccentList: 'Bending Picture Accent List',
textStackedList: 'Stacked List',
textIncreasingCircleProcess: 'Increasing Circle Process',
textPieProcess: 'Pie Process',
textDetailedProcess: 'Detailed Process',
textGroupedList: 'Grouped List',
textHorizontalPictureList: 'Horizontal Picture List',
textContinuousPictureList: 'Continuous Picture List',
textPictureStrips: 'Picture Strips',
textVerticalPictureList: 'Vertical Picture List',
textAlternatingPictureBlocks: 'Alternating Picture Blocks',
textVerticalPictureAccentList: 'Vertical Picture Accent List',
textTitledPictureAccentList: 'Titled Picture Accent List',
textVerticalBlockList: 'Vertical Block List',
textVerticalChevronList: 'Vertical Chevron List',
textVerticalAccentList: 'Vertical Accent List',
textVerticalArrowList: 'Vertical Arrow List',
textTrapezoidList: 'Trapezoid List',
textDescendingBlockList: 'Descending Block List',
textTableList: 'Table List',
textSegmentedProcess: 'Segmented Process',
textVerticalCurvedList: 'Vertical Curved List',
textPyramidList: 'Pyramid List',
textTargetList: 'Target List',
textHierarchyList: 'Hierarchy List',
textVerticalCircleList: 'Vertical Circle List',
textTableHierarchy: 'Table Hierarchy',
textBasicProcess: 'Basic Process',
textStepUpProcess: 'Step Up Process',
textStepDownProcess: 'Step Down Process',
textAccentProcess: 'Accent Process',
textPictureAccentProcess: 'Picture Accent Process',
textAlternatingFlow: 'Alternating Flow',
textContinuousBlockProcess: 'Continuous Block Process',
textIncreasingArrowProcess: 'Increasing Arrow Process',
textContinuousArrowProcess: 'Continuous Arrow Process',
textProcessArrows: 'Process Arrows',
textCircleAccentTimeline: 'Circle Accent Timeline',
textBasicTimeline: 'Basic Timeline',
textBasicChevronProcess: 'Basic Chevron Process',
textClosedChevronProcess: 'Closed Chevron Process',
textChevronList: 'Chevron List',
textSubStepProcess: 'Sub-Step Process',
textPhasedProcess: 'Phased Process',
textRandomToResultProcess: 'Random to Result Process',
textVerticalProcess: 'Vertical Process',
textStaggeredProcess: 'Staggered Process',
textProcessList: 'Process List',
textCircleArrowProcess: 'Circle Arrow Process',
textBasicBendingProcess: 'Basic Bending Process',
textRepeatingBendingProcess: 'Repeating Bending Process',
textVerticalBendingProcess: 'Vertical Bending Process',
textAscendingPictureAccentProcess: 'Ascending Picture Accent Process',
textUpwardArrow: 'Upward Arrow',
textDescendingProcess: 'Descending Process',
textCircularBendingProcess: 'Circular Bending Process',
textEquation: 'Equation',
textVerticalEquation: 'Vertical Equation',
textFunnel: 'Funnel',
textGear: 'Gear',
textArrowRibbon: 'Arrow Ribbon',
textOpposingArrows: 'Opposing Arrows',
textConvergingArrows: 'Converging Arrows',
textDivergingArrows: 'Diverging Arrows',
textBasicCycle: 'Basic Cycle',
textTextCycle: 'Text Cycle',
textBlockCycle: 'Block Cycle',
textNondirectionalCycle: 'Nondirectional Cycle',
textContinuousCycle: 'Continuous Cycle',
textMultidirectionalCycle: 'Multidirectional Cycle',
textSegmentedCycle: 'Segmented Cycle',
textBasicPie: 'Basic Pie',
textRadialCycle: 'Radial Cycle',
textBasicRadial: 'Basic Radial',
textDivergingRadial: 'Diverging Radial',
textRadialVenn: 'Radial Venn',
textCycleMatrix: 'Cycle Matrix',
textRadialCluster: 'Radial Cluster',
textOrganizationChart: 'Organization Chart',
textNameAndTitleOrganizationChart: 'Name and Title Organization Chart',
textHalfCircleOrganizationChart: 'Half Circle Organization Chart',
textCirclePictureHierarchy: 'Circle Picture Hierarchy',
textLabeledHierarchy: 'Labeled Hierarchy',
textHorizontalOrganizationChart: 'Horizontal Organization Chart',
textHorizontalMultiLevelHierarchy: 'Horizontal Multi-Level Hierarchy',
textHorizontalHierarchy: 'Horizontal Hierarchy',
textHorizontalLabeledHierarchy: 'Horizontal Labeled Hierarchy',
textBalance: 'Balance',
textCircleRelationship: 'Circle Relationship',
textHexagonCluster: 'Hexagon Cluster',
textOpposingIdeas: 'Opposing Ideas',
textPlusAndMinus: 'Plus and Minus',
textReverseList: 'Reverse List',
textCounterbalanceArrows: 'Counterbalance Arrows',
textSegmentedPyramid: 'Segmented Pyramid',
textNestedTarget: 'Nested Target',
textConvergingRadial: 'Converging Radial',
textRadialList: 'Radial List',
textBasicTarget: 'Basic Target',
textBasicVenn: 'Basic Venn',
textLinearVenn: 'Linear Venn',
textStackedVenn: 'Stacked Venn',
textBasicMatrix: 'Basic Matrix',
textTitledMatrix: 'Titled Matrix',
textGridMatrix: 'Grid Matrix',
textBasicPyramid: 'Basic Pyramid',
textInvertedPyramid: 'Inverted Pyramid',
textAccentedPicture: 'Accented Picture',
textCircularPictureCallout: 'Circular Picture Callout',
textSnapshotPictureList: 'Snapshot Picture List',
textSpiralPicture: 'Spiral Picture',
textCaptionedPictures: 'Captioned Pictures',
textBendingPictureCaption: 'Bending Picture Caption',
textBendingPictureSemiTranparentText: 'Bending Picture Semi-Tranparent Text',
textBendingPictureBlocks: 'Bending Picture Blocks',
textBendingPictureCaptionList: 'Bending Picture Caption List',
textTitledPictureBlocks: 'Titled Picture Blocks',
textPictureGrid: 'Picture Grid',
textPictureAccentBlocks: 'Picture Accent Blocks',
textAlternatingPictureCircles: 'Alternating Picture Circles',
textTitlePictureLineup: 'Title Picture Lineup',
textPictureLineup: 'Picture Lineup',
textFramedTextPicture: 'Framed Text Picture',
textBubblePictureList: 'Bubble Picture List',
textOther: 'Other',
textPictureOrganizationChart: 'Picture Organization Chart',
textChevronAccentProcess: 'Chevron Accent Process',
textRadialPictureList: 'Radial Picture List',
textVerticalBracketList: 'Vertical Bracket List',
textInterconnectedBlockProcess: 'Interconnected Block Process',
textTabbedArc: 'Tabbed Arc',
textThemePictureAccent: 'Theme Picture Accent',
textVaryingWidthList: 'Varying Width List',
textConvergingText: 'Converging Text',
textInterconnectedRings: 'Interconnected Rings',
textArchitectureLayout: 'Architecture Layout',
textThemePictureAlternatingAccent: 'Theme Picture Alternating Accent',
textThemePictureGrid: 'Theme Picture Grid',
textCircleProcess: 'Circle Process',
textHexagonRadial: 'Hexagon Radial',
textPictureFrame: 'PictureFrame',
textTabList: 'Tab List',
getSmartArtData: function() {
return [
// list
{
id: 'menu-smart-art-group-list',
sectionId: Asc.c_oAscSmartArtSectionNames.List,
caption: this.textList,
icon: 'smart-list',
items: [
{ type: Asc.c_oAscSmartArtTypes.BasicBlockList, tip: this.textBasicBlockList},
{ type: Asc.c_oAscSmartArtTypes.AlternatingHexagonList, tip: this.textAlternatingHexagons},
{ type: Asc.c_oAscSmartArtTypes.PictureCaptionList, tip: this.textPictureCaptionList},
{ type: Asc.c_oAscSmartArtTypes.LinedList, tip: this.textLinedList},
{ type: Asc.c_oAscSmartArtTypes.VerticalBulletList, tip: this.textVerticalBulletList},
{ type: Asc.c_oAscSmartArtTypes.VerticalBoxList, tip: this.textVerticalBoxList},
{ type: Asc.c_oAscSmartArtTypes.VerticalBracketList, tip: this.textVerticalBracketList},
{ type: Asc.c_oAscSmartArtTypes.VaryingWidthList, tip: this.textVaryingWidthList},
{ type: Asc.c_oAscSmartArtTypes.TabList, tip: this.textTabList},
{ type: Asc.c_oAscSmartArtTypes.HorizontalBulletList, tip: this.textHorizontalBulletList},
{ type: Asc.c_oAscSmartArtTypes.SquareAccentList, tip: this.textSquareAccentList},
{ type: Asc.c_oAscSmartArtTypes.PictureAccentList, tip: this.textPictureAccentList},
{ type: Asc.c_oAscSmartArtTypes.BendingPictureAccentList, tip: this.textBendingPictureAccentList},
{ type: Asc.c_oAscSmartArtTypes.StackedList, tip: this.textStackedList},
{ type: Asc.c_oAscSmartArtTypes.IncreasingCircleProcess, tip: this.textIncreasingCircleProcess},
{ type: Asc.c_oAscSmartArtTypes.PieProcess, tip: this.textPieProcess},
{ type: Asc.c_oAscSmartArtTypes.DetailedProcess, tip: this.textDetailedProcess},
{ type: Asc.c_oAscSmartArtTypes.GroupedList, tip: this.textGroupedList},
{ type: Asc.c_oAscSmartArtTypes.HorizontalPictureList, tip: this.textHorizontalPictureList},
{ type: Asc.c_oAscSmartArtTypes.ContinuousPictureList, tip: this.textContinuousPictureList},
{ type: Asc.c_oAscSmartArtTypes.PictureStrips, tip: this.textPictureStrips},
{ type: Asc.c_oAscSmartArtTypes.VerticalPictureList, tip: this.textVerticalPictureList},
{ type: Asc.c_oAscSmartArtTypes.AlternatingPictureBlocks, tip: this.textAlternatingPictureBlocks},
{ type: Asc.c_oAscSmartArtTypes.VerticalPictureAccentList, tip: this.textVerticalPictureAccentList},
{ type: Asc.c_oAscSmartArtTypes.TitledPictureAccentList, tip: this.textTitledPictureAccentList},
{ type: Asc.c_oAscSmartArtTypes.VerticalBlockList, tip: this.textVerticalBlockList},
{ type: Asc.c_oAscSmartArtTypes.VerticalChevronList, tip: this.textVerticalChevronList},
{ type: Asc.c_oAscSmartArtTypes.VerticalAccentList, tip: this.textVerticalAccentList},
{ type: Asc.c_oAscSmartArtTypes.VerticalArrowList, tip: this.textVerticalArrowList},
{ type: Asc.c_oAscSmartArtTypes.TrapezoidList, tip: this.textTrapezoidList},
{ type: Asc.c_oAscSmartArtTypes.DescendingBlockList, tip: this.textDescendingBlockList},
{ type: Asc.c_oAscSmartArtTypes.TableList, tip: this.textTableList},
{ type: Asc.c_oAscSmartArtTypes.SegmentedProcess, tip: this.textSegmentedProcess},
{ type: Asc.c_oAscSmartArtTypes.VerticalCurvedList, tip: this.textVerticalCurvedList},
{ type: Asc.c_oAscSmartArtTypes.PyramidList, tip: this.textPyramidList},
{ type: Asc.c_oAscSmartArtTypes.TargetList, tip: this.textTargetList},
{ type: Asc.c_oAscSmartArtTypes.HierarchyList, tip: this.textHierarchyList},
{ type: Asc.c_oAscSmartArtTypes.VerticalCircleList, tip: this.textVerticalCircleList},
{ type: Asc.c_oAscSmartArtTypes.TableHierarchy, tip: this.textTableHierarchy},
{ type: Asc.c_oAscSmartArtTypes.ArchitectureLayout, tip: this.textArchitectureLayout}
]
},
// process
{
id: 'menu-smart-art-group-process',
sectionId: Asc.c_oAscSmartArtSectionNames.Process,
caption: this.textProcess,
icon: 'smart-process',
items: [
{ type: Asc.c_oAscSmartArtTypes.BasicProcess, tip: this.textBasicProcess},
{ type: Asc.c_oAscSmartArtTypes.StepUpProcess, tip: this.textStepUpProcess},
{ type: Asc.c_oAscSmartArtTypes.StepDownProcess, tip: this.textStepDownProcess},
{ type: Asc.c_oAscSmartArtTypes.AccentProcess, tip: this.textAccentProcess},
{ type: Asc.c_oAscSmartArtTypes.PictureAccentProcess, tip: this.textPictureAccentProcess},
{ type: Asc.c_oAscSmartArtTypes.AlternatingFlow, tip: this.textAlternatingFlow},
{ type: Asc.c_oAscSmartArtTypes.IncreasingCircleProcess, tip: this.textIncreasingCircleProcess},
{ type: Asc.c_oAscSmartArtTypes.PieProcess, tip: this.textPieProcess},
{ type: Asc.c_oAscSmartArtTypes.ContinuousBlockProcess, tip: this.textContinuousBlockProcess},
{ type: Asc.c_oAscSmartArtTypes.IncreasingArrowsProcess, tip: this.textIncreasingArrowProcess},
{ type: Asc.c_oAscSmartArtTypes.InterconnectedBlockProcess, tip: this.textInterconnectedBlockProcess},
{ type: Asc.c_oAscSmartArtTypes.ContinuousArrowProcess, tip: this.textContinuousArrowProcess},
{ type: Asc.c_oAscSmartArtTypes.ConvergingText, tip: this.textConvergingText},
{ type: Asc.c_oAscSmartArtTypes.ProcessArrows, tip: this.textProcessArrows},
{ type: Asc.c_oAscSmartArtTypes.CircleAccentTimeline, tip: this.textCircleAccentTimeline},
{ type: Asc.c_oAscSmartArtTypes.BasicTimeline, tip: this.textBasicTimeline},
{ type: Asc.c_oAscSmartArtTypes.CircleProcess, tip: this.textCircleProcess},
{ type: Asc.c_oAscSmartArtTypes.BasicChevronProcess, tip: this.textBasicChevronProcess},
{ type: Asc.c_oAscSmartArtTypes.ChevronAccentProcess, tip: this.textChevronAccentProcess},
{ type: Asc.c_oAscSmartArtTypes.ClosedChevronProcess, tip: this.textClosedChevronProcess},
{ type: Asc.c_oAscSmartArtTypes.ChevronList, tip: this.textChevronList},
{ type: Asc.c_oAscSmartArtTypes.VerticalChevronList, tip: this.textVerticalChevronList},
{ type: Asc.c_oAscSmartArtTypes.SubStepProcess, tip: this.textSubStepProcess},
{ type: Asc.c_oAscSmartArtTypes.PhasedProcess, tip: this.textPhasedProcess},
{ type: Asc.c_oAscSmartArtTypes.RandomToResultProcess, tip: this.textRandomToResultProcess},
{ type: Asc.c_oAscSmartArtTypes.VerticalProcess, tip: this.textVerticalProcess},
{ type: Asc.c_oAscSmartArtTypes.StaggeredProcess, tip: this.textStaggeredProcess},
{ type: Asc.c_oAscSmartArtTypes.ProcessList, tip: this.textProcessList},
{ type: Asc.c_oAscSmartArtTypes.SegmentedProcess, tip: this.textSegmentedProcess},
{ type: Asc.c_oAscSmartArtTypes.CircleArrowProcess, tip: this.textCircleArrowProcess},
{ type: Asc.c_oAscSmartArtTypes.BasicBendingProcess, tip: this.textBasicBendingProcess},
{ type: Asc.c_oAscSmartArtTypes.RepeatingBendingProcess, tip: this.textRepeatingBendingProcess},
{ type: Asc.c_oAscSmartArtTypes.VerticalBendingProcess, tip: this.textVerticalBendingProcess},
{ type: Asc.c_oAscSmartArtTypes.ContinuousPictureList, tip: this.textContinuousPictureList},
{ type: Asc.c_oAscSmartArtTypes.DetailedProcess, tip: this.textDetailedProcess},
{ type: Asc.c_oAscSmartArtTypes.VerticalArrowList, tip: this.textVerticalArrowList},
{ type: Asc.c_oAscSmartArtTypes.AscendingPictureAccentProcess, tip: this.textAscendingPictureAccentProcess},
{ type: Asc.c_oAscSmartArtTypes.UpwardArrow, tip: this.textUpwardArrow},
{ type: Asc.c_oAscSmartArtTypes.DescendingProcess, tip: this.textDescendingProcess},
{ type: Asc.c_oAscSmartArtTypes.CircularBendingProcess, tip: this.textCircularBendingProcess},
{ type: Asc.c_oAscSmartArtTypes.Equation, tip: this.textEquation},
{ type: Asc.c_oAscSmartArtTypes.VerticalEquation, tip: this.textVerticalEquation},
{ type: Asc.c_oAscSmartArtTypes.Funnel, tip: this.textFunnel},
{ type: Asc.c_oAscSmartArtTypes.Gear, tip: this.textGear},
{ type: Asc.c_oAscSmartArtTypes.ArrowRibbon, tip: this.textArrowRibbon},
{ type: Asc.c_oAscSmartArtTypes.OpposingArrows, tip: this.textOpposingArrows},
{ type: Asc.c_oAscSmartArtTypes.ConvergingArrows, tip: this.textConvergingArrows},
{ type: Asc.c_oAscSmartArtTypes.DivergingArrows, tip: this.textDivergingArrows}
]
},
// cycle
{
id: 'menu-smart-art-group-cycle',
sectionId: Asc.c_oAscSmartArtSectionNames.Cycle,
caption: this.textCycle,
icon: 'smart-cycle',
items: [
{ type: Asc.c_oAscSmartArtTypes.BasicCycle, tip: this.textBasicCycle},
{ type: Asc.c_oAscSmartArtTypes.TextCycle, tip: this.textTextCycle},
{ type: Asc.c_oAscSmartArtTypes.BlockCycle, tip: this.textBlockCycle},
{ type: Asc.c_oAscSmartArtTypes.NonDirectionalCycle, tip: this.textNondirectionalCycle},
{ type: Asc.c_oAscSmartArtTypes.ContinuousCycle, tip: this.textContinuousCycle},
{ type: Asc.c_oAscSmartArtTypes.MultiDirectionalCycle, tip: this.textMultidirectionalCycle},
{ type: Asc.c_oAscSmartArtTypes.SegmentedCycle, tip: this.textSegmentedCycle},
{ type: Asc.c_oAscSmartArtTypes.BasicPie, tip: this.textBasicPie},
{ type: Asc.c_oAscSmartArtTypes.HexagonRadial, tip: this.textHexagonRadial},
{ type: Asc.c_oAscSmartArtTypes.RadialCycle, tip: this.textRadialCycle},
{ type: Asc.c_oAscSmartArtTypes.BasicRadial, tip: this.textBasicRadial},
{ type: Asc.c_oAscSmartArtTypes.DivergingRadial, tip: this.textDivergingRadial},
{ type: Asc.c_oAscSmartArtTypes.RadialVenn, tip: this.textRadialVenn},
{ type: Asc.c_oAscSmartArtTypes.CycleMatrix, tip: this.textCycleMatrix},
{ type: Asc.c_oAscSmartArtTypes.Gear, tip: this.textGear},
{ type: Asc.c_oAscSmartArtTypes.RadialCluster, tip: this.textRadialCluster},
{ type: Asc.c_oAscSmartArtTypes.CircleArrowProcess, tip: this.textCircleArrowProcess}
]
},
// hierarchy
{
id: 'menu-smart-art-group-hierarchy',
sectionId: Asc.c_oAscSmartArtSectionNames.Hierarchy,
caption: this.textHierarchy,
icon: 'smart-hierarchy',
items: [
{ type: Asc.c_oAscSmartArtTypes.OrganizationChart, tip: this.textOrganizationChart},
{ type: Asc.c_oAscSmartArtTypes.PictureOrganizationChart, tip: this.textPictureOrganizationChart},
{ type: Asc.c_oAscSmartArtTypes.NameAndTitleOrganizationChart, tip: this.textNameAndTitleOrganizationChart},
{ type: Asc.c_oAscSmartArtTypes.HalfCircleOrganizationChart, tip: this.textHalfCircleOrganizationChart},
{ type: Asc.c_oAscSmartArtTypes.CirclePictureHierarchy, tip: this.textCirclePictureHierarchy},
{ type: Asc.c_oAscSmartArtTypes.Hierarchy, tip: this.textHierarchy},
{ type: Asc.c_oAscSmartArtTypes.LabeledHierarchy, tip: this.textLabeledHierarchy},
{ type: Asc.c_oAscSmartArtTypes.TableHierarchy, tip: this.textTableHierarchy},
{ type: Asc.c_oAscSmartArtTypes.HorizontalOrganizationChart, tip: this.textHorizontalOrganizationChart},
{ type: Asc.c_oAscSmartArtTypes.ArchitectureLayout, tip: this.textArchitectureLayout},
{ type: Asc.c_oAscSmartArtTypes.HorizontalMultiLevelHierarchy, tip: this.textHorizontalMultiLevelHierarchy},
{ type: Asc.c_oAscSmartArtTypes.HorizontalHierarchy, tip: this.textHorizontalHierarchy},
{ type: Asc.c_oAscSmartArtTypes.HorizontalLabeledHierarchy, tip: this.textHorizontalLabeledHierarchy},
{ type: Asc.c_oAscSmartArtTypes.HierarchyList, tip: this.textHierarchyList},
{ type: Asc.c_oAscSmartArtTypes.LinedList, tip: this.textLinedList}
]
},
// relationship
{
id: 'menu-smart-art-group-relationship',
sectionId: Asc.c_oAscSmartArtSectionNames.Relationship,
caption: this.textRelationship,
icon: 'smart-relationship',
items: [
{ type: Asc.c_oAscSmartArtTypes.Balance, tip: this.textBalance},
{ type: Asc.c_oAscSmartArtTypes.CircleRelationship, tip: this.textCircleRelationship},
{ type: Asc.c_oAscSmartArtTypes.Funnel, tip: this.textFunnel},
{ type: Asc.c_oAscSmartArtTypes.Gear, tip: this.textGear},
{ type: Asc.c_oAscSmartArtTypes.HexagonCluster, tip: this.textHexagonCluster},
{ type: Asc.c_oAscSmartArtTypes.OpposingIdeas, tip: this.textOpposingIdeas},
{ type: Asc.c_oAscSmartArtTypes.PlusAndMinus, tip: this.textPlusAndMinus},
{ type: Asc.c_oAscSmartArtTypes.ReverseList, tip: this.textReverseList},
{ type: Asc.c_oAscSmartArtTypes.ArrowRibbon, tip: this.textArrowRibbon},
{ type: Asc.c_oAscSmartArtTypes.CounterbalanceArrows, tip: this.textCounterbalanceArrows},
{ type: Asc.c_oAscSmartArtTypes.ConvergingArrows, tip: this.textConvergingArrows},
{ type: Asc.c_oAscSmartArtTypes.DivergingArrows, tip: this.textDivergingArrows},
{ type: Asc.c_oAscSmartArtTypes.OpposingArrows, tip: this.textOpposingArrows},
{ type: Asc.c_oAscSmartArtTypes.SegmentedPyramid, tip: this.textSegmentedPyramid},
{ type: Asc.c_oAscSmartArtTypes.TableHierarchy, tip: this.textTableHierarchy},
{ type: Asc.c_oAscSmartArtTypes.ArchitectureLayout, tip: this.textArchitectureLayout},
{ type: Asc.c_oAscSmartArtTypes.TargetList, tip: this.textTargetList},
{ type: Asc.c_oAscSmartArtTypes.NestedTarget, tip: this.textNestedTarget},
{ type: Asc.c_oAscSmartArtTypes.GroupedList, tip: this.textGroupedList},
{ type: Asc.c_oAscSmartArtTypes.ContinuousPictureList, tip: this.textContinuousPictureList},
{ type: Asc.c_oAscSmartArtTypes.HierarchyList, tip: this.textHierarchyList},
{ type: Asc.c_oAscSmartArtTypes.PictureAccentList, tip: this.textPictureAccentList},
{ type: Asc.c_oAscSmartArtTypes.Equation, tip: this.textEquation},
{ type: Asc.c_oAscSmartArtTypes.VerticalEquation, tip: this.textVerticalEquation},
{ type: Asc.c_oAscSmartArtTypes.ConvergingRadial, tip: this.textConvergingRadial},
{ type: Asc.c_oAscSmartArtTypes.RadialCluster, tip: this.textRadialCluster},
{ type: Asc.c_oAscSmartArtTypes.RadialList, tip: this.textRadialList},
{ type: Asc.c_oAscSmartArtTypes.TabbedArc, tip: this.textTabbedArc},
{ type: Asc.c_oAscSmartArtTypes.RadialCycle, tip: this.textRadialCycle},
{ type: Asc.c_oAscSmartArtTypes.BasicRadial, tip: this.textBasicRadial},
{ type: Asc.c_oAscSmartArtTypes.DivergingRadial, tip: this.textDivergingRadial},
{ type: Asc.c_oAscSmartArtTypes.NonDirectionalCycle, tip: this.textNondirectionalCycle},
{ type: Asc.c_oAscSmartArtTypes.BasicTarget, tip: this.textBasicTarget},
{ type: Asc.c_oAscSmartArtTypes.CycleMatrix, tip: this.textCycleMatrix},
{ type: Asc.c_oAscSmartArtTypes.BasicPie, tip: this.textBasicPie},
{ type: Asc.c_oAscSmartArtTypes.BasicVenn, tip: this.textBasicVenn},
{ type: Asc.c_oAscSmartArtTypes.LinearVenn, tip: this.textLinearVenn},
{ type: Asc.c_oAscSmartArtTypes.StackedVenn, tip: this.textStackedVenn},
{ type: Asc.c_oAscSmartArtTypes.RadialVenn, tip: this.textRadialVenn},
{ type: Asc.c_oAscSmartArtTypes.InterconnectedRings, tip: this.textInterconnectedRings},
]
},
// matrix
{
id: 'menu-smart-art-group-matrix',
sectionId: Asc.c_oAscSmartArtSectionNames.Matrix,
caption: this.textMatrix,
icon: 'smart-matrix',
items: [
{ type: Asc.c_oAscSmartArtTypes.BasicMatrix, tip: this.textBasicMatrix},
{ type: Asc.c_oAscSmartArtTypes.TitledMatrix, tip: this.textTitledMatrix},
{ type: Asc.c_oAscSmartArtTypes.GridMatrix, tip: this.textGridMatrix},
{ type: Asc.c_oAscSmartArtTypes.CycleMatrix, tip: this.textCycleMatrix}
]
},
// pyramid
{
id: 'menu-smart-art-group-pyramid',
sectionId: Asc.c_oAscSmartArtSectionNames.Pyramid,
caption: this.textPyramid,
icon: 'smart-pyramid',
items: [
{ type: Asc.c_oAscSmartArtTypes.BasicPyramid, tip: this.textBasicPyramid},
{ type: Asc.c_oAscSmartArtTypes.InvertedPyramid, tip: this.textInvertedPyramid},
{ type: Asc.c_oAscSmartArtTypes.PyramidList, tip: this.textPyramidList},
{ type: Asc.c_oAscSmartArtTypes.SegmentedPyramid, tip: this.textSegmentedPyramid}
]
},
// picture
{
id: 'menu-smart-art-group-picture',
sectionId: Asc.c_oAscSmartArtSectionNames.Picture,
caption: this.textPicture,
icon: 'btn-menu-image',
items: [
{ type: Asc.c_oAscSmartArtTypes.AccentedPicture, tip: this.textAccentedPicture},
{ type: Asc.c_oAscSmartArtTypes.CircularPictureCallout, tip: this.textCircularPictureCallout},
{ type: Asc.c_oAscSmartArtTypes.PictureCaptionList, tip: this.textPictureCaptionList},
{ type: Asc.c_oAscSmartArtTypes.RadialPictureList, tip: this.textRadialPictureList},
{ type: Asc.c_oAscSmartArtTypes.SnapshotPictureList, tip: this.textSnapshotPictureList},
{ type: Asc.c_oAscSmartArtTypes.SpiralPicture, tip: this.textSpiralPicture},
{ type: Asc.c_oAscSmartArtTypes.CaptionedPictures, tip: this.textCaptionedPictures},
{ type: Asc.c_oAscSmartArtTypes.BendingPictureCaption, tip: this.textBendingPictureCaption},
{ type: Asc.c_oAscSmartArtTypes.PictureFrame, tip: this.textPictureFrame},
{ type: Asc.c_oAscSmartArtTypes.BendingPictureSemiTransparentText, tip: this.textBendingPictureSemiTranparentText},
{ type: Asc.c_oAscSmartArtTypes.BendingPictureBlocks, tip: this.textBendingPictureBlocks},
{ type: Asc.c_oAscSmartArtTypes.BendingPictureCaptionList, tip: this.textBendingPictureCaptionList},
{ type: Asc.c_oAscSmartArtTypes.TitledPictureBlocks, tip: this.textTitledPictureBlocks},
{ type: Asc.c_oAscSmartArtTypes.PictureGrid, tip: this.textPictureGrid},
{ type: Asc.c_oAscSmartArtTypes.PictureAccentBlocks, tip: this.textPictureAccentBlocks},
{ type: Asc.c_oAscSmartArtTypes.PictureStrips, tip: this.textPictureStrips},
{ type: Asc.c_oAscSmartArtTypes.ThemePictureAccent, tip: this.textThemePictureAccent},
{ type: Asc.c_oAscSmartArtTypes.ThemePictureGrid, tip: this.textThemePictureGrid},
{ type: Asc.c_oAscSmartArtTypes.ThemePictureAlternatingAccent, tip: this.textThemePictureAlternatingAccent},
{ type: Asc.c_oAscSmartArtTypes.TitledPictureAccentList, tip: this.textTitledPictureAccentList},
{ type: Asc.c_oAscSmartArtTypes.AlternatingPictureBlocks, tip: this.textAlternatingPictureBlocks},
{ type: Asc.c_oAscSmartArtTypes.AscendingPictureAccentProcess, tip: this.textAscendingPictureAccentProcess},
{ type: Asc.c_oAscSmartArtTypes.AlternatingPictureCircles, tip: this.textAlternatingPictureCircles},
{ type: Asc.c_oAscSmartArtTypes.TitlePictureLineup, tip: this.textTitlePictureLineup},
{ type: Asc.c_oAscSmartArtTypes.PictureLineup, tip: this.textPictureLineup},
{ type: Asc.c_oAscSmartArtTypes.FramedTextPicture, tip: this.textFramedTextPicture},
{ type: Asc.c_oAscSmartArtTypes.HexagonCluster, tip: this.textHexagonCluster},
{ type: Asc.c_oAscSmartArtTypes.BubblePictureList, tip: this.textBubblePictureList},
{ type: Asc.c_oAscSmartArtTypes.CirclePictureHierarchy, tip: this.textCirclePictureHierarchy},
{ type: Asc.c_oAscSmartArtTypes.HorizontalPictureList, tip: this.textHorizontalPictureList},
{ type: Asc.c_oAscSmartArtTypes.ContinuousPictureList, tip: this.textContinuousPictureList},
{ type: Asc.c_oAscSmartArtTypes.VerticalPictureList, tip: this.textVerticalPictureList},
{ type: Asc.c_oAscSmartArtTypes.VerticalPictureAccentList, tip: this.textVerticalPictureAccentList},
{ type: Asc.c_oAscSmartArtTypes.BendingPictureAccentList, tip: this.textBendingPictureAccentList},
{ type: Asc.c_oAscSmartArtTypes.PictureAccentList, tip: this.textPictureAccentList},
{ type: Asc.c_oAscSmartArtTypes.PictureAccentProcess, tip: this.textPictureAccentProcess}
]
},
// Other
{
id: 'menu-smart-art-group-other',
sectionId: Asc.c_oAscSmartArtSectionNames.OfficeCom,
caption: this.textOther,
items: [
{ type: Asc.c_oAscSmartArtTypes.PictureOrganizationChart, tip: this.textPictureOrganizationChart},
{ type: Asc.c_oAscSmartArtTypes.ChevronAccentProcess, tip: this.textChevronAccentProcess},
{ type: Asc.c_oAscSmartArtTypes.RadialPictureList, tip: this.textRadialPictureList},
{ type: Asc.c_oAscSmartArtTypes.VerticalBracketList, tip: this.textVerticalBracketList},
{ type: Asc.c_oAscSmartArtTypes.InterconnectedBlockProcess, tip: this.textInterconnectedBlockProcess},
{ type: Asc.c_oAscSmartArtTypes.TabbedArc, tip: this.textTabbedArc},
{ type: Asc.c_oAscSmartArtTypes.ThemePictureAccent, tip: this.textThemePictureAccent},
{ type: Asc.c_oAscSmartArtTypes.VaryingWidthList, tip: this.textVaryingWidthList},
{ type: Asc.c_oAscSmartArtTypes.ConvergingText, tip: this.textConvergingText},
{ type: Asc.c_oAscSmartArtTypes.InterconnectedRings, tip: this.textInterconnectedRings},
{ type: Asc.c_oAscSmartArtTypes.ArchitectureLayout, tip: this.textArchitectureLayout},
{ type: Asc.c_oAscSmartArtTypes.ThemePictureAlternatingAccent, tip: this.textThemePictureAlternatingAccent},
{ type: Asc.c_oAscSmartArtTypes.ThemePictureGrid, tip: this.textThemePictureGrid},
{ type: Asc.c_oAscSmartArtTypes.CircleProcess, tip: this.textCircleProcess},
{ type: Asc.c_oAscSmartArtTypes.HexagonRadial, tip: this.textHexagonRadial},
{ type: Asc.c_oAscSmartArtTypes.PictureFrame, tip: this.textPictureFrame},
{ type: Asc.c_oAscSmartArtTypes.TabList, tip: this.textTabList}
]
}
];
},
}
})(), Common.define.smartArt || {});
});

BIN
apps/common/main/resources/img/toolbar/1.25x/big/smart-art.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 431 B

BIN
apps/common/main/resources/img/toolbar/1.25x/smart-cycle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 351 B

BIN
apps/common/main/resources/img/toolbar/1.25x/smart-hierarchy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 158 B

BIN
apps/common/main/resources/img/toolbar/1.25x/smart-list.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 135 B

BIN
apps/common/main/resources/img/toolbar/1.25x/smart-matrix.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 153 B

BIN
apps/common/main/resources/img/toolbar/1.25x/smart-process.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 206 B

BIN
apps/common/main/resources/img/toolbar/1.25x/smart-pyramid.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 142 B

BIN
apps/common/main/resources/img/toolbar/1.25x/smart-relationship.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 478 B

BIN
apps/common/main/resources/img/toolbar/1.5x/big/smart-art.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 462 B

BIN
apps/common/main/resources/img/toolbar/1.5x/smart-cycle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 400 B

BIN
apps/common/main/resources/img/toolbar/1.5x/smart-hierarchy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 168 B

BIN
apps/common/main/resources/img/toolbar/1.5x/smart-list.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 136 B

BIN
apps/common/main/resources/img/toolbar/1.5x/smart-matrix.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 166 B

BIN
apps/common/main/resources/img/toolbar/1.5x/smart-process.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 365 B

BIN
apps/common/main/resources/img/toolbar/1.5x/smart-pyramid.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 150 B

BIN
apps/common/main/resources/img/toolbar/1.5x/smart-relationship.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 562 B

BIN
apps/common/main/resources/img/toolbar/1.75x/big/smart-art.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 548 B

BIN
apps/common/main/resources/img/toolbar/1.75x/smart-cycle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 441 B

BIN
apps/common/main/resources/img/toolbar/1.75x/smart-hierarchy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 182 B

BIN
apps/common/main/resources/img/toolbar/1.75x/smart-list.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 139 B

BIN
apps/common/main/resources/img/toolbar/1.75x/smart-matrix.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 167 B

BIN
apps/common/main/resources/img/toolbar/1.75x/smart-process.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 363 B

BIN
apps/common/main/resources/img/toolbar/1.75x/smart-pyramid.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 161 B

BIN
apps/common/main/resources/img/toolbar/1.75x/smart-relationship.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 712 B

BIN
apps/common/main/resources/img/toolbar/1x/big/smart-art.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 371 B

BIN
apps/common/main/resources/img/toolbar/1x/smart-cycle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 324 B

BIN
apps/common/main/resources/img/toolbar/1x/smart-hierarchy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 152 B

BIN
apps/common/main/resources/img/toolbar/1x/smart-list.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 129 B

BIN
apps/common/main/resources/img/toolbar/1x/smart-matrix.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 141 B

BIN
apps/common/main/resources/img/toolbar/1x/smart-process.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 252 B

BIN
apps/common/main/resources/img/toolbar/1x/smart-pyramid.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 139 B

BIN
apps/common/main/resources/img/toolbar/1x/smart-relationship.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 416 B

BIN
apps/common/main/resources/img/toolbar/2x/big/smart-art.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 765 B

BIN
apps/common/main/resources/img/toolbar/2x/smart-cycle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 606 B

BIN
apps/common/main/resources/img/toolbar/2x/smart-hierarchy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 181 B

BIN
apps/common/main/resources/img/toolbar/2x/smart-list.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 143 B

BIN
apps/common/main/resources/img/toolbar/2x/smart-matrix.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 164 B

BIN
apps/common/main/resources/img/toolbar/2x/smart-process.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 420 B

BIN
apps/common/main/resources/img/toolbar/2x/smart-pyramid.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 169 B

BIN
apps/common/main/resources/img/toolbar/2x/smart-relationship.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 845 B

60
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -118,7 +118,9 @@ define([
'change:compact' : this.onClickChangeCompact,
'home:open' : this.onHomeOpen,
'add:chart' : this.onSelectChart,
'insert:textart' : this.onInsertTextart
'insert:textart' : this.onInsertTextart,
'generate:smartart' : this.generateSmartArt,
'insert:smartart' : this.onInsertSmartArt
},
'FileMenu': {
'menu:hide': this.onFileMenu.bind(this, 'hide'),
@ -428,6 +430,9 @@ define([
Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this));
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
Common.NotificationCenter.on('dropcap:settings', _.bind(this.onDropCapAdvancedClick, this));
this.api.asc_registerCallback('asc_onBeginSmartArtPreview', _.bind(this.onApiBeginSmartArtPreview, this));
this.api.asc_registerCallback('asc_onAddSmartArtPreview', _.bind(this.onApiAddSmartArtPreview, this));
this.api.asc_registerCallback('asc_onEndSmartArtPreview', _.bind(this.onApiEndSmartArtPreview, this));
} else if (this.mode.isRestrictedEdit) {
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
@ -837,7 +842,7 @@ define([
this.toolbar.lockToolbar(Common.enumLock.inSmartart, in_smart_art, {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle])});
this.toolbar.lockToolbar(Common.enumLock.inSmartartInternal, in_smart_art_internal, {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle, toolbar.btnDecLeftOffset, toolbar.btnIncLeftOffset])});
this.toolbar.lockToolbar(Common.enumLock.inEquation, in_equation, {array: toolbar.btnsPageBreak.concat([toolbar.btnDropCap, toolbar.btnInsertTable, toolbar.btnBlankPage, toolbar.btnInsertShape,
toolbar.btnInsertText, toolbar.btnInsertTextArt, toolbar.btnInsertImage, toolbar.btnSuperscript, toolbar.btnSubscript, toolbar.btnEditHeader])});
toolbar.btnInsertText, toolbar.btnInsertTextArt, toolbar.btnInsertImage, toolbar.btnInsertSmartArt, toolbar.btnSuperscript, toolbar.btnSubscript, toolbar.btnEditHeader])});
in_control = this.api.asc_IsContentControl();
var control_props = in_control ? this.api.asc_GetContentControlProperties() : null,
@ -856,7 +861,7 @@ define([
}
this.toolbar.lockToolbar(Common.enumLock.controlPlain, control_plain, {array: [toolbar.btnInsertTable, toolbar.btnInsertImage, toolbar.btnInsertChart, toolbar.btnInsertText, toolbar.btnInsertTextArt,
toolbar.btnInsertShape, toolbar.btnInsertEquation, toolbar.btnDropCap, toolbar.btnColumns, toolbar.mnuInsertPageNum ]});
toolbar.btnInsertShape, toolbar.btnInsertSmartArt, toolbar.btnInsertEquation, toolbar.btnDropCap, toolbar.btnColumns, toolbar.mnuInsertPageNum ]});
if (enable_dropcap && frame_pr) {
var value = frame_pr.get_FramePr(),
drop_value = Asc.c_oAscDropCap.None;
@ -881,8 +886,8 @@ define([
this.toolbar.lockToolbar(Common.enumLock.inHeader, in_header, {array: toolbar.btnsPageBreak.concat([toolbar.btnBlankPage])});
this.toolbar.lockToolbar(Common.enumLock.inControl, in_control, {array: toolbar.btnsPageBreak.concat([toolbar.btnBlankPage])});
this.toolbar.lockToolbar(Common.enumLock.cantPageBreak, in_image && !btn_eq_state, {array: toolbar.btnsPageBreak.concat([toolbar.btnBlankPage])});
this.toolbar.lockToolbar(Common.enumLock.contentLock, content_locked, {array: [toolbar.btnInsertShape, toolbar.btnInsertText, toolbar.btnInsertImage, toolbar.btnInsertTextArt, toolbar.btnInsertChart ]});
this.toolbar.lockToolbar(Common.enumLock.inFootnote, in_footnote, {array: toolbar.btnsPageBreak.concat([toolbar.btnBlankPage, toolbar.btnInsertShape, toolbar.btnInsertText, toolbar.btnInsertTextArt ])});
this.toolbar.lockToolbar(Common.enumLock.contentLock, content_locked, {array: [toolbar.btnInsertShape, toolbar.btnInsertText, toolbar.btnInsertImage, toolbar.btnInsertTextArt, toolbar.btnInsertChart, toolbar.btnInsertSmartArt ]});
this.toolbar.lockToolbar(Common.enumLock.inFootnote, in_footnote, {array: toolbar.btnsPageBreak.concat([toolbar.btnBlankPage, toolbar.btnInsertShape, toolbar.btnInsertText, toolbar.btnInsertTextArt, toolbar.btnInsertSmartArt ])});
this.toolbar.lockToolbar(Common.enumLock.cantAddImagePara, in_para && !can_add_image, {array: [toolbar.btnInsertImage, toolbar.btnInsertTextArt]});
if (in_chart !== this._state.in_chart) {
@ -3363,6 +3368,51 @@ define([
})).show();
},
generateSmartArt: function (groupName) {
this.api.asc_generateSmartArtPreviews(groupName);
},
onApiBeginSmartArtPreview: function () {
this.smartArtGroups = this.toolbar.btnInsertSmartArt.menu.items;
this.smartArtData = Common.define.smartArt.getSmartArtData();
},
onApiAddSmartArtPreview: function (previews) {
previews.forEach(_.bind(function (preview) {
var image = preview.asc_getImage(),
sectionId = preview.asc_getSectionId(),
section = _.findWhere(this.smartArtData, {sectionId: sectionId}),
item = _.findWhere(section.items, {type: image.asc_getName()}),
menu = _.findWhere(this.smartArtGroups, {value: sectionId}),
menuPicker = menu.menuPicker;
if (item) {
var arr = [{
tip: item.tip,
value: item.type,
imageUrl: image.asc_getImage()
}];
if (menuPicker.store.length < 1) {
menuPicker.store.reset(arr);
} else {
menuPicker.store.add(arr);
}
}
this.currentSmartArtMenu = menu;
}, this));
},
onApiEndSmartArtPreview: function () {
if (this.currentSmartArtMenu) {
this.currentSmartArtMenu.menu.alignPosition();
}
},
onInsertSmartArt: function (value) {
if (this.api) {
this.api.asc_createSmartArt(value);
}
},
onChangeProtectDocument: function(props) {
if (!props) {
var docprotect = this.getApplication().getController('DocProtection');

1
apps/documenteditor/main/app/template/Toolbar.template
View file

@ -103,6 +103,7 @@
<span class="btn-slot text x-huge" id="slot-btn-insimage"></span>
<span class="btn-slot text x-huge" id="slot-btn-inschart"></span>
<span class="btn-slot text x-huge" id="slot-btn-insshape"></span>
<span class="btn-slot text x-huge" id="slot-btn-inssmartart"></span>
</div>
<div class="separator long"></div>
<div class="group">

72
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -783,6 +783,20 @@ define([
});
this.paragraphControls.push(this.btnInsertShape);
this.btnInsertSmartArt = new Common.UI.Button({
id: 'tlbtn-insertsmartart',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon smart-art',
lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.viewFormMode,
_set.lostConnect, _set.disableOnStart],
caption: me.capBtnInsSmartArt,
menu: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
});
this.paragraphControls.push(this.btnInsertSmartArt);
this.btnInsertEquation = new Common.UI.Button({
id: 'tlbtn-insertequation',
cls: 'btn-toolbar x-huge icon-top',
@ -1720,6 +1734,7 @@ define([
_injectComponent('#slot-btn-datetime', this.btnInsDateTime);
_injectComponent('#slot-btn-blankpage', this.btnBlankPage);
_injectComponent('#slot-btn-insshape', this.btnInsertShape);
_injectComponent('#slot-btn-inssmartart', this.btnInsertSmartArt);
_injectComponent('#slot-btn-insequation', this.btnInsertEquation);
_injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
_injectComponent('#slot-btn-pageorient', this.btnPageOrient);
@ -2019,6 +2034,7 @@ define([
this.btnInsDateTime.updateHint(this.tipDateTime);
this.btnBlankPage.updateHint(this.tipBlankPage);
this.btnInsertShape.updateHint(this.tipInsertShape);
this.btnInsertSmartArt.updateHint(this.tipInsertSmartArt);
this.btnInsertEquation.updateHint(this.tipInsertEquation);
this.btnInsertSymbol.updateHint(this.tipInsertSymbol);
this.btnDropCap.updateHint(this.tipDropCap);
@ -2203,6 +2219,60 @@ define([
};
this.btnInsertChart.menu.on('show:before', onShowBefore);
this.btnInsertSmartArt.setMenu(new Common.UI.Menu({
cls: 'shifted-right',
items: []
}));
var smartArtData = Common.define.smartArt.getSmartArtData();
smartArtData.forEach(function (item, index) {
var length = item.items.length,
width = 399;
if (length < 5) {
width = length * (70 + 8) + 9; // 4px margin + 4px margin
}
me.btnInsertSmartArt.menu.addItem({
caption: item.caption,
value: item.sectionId,
itemId: item.id,
iconCls: item.icon ? 'menu__icon ' + item.icon : undefined,
menu: new Common.UI.Menu({
items: [
{template: _.template('<div id="' + item.id + '" class="menu-add-smart-art" style="width: ' + width + 'px; height: 500px; margin-left: 5px;"></div>')}
],
menuAlign: 'tl-tr',
})});
});
var onShowBeforeSmartArt = function (menu) { // + <% if(typeof imageUrl === "undefined" || imageUrl===null || imageUrl==="") { %> style="visibility: hidden;" <% } %>/>',
me.btnInsertSmartArt.menu.items.forEach(function (item, index) {
item.$el.one('mouseenter', function () {
me.fireEvent('generate:smartart', [item.value]);
item.$el.mouseenter();
});
item.menuPicker = new Common.UI.DataView({
el: $('#' + item.options.itemId),
parentMenu: me.btnInsertSmartArt.menu.items[index].menu,
itemTemplate: _.template([
'<div>',
'<img src="<%= imageUrl %>" width="' + 70 + '" height="' + 70 + '" />',
'</div>'
].join('')),
store: new Common.UI.DataViewStore(),
delayRenderTips: true,
scrollAlwaysVisible: true,
showLast: false
});
item.menuPicker.on('item:click', function(picker, item, record, e) {
if (record) {
me.fireEvent('insert:smartart', [record.get('value')]);
}
Common.NotificationCenter.trigger('edit:complete', me);
});
});
menu.off('show:before', onShowBeforeSmartArt);
};
this.btnInsertSmartArt.menu.on('show:before', onShowBeforeSmartArt);
var onShowBeforeTextArt = function (menu) {
var collection = DE.getCollection('Common.Collections.TextArt');
if (collection.length<1)
@ -2719,6 +2789,7 @@ define([
tipBack: 'Back',
tipInsertShape: 'Insert Autoshape',
tipInsertEquation: 'Insert Equation',
tipInsertSmartArt: 'Insert SmartArt',
mniImageFromFile: 'Image from File',
mniImageFromUrl: 'Image from URL',
mniCustomTable: 'Insert Custom Table',
@ -2822,6 +2893,7 @@ define([
capBtnPageOrient: 'Orientation',
capBtnMargins: 'Margins',
capBtnPageSize: 'Size',
capBtnInsSmartArt: 'SmartArt',
tipImgAlign: 'Align objects',
tipImgGroup: 'Group objects',
tipImgWrapping: 'Wrap text',

161
apps/documenteditor/main/locale/en.json
View file

@ -125,6 +125,165 @@
"Common.define.chartData.textScatterSmoothMarker": "Scatter with smooth lines and markers",
"Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface",
"Common.define.smartArt.textList": "List",
"Common.define.smartArt.textProcess": "Process",
"Common.define.smartArt.textCycle": "Cycle",
"Common.define.smartArt.textHierarchy": "Hierarchy",
"Common.define.smartArt.textRelationship": "Relationship",
"Common.define.smartArt.textMatrix": "Matrix",
"Common.define.smartArt.textPyramid": "Pyramid",
"Common.define.smartArt.textPicture": "Picture",
"Common.define.smartArt.textBasicBlockList": "Basic Block List",
"Common.define.smartArt.textAlternatingHexagons": "Alternating Hexagons",
"Common.define.smartArt.textPictureCaptionList": "Picture Caption List",
"Common.define.smartArt.textLinedList": "Lined List",
"Common.define.smartArt.textVerticalBulletList": "Vertical Bullet List",
"Common.define.smartArt.textVerticalBoxList": "Vertical Box List",
"Common.define.smartArt.textHorizontalBulletList": "Horizontal Bullet List",
"Common.define.smartArt.textSquareAccentList": "Square Accent List",
"Common.define.smartArt.textPictureAccentList": "Picture Accent List",
"Common.define.smartArt.textBendingPictureAccentList": "Bending Picture Accent List",
"Common.define.smartArt.textStackedList": "Stacked List",
"Common.define.smartArt.textIncreasingCircleProcess": "Increasing Circle Process",
"Common.define.smartArt.textPieProcess": "Pie Process",
"Common.define.smartArt.textDetailedProcess": "Detailed Process",
"Common.define.smartArt.textGroupedList": "Grouped List",
"Common.define.smartArt.textHorizontalPictureList": "Horizontal Picture List",
"Common.define.smartArt.textContinuousPictureList": "Continuous Picture List",
"Common.define.smartArt.textPictureStrips": "Picture Strips",
"Common.define.smartArt.textVerticalPictureList": "Vertical Picture List",
"Common.define.smartArt.textAlternatingPictureBlocks": "Alternating Picture Blocks",
"Common.define.smartArt.textVerticalPictureAccentList": "Vertical Picture Accent List",
"Common.define.smartArt.textTitledPictureAccentList": "Titled Picture Accent List",
"Common.define.smartArt.textVerticalBlockList": "Vertical Block List",
"Common.define.smartArt.textVerticalChevronList": "Vertical Chevron List",
"Common.define.smartArt.textVerticalAccentList": "Vertical Accent List",
"Common.define.smartArt.textVerticalArrowList": "Vertical Arrow List",
"Common.define.smartArt.textTrapezoidList": "Trapezoid List",
"Common.define.smartArt.textDescendingBlockList": "Descending Block List",
"Common.define.smartArt.textTableList": "Table List",
"Common.define.smartArt.textSegmentedProcess": "Segmented Process",
"Common.define.smartArt.textVerticalCurvedList": "Vertical Curved List",
"Common.define.smartArt.textPyramidList": "Pyramid List",
"Common.define.smartArt.textTargetList": "Target List",
"Common.define.smartArt.textHierarchyList": "Hierarchy List",
"Common.define.smartArt.textVerticalCircleList": "Vertical Circle List",
"Common.define.smartArt.textTableHierarchy": "Table Hierarchy",
"Common.define.smartArt.textBasicProcess": "Basic Process",
"Common.define.smartArt.textStepUpProcess": "Step Up Process",
"Common.define.smartArt.textStepDownProcess": "Step Down Process",
"Common.define.smartArt.textAccentProcess": "Accent Process",
"Common.define.smartArt.textPictureAccentProcess": "Picture Accent Process",
"Common.define.smartArt.textAlternatingFlow": "Alternating Flow",
"Common.define.smartArt.textContinuousBlockProcess": "Continuous Block Process",
"Common.define.smartArt.textIncreasingArrowProcess": "Increasing Arrow Process",
"Common.define.smartArt.textContinuousArrowProcess": "Continuous Arrow Process",
"Common.define.smartArt.textProcessArrows": "Process Arrows",
"Common.define.smartArt.textCircleAccentTimeline": "Circle Accent Timeline",
"Common.define.smartArt.textBasicTimeline": "Basic Timeline",
"Common.define.smartArt.textBasicChevronProcess": "Basic Chevron Process",
"Common.define.smartArt.textClosedChevronProcess": "Closed Chevron Process",
"Common.define.smartArt.textChevronList": "Chevron List",
"Common.define.smartArt.textSubStepProcess": "Sub-Step Process",
"Common.define.smartArt.textPhasedProcess": "Phased Process",
"Common.define.smartArt.textRandomToResultProcess": "Random to Result Process",
"Common.define.smartArt.textVerticalProcess": "Vertical Process",
"Common.define.smartArt.textStaggeredProcess": "Staggered Process",
"Common.define.smartArt.textProcessList": "Process List",
"Common.define.smartArt.textCircleArrowProcess": "Circle Arrow Process",
"Common.define.smartArt.textBasicBendingProcess": "Basic Bending Process",
"Common.define.smartArt.textRepeatingBendingProcess": "Repeating Bending Process",
"Common.define.smartArt.textVerticalBendingProcess": "Vertical Bending Process",
"Common.define.smartArt.textAscendingPictureAccentProcess": "Ascending Picture Accent Process",
"Common.define.smartArt.textUpwardArrow": "Upward Arrow",
"Common.define.smartArt.textDescendingProcess": "Descending Process",
"Common.define.smartArt.textCircularBendingProcess": "Circular Bending Process",
"Common.define.smartArt.textEquation": "Equation",
"Common.define.smartArt.textVerticalEquation": "Vertical Equation",
"Common.define.smartArt.textFunnel": "Funnel",
"Common.define.smartArt.textGear": "Gear",
"Common.define.smartArt.textArrowRibbon": "Arrow Ribbon",
"Common.define.smartArt.textOpposingArrows": "Opposing Arrows",
"Common.define.smartArt.textConvergingArrows": "Converging Arrows",
"Common.define.smartArt.textDivergingArrows": "Diverging Arrows",
"Common.define.smartArt.textBasicCycle": "Basic Cycle",
"Common.define.smartArt.textTextCycle": "Text Cycle",
"Common.define.smartArt.textBlockCycle": "Block Cycle",
"Common.define.smartArt.textNondirectionalCycle": "Nondirectional Cycle",
"Common.define.smartArt.textContinuousCycle": "Continuous Cycle",
"Common.define.smartArt.textMultidirectionalCycle": "Multidirectional Cycle",
"Common.define.smartArt.textSegmentedCycle": "Segmented Cycle",
"Common.define.smartArt.textBasicPie": "Basic Pie",
"Common.define.smartArt.textRadialCycle": "Radial Cycle",
"Common.define.smartArt.textBasicRadial": "Basic Radial",
"Common.define.smartArt.textDivergingRadial": "Diverging Radial",
"Common.define.smartArt.textRadialVenn": "Radial Venn",
"Common.define.smartArt.textCycleMatrix": "Cycle Matrix",
"Common.define.smartArt.textRadialCluster": "Radial Cluster",
"Common.define.smartArt.textOrganizationChart": "Organization Chart",
"Common.define.smartArt.textNameAndTitleOrganizationChart": "Name and Title Organization Chart",
"Common.define.smartArt.textHalfCircleOrganizationChart": "Half Circle Organization Chart",
"Common.define.smartArt.textCirclePictureHierarchy": "Circle Picture Hierarchy",
"Common.define.smartArt.textLabeledHierarchy": "Labeled Hierarchy",
"Common.define.smartArt.textHorizontalOrganizationChart": "Horizontal Organization Chart",
"Common.define.smartArt.textHorizontalMultiLevelHierarchy": "Horizontal Multi-Level Hierarchy",
"Common.define.smartArt.textHorizontalHierarchy": "Horizontal Hierarchy",
"Common.define.smartArt.textHorizontalLabeledHierarchy": "Horizontal Labeled Hierarchy",
"Common.define.smartArt.textBalance": "Balance",
"Common.define.smartArt.textCircleRelationship": "Circle Relationship",
"Common.define.smartArt.textHexagonCluster": "Hexagon Cluster",
"Common.define.smartArt.textOpposingIdeas": "Opposing Ideas",
"Common.define.smartArt.textPlusAndMinus": "Plus and Minus",
"Common.define.smartArt.textReverseList": "Reverse List",
"Common.define.smartArt.textCounterbalanceArrows": "Counterbalance Arrows",
"Common.define.smartArt.textSegmentedPyramid": "Segmented Pyramid",
"Common.define.smartArt.textNestedTarget": "Nested Target",
"Common.define.smartArt.textConvergingRadial": "Converging Radial",
"Common.define.smartArt.textRadialList": "Radial List",
"Common.define.smartArt.textBasicTarget": "Basic Target",
"Common.define.smartArt.textBasicVenn": "Basic Venn",
"Common.define.smartArt.textLinearVenn": "Linear Venn",
"Common.define.smartArt.textStackedVenn": "Stacked Venn",
"Common.define.smartArt.textBasicMatrix": "Basic Matrix",
"Common.define.smartArt.textTitledMatrix": "Titled Matrix",
"Common.define.smartArt.textGridMatrix": "Grid Matrix",
"Common.define.smartArt.textBasicPyramid": "Basic Pyramid",
"Common.define.smartArt.textInvertedPyramid": "Inverted Pyramid",
"Common.define.smartArt.textAccentedPicture": "Accented Picture",
"Common.define.smartArt.textCircularPictureCallout": "Circular Picture Callout",
"Common.define.smartArt.textSnapshotPictureList": "Snapshot Picture List",
"Common.define.smartArt.textSpiralPicture": "Spiral Picture",
"Common.define.smartArt.textCaptionedPictures": "Captioned Pictures",
"Common.define.smartArt.textBendingPictureCaption": "Bending Picture Caption",
"Common.define.smartArt.textBendingPictureSemiTranparentText": "Bending Picture Semi-Tranparent Text",
"Common.define.smartArt.textBendingPictureBlocks": "Bending Picture Blocks",
"Common.define.smartArt.textBendingPictureCaptionList": "Bending Picture Caption List",
"Common.define.smartArt.textTitledPictureBlocks": "Titled Picture Blocks",
"Common.define.smartArt.textPictureGrid": "Picture Grid",
"Common.define.smartArt.textPictureAccentBlocks": "Picture Accent Blocks",
"Common.define.smartArt.textAlternatingPictureCircles": "Alternating Picture Circles",
"Common.define.smartArt.textTitlePictureLineup": "Title Picture Lineup",
"Common.define.smartArt.textPictureLineup": "Picture Lineup",
"Common.define.smartArt.textFramedTextPicture": "Framed Text Picture",
"Common.define.smartArt.textBubblePictureList": "Bubble Picture List",
"Common.define.smartArt.textOther": "Other",
"Common.define.smartArt.textPictureOrganizationChart": "Picture Organization Chart",
"Common.define.smartArt.textChevronAccentProcess": "Chevron Accent Process",
"Common.define.smartArt.textRadialPictureList": "Radial Picture List",
"Common.define.smartArt.textVerticalBracketList": "Vertical Bracket List",
"Common.define.smartArt.textInterconnectedBlockProcess": "Interconnected Block Process",
"Common.define.smartArt.textTabbedArc": "Tabbed Arc",
"Common.define.smartArt.textThemePictureAccent": "Theme Picture Accent",
"Common.define.smartArt.textVaryingWidthList": "Varying Width List",
"Common.define.smartArt.textConvergingText": "Converging Text",
"Common.define.smartArt.textInterconnectedRings": "Interconnected Rings",
"Common.define.smartArt.textArchitectureLayout": "Architecture Layout",
"Common.define.smartArt.textThemePictureAlternatingAccent": "Theme Picture Alternating Accent",
"Common.define.smartArt.textThemePictureGrid": "Theme Picture Grid",
"Common.define.smartArt.textCircleProcess": "Circle Process",
"Common.define.smartArt.textHexagonRadial": "Hexagon Radial",
"Common.define.smartArt.textPictureFrame": "PictureFrame",
"Common.define.smartArt.textTabList": "Tab List",
"Common.Translation.textMoreButton": "More",
"Common.Translation.warnFileLocked": "You can't edit this file because it's being edited in another app.",
"Common.Translation.warnFileLockedBtnEdit": "Create a copy",
@ -2980,6 +3139,8 @@
"DE.Views.Toolbar.txtScheme7": "Equity",
"DE.Views.Toolbar.txtScheme8": "Flow",
"DE.Views.Toolbar.txtScheme9": "Foundry",
"DE.Views.Toolbar.tipInsertSmartArt": "Insert SmartArt",
"DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
"DE.Views.ViewTab.textAlwaysShowToolbar": "Always show toolbar",
"DE.Views.ViewTab.textDarkDocument": "Dark document",
"DE.Views.ViewTab.textFitToPage": "Fit To Page",

54
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -138,7 +138,9 @@ define([
'duplicate:check' : this.onDuplicateCheck.bind(this),
'change:slide' : this.onChangeSlide.bind(this),
'change:compact' : this.onClickChangeCompact,
'add:chart' : this.onSelectChart
'add:chart' : this.onSelectChart,
'generate:smartart' : this.generateSmartArt,
'insert:smartart' : this.onInsertSmartArt
},
'FileMenu': {
'menu:hide': this.onFileMenu.bind(this, 'hide'),
@ -412,6 +414,9 @@ define([
Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this));
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
this.api.asc_registerCallback('asc_onCanCopyCut', _.bind(this.onApiCanCopyCut, this));
this.api.asc_registerCallback('asc_onBeginSmartArtPreview', _.bind(this.onApiBeginSmartArtPreview, this));
this.api.asc_registerCallback('asc_onAddSmartArtPreview', _.bind(this.onApiAddSmartArtPreview, this));
this.api.asc_registerCallback('asc_onEndSmartArtPreview', _.bind(this.onApiEndSmartArtPreview, this));
} else if (this.mode.isRestrictedEdit) {
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPagesRestricted, this));
}
@ -735,7 +740,7 @@ define([
this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, {array: this.toolbar.paragraphControls});
this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, {array: [
this.toolbar.btnChangeSlide, this.toolbar.btnPreview, this.toolbar.btnPrint, this.toolbar.btnCopy, this.toolbar.btnCut, this.toolbar.btnSelectAll, this.toolbar.btnPaste,
this.toolbar.btnCopyStyle, this.toolbar.btnInsertTable, this.toolbar.btnInsertChart,
this.toolbar.btnCopyStyle, this.toolbar.btnInsertTable, this.toolbar.btnInsertChart, this.toolbar.btnInsertSmartArt,
this.toolbar.btnColorSchemas, this.toolbar.btnShapeAlign,
this.toolbar.btnShapeArrange, this.toolbar.btnSlideSize, this.toolbar.listTheme, this.toolbar.btnEditHeader, this.toolbar.btnInsDateTime, this.toolbar.btnInsSlideNum
]});
@ -2726,6 +2731,51 @@ define([
}
},
generateSmartArt: function (groupName) {
this.api.asc_generateSmartArtPreviews(groupName);
},
onApiBeginSmartArtPreview: function () {
this.smartArtGroups = this.toolbar.btnInsertSmartArt.menu.items;
this.smartArtData = Common.define.smartArt.getSmartArtData();
},
onApiAddSmartArtPreview: function (previews) {
previews.forEach(_.bind(function (preview) {
var image = preview.asc_getImage(),
sectionId = preview.asc_getSectionId(),
section = _.findWhere(this.smartArtData, {sectionId: sectionId}),
item = _.findWhere(section.items, {type: image.asc_getName()}),
menu = _.findWhere(this.smartArtGroups, {value: sectionId}),
menuPicker = menu.menuPicker;
if (item) {
var arr = [{
tip: item.tip,
value: item.type,
imageUrl: image.asc_getImage()
}];
if (menuPicker.store.length < 1) {
menuPicker.store.reset(arr);
} else {
menuPicker.store.add(arr);
}
}
this.currentSmartArtMenu = menu;
}, this));
},
onApiEndSmartArtPreview: function () {
if (this.currentSmartArtMenu) {
this.currentSmartArtMenu.menu.alignPosition();
}
},
onInsertSmartArt: function (value) {
if (this.api) {
this.api.asc_createSmartArt(value);
}
},
textEmptyImgUrl : 'You need to specify image URL.',
textWarning : 'Warning',
textFontSizeErr : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 300',

1
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -127,6 +127,7 @@
<span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
<span class="btn-slot text x-huge slot-insertimg"></span>
<span class="btn-slot text x-huge" id="slot-btn-insertchart"></span>
<span class="btn-slot text x-huge" id="slot-btn-inssmartart"></span>
</div>
<div class="separator long invisible"></div>
<div class="group small" id="slot-combo-insertshape"></div>

73
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -764,6 +764,19 @@ define([
});
me.slideOnlyControls.push(me.btnInsertChart);
this.btnInsertSmartArt = new Common.UI.Button({
id: 'tlbtn-insertsmartart',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon smart-art',
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
caption: me.capBtnInsSmartArt,
menu: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
});
me.slideOnlyControls.push(this.btnInsertSmartArt);
me.btnInsertEquation = new Common.UI.Button({
id: 'tlbtn-insertequation',
cls: 'btn-toolbar x-huge icon-top',
@ -1133,7 +1146,7 @@ define([
this.btnBold, this.btnItalic, this.btnUnderline, this.btnStrikeout, this.btnSuperscript, this.btnChangeCase, this.btnHighlightColor,
this.btnSubscript, this.btnFontColor, this.btnClearStyle, this.btnCopyStyle, this.btnMarkers,
this.btnNumbers, this.btnDecLeftOffset, this.btnIncLeftOffset, this.btnLineSpace, this.btnHorizontalAlign, this.btnColumns,
this.btnVerticalAlign, this.btnShapeArrange, this.btnShapeAlign, this.btnInsertTable, this.btnInsertChart,
this.btnVerticalAlign, this.btnShapeArrange, this.btnShapeAlign, this.btnInsertTable, this.btnInsertChart, this.btnInsertSmartArt,
this.btnInsertEquation, this.btnInsertSymbol, this.btnInsertHyperlink, this.btnColorSchemas, this.btnSlideSize, this.listTheme, this.mnuShowSettings
];
@ -1260,6 +1273,7 @@ define([
_injectComponent('#slot-btn-columns', this.btnColumns);
_injectComponent('#slot-btn-arrange-shape', this.btnShapeArrange);
_injectComponent('#slot-btn-align-shape', this.btnShapeAlign);
_injectComponent('#slot-btn-inssmartart', this.btnInsertSmartArt);
_injectComponent('#slot-btn-insertequation', this.btnInsertEquation);
_injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
_injectComponent('#slot-btn-insertlink', this.btnInsertHyperlink);
@ -1421,6 +1435,7 @@ define([
this.btnColumns.updateHint(this.tipColumns);
this.btnInsertTable.updateHint(this.tipInsertTable);
this.btnInsertChart.updateHint(this.tipInsertChart);
this.btnInsertSmartArt.updateHint(this.tipInsertSmartArt);
this.btnInsertEquation.updateHint(this.tipInsertEquation);
this.btnInsertSymbol.updateHint(this.tipInsertSymbol);
this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
@ -1499,6 +1514,60 @@ define([
};
this.btnInsertChart.menu.on('show:before', onShowBefore);
this.btnInsertSmartArt.setMenu(new Common.UI.Menu({
cls: 'shifted-right',
items: []
}));
var smartArtData = Common.define.smartArt.getSmartArtData();
smartArtData.forEach(function (item, index) {
var length = item.items.length,
width = 399;
if (length < 5) {
width = length * (70 + 8) + 9; // 4px margin + 4px margin
}
me.btnInsertSmartArt.menu.addItem({
caption: item.caption,
value: item.sectionId,
itemId: item.id,
iconCls: item.icon ? 'menu__icon ' + item.icon : undefined,
menu: new Common.UI.Menu({
items: [
{template: _.template('<div id="' + item.id + '" class="menu-add-smart-art" style="width: ' + width + 'px; height: 500px; margin-left: 5px;"></div>')}
],
menuAlign: 'tl-tr',
})});
});
var onShowBeforeSmartArt = function (menu) { // + <% if(typeof imageUrl === "undefined" || imageUrl===null || imageUrl==="") { %> style="visibility: hidden;" <% } %>/>',
me.btnInsertSmartArt.menu.items.forEach(function (item, index) {
item.$el.one('mouseenter', function () {
me.fireEvent('generate:smartart', [item.value]);
item.$el.mouseenter();
});
item.menuPicker = new Common.UI.DataView({
el: $('#' + item.options.itemId),
parentMenu: me.btnInsertSmartArt.menu.items[index].menu,
itemTemplate: _.template([
'<div>',
'<img src="<%= imageUrl %>" width="' + 70 + '" height="' + 70 + '" />',
'</div>'
].join('')),
store: new Common.UI.DataViewStore(),
delayRenderTips: true,
scrollAlwaysVisible: true,
showLast: false
});
item.menuPicker.on('item:click', function(picker, item, record, e) {
if (record) {
me.fireEvent('insert:smartart', [record.get('value')]);
}
Common.NotificationCenter.trigger('edit:complete', me);
});
});
menu.off('show:before', onShowBeforeSmartArt);
};
this.btnInsertSmartArt.menu.on('show:before', onShowBeforeSmartArt);
var onShowBeforeTextArt = function (menu) {
var collection = PE.getCollection('Common.Collections.TextArt');
if (collection.length<1)
@ -2021,6 +2090,7 @@ define([
textShowCurrent: 'Show from Current slide',
textShowSettings: 'Show Settings',
tipInsertEquation: 'Insert Equation',
tipInsertSmartArt: 'Insert SmartArt',
tipChangeChart: 'Change Chart Type',
capInsertText: 'Text',
capInsertTextArt: 'Text Art',
@ -2053,6 +2123,7 @@ define([
textListSettings: 'List Settings',
capBtnAddComment: 'Add Comment',
capBtnInsSymbol: 'Symbol',
capBtnInsSmartArt: 'SmartArt',
tipInsertSymbol: 'Insert symbol',
capInsertAudio: 'Audio',
capInsertVideo: 'Video',

161
apps/presentationeditor/main/locale/en.json
View file

@ -51,6 +51,165 @@
"Common.define.chartData.textScatterSmoothMarker": "Scatter with smooth lines and markers",
"Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface",
"Common.define.smartArt.textList": "List",
"Common.define.smartArt.textProcess": "Process",
"Common.define.smartArt.textCycle": "Cycle",
"Common.define.smartArt.textHierarchy": "Hierarchy",
"Common.define.smartArt.textRelationship": "Relationship",
"Common.define.smartArt.textMatrix": "Matrix",
"Common.define.smartArt.textPyramid": "Pyramid",
"Common.define.smartArt.textPicture": "Picture",
"Common.define.smartArt.textBasicBlockList": "Basic Block List",
"Common.define.smartArt.textAlternatingHexagons": "Alternating Hexagons",
"Common.define.smartArt.textPictureCaptionList": "Picture Caption List",
"Common.define.smartArt.textLinedList": "Lined List",
"Common.define.smartArt.textVerticalBulletList": "Vertical Bullet List",
"Common.define.smartArt.textVerticalBoxList": "Vertical Box List",
"Common.define.smartArt.textHorizontalBulletList": "Horizontal Bullet List",
"Common.define.smartArt.textSquareAccentList": "Square Accent List",
"Common.define.smartArt.textPictureAccentList": "Picture Accent List",
"Common.define.smartArt.textBendingPictureAccentList": "Bending Picture Accent List",
"Common.define.smartArt.textStackedList": "Stacked List",
"Common.define.smartArt.textIncreasingCircleProcess": "Increasing Circle Process",
"Common.define.smartArt.textPieProcess": "Pie Process",
"Common.define.smartArt.textDetailedProcess": "Detailed Process",
"Common.define.smartArt.textGroupedList": "Grouped List",
"Common.define.smartArt.textHorizontalPictureList": "Horizontal Picture List",
"Common.define.smartArt.textContinuousPictureList": "Continuous Picture List",
"Common.define.smartArt.textPictureStrips": "Picture Strips",
"Common.define.smartArt.textVerticalPictureList": "Vertical Picture List",
"Common.define.smartArt.textAlternatingPictureBlocks": "Alternating Picture Blocks",
"Common.define.smartArt.textVerticalPictureAccentList": "Vertical Picture Accent List",
"Common.define.smartArt.textTitledPictureAccentList": "Titled Picture Accent List",
"Common.define.smartArt.textVerticalBlockList": "Vertical Block List",
"Common.define.smartArt.textVerticalChevronList": "Vertical Chevron List",
"Common.define.smartArt.textVerticalAccentList": "Vertical Accent List",
"Common.define.smartArt.textVerticalArrowList": "Vertical Arrow List",
"Common.define.smartArt.textTrapezoidList": "Trapezoid List",
"Common.define.smartArt.textDescendingBlockList": "Descending Block List",
"Common.define.smartArt.textTableList": "Table List",
"Common.define.smartArt.textSegmentedProcess": "Segmented Process",
"Common.define.smartArt.textVerticalCurvedList": "Vertical Curved List",
"Common.define.smartArt.textPyramidList": "Pyramid List",
"Common.define.smartArt.textTargetList": "Target List",
"Common.define.smartArt.textHierarchyList": "Hierarchy List",
"Common.define.smartArt.textVerticalCircleList": "Vertical Circle List",
"Common.define.smartArt.textTableHierarchy": "Table Hierarchy",
"Common.define.smartArt.textBasicProcess": "Basic Process",
"Common.define.smartArt.textStepUpProcess": "Step Up Process",
"Common.define.smartArt.textStepDownProcess": "Step Down Process",
"Common.define.smartArt.textAccentProcess": "Accent Process",
"Common.define.smartArt.textPictureAccentProcess": "Picture Accent Process",
"Common.define.smartArt.textAlternatingFlow": "Alternating Flow",
"Common.define.smartArt.textContinuousBlockProcess": "Continuous Block Process",
"Common.define.smartArt.textIncreasingArrowProcess": "Increasing Arrow Process",
"Common.define.smartArt.textContinuousArrowProcess": "Continuous Arrow Process",
"Common.define.smartArt.textProcessArrows": "Process Arrows",
"Common.define.smartArt.textCircleAccentTimeline": "Circle Accent Timeline",
"Common.define.smartArt.textBasicTimeline": "Basic Timeline",
"Common.define.smartArt.textBasicChevronProcess": "Basic Chevron Process",
"Common.define.smartArt.textClosedChevronProcess": "Closed Chevron Process",
"Common.define.smartArt.textChevronList": "Chevron List",
"Common.define.smartArt.textSubStepProcess": "Sub-Step Process",
"Common.define.smartArt.textPhasedProcess": "Phased Process",
"Common.define.smartArt.textRandomToResultProcess": "Random to Result Process",
"Common.define.smartArt.textVerticalProcess": "Vertical Process",
"Common.define.smartArt.textStaggeredProcess": "Staggered Process",
"Common.define.smartArt.textProcessList": "Process List",
"Common.define.smartArt.textCircleArrowProcess": "Circle Arrow Process",
"Common.define.smartArt.textBasicBendingProcess": "Basic Bending Process",
"Common.define.smartArt.textRepeatingBendingProcess": "Repeating Bending Process",
"Common.define.smartArt.textVerticalBendingProcess": "Vertical Bending Process",
"Common.define.smartArt.textAscendingPictureAccentProcess": "Ascending Picture Accent Process",
"Common.define.smartArt.textUpwardArrow": "Upward Arrow",
"Common.define.smartArt.textDescendingProcess": "Descending Process",
"Common.define.smartArt.textCircularBendingProcess": "Circular Bending Process",
"Common.define.smartArt.textEquation": "Equation",
"Common.define.smartArt.textVerticalEquation": "Vertical Equation",
"Common.define.smartArt.textFunnel": "Funnel",
"Common.define.smartArt.textGear": "Gear",
"Common.define.smartArt.textArrowRibbon": "Arrow Ribbon",
"Common.define.smartArt.textOpposingArrows": "Opposing Arrows",
"Common.define.smartArt.textConvergingArrows": "Converging Arrows",
"Common.define.smartArt.textDivergingArrows": "Diverging Arrows",
"Common.define.smartArt.textBasicCycle": "Basic Cycle",
"Common.define.smartArt.textTextCycle": "Text Cycle",
"Common.define.smartArt.textBlockCycle": "Block Cycle",
"Common.define.smartArt.textNondirectionalCycle": "Nondirectional Cycle",
"Common.define.smartArt.textContinuousCycle": "Continuous Cycle",
"Common.define.smartArt.textMultidirectionalCycle": "Multidirectional Cycle",
"Common.define.smartArt.textSegmentedCycle": "Segmented Cycle",
"Common.define.smartArt.textBasicPie": "Basic Pie",
"Common.define.smartArt.textRadialCycle": "Radial Cycle",
"Common.define.smartArt.textBasicRadial": "Basic Radial",
"Common.define.smartArt.textDivergingRadial": "Diverging Radial",
"Common.define.smartArt.textRadialVenn": "Radial Venn",
"Common.define.smartArt.textCycleMatrix": "Cycle Matrix",
"Common.define.smartArt.textRadialCluster": "Radial Cluster",
"Common.define.smartArt.textOrganizationChart": "Organization Chart",
"Common.define.smartArt.textNameAndTitleOrganizationChart": "Name and Title Organization Chart",
"Common.define.smartArt.textHalfCircleOrganizationChart": "Half Circle Organization Chart",
"Common.define.smartArt.textCirclePictureHierarchy": "Circle Picture Hierarchy",
"Common.define.smartArt.textLabeledHierarchy": "Labeled Hierarchy",
"Common.define.smartArt.textHorizontalOrganizationChart": "Horizontal Organization Chart",
"Common.define.smartArt.textHorizontalMultiLevelHierarchy": "Horizontal Multi-Level Hierarchy",
"Common.define.smartArt.textHorizontalHierarchy": "Horizontal Hierarchy",
"Common.define.smartArt.textHorizontalLabeledHierarchy": "Horizontal Labeled Hierarchy",
"Common.define.smartArt.textBalance": "Balance",
"Common.define.smartArt.textCircleRelationship": "Circle Relationship",
"Common.define.smartArt.textHexagonCluster": "Hexagon Cluster",
"Common.define.smartArt.textOpposingIdeas": "Opposing Ideas",
"Common.define.smartArt.textPlusAndMinus": "Plus and Minus",
"Common.define.smartArt.textReverseList": "Reverse List",
"Common.define.smartArt.textCounterbalanceArrows": "Counterbalance Arrows",
"Common.define.smartArt.textSegmentedPyramid": "Segmented Pyramid",
"Common.define.smartArt.textNestedTarget": "Nested Target",
"Common.define.smartArt.textConvergingRadial": "Converging Radial",
"Common.define.smartArt.textRadialList": "Radial List",
"Common.define.smartArt.textBasicTarget": "Basic Target",
"Common.define.smartArt.textBasicVenn": "Basic Venn",
"Common.define.smartArt.textLinearVenn": "Linear Venn",
"Common.define.smartArt.textStackedVenn": "Stacked Venn",
"Common.define.smartArt.textBasicMatrix": "Basic Matrix",
"Common.define.smartArt.textTitledMatrix": "Titled Matrix",
"Common.define.smartArt.textGridMatrix": "Grid Matrix",
"Common.define.smartArt.textBasicPyramid": "Basic Pyramid",
"Common.define.smartArt.textInvertedPyramid": "Inverted Pyramid",
"Common.define.smartArt.textAccentedPicture": "Accented Picture",
"Common.define.smartArt.textCircularPictureCallout": "Circular Picture Callout",
"Common.define.smartArt.textSnapshotPictureList": "Snapshot Picture List",
"Common.define.smartArt.textSpiralPicture": "Spiral Picture",
"Common.define.smartArt.textCaptionedPictures": "Captioned Pictures",
"Common.define.smartArt.textBendingPictureCaption": "Bending Picture Caption",
"Common.define.smartArt.textBendingPictureSemiTranparentText": "Bending Picture Semi-Tranparent Text",
"Common.define.smartArt.textBendingPictureBlocks": "Bending Picture Blocks",
"Common.define.smartArt.textBendingPictureCaptionList": "Bending Picture Caption List",
"Common.define.smartArt.textTitledPictureBlocks": "Titled Picture Blocks",
"Common.define.smartArt.textPictureGrid": "Picture Grid",
"Common.define.smartArt.textPictureAccentBlocks": "Picture Accent Blocks",
"Common.define.smartArt.textAlternatingPictureCircles": "Alternating Picture Circles",
"Common.define.smartArt.textTitlePictureLineup": "Title Picture Lineup",
"Common.define.smartArt.textPictureLineup": "Picture Lineup",
"Common.define.smartArt.textFramedTextPicture": "Framed Text Picture",
"Common.define.smartArt.textBubblePictureList": "Bubble Picture List",
"Common.define.smartArt.textOther": "Other",
"Common.define.smartArt.textPictureOrganizationChart": "Picture Organization Chart",
"Common.define.smartArt.textChevronAccentProcess": "Chevron Accent Process",
"Common.define.smartArt.textRadialPictureList": "Radial Picture List",
"Common.define.smartArt.textVerticalBracketList": "Vertical Bracket List",
"Common.define.smartArt.textInterconnectedBlockProcess": "Interconnected Block Process",
"Common.define.smartArt.textTabbedArc": "Tabbed Arc",
"Common.define.smartArt.textThemePictureAccent": "Theme Picture Accent",
"Common.define.smartArt.textVaryingWidthList": "Varying Width List",
"Common.define.smartArt.textConvergingText": "Converging Text",
"Common.define.smartArt.textInterconnectedRings": "Interconnected Rings",
"Common.define.smartArt.textArchitectureLayout": "Architecture Layout",
"Common.define.smartArt.textThemePictureAlternatingAccent": "Theme Picture Alternating Accent",
"Common.define.smartArt.textThemePictureGrid": "Theme Picture Grid",
"Common.define.smartArt.textCircleProcess": "Circle Process",
"Common.define.smartArt.textHexagonRadial": "Hexagon Radial",
"Common.define.smartArt.textPictureFrame": "PictureFrame",
"Common.define.smartArt.textTabList": "Tab List",
"Common.define.effectData.textAcross": "Across",
"Common.define.effectData.textAppear": "Appear",
"Common.define.effectData.textArcDown": "Arc Down",
@ -2380,6 +2539,8 @@
"PE.Views.Toolbar.txtScheme9": "Foundry",
"PE.Views.Toolbar.txtSlideAlign": "Align to Slide",
"PE.Views.Toolbar.txtUngroup": "Ungroup",
"PE.Views.Toolbar.tipInsertSmartArt": "Insert SmartArt",
"PE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
"PE.Views.Transitions.strDelay": "Delay",
"PE.Views.Transitions.strDuration": "Duration",
"PE.Views.Transitions.strStartOnClick": "Start On Click",

52
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -85,7 +85,9 @@ define([
'insert:textart': this.onInsertTextart,
'change:scalespn': this.onClickChangeScaleInMenu.bind(me),
'click:customscale': this.onScaleClick.bind(me),
'home:open' : this.onHomeOpen
'home:open' : this.onHomeOpen,
'generate:smartart' : this.generateSmartArt,
'insert:smartart' : this.onInsertSmartArt
},
'FileMenu': {
'menu:hide': me.onFileMenu.bind(me, 'hide'),
@ -493,6 +495,9 @@ define([
this.api.asc_registerCallback('asc_onUnLockCFManager', _.bind(this.onUnLockCFManager, this));
this.api.asc_registerCallback('asc_onZoomChanged', _.bind(this.onApiZoomChange, this));
Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this));
this.api.asc_registerCallback('asc_onBeginSmartArtPreview', _.bind(this.onApiBeginSmartArtPreview, this));
this.api.asc_registerCallback('asc_onAddSmartArtPreview', _.bind(this.onApiAddSmartArtPreview, this));
this.api.asc_registerCallback('asc_onEndSmartArtPreview', _.bind(this.onApiEndSmartArtPreview, this));
} else if (config.isEditOle) {
Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this));
} else if (config.isRestrictedEdit) {
@ -4928,6 +4933,51 @@ define([
Common.component.Analytics.trackEvent('ToolBar', 'Vertical align');
},
generateSmartArt: function (groupName) {
this.api.asc_generateSmartArtPreviews(groupName);
},
onApiBeginSmartArtPreview: function () {
this.smartArtGroups = this.toolbar.btnInsertSmartArt.menu.items;
this.smartArtData = Common.define.smartArt.getSmartArtData();
},
onApiAddSmartArtPreview: function (previews) {
previews.forEach(_.bind(function (preview) {
var image = preview.asc_getImage(),
sectionId = preview.asc_getSectionId(),
section = _.findWhere(this.smartArtData, {sectionId: sectionId}),
item = _.findWhere(section.items, {type: image.asc_getName()}),
menu = _.findWhere(this.smartArtGroups, {value: sectionId}),
menuPicker = menu.menuPicker;
if (item) {
var arr = [{
tip: item.tip,
value: item.type,
imageUrl: image.asc_getImage()
}];
if (menuPicker.store.length < 1) {
menuPicker.store.reset(arr);
} else {
menuPicker.store.add(arr);
}
}
this.currentSmartArtMenu = menu;
}, this));
},
onApiEndSmartArtPreview: function () {
if (this.currentSmartArtMenu) {
this.currentSmartArtMenu.menu.alignPosition();
}
},
onInsertSmartArt: function (value) {
if (this.api) {
this.api.asc_createSmartArt(value);
}
},
textEmptyImgUrl : 'You need to specify image URL.',
warnMergeLostData : 'Operation can destroy data in the selected cells.<br>Continue?',
textWarning : 'Warning',

1
apps/spreadsheeteditor/main/app/template/Toolbar.template
View file

@ -140,6 +140,7 @@
<span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
<span class="btn-slot text x-huge" id="slot-btn-inschart"></span>
<span class="btn-slot text x-huge" id="slot-btn-inssparkline"></span>
<span class="btn-slot text x-huge" id="slot-btn-inssmartart"></span>
</div>
<div class="separator long"></div>
<div class="group">

76
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1209,6 +1209,18 @@ define([
dataHintOffset: 'small'
});
this.btnInsertSmartArt = new Common.UI.Button({
id: 'tlbtn-insertsmartart',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon smart-art',
lock: [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']],
caption: me.capBtnInsSmartArt,
menu: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
});
me.btnInsertShape = new Common.UI.Button({
id : 'tlbtn-insertshape',
cls : 'btn-toolbar x-huge icon-top',
@ -2065,7 +2077,7 @@ define([
me.btnItalic, me.btnUnderline, me.btnStrikeout, me.btnSubscript, me.btnTextColor, me.btnAlignLeft,
me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust, me.btnAlignTop,
me.btnAlignMiddle, me.btnAlignBottom, me.btnWrap, me.btnTextOrient, me.btnBackColor, me.btnInsertTable,
me.btnMerge, me.btnInsertFormula, me.btnNamedRange, me.btnIncDecimal, me.btnInsertShape, me.btnInsertEquation, me.btnInsertSymbol, me.btnInsertSlicer,
me.btnMerge, me.btnInsertFormula, me.btnNamedRange, me.btnIncDecimal, me.btnInsertShape, me.btnInsertSmartArt, me.btnInsertEquation, me.btnInsertSymbol, me.btnInsertSlicer,
me.btnInsertText, me.btnInsertTextArt, me.btnSortUp, me.btnSortDown, me.btnSetAutofilter, me.btnClearAutofilter,
me.btnTableTemplate, me.btnCellStyle, me.btnPercentStyle, me.btnCurrencyStyle, me.btnDecDecimal, me.btnAddCell, me.btnDeleteCell, me.btnCondFormat,
me.cmbNumberFormat, me.btnBorders, me.btnInsertImage, me.btnInsertHyperlink,
@ -2274,6 +2286,7 @@ define([
_injectComponent('#slot-btn-search', this.btnSearch);
_injectComponent('#slot-btn-inschart', this.btnInsertChart);
_injectComponent('#slot-btn-inssparkline', this.btnInsertSparkline);
_injectComponent('#slot-btn-inssmartart', this.btnInsertSmartArt);
_injectComponent('#slot-field-styles', this.listStyles);
_injectComponent('#slot-btn-chart', this.btnEditChart);
_injectComponent('#slot-btn-chart-data', this.btnEditChartData);
@ -2344,6 +2357,7 @@ define([
_updateHint(this.btnInsertImage, this.tipInsertImage);
_updateHint(this.btnInsertChart, this.tipInsertChartSpark);
_updateHint(this.btnInsertSparkline, this.tipInsertSpark);
_updateHint(this.btnInsertSmartArt, this.tipInsertSmartArt);
_updateHint(this.btnInsertText, [this.tipInsertHorizontalText ,this.tipInsertText]);
_updateHint(this.btnInsertTextArt, this.tipInsertTextart);
_updateHint(this.btnInsertHyperlink, this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
@ -2555,6 +2569,62 @@ define([
this.btnInsertChart.menu.on('show:before', onShowBefore);
}
if (this.btnInsertSmartArt) {
this.btnInsertSmartArt.setMenu(new Common.UI.Menu({
cls: 'shifted-right',
items: []
}));
var smartArtData = Common.define.smartArt.getSmartArtData();
smartArtData.forEach(function (item, index) {
var length = item.items.length,
width = 399;
if (length < 5) {
width = length * (70 + 8) + 9; // 4px margin + 4px margin
}
me.btnInsertSmartArt.menu.addItem({
caption: item.caption,
value: item.sectionId,
itemId: item.id,
iconCls: item.icon ? 'menu__icon ' + item.icon : undefined,
menu: new Common.UI.Menu({
items: [
{template: _.template('<div id="' + item.id + '" class="menu-add-smart-art" style="width: ' + width + 'px; height: 500px; margin-left: 5px;"></div>')}
],
menuAlign: 'tl-tr',
})});
});
var onShowBeforeSmartArt = function (menu) { // + <% if(typeof imageUrl === "undefined" || imageUrl===null || imageUrl==="") { %> style="visibility: hidden;" <% } %>/>',
me.btnInsertSmartArt.menu.items.forEach(function (item, index) {
item.$el.one('mouseenter', function () {
me.fireEvent('generate:smartart', [item.value]);
item.$el.mouseenter();
});
item.menuPicker = new Common.UI.DataView({
el: $('#' + item.options.itemId),
parentMenu: me.btnInsertSmartArt.menu.items[index].menu,
itemTemplate: _.template([
'<div>',
'<img src="<%= imageUrl %>" width="' + 70 + '" height="' + 70 + '" />',
'</div>'
].join('')),
store: new Common.UI.DataViewStore(),
delayRenderTips: true,
scrollAlwaysVisible: true,
showLast: false
});
item.menuPicker.on('item:click', function(picker, item, record, e) {
if (record) {
me.fireEvent('insert:smartart', [record.get('value')]);
}
Common.NotificationCenter.trigger('edit:complete', me);
});
});
menu.off('show:before', onShowBeforeSmartArt);
};
this.btnInsertSmartArt.menu.on('show:before', onShowBeforeSmartArt);
}
if ( this.btnInsertSparkline ) {
this.btnInsertSparkline.setMenu(new Common.UI.Menu({
style: 'width: 166px;padding: 5px 0 10px;',
@ -3355,6 +3425,8 @@ define([
tipHAlighOle: 'Horizontal Align',
tipVAlighOle: 'Vertical Align',
tipSelectAll: 'Select all',
tipCut: 'Cut'
tipCut: 'Cut',
tipInsertSmartArt: 'Insert SmartArt',
capBtnInsSmartArt: 'SmartArt'
}, SSE.Views.Toolbar || {}));
});

161
apps/spreadsheeteditor/main/locale/en.json
View file

@ -49,6 +49,165 @@
"Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface",
"Common.define.chartData.textWinLossSpark": "Win/Loss",
"Common.define.smartArt.textList": "List",
"Common.define.smartArt.textProcess": "Process",
"Common.define.smartArt.textCycle": "Cycle",
"Common.define.smartArt.textHierarchy": "Hierarchy",
"Common.define.smartArt.textRelationship": "Relationship",
"Common.define.smartArt.textMatrix": "Matrix",
"Common.define.smartArt.textPyramid": "Pyramid",
"Common.define.smartArt.textPicture": "Picture",
"Common.define.smartArt.textBasicBlockList": "Basic Block List",
"Common.define.smartArt.textAlternatingHexagons": "Alternating Hexagons",
"Common.define.smartArt.textPictureCaptionList": "Picture Caption List",
"Common.define.smartArt.textLinedList": "Lined List",
"Common.define.smartArt.textVerticalBulletList": "Vertical Bullet List",
"Common.define.smartArt.textVerticalBoxList": "Vertical Box List",
"Common.define.smartArt.textHorizontalBulletList": "Horizontal Bullet List",
"Common.define.smartArt.textSquareAccentList": "Square Accent List",
"Common.define.smartArt.textPictureAccentList": "Picture Accent List",
"Common.define.smartArt.textBendingPictureAccentList": "Bending Picture Accent List",
"Common.define.smartArt.textStackedList": "Stacked List",
"Common.define.smartArt.textIncreasingCircleProcess": "Increasing Circle Process",
"Common.define.smartArt.textPieProcess": "Pie Process",
"Common.define.smartArt.textDetailedProcess": "Detailed Process",
"Common.define.smartArt.textGroupedList": "Grouped List",
"Common.define.smartArt.textHorizontalPictureList": "Horizontal Picture List",
"Common.define.smartArt.textContinuousPictureList": "Continuous Picture List",
"Common.define.smartArt.textPictureStrips": "Picture Strips",
"Common.define.smartArt.textVerticalPictureList": "Vertical Picture List",
"Common.define.smartArt.textAlternatingPictureBlocks": "Alternating Picture Blocks",
"Common.define.smartArt.textVerticalPictureAccentList": "Vertical Picture Accent List",
"Common.define.smartArt.textTitledPictureAccentList": "Titled Picture Accent List",
"Common.define.smartArt.textVerticalBlockList": "Vertical Block List",
"Common.define.smartArt.textVerticalChevronList": "Vertical Chevron List",
"Common.define.smartArt.textVerticalAccentList": "Vertical Accent List",
"Common.define.smartArt.textVerticalArrowList": "Vertical Arrow List",
"Common.define.smartArt.textTrapezoidList": "Trapezoid List",
"Common.define.smartArt.textDescendingBlockList": "Descending Block List",
"Common.define.smartArt.textTableList": "Table List",
"Common.define.smartArt.textSegmentedProcess": "Segmented Process",
"Common.define.smartArt.textVerticalCurvedList": "Vertical Curved List",
"Common.define.smartArt.textPyramidList": "Pyramid List",
"Common.define.smartArt.textTargetList": "Target List",
"Common.define.smartArt.textHierarchyList": "Hierarchy List",
"Common.define.smartArt.textVerticalCircleList": "Vertical Circle List",
"Common.define.smartArt.textTableHierarchy": "Table Hierarchy",
"Common.define.smartArt.textBasicProcess": "Basic Process",
"Common.define.smartArt.textStepUpProcess": "Step Up Process",
"Common.define.smartArt.textStepDownProcess": "Step Down Process",
"Common.define.smartArt.textAccentProcess": "Accent Process",
"Common.define.smartArt.textPictureAccentProcess": "Picture Accent Process",
"Common.define.smartArt.textAlternatingFlow": "Alternating Flow",
"Common.define.smartArt.textContinuousBlockProcess": "Continuous Block Process",
"Common.define.smartArt.textIncreasingArrowProcess": "Increasing Arrow Process",
"Common.define.smartArt.textContinuousArrowProcess": "Continuous Arrow Process",
"Common.define.smartArt.textProcessArrows": "Process Arrows",
"Common.define.smartArt.textCircleAccentTimeline": "Circle Accent Timeline",
"Common.define.smartArt.textBasicTimeline": "Basic Timeline",
"Common.define.smartArt.textBasicChevronProcess": "Basic Chevron Process",
"Common.define.smartArt.textClosedChevronProcess": "Closed Chevron Process",
"Common.define.smartArt.textChevronList": "Chevron List",
"Common.define.smartArt.textSubStepProcess": "Sub-Step Process",
"Common.define.smartArt.textPhasedProcess": "Phased Process",
"Common.define.smartArt.textRandomToResultProcess": "Random to Result Process",
"Common.define.smartArt.textVerticalProcess": "Vertical Process",
"Common.define.smartArt.textStaggeredProcess": "Staggered Process",
"Common.define.smartArt.textProcessList": "Process List",
"Common.define.smartArt.textCircleArrowProcess": "Circle Arrow Process",
"Common.define.smartArt.textBasicBendingProcess": "Basic Bending Process",
"Common.define.smartArt.textRepeatingBendingProcess": "Repeating Bending Process",
"Common.define.smartArt.textVerticalBendingProcess": "Vertical Bending Process",
"Common.define.smartArt.textAscendingPictureAccentProcess": "Ascending Picture Accent Process",
"Common.define.smartArt.textUpwardArrow": "Upward Arrow",
"Common.define.smartArt.textDescendingProcess": "Descending Process",
"Common.define.smartArt.textCircularBendingProcess": "Circular Bending Process",
"Common.define.smartArt.textEquation": "Equation",
"Common.define.smartArt.textVerticalEquation": "Vertical Equation",
"Common.define.smartArt.textFunnel": "Funnel",
"Common.define.smartArt.textGear": "Gear",
"Common.define.smartArt.textArrowRibbon": "Arrow Ribbon",
"Common.define.smartArt.textOpposingArrows": "Opposing Arrows",
"Common.define.smartArt.textConvergingArrows": "Converging Arrows",
"Common.define.smartArt.textDivergingArrows": "Diverging Arrows",
"Common.define.smartArt.textBasicCycle": "Basic Cycle",
"Common.define.smartArt.textTextCycle": "Text Cycle",
"Common.define.smartArt.textBlockCycle": "Block Cycle",
"Common.define.smartArt.textNondirectionalCycle": "Nondirectional Cycle",
"Common.define.smartArt.textContinuousCycle": "Continuous Cycle",
"Common.define.smartArt.textMultidirectionalCycle": "Multidirectional Cycle",
"Common.define.smartArt.textSegmentedCycle": "Segmented Cycle",
"Common.define.smartArt.textBasicPie": "Basic Pie",
"Common.define.smartArt.textRadialCycle": "Radial Cycle",
"Common.define.smartArt.textBasicRadial": "Basic Radial",
"Common.define.smartArt.textDivergingRadial": "Diverging Radial",
"Common.define.smartArt.textRadialVenn": "Radial Venn",
"Common.define.smartArt.textCycleMatrix": "Cycle Matrix",
"Common.define.smartArt.textRadialCluster": "Radial Cluster",
"Common.define.smartArt.textOrganizationChart": "Organization Chart",
"Common.define.smartArt.textNameAndTitleOrganizationChart": "Name and Title Organization Chart",
"Common.define.smartArt.textHalfCircleOrganizationChart": "Half Circle Organization Chart",
"Common.define.smartArt.textCirclePictureHierarchy": "Circle Picture Hierarchy",
"Common.define.smartArt.textLabeledHierarchy": "Labeled Hierarchy",
"Common.define.smartArt.textHorizontalOrganizationChart": "Horizontal Organization Chart",
"Common.define.smartArt.textHorizontalMultiLevelHierarchy": "Horizontal Multi-Level Hierarchy",
"Common.define.smartArt.textHorizontalHierarchy": "Horizontal Hierarchy",
"Common.define.smartArt.textHorizontalLabeledHierarchy": "Horizontal Labeled Hierarchy",
"Common.define.smartArt.textBalance": "Balance",
"Common.define.smartArt.textCircleRelationship": "Circle Relationship",
"Common.define.smartArt.textHexagonCluster": "Hexagon Cluster",
"Common.define.smartArt.textOpposingIdeas": "Opposing Ideas",
"Common.define.smartArt.textPlusAndMinus": "Plus and Minus",
"Common.define.smartArt.textReverseList": "Reverse List",
"Common.define.smartArt.textCounterbalanceArrows": "Counterbalance Arrows",
"Common.define.smartArt.textSegmentedPyramid": "Segmented Pyramid",
"Common.define.smartArt.textNestedTarget": "Nested Target",
"Common.define.smartArt.textConvergingRadial": "Converging Radial",
"Common.define.smartArt.textRadialList": "Radial List",
"Common.define.smartArt.textBasicTarget": "Basic Target",
"Common.define.smartArt.textBasicVenn": "Basic Venn",
"Common.define.smartArt.textLinearVenn": "Linear Venn",
"Common.define.smartArt.textStackedVenn": "Stacked Venn",
"Common.define.smartArt.textBasicMatrix": "Basic Matrix",
"Common.define.smartArt.textTitledMatrix": "Titled Matrix",
"Common.define.smartArt.textGridMatrix": "Grid Matrix",
"Common.define.smartArt.textBasicPyramid": "Basic Pyramid",
"Common.define.smartArt.textInvertedPyramid": "Inverted Pyramid",
"Common.define.smartArt.textAccentedPicture": "Accented Picture",
"Common.define.smartArt.textCircularPictureCallout": "Circular Picture Callout",
"Common.define.smartArt.textSnapshotPictureList": "Snapshot Picture List",
"Common.define.smartArt.textSpiralPicture": "Spiral Picture",
"Common.define.smartArt.textCaptionedPictures": "Captioned Pictures",
"Common.define.smartArt.textBendingPictureCaption": "Bending Picture Caption",
"Common.define.smartArt.textBendingPictureSemiTranparentText": "Bending Picture Semi-Tranparent Text",
"Common.define.smartArt.textBendingPictureBlocks": "Bending Picture Blocks",
"Common.define.smartArt.textBendingPictureCaptionList": "Bending Picture Caption List",
"Common.define.smartArt.textTitledPictureBlocks": "Titled Picture Blocks",
"Common.define.smartArt.textPictureGrid": "Picture Grid",
"Common.define.smartArt.textPictureAccentBlocks": "Picture Accent Blocks",
"Common.define.smartArt.textAlternatingPictureCircles": "Alternating Picture Circles",
"Common.define.smartArt.textTitlePictureLineup": "Title Picture Lineup",
"Common.define.smartArt.textPictureLineup": "Picture Lineup",
"Common.define.smartArt.textFramedTextPicture": "Framed Text Picture",
"Common.define.smartArt.textBubblePictureList": "Bubble Picture List",
"Common.define.smartArt.textOther": "Other",
"Common.define.smartArt.textPictureOrganizationChart": "Picture Organization Chart",
"Common.define.smartArt.textChevronAccentProcess": "Chevron Accent Process",
"Common.define.smartArt.textRadialPictureList": "Radial Picture List",
"Common.define.smartArt.textVerticalBracketList": "Vertical Bracket List",
"Common.define.smartArt.textInterconnectedBlockProcess": "Interconnected Block Process",
"Common.define.smartArt.textTabbedArc": "Tabbed Arc",
"Common.define.smartArt.textThemePictureAccent": "Theme Picture Accent",
"Common.define.smartArt.textVaryingWidthList": "Varying Width List",
"Common.define.smartArt.textConvergingText": "Converging Text",
"Common.define.smartArt.textInterconnectedRings": "Interconnected Rings",
"Common.define.smartArt.textArchitectureLayout": "Architecture Layout",
"Common.define.smartArt.textThemePictureAlternatingAccent": "Theme Picture Alternating Accent",
"Common.define.smartArt.textThemePictureGrid": "Theme Picture Grid",
"Common.define.smartArt.textCircleProcess": "Circle Process",
"Common.define.smartArt.textHexagonRadial": "Hexagon Radial",
"Common.define.smartArt.textPictureFrame": "PictureFrame",
"Common.define.smartArt.textTabList": "Tab List",
"Common.define.conditionalData.exampleText": "AaBbCcYyZz",
"Common.define.conditionalData.noFormatText": "No format set",
"Common.define.conditionalData.text1Above": "1 std dev above",
@ -3675,6 +3834,8 @@
"SSE.Views.Toolbar.txtTime": "Time",
"SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells",
"SSE.Views.Toolbar.txtYen": "¥ Yen",
"SSE.Views.Toolbar.tipInsertSmartArt": "Insert SmartArt",
"SSE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
"SSE.Views.Top10FilterDialog.textType": "Show",
"SSE.Views.Top10FilterDialog.txtBottom": "Bottom",
"SSE.Views.Top10FilterDialog.txtBy": "by",