From 86e628b6b61ab7e89e70ff46656a374dd0651e7f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Jan 2021 12:57:22 +0300 Subject: [PATCH 1/3] Add new chart types --- apps/common/main/lib/util/define.js | 16 ++++++++++- apps/common/main/resources/less/toolbar.less | 2 ++ .../main/app/view/ChartSettings.js | 6 ++--- apps/documenteditor/main/app/view/Toolbar.js | 6 ++--- apps/documenteditor/main/locale/en.json | 7 +++++ .../main/app/view/ChartSettings.js | 6 ++--- .../main/app/view/DocumentHolder.js | 2 +- .../main/app/view/Toolbar.js | 6 ++--- apps/presentationeditor/main/locale/en.json | 7 +++++ .../main/app/view/ChartSettings.js | 4 +-- .../main/app/view/ChartSettingsDlg.js | 27 ++++++++++++------- .../main/app/view/ChartTypeDialog.js | 12 ++++----- .../main/app/view/Toolbar.js | 6 ++--- apps/spreadsheeteditor/main/locale/en.json | 7 +++++ 14 files changed, 80 insertions(+), 34 deletions(-) diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js index 6cfe52f04..a016eb199 100644 --- a/apps/common/main/lib/util/define.js +++ b/apps/common/main/lib/util/define.js @@ -440,6 +440,9 @@ define(function(){ 'use strict'; textBarNormal3dPerspective: '3-D column', textLineStacked: 'Stacked line', textLineStackedPer: '100% Stacked line', + textLineMarker: 'Line with markers', + textLineStackedMarker: 'Stacked line with markers', + textLineStackedPerMarker: '100% Stacked line with markers', textLine3d: '3-D line', textDoughnut: 'Doughnut', textPie3d: '3-D pie', @@ -452,6 +455,10 @@ define(function(){ 'use strict'; textAreaStacked: 'Stacked area', textAreaStackedPer: '100% Stacked area', textScatter: 'Scatter', + textScatterSmoothMarker: 'Scatter with smooth lines and markers', + textScatterSmooth: 'Scatter with smooth lines', + textScatterLineMarker: 'Scatter with straight lines and markers', + textScatterLine: 'Scatter with straight lines', textComboBarLine: 'Clustered column - line', textComboBarLineSecondary: 'Clustered column - line on secondary axis', textComboAreaBar: 'Stacked area - clustered column', @@ -464,8 +471,8 @@ define(function(){ 'use strict'; {id: 'menu-chart-group-pie', caption: this.textPie}, {id: 'menu-chart-group-hbar', caption: this.textBar}, {id: 'menu-chart-group-area', caption: this.textArea, inline: true}, - {id: 'menu-chart-group-scatter', caption: this.textPoint, inline: true}, {id: 'menu-chart-group-stock', caption: this.textStock, inline: true}, + {id: 'menu-chart-group-scatter', caption: this.textPoint}, {id: 'menu-chart-group-combo', caption: this.textCombo} // {id: 'menu-chart-group-surface', caption: this.textSurface} ]; @@ -483,6 +490,9 @@ define(function(){ 'use strict'; { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal', tip: this.textLine}, { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack', tip: this.textLineStacked}, { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack', tip: this.textLineStackedPer}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormalMarker, iconCls: 'line-normal-marker', tip: this.textLineMarker}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedMarker, iconCls: 'line-stack-marker', tip: this.textLineStackedMarker}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPerMarker,iconCls: 'line-pstack-marker', tip: this.textLineStackedPerMarker}, { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d', tip: this.textLine3d, is3d: true}, { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal', tip: this.textPie}, { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut', tip: this.textDoughnut}, @@ -497,6 +507,10 @@ define(function(){ 'use strict'; { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack', tip: this.textAreaStacked}, { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack', tip: this.textAreaStackedPer}, { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal', tip: this.textScatter}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatterSmoothMarker,iconCls: 'point-smooth-marker', tip: this.textScatterSmoothMarker}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatterSmooth, iconCls: 'point-smooth', tip: this.textScatterSmooth}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatterLineMarker, iconCls: 'point-line-marker', tip: this.textScatterLineMarker}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatterLine, iconCls: 'point-line', tip: this.textScatterLine}, { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal', tip: this.textStock}, { group: 'menu-chart-group-combo', type: Asc.c_oAscChartTypeSettings.comboBarLine, iconCls: 'combo-bar-line', tip: this.textComboBarLine}, { group: 'menu-chart-group-combo', type: Asc.c_oAscChartTypeSettings.comboBarLineSecondary, iconCls: 'combo-bar-line-sec', tip: this.textComboBarLineSecondary}, diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index ee0289d94..6b0737226 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -517,6 +517,8 @@ // charts .menu-insertchart { + margin: 5px 5px 0 10px; + .group-description { padding-left: 4px; } diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 011a52bd1..913031aa2 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -250,9 +250,9 @@ define([ cls : 'btn-large-dataview', iconCls : 'svgicon chart-column-normal', menu : new Common.UI.Menu({ - style: 'width: 364px; padding-top: 12px;', + style: 'width: 364px;', items: [ - { template: _.template('') } + { template: _.template('') } ] }) }); @@ -260,7 +260,7 @@ define([ me.mnuChartTypePicker = new Common.UI.DataView({ el: $('#id-chart-menu-type'), parentMenu: btn.menu, - restoreHeight: 421, + restoreHeight: 465, groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
\">
') diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 1d51e90ca..672bdd40b 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1756,7 +1756,7 @@ define([ this.btnInsertChart.setMenu( new Common.UI.Menu({ style: 'width: 364px;', items: [ - {template: _.template('')} + {template: _.template('')} ] })); @@ -1765,8 +1765,8 @@ define([ el: $('#id-toolbar-menu-insertchart'), parentMenu: menu, showLast: false, - restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)), + restoreHeight: 465, + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
\">
') }); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index b4a115636..975ad8547 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -104,10 +104,17 @@ "Common.define.chartData.textLine3d": "3-D line", "Common.define.chartData.textLineStacked": "Stacked line", "Common.define.chartData.textLineStackedPer": "100% Stacked line", + "Common.define.chartData.textLineMarker": "Line with markers", + "Common.define.chartData.textLineStackedMarker": "Stacked line with markers", + "Common.define.chartData.textLineStackedPerMarker": "100% Stacked line with markers", "Common.define.chartData.textPie": "Pie", "Common.define.chartData.textPie3d": "3-D pie", "Common.define.chartData.textPoint": "XY (Scatter)", "Common.define.chartData.textScatter": "Scatter", + "Common.define.chartData.textScatterSmoothMarker": "Scatter with smooth lines and markers", + "Common.define.chartData.textScatterSmooth": "Scatter with smooth lines", + "Common.define.chartData.textScatterLineMarker": "Scatter with straight lines and markers", + "Common.define.chartData.textScatterLine": "Scatter with straight lines", "Common.define.chartData.textStock": "Stock", "Common.define.chartData.textSurface": "Surface", "Common.Translation.warnFileLocked": "You can't edit this file because it's being edited in another app.", diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index f48a79233..b33b20ae9 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -203,9 +203,9 @@ define([ cls : 'btn-large-dataview', iconCls : 'svgicon chart-bar-normal', menu : new Common.UI.Menu({ - style: 'width: 364px; padding-top: 12px;', + style: 'width: 364px;', items: [ - { template: _.template('') } + { template: _.template('') } ] }) }); @@ -213,7 +213,7 @@ define([ me.mnuChartTypePicker = new Common.UI.DataView({ el: $('#id-chart-menu-type'), parentMenu: btn.menu, - restoreHeight: 421, + restoreHeight: 465, groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
\">
') diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 2dcd960cb..332f96444 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -3653,7 +3653,7 @@ define([ this.placeholderMenuChart = menu = new Common.UI.Menu({ style: 'width: 364px;', items: [ - {template: _.template('')} + {template: _.template('')} ] }); // Prepare menu container diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index d4950b936..9e64c9b56 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1208,7 +1208,7 @@ define([ this.btnInsertChart.setMenu( new Common.UI.Menu({ style: 'width: 364px;', items: [ - {template: _.template('')} + {template: _.template('')} ] })); @@ -1217,8 +1217,8 @@ define([ el: $('#id-toolbar-menu-insertchart'), parentMenu: menu, showLast: false, - restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)), + restoreHeight: 465, + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
\">
') }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 8053ae156..7e3b4c917 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -34,10 +34,17 @@ "Common.define.chartData.textLine3d": "3-D line", "Common.define.chartData.textLineStacked": "Stacked line", "Common.define.chartData.textLineStackedPer": "100% Stacked line", + "Common.define.chartData.textLineMarker": "Line with markers", + "Common.define.chartData.textLineStackedMarker": "Stacked line with markers", + "Common.define.chartData.textLineStackedPerMarker": "100% Stacked line with markers", "Common.define.chartData.textPie": "Pie", "Common.define.chartData.textPie3d": "3-D pie", "Common.define.chartData.textPoint": "XY (Scatter)", "Common.define.chartData.textScatter": "Scatter", + "Common.define.chartData.textScatterSmoothMarker": "Scatter with smooth lines and markers", + "Common.define.chartData.textScatterSmooth": "Scatter with smooth lines", + "Common.define.chartData.textScatterLineMarker": "Scatter with straight lines and markers", + "Common.define.chartData.textScatterLine": "Scatter with straight lines", "Common.define.chartData.textStock": "Stock", "Common.define.chartData.textSurface": "Surface", "Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.", diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 3b588cf58..f86cbbe7b 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -646,9 +646,9 @@ define([ cls : 'btn-large-dataview', iconCls : 'svgicon chart-spark-column', menu : new Common.UI.Menu({ - style: 'width: 167px; padding-top: 12px;', + style: 'width: 167px;', items: [ - { template: _.template('') } + { template: _.template('') } ] }) }); diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index c32f5e47b..90382ec6d 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -123,10 +123,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' cls: 'btn-large-dataview', iconCls: 'svgicon chart-bar-normal', menu: new Common.UI.Menu({ - style: 'width: 364px; padding-top: 12px;', + style: 'width: 364px;', additionalAlign: this.menuAddAlign, items: [ - {template: _.template('')} + {template: _.template('')} ] }) }); @@ -134,7 +134,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' me.mnuChartTypePicker = new Common.UI.DataView({ el: $('#id-chart-dlg-menu-type'), parentMenu: btn.menu, - restoreHeight: 421, + restoreHeight: 465, groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
\">
') @@ -774,10 +774,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' cls : 'btn-large-dataview', iconCls : 'svgicon chart-spark-column', menu : new Common.UI.Menu({ - style: 'width: 167px; padding-top: 12px;', + style: 'width: 167px;', additionalAlign: this.menuAddAlign, items: [ - { template: _.template('') } + { template: _.template('') } ] }) }); @@ -1115,7 +1115,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' updateAxisProps: function(type, isDefault) { var value = (type == Asc.c_oAscChartTypeSettings.lineNormal || type == Asc.c_oAscChartTypeSettings.lineStacked || - type == Asc.c_oAscChartTypeSettings.lineStackedPer || type == Asc.c_oAscChartTypeSettings.scatter); + type == Asc.c_oAscChartTypeSettings.lineStackedPer || type == Asc.c_oAscChartTypeSettings.lineNormalMarker || + type == Asc.c_oAscChartTypeSettings.lineStackedMarker || type == Asc.c_oAscChartTypeSettings.lineStackedPerMarker || + type == Asc.c_oAscChartTypeSettings.scatter || type == Asc.c_oAscChartTypeSettings.scatterSmoothMarker || type == Asc.c_oAscChartTypeSettings.scatterSmooth || + type == Asc.c_oAscChartTypeSettings.scatterLineMarker || type == Asc.c_oAscChartTypeSettings.scatterLine); this.chMarkers.setVisible(value); this.cmbLines.setVisible(value); this.lblLines.toggleClass('hidden', !value); @@ -1144,7 +1147,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' value = (type == Asc.c_oAscChartTypeSettings.hBarNormal || type == Asc.c_oAscChartTypeSettings.hBarStacked || type == Asc.c_oAscChartTypeSettings.hBarStackedPer || type == Asc.c_oAscChartTypeSettings.hBarNormal3d || type == Asc.c_oAscChartTypeSettings.hBarStacked3d || type == Asc.c_oAscChartTypeSettings.hBarStackedPer3d); this.btnsCategory[2].options.contentTarget = (value) ? 'id-chart-settings-dlg-hor' : 'id-chart-settings-dlg-vert'; - this.btnsCategory[4].options.contentTarget = (value || type == Asc.c_oAscChartTypeSettings.scatter) ? 'id-chart-settings-dlg-vert' : 'id-chart-settings-dlg-hor'; + this.btnsCategory[4].options.contentTarget = (value || type == Asc.c_oAscChartTypeSettings.scatter || type == Asc.c_oAscChartTypeSettings.scatterSmoothMarker || type == Asc.c_oAscChartTypeSettings.scatterSmooth || + type == Asc.c_oAscChartTypeSettings.scatterLineMarker || type == Asc.c_oAscChartTypeSettings.scatterLine) ? 'id-chart-settings-dlg-vert' : 'id-chart-settings-dlg-hor'; }, updateDataLabels: function(chartType, labelPos) { @@ -1161,7 +1165,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' data.push({ value: Asc.c_oAscChartDataLabelsPos.inBase, displayValue: this.textInnerBottom }, { value: Asc.c_oAscChartDataLabelsPos.inEnd, displayValue: this.textInnerTop }); else if (chartType == Asc.c_oAscChartTypeSettings.lineNormal || chartType == Asc.c_oAscChartTypeSettings.lineStacked || chartType == Asc.c_oAscChartTypeSettings.lineStackedPer || - chartType == Asc.c_oAscChartTypeSettings.stock || chartType == Asc.c_oAscChartTypeSettings.scatter) + chartType == Asc.c_oAscChartTypeSettings.lineNormalMarker || chartType == Asc.c_oAscChartTypeSettings.lineStackedMarker || chartType == Asc.c_oAscChartTypeSettings.lineStackedPerMarker || + chartType == Asc.c_oAscChartTypeSettings.stock || chartType == Asc.c_oAscChartTypeSettings.scatter || chartType == Asc.c_oAscChartTypeSettings.scatterSmoothMarker || + chartType == Asc.c_oAscChartTypeSettings.scatterSmooth || chartType == Asc.c_oAscChartTypeSettings.scatterLineMarker || chartType == Asc.c_oAscChartTypeSettings.scatterLine) data.push({ value: Asc.c_oAscChartDataLabelsPos.l, displayValue: this.textLeft }, { value: Asc.c_oAscChartDataLabelsPos.r, displayValue: this.textRight }, { value: Asc.c_oAscChartDataLabelsPos.t, displayValue: this.textTop }, @@ -1519,7 +1525,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.chartSettings.putShowMarker(this.chMarkers.getValue()=='checked'); value = (type == Asc.c_oAscChartTypeSettings.lineNormal || type == Asc.c_oAscChartTypeSettings.lineStacked || - type == Asc.c_oAscChartTypeSettings.lineStackedPer || type == Asc.c_oAscChartTypeSettings.scatter); + type == Asc.c_oAscChartTypeSettings.lineStackedPer || type == Asc.c_oAscChartTypeSettings.lineNormalMarker || + type == Asc.c_oAscChartTypeSettings.lineStackedMarker || type == Asc.c_oAscChartTypeSettings.lineStackedPerMarker || + type == Asc.c_oAscChartTypeSettings.scatter || type == Asc.c_oAscChartTypeSettings.scatterSmoothMarker || type == Asc.c_oAscChartTypeSettings.scatterSmooth || + type == Asc.c_oAscChartTypeSettings.scatterLineMarker || type == Asc.c_oAscChartTypeSettings.scatterLine); if (value) { value = this.cmbLines.getValue(); this.chartSettings.putLine(value!==0); diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index 043889d85..0fdeeef17 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -146,10 +146,10 @@ define([ cls : 'btn-large-dataview', iconCls : 'svgicon chart-bar-normal', menu : new Common.UI.Menu({ - style: 'width: 364px; padding-top: 12px;', + style: 'width: 364px;', additionalAlign: this.menuAddAlign, items: [ - { template: _.template('') } + { template: _.template('') } ] }) }); @@ -157,7 +157,7 @@ define([ me.mnuChartTypePicker = new Common.UI.DataView({ el: $('#chart-type-dlg-menu-type', me.$window), parentMenu: btn.menu, - restoreHeight: 421, + restoreHeight: 465, groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), store: new Common.UI.DataViewStore(arr), itemTemplate: _.template('
\">
') @@ -394,10 +394,10 @@ define([ }); var combomenu = new Common.UI.Menu({ cls: 'menu-absolute', - style: 'width: 318px; padding-top: 12px;', + style: 'width: 318px;', additionalAlign: this.menuAddAlign, items: [ - { template: _.template('') } + { template: _.template('') } ] }); combomenu.render(el); @@ -406,7 +406,7 @@ define([ var picker = new Common.UI.DataView({ el: $('#chart-type-dlg-series-menu-' + index), parentMenu: menu, - restoreHeight: 421, + restoreHeight: 465, groups: new Common.UI.DataViewGroupStore(me._arrSeriesGroups), store: store, itemTemplate: _.template('
\">
') diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 339470977..e59b8abe4 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1873,7 +1873,7 @@ define([ this.btnInsertChart.setMenu(new Common.UI.Menu({ style: 'width: 364px;', items: [ - { template: _.template('') } + { template: _.template('') } ] })); @@ -1882,8 +1882,8 @@ define([ el: $('#id-toolbar-menu-insertchart'), parentMenu: menu, showLast: false, - restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)/*.concat(Common.define.chartData.getSparkGroupData(true))*/), + restoreHeight: 465, + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()/*.concat(Common.define.chartData.getSparkGroupData(true))*/), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()/*.concat(Common.define.chartData.getSparkData())*/), itemTemplate: _.template('
\">
') }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 9c96c346e..6867f29e3 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -33,10 +33,17 @@ "Common.define.chartData.textLineSpark": "Line", "Common.define.chartData.textLineStacked": "Stacked line", "Common.define.chartData.textLineStackedPer": "100% Stacked line", + "Common.define.chartData.textLineMarker": "Line with markers", + "Common.define.chartData.textLineStackedMarker": "Stacked line with markers", + "Common.define.chartData.textLineStackedPerMarker": "100% Stacked line with markers", "Common.define.chartData.textPie": "Pie", "Common.define.chartData.textPie3d": "3-D pie", "Common.define.chartData.textPoint": "XY (Scatter)", "Common.define.chartData.textScatter": "Scatter", + "Common.define.chartData.textScatterSmoothMarker": "Scatter with smooth lines and markers", + "Common.define.chartData.textScatterSmooth": "Scatter with smooth lines", + "Common.define.chartData.textScatterLineMarker": "Scatter with straight lines and markers", + "Common.define.chartData.textScatterLine": "Scatter with straight lines", "Common.define.chartData.textSparks": "Sparklines", "Common.define.chartData.textStock": "Stock", "Common.define.chartData.textSurface": "Surface", From 20d9a35c09985c2a0888b1b93ae5ae2131d06235 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sat, 23 Jan 2021 12:52:10 +0300 Subject: [PATCH 2/3] Update chart icons --- .../main/resources/img/toolbar/charttypes.svg | 39 ++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/apps/common/main/resources/img/toolbar/charttypes.svg b/apps/common/main/resources/img/toolbar/charttypes.svg index d31405510..daa501ee8 100644 --- a/apps/common/main/resources/img/toolbar/charttypes.svg +++ b/apps/common/main/resources/img/toolbar/charttypes.svg @@ -36,8 +36,8 @@ - - + + @@ -48,8 +48,9 @@ - - + + + @@ -104,7 +105,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From dee1f1e43a2b0c69d378ba43fe78c9441f505310 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 25 Jan 2021 12:40:06 +0300 Subject: [PATCH 3/3] Update icons --- .../main/resources/img/toolbar/charttypes.svg | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/apps/common/main/resources/img/toolbar/charttypes.svg b/apps/common/main/resources/img/toolbar/charttypes.svg index daa501ee8..b868c604e 100644 --- a/apps/common/main/resources/img/toolbar/charttypes.svg +++ b/apps/common/main/resources/img/toolbar/charttypes.svg @@ -40,12 +40,33 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + +