From 2ea5a0a47c237efb143b93f21344e66384df0c89 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Aug 2024 23:44:33 +0300 Subject: [PATCH 01/24] [DE] Add signature field --- .../main/app/controller/FormsTab.js | 3 ++- .../main/app/view/FormSettings.js | 24 ++++++++++++------- apps/documenteditor/main/app/view/FormsTab.js | 21 +++++++++++++++- apps/documenteditor/main/locale/en.json | 3 +++ 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index a0df61aee0..74b3e08937 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -280,7 +280,8 @@ define([ this.api.asc_AddContentControlTextForm(props); } else if (type == 'complex') { this.api.asc_AddComplexForm(); - } + } else if (type === 'signature') + this.api.asc_AddContentControlSignature(oFormPr); var me = this; if (!this._state.formCount) { // add first form diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index cb410464f0..b288cf73fe 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -109,6 +109,7 @@ define([ this.DateOnlySettings = el.find('.form-datetime'); this.DefValueText = el.find('#form-txt-def-value').closest('tr'); this.DefValueDropDown = el.find('#form-combo-def-value').closest('tr'); + this.TagSettings = el.find('#form-txt-tag').closest('tr'); !Common.UI.FeaturesManager.isFeatureEnabled('roles', true) && el.find('#form-combo-roles').closest('tr').hide(); }, @@ -1391,8 +1392,8 @@ define([ if (formPr) { this._originalFormProps = formPr; - if (type == Asc.c_oAscContentControlSpecificType.Picture) - this.labelFormName.text(this.textImage); + if (type == Asc.c_oAscContentControlSpecificType.Picture) + this.labelFormName.text(props.is_Signature() ? this.textSignature : this.textImage); var data = this.api.asc_GetFormKeysByType(type); if (!this._state.arrKey || this._state.arrKey.length!==data.length || _.difference(this._state.arrKey, data).length>0) { @@ -1543,9 +1544,11 @@ define([ } - var pictPr = props.get_PictureFormPr(); + var pictPr = props.get_PictureFormPr(), + isSignature = false; if (pictPr) { this._originalPictProps = pictPr; + isSignature = props.is_Signature(); val = pictPr.get_ConstantProportions(); if ( this._state.Aspect!==val ) { this.chAspect.setValue(!!val, true); @@ -1578,6 +1581,7 @@ define([ var disableSliders = this._state.scaleFlag === Asc.c_oAscPictureFormScaleFlag.Always && !this._state.Aspect || this._state.DisabledControls; this.sldrPreviewPositionX.setDisabled(disableSliders); this.sldrPreviewPositionY.setDisabled(disableSliders); + this.chRequired.setDisabled(isSignature || this._state.DisabledControls); } var formTextPr = props.get_TextFormPr(); @@ -1704,12 +1708,14 @@ define([ this.ConnectedSettings.toggleClass('hidden', !connected); this.TextOnlySettingsMask.toggleClass('hidden', !(type === Asc.c_oAscContentControlSpecificType.None && !!formTextPr) || this._state.FormatType!==Asc.TextFormFormatType.Mask); this.TextOnlySettingsRegExp.toggleClass('hidden', !(type === Asc.c_oAscContentControlSpecificType.None && !!formTextPr) || this._state.FormatType!==Asc.TextFormFormatType.RegExp); - if (this.type !== type || this.isSimpleInsideComplex !== isSimpleInsideComplex || needUpdateTextControls || type == Asc.c_oAscContentControlSpecificType.CheckBox) - this.showHideControls(type, formTextPr, specProps, isSimpleInsideComplex); + if (this.type !== type || this.isSimpleInsideComplex !== isSimpleInsideComplex || needUpdateTextControls || + type == Asc.c_oAscContentControlSpecificType.CheckBox || this.isSignature !== isSignature) + this.showHideControls(type, formTextPr, specProps, isSimpleInsideComplex, isSignature); if (this.type !== type || this.isSimpleInsideComplex !== isSimpleInsideComplex) this.fireEvent('updatescroller', this); this.type = type; this.isSimpleInsideComplex = isSimpleInsideComplex; + this.isSignature = isSignature; this._state.internalId = this.internalId; } @@ -1804,9 +1810,10 @@ define([ this.sldrPreviewPositionY.setDisabled(disableSliders || this._state.DisabledControls); this.btnListAdd.setDisabled(this.txtNewValue.length<1 || this._state.DisabledControls); this.btnLockForm.setDisabled(disable); + this.chRequired.setDisabled(this.isSignature || this._state.DisabledControls); }, - showHideControls: function(type, textProps, specProps, isSimpleInsideComplex) { + showHideControls: function(type, textProps, specProps, isSimpleInsideComplex, isSignature) { var textOnly = false, checkboxOnly = false, radioboxOnly = false, @@ -1830,17 +1837,18 @@ define([ this.TextOnlySettings.toggleClass('hidden', !textOnly); this.TextOnlySimpleSettings.toggleClass('hidden', !textOnly || isSimpleInsideComplex); this.ListOnlySettings.toggleClass('hidden', !listOnly); - this.ImageOnlySettings.toggleClass('hidden', !imageOnly); + this.ImageOnlySettings.toggleClass('hidden', !imageOnly || isSignature); this.RadioOnlySettings.toggleClass('hidden', !radioboxOnly); this.KeySettings.toggleClass('hidden', radioboxOnly || isSimpleInsideComplex); var value = (checkboxOnly || radioboxOnly); this.PlaceholderSettings.toggleClass('hidden', value); this.CheckOnlySettings.toggleClass('hidden', !value); - this.FixedSettings.toggleClass('hidden', imageOnly || isSimpleInsideComplex); + this.FixedSettings.toggleClass('hidden', imageOnly || isSimpleInsideComplex || isSignature); this.NotInComplexSettings.toggleClass('hidden', isSimpleInsideComplex); this.DateOnlySettings.toggleClass('hidden', !dateOnly); this.DefValueText.toggleClass('hidden', !(type === Asc.c_oAscContentControlSpecificType.ComboBox || textOnly)); this.DefValueDropDown.toggleClass('hidden', type !== Asc.c_oAscContentControlSpecificType.DropDownList); + this.TagSettings.toggleClass('hidden', isSignature || isSimpleInsideComplex); }, onSelectItem: function(listView, itemView, record) { diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js index e5394990b9..61b5999341 100644 --- a/apps/documenteditor/main/app/view/FormsTab.js +++ b/apps/documenteditor/main/app/view/FormsTab.js @@ -69,6 +69,7 @@ define([ '' + '' + '' + + '' + '' + '' + ' diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index b59eb8346b..433de714c9 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -241,6 +241,11 @@ define([ this.lblLines = $('#chart-dlg-label-lines'); + this.chShowEquation = new Common.UI.CheckBox({ + el: $('#chart-dlg-chk-show-equation'), + labelText: this.textShowEquation + }); + // Vertical Axis this.cmbMinType = []; this.spnMinValue = []; @@ -1193,6 +1198,7 @@ define([ this.chMarkers.setVisible(value); this.cmbLines.setVisible(value); this.lblLines.toggleClass('hidden', !value); + this.lblLines.closest('tr').toggleClass('hidden', !value); if (value) { this.chMarkers.setValue(this.chartSettings.getShowMarker(), true); @@ -1507,10 +1513,12 @@ define([ this.chCategoryName.setValue(this.chartSettings.getShowCatName(), true); this.chValue.setValue(this.chartSettings.getShowVal(), true); + this.chShowEquation.setValue(this.chartSettings.getDisplayTrendlinesEquation(), true); + var value = props.getSeparator(); this.txtSeparator.setValue((value) ? value : ''); - Common.UI.FocusManager.add(this, [this.cmbChartTitle, this.cmbLegendPos, this.cmbDataLabels, this.chSeriesName, this.chCategoryName, this.chValue, this.txtSeparator, this.cmbLines, this.chMarkers]); + Common.UI.FocusManager.add(this, [this.cmbChartTitle, this.cmbLegendPos, this.cmbDataLabels, this.chSeriesName, this.chCategoryName, this.chValue, this.txtSeparator, this.cmbLines, this.chMarkers, this.chShowEquation]); // Vertical Axis this.vertAxisProps = props.getVertAxesProps(); @@ -1649,6 +1657,8 @@ define([ this.chartSettings.putShowCatName(this.chCategoryName.getValue()=='checked'); this.chartSettings.putShowVal(this.chValue.getValue()=='checked'); + this.chartSettings.putDisplayTrendlinesEquation(this.chShowEquation.getValue()=='checked'); + this.chartSettings.putSeparator(_.isEmpty(this.txtSeparator.getValue()) ? ' ' : this.txtSeparator.getValue()); this.chMarkers.isVisible() && this.chartSettings.putShowMarker(this.chMarkers.getValue()=='checked'); @@ -1987,7 +1997,9 @@ define([ textHideAxis: 'Hide axis', textFormat: 'Label format', textBase: 'Base', - textLogScale: 'Logarithmic Scale' + textLogScale: 'Logarithmic Scale', + textTrendlineOptions: 'Trendline options', + textShowEquation: 'Display equation on chart' }, SSE.Views.ChartSettingsDlg || {})); }); diff --git a/apps/spreadsheeteditor/main/locale/ar.json b/apps/spreadsheeteditor/main/locale/ar.json index 2d3f1f1de1..590c685cf8 100644 --- a/apps/spreadsheeteditor/main/locale/ar.json +++ b/apps/spreadsheeteditor/main/locale/ar.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "أدخل كلمة السر لفك تشفير الصفحة", "SSE.Views.WBProtection.txtSheetUnlockTitle": "فك حماية الورقة", "SSE.Views.WBProtection.txtWBUnlockDescription": "أدخل كلمة سر لفك تشفير المصنف", - "SSE.Views.WBProtection.txtWBUnlockTitle": "فك حماية المصنف" + "SSE.Views.WBProtection.txtWBUnlockTitle": "فك حماية المصنف", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/az.json b/apps/spreadsheeteditor/main/locale/az.json index 5788b7c52a..ddbc81b1b6 100644 --- a/apps/spreadsheeteditor/main/locale/az.json +++ b/apps/spreadsheeteditor/main/locale/az.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Vərəqin mühafizəsini ləğv etmək üçün parol daxil edin", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Vərəqin qorumasını ləğv et", "SSE.Views.WBProtection.txtWBUnlockDescription": "İş kitabının mühafizəsini ləğv etmək üçün parol daxil edin", - "SSE.Views.WBProtection.txtWBUnlockTitle": "İş kitabının qorumasını ləğv et" + "SSE.Views.WBProtection.txtWBUnlockTitle": "İş kitabının qorumasını ləğv et", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/be.json b/apps/spreadsheeteditor/main/locale/be.json index 98b364a392..fb881fe4c3 100644 --- a/apps/spreadsheeteditor/main/locale/be.json +++ b/apps/spreadsheeteditor/main/locale/be.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Каб зняць абарону аркуша, увядзіце пароль", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Зняць абарону аркуша", "SSE.Views.WBProtection.txtWBUnlockDescription": "Каб зняць абарону кнігі, увядзіце пароль", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняць абарону працоўнай кнігі" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняць абарону працоўнай кнігі", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/bg.json b/apps/spreadsheeteditor/main/locale/bg.json index e345d80c1c..2677f64a5f 100644 --- a/apps/spreadsheeteditor/main/locale/bg.json +++ b/apps/spreadsheeteditor/main/locale/bg.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Unprotect sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ca.json b/apps/spreadsheeteditor/main/locale/ca.json index afeb67d71e..c71588e53b 100644 --- a/apps/spreadsheeteditor/main/locale/ca.json +++ b/apps/spreadsheeteditor/main/locale/ca.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introdueix una contrasenya per desprotegir el full", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desprotegeix el full", "SSE.Views.WBProtection.txtWBUnlockDescription": "Introdueix una contrasenya per desprotegir el llibre", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotegeix el llibre de treball" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotegeix el llibre de treball", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/cs.json b/apps/spreadsheeteditor/main/locale/cs.json index 4fe68402a5..031b05c3b0 100644 --- a/apps/spreadsheeteditor/main/locale/cs.json +++ b/apps/spreadsheeteditor/main/locale/cs.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Zadejte heslo pro deaktivaci zabezpečení listu", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Zrušit zabezpečení listu", "SSE.Views.WBProtection.txtWBUnlockDescription": "Vložte heslo pro přístup k sešitu", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušit zabezpečení sešitu" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušit zabezpečení sešitu", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/da.json b/apps/spreadsheeteditor/main/locale/da.json index 81e7066090..a7b677beb4 100644 --- a/apps/spreadsheeteditor/main/locale/da.json +++ b/apps/spreadsheeteditor/main/locale/da.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Indtast en adgangskode for at fjerne beskyttelsen af ​​arket", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Fjern beskyttelse af ark", "SSE.Views.WBProtection.txtWBUnlockDescription": "Indtast en adgangskode for at fjerne beskyttelsen af ​​projektmappen", - "SSE.Views.WBProtection.txtWBUnlockTitle": "ubeskyt projektmappe" + "SSE.Views.WBProtection.txtWBUnlockTitle": "ubeskyt projektmappe", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index d174f91656..796921865e 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Zum Entschützen der Tabellenkalkulation bitte Kennwort eingeben", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Liste entschützen", "SSE.Views.WBProtection.txtWBUnlockDescription": "Zum Entschützen der Arbeitsmappe bitte Kennwort eingeben", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Arbeitsmappe entschützen" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Arbeitsmappe entschützen", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/el.json b/apps/spreadsheeteditor/main/locale/el.json index 466bdc6203..1ba59ed9e8 100644 --- a/apps/spreadsheeteditor/main/locale/el.json +++ b/apps/spreadsheeteditor/main/locale/el.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Εισάγετε συνθηματικό για άρση προστασίας φύλλου", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Άρση προστασίας φύλλου", "SSE.Views.WBProtection.txtWBUnlockDescription": "Εισάγετε συνθηματικό για άρση προστασίας βιβλίου εργασίας", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Άρση προστασίας βιβλίου εργασίας" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Άρση προστασίας βιβλίου εργασίας", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 9dfc76adbf..b9f2ce4b65 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -2204,6 +2204,8 @@ "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y axis title", "SSE.Views.ChartSettingsDlg.textZero": "Zero", "SSE.Views.ChartSettingsDlg.txtEmpty": "This field is required", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", "SSE.Views.ChartTypeDialog.errorComboSeries": "To create a combination chart, select at least two series of data.", "SSE.Views.ChartTypeDialog.errorSecondaryAxis": "The selected chart type requires the secondary axis that an existing chart is using. Select another chart type.", "SSE.Views.ChartTypeDialog.textSecondary": "Secondary axis", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 6dd578229b..30636db45a 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introduzca una contraseña para quitarle la protección a la hoja", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desproteger hoja", "SSE.Views.WBProtection.txtWBUnlockDescription": "Introduzca una contraseña para quitarle la protección al libro", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger libro" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger libro", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/eu.json b/apps/spreadsheeteditor/main/locale/eu.json index 9631525b95..b419ecc10f 100644 --- a/apps/spreadsheeteditor/main/locale/eu.json +++ b/apps/spreadsheeteditor/main/locale/eu.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Idatzi pasahitza orriari babesa kentzeko", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Kendu babesa orriari", "SSE.Views.WBProtection.txtWBUnlockDescription": "Idatzi pasahitza laneko liburuari babesa kentzeko", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Kendu babesa laneko liburuari" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Kendu babesa laneko liburuari", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/fi.json b/apps/spreadsheeteditor/main/locale/fi.json index f098434816..6cf4808f62 100644 --- a/apps/spreadsheeteditor/main/locale/fi.json +++ b/apps/spreadsheeteditor/main/locale/fi.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Unprotect sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 7d4b4811c4..537c5588ce 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Entrez un mot de passe pour déprotéger la feuille de calcul", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Déprotéger la feuille de calcul", "SSE.Views.WBProtection.txtWBUnlockDescription": "Entrez un mot de passe pour déprotéger le classeur", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Déprotéger le classeur" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Déprotéger le classeur", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/gl.json b/apps/spreadsheeteditor/main/locale/gl.json index 94b72d886e..03db922b84 100644 --- a/apps/spreadsheeteditor/main/locale/gl.json +++ b/apps/spreadsheeteditor/main/locale/gl.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introduza un contrasinal para quitarlle a protección á folla", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desprotexer folla", "SSE.Views.WBProtection.txtWBUnlockDescription": "Introduza un contrasinal para quitarlle a protección ao libro", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotexer libro" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotexer libro", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/he.json b/apps/spreadsheeteditor/main/locale/he.json index a6672a7acf..6f747f7df4 100644 --- a/apps/spreadsheeteditor/main/locale/he.json +++ b/apps/spreadsheeteditor/main/locale/he.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "הזנת סיסמה כדי להסיר הגנה גיליון", "SSE.Views.WBProtection.txtSheetUnlockTitle": "הסרת הגנה על גליון", "SSE.Views.WBProtection.txtWBUnlockDescription": "הזנת סיסמה כדי לבטל את ההגנה חוברת עבודה", - "SSE.Views.WBProtection.txtWBUnlockTitle": "חוברת עבודה לא מוגנת" + "SSE.Views.WBProtection.txtWBUnlockTitle": "חוברת עבודה לא מוגנת", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json index a79e80fbad..ac6988764c 100644 --- a/apps/spreadsheeteditor/main/locale/hu.json +++ b/apps/spreadsheeteditor/main/locale/hu.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Írjon be egy jelszót a munkalap védelmének megszüntetéséhez", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Munkalap védelmének megszüntetése", "SSE.Views.WBProtection.txtWBUnlockDescription": "Írjon be egy jelszót a munkafüzet védelmének megszüntetéséhez", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Munkafüzet védelmének megszüntetése" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Munkafüzet védelmének megszüntetése", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/hy.json b/apps/spreadsheeteditor/main/locale/hy.json index 26fc3819f2..5f485f94fc 100644 --- a/apps/spreadsheeteditor/main/locale/hy.json +++ b/apps/spreadsheeteditor/main/locale/hy.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Մուտքագրեք գաղտնաբառ՝ թերթը չպաշտպանելու համար", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Չպաշտպանել թերթիկը", "SSE.Views.WBProtection.txtWBUnlockDescription": "Մուտքագրեք գաղտնաբառ՝ աշխատանքային գրքույկը պաշտպանելու համար", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Չպաշտպանել աշխատանքային գրքույկը" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Չպաշտպանել աշխատանքային գրքույկը", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/id.json b/apps/spreadsheeteditor/main/locale/id.json index 4bcb9853ea..0baf42a661 100644 --- a/apps/spreadsheeteditor/main/locale/id.json +++ b/apps/spreadsheeteditor/main/locale/id.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Masukkan password untuk membuka proteksi sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Buka Proteksi Sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Masukkan password untuk membuka proteksi workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Buka Proteksi Workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Buka Proteksi Workbook", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index 480bb3127c..25092871cd 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Inserisci una password per rimuovere la protezione del foglio", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Rimuovi la protezione del foglio", "SSE.Views.WBProtection.txtWBUnlockDescription": "Inserisci una password per rimuovere la protezione del libro di lavoro", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Rimuovi la protezione del libro di lavoro" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Rimuovi la protezione del libro di lavoro", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ja.json b/apps/spreadsheeteditor/main/locale/ja.json index 67636beff9..e6e40ca0aa 100644 --- a/apps/spreadsheeteditor/main/locale/ja.json +++ b/apps/spreadsheeteditor/main/locale/ja.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "シートを保護解除するようにパスワードを入力してください", "SSE.Views.WBProtection.txtSheetUnlockTitle": "シートを保護を解除する", "SSE.Views.WBProtection.txtWBUnlockDescription": "ブックを保護解除するようにパスワードを入力してください", - "SSE.Views.WBProtection.txtWBUnlockTitle": "ブックを保護を解除する" + "SSE.Views.WBProtection.txtWBUnlockTitle": "ブックを保護を解除する", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ko.json b/apps/spreadsheeteditor/main/locale/ko.json index b95186380e..4017fe2275 100644 --- a/apps/spreadsheeteditor/main/locale/ko.json +++ b/apps/spreadsheeteditor/main/locale/ko.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "양식 보호를 해제하려면 비밀번호를 입력하세요.", "SSE.Views.WBProtection.txtSheetUnlockTitle": "시트 보호해제", "SSE.Views.WBProtection.txtWBUnlockDescription": "통합 문서 보호를 해제하려면 비밀번호를 입력하세요.", - "SSE.Views.WBProtection.txtWBUnlockTitle": "통합 문서 보호 잠금 해제" + "SSE.Views.WBProtection.txtWBUnlockTitle": "통합 문서 보호 잠금 해제", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/lo.json b/apps/spreadsheeteditor/main/locale/lo.json index d3dc3cc46b..3357cfcfc4 100644 --- a/apps/spreadsheeteditor/main/locale/lo.json +++ b/apps/spreadsheeteditor/main/locale/lo.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "ໃສ່ລະຫັດຜ່ານເພື່ອຍົກເລີກການປ້ອງກັນແຜ່ນ", "SSE.Views.WBProtection.txtSheetUnlockTitle": "ບໍ່ປ້ອງກັນແຜ່ນຊີດ", "SSE.Views.WBProtection.txtWBUnlockDescription": "ປ້ອນລະຫັດຜ່ານເພື່ອບໍ່ປົກປ້ອງປື້ມບັນທືກ", - "SSE.Views.WBProtection.txtWBUnlockTitle": "ບໍ່ປ້ອງ ປື້ມບັນທືກ" + "SSE.Views.WBProtection.txtWBUnlockTitle": "ບໍ່ປ້ອງ ປື້ມບັນທືກ", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/lv.json b/apps/spreadsheeteditor/main/locale/lv.json index a426156885..285dcbb2cb 100644 --- a/apps/spreadsheeteditor/main/locale/lv.json +++ b/apps/spreadsheeteditor/main/locale/lv.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Ievadiet paroli, lai noņemtu lapas aizsardzību", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Noņemt aizsargāto lapu", "SSE.Views.WBProtection.txtWBUnlockDescription": "Ievadiet paroli, lai noņemtu darbgrāmatas aizsardzību", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Noņemt darbgrāmatas aizsardzību" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Noņemt darbgrāmatas aizsardzību", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ms.json b/apps/spreadsheeteditor/main/locale/ms.json index 275a2e3d71..c2ac1c59a5 100644 --- a/apps/spreadsheeteditor/main/locale/ms.json +++ b/apps/spreadsheeteditor/main/locale/ms.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Masukkan kata laluan untuk melindungi helaian", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Helaian Nyahlindung", "SSE.Views.WBProtection.txtWBUnlockDescription": "Masukkan kata laluan untuk melindungi buku kerja", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Buku Kerja Nyahlindung" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Buku Kerja Nyahlindung", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/nl.json b/apps/spreadsheeteditor/main/locale/nl.json index 0114fb8813..efe57f62d8 100644 --- a/apps/spreadsheeteditor/main/locale/nl.json +++ b/apps/spreadsheeteditor/main/locale/nl.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Voer een wachtwoord in om de beveiliging voor het blad op te heffen", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Beveiliging van blad opheffen", "SSE.Views.WBProtection.txtWBUnlockDescription": "Voer een wachtwoord in om de beveiliging voor het werkboek op te heffen", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Beveiliging van werkboek opheffen" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Beveiliging van werkboek opheffen", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/pl.json b/apps/spreadsheeteditor/main/locale/pl.json index 00d053b07d..e80d8f716b 100644 --- a/apps/spreadsheeteditor/main/locale/pl.json +++ b/apps/spreadsheeteditor/main/locale/pl.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Wprowadź hasło, aby odblokować arkusz", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Usuń ochronę arkusza", "SSE.Views.WBProtection.txtWBUnlockDescription": "Wprowadź hasło, aby wyłączyć ochronę skoroszytu", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Usuń ochronę skoroszytu" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Usuń ochronę skoroszytu", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/pt-pt.json b/apps/spreadsheeteditor/main/locale/pt-pt.json index 0ab5d1115d..d0490f0b9d 100644 --- a/apps/spreadsheeteditor/main/locale/pt-pt.json +++ b/apps/spreadsheeteditor/main/locale/pt-pt.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introduza uma palavra-passe para desbloquear a folha", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desproteger folha", "SSE.Views.WBProtection.txtWBUnlockDescription": "Introduza uma palavra-passe para desbloquear o livro", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger Livro" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger Livro", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index 0733db303a..903eae2ba6 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Digite uma senha para desproteger a folha", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desproteger a folha", "SSE.Views.WBProtection.txtWBUnlockDescription": "Digite uma senha para desproteger a pasta de trabalho", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger pasta de trabalho" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger pasta de trabalho", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ro.json b/apps/spreadsheeteditor/main/locale/ro.json index 029e14b913..7de4cb2ef5 100644 --- a/apps/spreadsheeteditor/main/locale/ro.json +++ b/apps/spreadsheeteditor/main/locale/ro.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introduceți parola pentru dezactivarea protejării a foii de calcul", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Anularea protecției foii de calcul", "SSE.Views.WBProtection.txtWBUnlockDescription": "Introduceți parola pentru dezactivarea protejării a registrului de calcul", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Dezactivarea protejării registrului de calcul" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Dezactivarea protejării registrului de calcul", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 765b6a29c4..3f74b5d586 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Введите пароль для отключения защиты листа", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Снять защиту листа", "SSE.Views.WBProtection.txtWBUnlockDescription": "Введите пароль для отключения защиты книги", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Снять защиту книги" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Снять защиту книги", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/si.json b/apps/spreadsheeteditor/main/locale/si.json index 57d753a49c..878b5f9bc9 100644 --- a/apps/spreadsheeteditor/main/locale/si.json +++ b/apps/spreadsheeteditor/main/locale/si.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "පත්‍රය අනාරක්‍ෂණයට මුරපදයක් යොදන්න", "SSE.Views.WBProtection.txtSheetUnlockTitle": "කොළය අනාරක්‍ෂණය", "SSE.Views.WBProtection.txtWBUnlockDescription": "වැඩපොත අනාරක්‍ෂණයට මුරපදයක් ඇතුල් කරන්න", - "SSE.Views.WBProtection.txtWBUnlockTitle": "වැඩපොත අනාරක්‍ෂණය" + "SSE.Views.WBProtection.txtWBUnlockTitle": "වැඩපොත අනාරක්‍ෂණය", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sk.json b/apps/spreadsheeteditor/main/locale/sk.json index 9f51d28802..aca879321d 100644 --- a/apps/spreadsheeteditor/main/locale/sk.json +++ b/apps/spreadsheeteditor/main/locale/sk.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Zadajte heslo pre deaktiváciu zabezpečenia listu", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Zrušte ochranu listu", "SSE.Views.WBProtection.txtWBUnlockDescription": "Vložte heslo pre vstup k zošitu", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušte ochranu zošita" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušte ochranu zošita", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sl.json b/apps/spreadsheeteditor/main/locale/sl.json index 33959fef63..655bc6a181 100644 --- a/apps/spreadsheeteditor/main/locale/sl.json +++ b/apps/spreadsheeteditor/main/locale/sl.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Unprotect sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sr-cyrl.json b/apps/spreadsheeteditor/main/locale/sr-cyrl.json index d3ca3e2846..792beddde4 100644 --- a/apps/spreadsheeteditor/main/locale/sr-cyrl.json +++ b/apps/spreadsheeteditor/main/locale/sr-cyrl.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Унесите лозинку да незаштитите лист", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Незаштити лист", "SSE.Views.WBProtection.txtWBUnlockDescription": "Унесите лозинку да незаштитите радну књигу", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Незаштити радну књигу" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Незаштити радну књигу", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sr.json b/apps/spreadsheeteditor/main/locale/sr.json index ea4a0c1590..05ca14c9f6 100644 --- a/apps/spreadsheeteditor/main/locale/sr.json +++ b/apps/spreadsheeteditor/main/locale/sr.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Unesite lozinku da nezaštitite list", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Nezaštiti list", "SSE.Views.WBProtection.txtWBUnlockDescription": "Unesite lozinku da nezaštitite radnu knjigu", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Nezaštiti radnu knjigu" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Nezaštiti radnu knjigu", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sv.json b/apps/spreadsheeteditor/main/locale/sv.json index e34cf4b206..ed6a336ac4 100644 --- a/apps/spreadsheeteditor/main/locale/sv.json +++ b/apps/spreadsheeteditor/main/locale/sv.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Ange ett lösenord för att låsa upp kalkylarkets skydd", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Lås upp kalkylbladet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Ange ett lösenord för att låsa upp arbetsbokens skydd", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Lås upp arbetsboken" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Lås upp arbetsboken", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/tr.json b/apps/spreadsheeteditor/main/locale/tr.json index 8b13150926..3f85699d16 100644 --- a/apps/spreadsheeteditor/main/locale/tr.json +++ b/apps/spreadsheeteditor/main/locale/tr.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Sayfanın korumasını kaldırmak için bir şifre girin", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Korumasız Sayfa", "SSE.Views.WBProtection.txtWBUnlockDescription": "Çalışma kitabının korumasını kaldırmak için bir parola girin", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Korumasız Çalışma Sayfası" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Korumasız Çalışma Sayfası", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/uk.json b/apps/spreadsheeteditor/main/locale/uk.json index 80cb020bca..d264ed388a 100644 --- a/apps/spreadsheeteditor/main/locale/uk.json +++ b/apps/spreadsheeteditor/main/locale/uk.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Введіть пароль для вимкнення захисту аркуша", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Зняти захист аркуша", "SSE.Views.WBProtection.txtWBUnlockDescription": "Введіть пароль для вимкнення захисту книги", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняти захист книги" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняти захист книги", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/vi.json b/apps/spreadsheeteditor/main/locale/vi.json index 02dcfa1107..eaedb89ad0 100644 --- a/apps/spreadsheeteditor/main/locale/vi.json +++ b/apps/spreadsheeteditor/main/locale/vi.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Unprotect sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/zh-tw.json b/apps/spreadsheeteditor/main/locale/zh-tw.json index 50a52621b2..b11f2aff6f 100644 --- a/apps/spreadsheeteditor/main/locale/zh-tw.json +++ b/apps/spreadsheeteditor/main/locale/zh-tw.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "輸入密碼以解除工作表的保護", "SSE.Views.WBProtection.txtSheetUnlockTitle": "解除工作表保護", "SSE.Views.WBProtection.txtWBUnlockDescription": "輸入密碼以解除工作簿的保護", - "SSE.Views.WBProtection.txtWBUnlockTitle": "解除工作簿保護" + "SSE.Views.WBProtection.txtWBUnlockTitle": "解除工作簿保護", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/zh.json b/apps/spreadsheeteditor/main/locale/zh.json index e863ddaea2..69299ebdf2 100644 --- a/apps/spreadsheeteditor/main/locale/zh.json +++ b/apps/spreadsheeteditor/main/locale/zh.json @@ -4489,5 +4489,7 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "输入密码以取消工作表保护", "SSE.Views.WBProtection.txtSheetUnlockTitle": "撤消工作表保护", "SSE.Views.WBProtection.txtWBUnlockDescription": "输入密码以取消工作簿保护", - "SSE.Views.WBProtection.txtWBUnlockTitle": "撤消工作簿保护" + "SSE.Views.WBProtection.txtWBUnlockTitle": "撤消工作簿保护", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file From 2d704a1927452b7abeeab12ba56802154044ea4c Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Tue, 8 Oct 2024 01:17:07 +0300 Subject: [PATCH 17/24] [PDF] changed 'Submit' button --- apps/documenteditor/mobile/locale/en.json | 2 +- apps/documenteditor/mobile/src/less/app.less | 2 +- .../mobile/src/view/Toolbar.jsx | 23 ++++++++++++++++--- .../mobile/src/view/settings/SettingsPage.jsx | 2 +- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index e08f66dcf6..94b5da5365 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -779,7 +779,7 @@ "textSpellcheck": "Spell Checking", "textStatistic": "Statistic", "textSubject": "Subject", - "textSubmit": "Submit", + "del_textSubmit": "Submit", "textSymbols": "Symbols", "textTheme": "Theme", "textTitle": "Title", diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 43f2dccc1f..4b36eee216 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -382,7 +382,7 @@ transition: opacity 300ms; } // -#btn-save-form { +#btn-submit-form { background-color: @toolbar-icons; color: @toolbar-background; height: 2em; diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx index e32c1059f7..666d28641a 100644 --- a/apps/documenteditor/mobile/src/view/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx @@ -91,9 +91,26 @@ const ToolbarView = props => { ] : [ props.movePrevField()}>, props.moveNextField()}>, - props.openOptions('settings')}>, - props.saveForm()}>, + (props.canSubmitForms ? + <> + props.openOptions('settings')}> + props.saveForm()}> + : <> + props.saveForm()}> + {props.openOptions('settings')}}> + + ) ]} diff --git a/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx b/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx index da3fe7f49a..2d17a0ba35 100644 --- a/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx +++ b/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx @@ -83,7 +83,7 @@ const SettingsPage = inject("storeAppOptions", "storeReview", "storeDocumentInfo : ''), (canFillForms && canSubmitForms ? - + : ''), From be0b10f20f52f0cdd91ee930d9da310810caa018 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 8 Oct 2024 08:55:59 +0000 Subject: [PATCH 18/24] Update apps/common/main/lib/util/themeinit.js [main] fix editors launch --- apps/common/main/lib/util/themeinit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/util/themeinit.js b/apps/common/main/lib/util/themeinit.js index e2ba2f5fd8..8cd8fcbf21 100644 --- a/apps/common/main/lib/util/themeinit.js +++ b/apps/common/main/lib/util/themeinit.js @@ -123,7 +123,7 @@ } } } else { - if ( window.uitheme.id.lastIndexOf("theme-gray", 0) === 0 ) { + if ( window.uitheme.id && window.uitheme.id.lastIndexOf("theme-gray", 0) === 0 ) { header_tokens.forEach(function (i) { !!document.documentElement.style.setProperty('--' + i, "#f7f7f7"); }); From 274ef0b3f6dd1a1c80783383a8f2b115971c5851 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 8 Oct 2024 12:05:00 +0300 Subject: [PATCH 19/24] [SSE] Fix trendline option --- .../main/app/view/ChartSettingsDlg.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index 433de714c9..a686924721 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -244,7 +244,10 @@ define([ this.chShowEquation = new Common.UI.CheckBox({ el: $('#chart-dlg-chk-show-equation'), labelText: this.textShowEquation - }); + }).on('change', _.bind(function (checkbox, state) { + if (this.chartSettings) + this.chartSettings.putDisplayTrendlinesEquation(state==='checked'); + }, this)); // Vertical Axis this.cmbMinType = []; @@ -1513,11 +1516,13 @@ define([ this.chCategoryName.setValue(this.chartSettings.getShowCatName(), true); this.chValue.setValue(this.chartSettings.getShowVal(), true); - this.chShowEquation.setValue(this.chartSettings.getDisplayTrendlinesEquation(), true); - var value = props.getSeparator(); this.txtSeparator.setValue((value) ? value : ''); + value = this.chartSettings.getDisplayTrendlinesEquation(); + this.chShowEquation.setValue(value !== undefined ? !!value : 'indeterminate', true); + this.chShowEquation.setDisabled(value===null, true); + Common.UI.FocusManager.add(this, [this.cmbChartTitle, this.cmbLegendPos, this.cmbDataLabels, this.chSeriesName, this.chCategoryName, this.chValue, this.txtSeparator, this.cmbLines, this.chMarkers, this.chShowEquation]); // Vertical Axis @@ -1657,8 +1662,6 @@ define([ this.chartSettings.putShowCatName(this.chCategoryName.getValue()=='checked'); this.chartSettings.putShowVal(this.chValue.getValue()=='checked'); - this.chartSettings.putDisplayTrendlinesEquation(this.chShowEquation.getValue()=='checked'); - this.chartSettings.putSeparator(_.isEmpty(this.txtSeparator.getValue()) ? ' ' : this.txtSeparator.getValue()); this.chMarkers.isVisible() && this.chartSettings.putShowMarker(this.chMarkers.getValue()=='checked'); From 3547f179a975cb938a818450edb320d9510769f0 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Tue, 8 Oct 2024 16:51:44 +0300 Subject: [PATCH 20/24] [mobile] changed 'settings' icon --- apps/common/mobile/resources/less/ios/icons.less | 5 +++++ apps/common/mobile/resources/less/material/icons.less | 5 +++++ apps/documenteditor/mobile/src/less/icons-ios.less | 5 ----- apps/documenteditor/mobile/src/less/icons-material.less | 5 ----- apps/presentationeditor/mobile/src/less/icons-ios.less | 6 ------ apps/presentationeditor/mobile/src/less/icons-material.less | 6 ------ apps/spreadsheeteditor/mobile/src/less/icons-ios.less | 5 ----- apps/spreadsheeteditor/mobile/src/less/icons-material.less | 5 ----- 8 files changed, 10 insertions(+), 32 deletions(-) diff --git a/apps/common/mobile/resources/less/ios/icons.less b/apps/common/mobile/resources/less/ios/icons.less index cc2e505a3c..804c965a0e 100644 --- a/apps/common/mobile/resources/less/ios/icons.less +++ b/apps/common/mobile/resources/less/ios/icons.less @@ -55,5 +55,10 @@ height: 24px; .encoded-svg-mask(''); } + &.icon-settings { + width: 24px; + height: 24px; + .encoded-svg-mask(''); + } } } diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less index 74e02fd9b8..9a3457b4a4 100644 --- a/apps/common/mobile/resources/less/material/icons.less +++ b/apps/common/mobile/resources/less/material/icons.less @@ -92,6 +92,11 @@ height: 24px; .encoded-svg-mask('', @toolbar-icons); } + &.icon-settings { + width: 22px; + height: 22px; + .encoded-svg-mask('', @toolbar-icons); + } } } } diff --git a/apps/documenteditor/mobile/src/less/icons-ios.less b/apps/documenteditor/mobile/src/less/icons-ios.less index faab8c7e8f..1b7b1d86ea 100644 --- a/apps/documenteditor/mobile/src/less/icons-ios.less +++ b/apps/documenteditor/mobile/src/less/icons-ios.less @@ -20,11 +20,6 @@ height: 22px; .encoded-svg-mask(''); } - &.icon-settings { - width: 24px; - height: 24px; - .encoded-svg-mask(''); - } &.icon-expand-down { width: 22px; height: 22px; diff --git a/apps/documenteditor/mobile/src/less/icons-material.less b/apps/documenteditor/mobile/src/less/icons-material.less index 267073920a..2a46124b09 100644 --- a/apps/documenteditor/mobile/src/less/icons-material.less +++ b/apps/documenteditor/mobile/src/less/icons-material.less @@ -21,11 +21,6 @@ height: 22px; .encoded-svg-mask('', @toolbar-icons); } - &.icon-settings { - width: 22px; - height: 22px; - .encoded-svg-mask('', @toolbar-icons); - } &.icon-prev { width: 20px; height: 20px; diff --git a/apps/presentationeditor/mobile/src/less/icons-ios.less b/apps/presentationeditor/mobile/src/less/icons-ios.less index 04532d397c..82dde9122e 100644 --- a/apps/presentationeditor/mobile/src/less/icons-ios.less +++ b/apps/presentationeditor/mobile/src/less/icons-ios.less @@ -61,12 +61,6 @@ .encoded-svg-mask(''); } - &.icon-settings { - width: 24px; - height: 24px; - .encoded-svg-mask(''); - } - &.icon-feedback { width: 22px; height: 22px; diff --git a/apps/presentationeditor/mobile/src/less/icons-material.less b/apps/presentationeditor/mobile/src/less/icons-material.less index c2396a834e..4ee863f566 100644 --- a/apps/presentationeditor/mobile/src/less/icons-material.less +++ b/apps/presentationeditor/mobile/src/less/icons-material.less @@ -467,12 +467,6 @@ .encoded-svg-mask('', @toolbar-icons); } - &.icon-settings { - width: 22px; - height: 22px; - .encoded-svg-mask('', @toolbar-icons); - } - &.icon-prev { width: 20px; height: 20px; diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less index a145bbff78..ee08b96d8c 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less @@ -42,11 +42,6 @@ height: 22px; .encoded-svg-mask('') } - &.icon-settings { - width: 24px; - height: 24px; - .encoded-svg-mask(''); - } &.icon-feedback { width: 22px; diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-material.less b/apps/spreadsheeteditor/mobile/src/less/icons-material.less index b94189b715..e0c9ede20b 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-material.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-material.less @@ -369,11 +369,6 @@ height: 22px; .encoded-svg-mask('', @toolbar-icons); } - &.icon-settings { - width: 22px; - height: 22px; - .encoded-svg-mask('', @toolbar-icons); - } &.icon-prev { width: 20px; height: 20px; From b6d0ee81971b89545beb5a293b535917aa2ac2e6 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Tue, 8 Oct 2024 16:55:57 +0300 Subject: [PATCH 21/24] [mobile] changed 'Save form' icon --- apps/documenteditor/mobile/src/less/icons-common.less | 2 +- apps/documenteditor/mobile/src/less/icons-material.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/mobile/src/less/icons-common.less b/apps/documenteditor/mobile/src/less/icons-common.less index 7296f63bf6..f100955f52 100644 --- a/apps/documenteditor/mobile/src/less/icons-common.less +++ b/apps/documenteditor/mobile/src/less/icons-common.less @@ -93,7 +93,7 @@ i.icon { &.icon-save-form { width: 24px; height: 24px; - .encoded-svg-mask('') + .encoded-svg-mask(''); } &.icon-add-favorites { width: 24px; diff --git a/apps/documenteditor/mobile/src/less/icons-material.less b/apps/documenteditor/mobile/src/less/icons-material.less index 2a46124b09..cf5b31c05f 100644 --- a/apps/documenteditor/mobile/src/less/icons-material.less +++ b/apps/documenteditor/mobile/src/less/icons-material.less @@ -93,7 +93,7 @@ &.icon-save-form { width: 24px; height: 24px; - .encoded-svg-mask('', @toolbar-icons); + .encoded-svg-mask('', @toolbar-icons); } } } From 1af9b6996396e1d6a6a7f13f05edd5db09e05fc4 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Tue, 8 Oct 2024 16:58:15 +0300 Subject: [PATCH 22/24] [mobile] removed 'save' and 'submit' buttons from settings view --- .../mobile/src/view/settings/SettingsPage.jsx | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx b/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx index 2d17a0ba35..dfdb1931af 100644 --- a/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx +++ b/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx @@ -82,16 +82,6 @@ const SettingsPage = inject("storeAppOptions", "storeReview", "storeDocumentInfo : ''), - (canFillForms && canSubmitForms ? - - - - : ''), - (_canDownload && canFillForms && !canSubmitForms ? - - - - : ''), From a1038c4631c386088dbd0bfa6eef25d9293867e0 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Tue, 8 Oct 2024 17:00:31 +0300 Subject: [PATCH 23/24] [mobile] refactoring --- .../documenteditor/mobile/src/controller/Toolbar.jsx | 1 + apps/documenteditor/mobile/src/less/app-ios.less | 2 +- apps/documenteditor/mobile/src/less/app.less | 1 + apps/documenteditor/mobile/src/view/Toolbar.jsx | 12 ++++++------ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/Toolbar.jsx b/apps/documenteditor/mobile/src/controller/Toolbar.jsx index 55c27c1995..1a82bb8ca5 100644 --- a/apps/documenteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/controller/Toolbar.jsx @@ -415,6 +415,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto saveForm={saveForm} isForm={isForm} canFillForms={canFillForms} + canSubmitForms={appOptions.canSubmitForms} /> ) })); diff --git a/apps/documenteditor/mobile/src/less/app-ios.less b/apps/documenteditor/mobile/src/less/app-ios.less index 2419089403..40f134a478 100644 --- a/apps/documenteditor/mobile/src/less/app-ios.less +++ b/apps/documenteditor/mobile/src/less/app-ios.less @@ -98,7 +98,7 @@ } } - #btn-save-form { + #btn-submit-form { background-color: @brand-form; } } diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 4b36eee216..9cfeea9d01 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -389,5 +389,6 @@ border-radius: 1em; padding-left: 15px; padding-right: 15px; + margin-right: 5px; } diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx index 666d28641a..a501573d50 100644 --- a/apps/documenteditor/mobile/src/view/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx @@ -92,24 +92,24 @@ const ToolbarView = props => { props.movePrevField()}>, props.moveNextField()}>, (props.canSubmitForms ? - <> + [ props.openOptions('settings')}> + onClick={() => props.openOptions('settings')}>, props.saveForm()}> - : <> + ] : [ props.saveForm()}> + icon='icon-save-form' href={false} onClick={() => props.saveForm()}>, {props.openOptions('settings')}}> - + ] ) ]} From ac00a94b6627b91de4fc9ff59cbbd5e65148b268 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 8 Oct 2024 21:32:24 +0300 Subject: [PATCH 24/24] Fix adding plugins to the toolbar (don't add separator to empty list) --- apps/common/main/lib/controller/Plugins.js | 28 ++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index d07bd2a9c6..2a86d452b2 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -450,28 +450,29 @@ define([ rank = 1.5; rank_plugins++; } - if (new_rank!==rank && rank>-1 && rank_plugins>0) { - _group.appendTo(me.$toolbarPanelPlugins); - $('
').appendTo(me.$toolbarPanelPlugins); - _group = $('
'); - rank_plugins = 0; - } else { - _group.appendTo(me.$toolbarPanelPlugins); - $('').appendTo(me.$toolbarPanelPlugins); - _group = $('
'); - } var btn = me.viewPlugins.createPluginButton(model); if (btn) { + if (new_rank!==rank && rank>-1 && rank_plugins>0) { + _group.appendTo(me.$toolbarPanelPlugins); + $('
').appendTo(me.$toolbarPanelPlugins); + _group = $('
'); + rank_plugins = 0; + } else if (rank_plugins>0) { + _group.appendTo(me.$toolbarPanelPlugins); + $('').appendTo(me.$toolbarPanelPlugins); + _group = $('
'); + } + var $slot = $('').appendTo(_group); btn.render($slot); rank_plugins++; + rank = new_rank; } if (new_rank === 1 && !isBackground) { _group = me.addBackgroundPluginsButton(_group); isBackground = true; } - rank = new_rank; }); _group.appendTo(me.$toolbarPanelPlugins); if (me.backgroundPlugins.length > 0) { @@ -972,6 +973,9 @@ define([ }); pluginStore.reset(arr); this.appOptions.canPlugins = !pluginStore.isEmpty(); + me.newInstalledBackgroundPlugins = _.filter(me.newInstalledBackgroundPlugins, function(item){ + return !!pluginStore.findWhere({guid: item.guid}); + }) } } else if (!uiCustomize){ @@ -1299,7 +1303,7 @@ define([ onModalClose: function () { var plugins = this.newInstalledBackgroundPlugins; - if (plugins && plugins.length > 0) { + if (plugins && plugins.length > 0 && this.viewPlugins.backgroundBtn && this.viewPlugins.backgroundBtn.isVisible()) { var text = plugins.length > 1 ? this.textPluginsSuccessfullyInstalled : Common.Utils.String.format(this.textPluginSuccessfullyInstalled, plugins[0].name); if (this.backgroundPluginsTip && this.backgroundPluginsTip.isVisible()) {