From 175a2a0d441adc3a9c5c31ff9127c27b0e0ff8c3 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 28 Jun 2021 14:39:33 +0300 Subject: [PATCH 1/4] [SSE mobile] Bug 48387 --- apps/spreadsheeteditor/mobile/locale/en.json | 34 ++++++++++++++++++- .../mobile/src/controller/Main.jsx | 34 ++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 02681d4f8..a5fe60013 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -28,7 +28,39 @@ "txtXAxis": "X Axis", "txtYAxis": "Y Axis", "txtArt": "Your text here", - "txtAccent": "Accent" + "txtAccent": "Accent", + "txtTable": "Table", + "txtPrintArea": "Print_Area", + "txtConfidential": "Confidential", + "txtPreparedBy": "Prepared by", + "txtPage": "Page", + "txtPageOf": "Page %1 of %2", + "txtPages": "Pages", + "txtDate": "Date", + "txtTime": "Time", + "txtTab": "Tab", + "txtFile": "File", + "txtColumn": "Column", + "txtRow": "Row", + "txtByField": "%1 of %2", + "txtAll": "(All)", + "txtValues": "Values", + "txtGrandTotal": "Grand Total", + "txtRowLbls": "Row Labels", + "txtColLbls": "Column Labels", + "txtMultiSelect": "Multi-Select (Alt+S)", + "txtClearFilter": "Clear Filter (Alt+C)", + "txtBlank": "(blank)", + "txtGroup": "Group", + "txtSeconds": "Seconds", + "txtMinutes": "Minutes", + "txtHours": "Hours", + "txtDays": "Days", + "txtMonths": "Months", + "txtQuarters": "Quarters", + "txtYears": "Years", + "txtOr": "%1 or %2", + "txtQuarter": "Qtr" }, "textGuest": "Guest", "textAnonymous": "Anonymous", diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index a021ed9e2..34d72d1af 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -221,7 +221,39 @@ class MainController extends Component { 'Diagram Title': _t.txtDiagramTitle, 'X Axis': _t.txtXAxis, 'Y Axis': _t.txtYAxis, - 'Your text here': _t.txtArt + 'Your text here': _t.txtArt, + 'Table': _t.txtTable, + 'Print_Area': _t.txtPrintArea, + 'Confidential': _t.txtConfidential, + 'Prepared by ': _t.txtPreparedBy + ' ', + 'Page': _t.txtPage, + 'Page %1 of %2': _t.txtPageOf, + 'Pages': _t.txtPages, + 'Date': _t.txtDate, + 'Time': _t.txtTime, + 'Tab': _t.txtTab, + 'File': _t.txtFile, + 'Column': _t.txtColumn, + 'Row': _t.txtRow, + '%1 of %2': _t.txtByField, + '(All)': _t.txtAll, + 'Values': _t.txtValues, + 'Grand Total': _t.txtGrandTotal, + 'Row Labels': _t.txtRowLbls, + 'Column Labels': _t.txtColLbls, + 'Multi-Select (Alt+S)': _t.txtMultiSelect, + 'Clear Filter (Alt+C)': _t.txtClearFilter, + '(blank)': _t.txtBlank, + 'Group': _t.txtGroup, + 'Seconds': _t.txtSeconds, + 'Minutes': _t.txtMinutes, + 'Hours': _t.txtHours, + 'Days': _t.txtDays, + 'Months': _t.txtMonths, + 'Quarters': _t.txtQuarters, + 'Years': _t.txtYears, + '%1 or %2': _t.txtOr, + 'Qtr': _t.txtQuarter }; styleNames.forEach(function(item){ translate[item] = _t['txtStyle_' + item.replace(/ /g, '_')] || item; From 1fb891a772c7ce80783588ac5477f19ad78edf24 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 28 Jun 2021 14:42:17 +0300 Subject: [PATCH 2/4] [DE mobile] Fix bug 50954 --- apps/documenteditor/mobile/src/controller/edit/EditText.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx index 922458b4b..b71bd38c5 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx @@ -18,7 +18,7 @@ class EditTextController extends Component { if (isDecrement) { typeof size === 'undefined' ? api.FontSizeOut() : size = Math.max(1, --size); } else { - typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(300, ++size); + typeof size === 'undefined' ? api.FontSizeIn() : size = Math.min(300, ++size); } if (typeof size !== 'undefined') { api.put_TextPrFontSize(size); From cc850adfcc77d0eb6f5d5fbaaf1ea35cde76e483 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 28 Jun 2021 15:52:28 +0300 Subject: [PATCH 3/4] [DE PE mobile] Fix bug 50773 --- .../mobile/src/controller/add/AddTable.jsx | 44 ++++++++++--------- .../mobile/src/controller/add/AddOther.jsx | 44 ++++++++++--------- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/add/AddTable.jsx b/apps/documenteditor/mobile/src/controller/add/AddTable.jsx index 4a0a4bfd5..7916390a1 100644 --- a/apps/documenteditor/mobile/src/controller/add/AddTable.jsx +++ b/apps/documenteditor/mobile/src/controller/add/AddTable.jsx @@ -56,28 +56,30 @@ class AddTableController extends Component { api.put_Table(parseInt(size[0]), parseInt(size[1]), type.toString()); } } - ] + ], + on: { + open: () => { + picker = f7.picker.create({ + containerEl: document.getElementById('picker-table-size'), + cols: [ + { + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + }, + { + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + } + ], + toolbar: false, + rotateEffect: true, + value: [3, 3] + }); + } + } }).open(); - dialog.on('opened', () => { - picker = f7.picker.create({ - containerEl: document.getElementById('picker-table-size'), - cols: [ - { - textAlign: 'center', - width: '100%', - values: [1,2,3,4,5,6,7,8,9,10] - }, - { - textAlign: 'center', - width: '100%', - values: [1,2,3,4,5,6,7,8,9,10] - } - ], - toolbar: false, - rotateEffect: true, - value: [3, 3] - }); - }); } render () { diff --git a/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx b/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx index 4ac82cca4..f10cbe1f5 100644 --- a/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx +++ b/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx @@ -64,28 +64,30 @@ class AddOtherController extends Component { api.put_Table(parseInt(size[0]), parseInt(size[1]), undefined, type.toString()); } } - ] + ], + on: { + open: () => { + picker = f7.picker.create({ + containerEl: document.getElementById('picker-table-size'), + cols: [ + { + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + }, + { + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + } + ], + toolbar: false, + rotateEffect: true, + value: [3, 3] + }); + } + } }).open(); - dialog.on('opened', () => { - picker = f7.picker.create({ - containerEl: document.getElementById('picker-table-size'), - cols: [ - { - textAlign: 'center', - width: '100%', - values: [1,2,3,4,5,6,7,8,9,10] - }, - { - textAlign: 'center', - width: '100%', - values: [1,2,3,4,5,6,7,8,9,10] - } - ], - toolbar: false, - rotateEffect: true, - value: [3, 3] - }); - }); } hideAddComment () { From dbf70c662a4a62ea60ac7596ae078b03a2d1d60a Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 28 Jun 2021 17:45:02 +0300 Subject: [PATCH 4/4] [mobile] Bug 47107 --- apps/documenteditor/mobile/locale/en.json | 22 ++++++++++++++++++- .../src/view/settings/DocumentSettings.jsx | 10 ++++++++- apps/presentationeditor/mobile/locale/en.json | 22 ++++++++++++++++++- .../view/settings/PresentationSettings.jsx | 10 ++++++++- apps/spreadsheeteditor/mobile/locale/en.json | 22 ++++++++++++++++++- .../src/view/settings/SpreadsheetSettings.jsx | 10 ++++++++- 6 files changed, 90 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 0492ef13d..4d0ad3a70 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -340,7 +340,27 @@ "textMarginsW": "Left and right margins are too high for a given page width", "textMarginsH": "Top and bottom margins are too high for a given page height", "textCollaboration": "Collaboration", - "textFindAndReplaceAll": "Find and Replace All" + "textFindAndReplaceAll": "Find and Replace All", + "txtScheme1": "Office", + "txtScheme2": "Grayscale", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme22": "New Office" }, "Edit": { "textClose": "Close", diff --git a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx index b20ad6c11..89111190b 100644 --- a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx @@ -162,6 +162,13 @@ const PageDocumentColorSchemes = props => { const _t = t('Settings', {returnObjects: true}); const storeSettings = props.storeDocumentSettings; const allSchemes = storeSettings.allSchemes; + const SchemeNames = [ + _t.txtScheme1, _t.txtScheme2, _t.txtScheme3, _t.txtScheme4, _t.txtScheme5, + _t.txtScheme6, _t.txtScheme7, _t.txtScheme8, _t.txtScheme9, _t.txtScheme10, + _t.txtScheme11, _t.txtScheme12, _t.txtScheme13, _t.txtScheme14, _t.txtScheme15, + _t.txtScheme16, _t.txtScheme17, _t.txtScheme18, _t.txtScheme19, _t.txtScheme20, + _t.txtScheme21, _t.txtScheme22 + ]; return ( @@ -169,8 +176,9 @@ const PageDocumentColorSchemes = props => { { allSchemes ? allSchemes.map((scheme, index) => { + const name = scheme.get_name(); return ( - { if(index !== curScheme) { setScheme(index); diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 381d210e9..8b114090e 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -209,7 +209,27 @@ "textHighlight": "Highlight Results", "textReplace": "Replace", "textNoTextFound": "Text not Found", - "textCollaboration": "Collaboration" + "textCollaboration": "Collaboration", + "txtScheme1": "Office", + "txtScheme2": "Grayscale", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme22": "New Office" }, "Add": { "textSlide": "Slide", diff --git a/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx b/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx index c8b345505..b04053ca8 100644 --- a/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx @@ -38,6 +38,13 @@ const PagePresentationColorSchemes = props => { const _t = t('View.Settings', {returnObjects: true}); const storePresentationSettings = props.storePresentationSettings; const allSchemes = storePresentationSettings.allSchemes; + const SchemeNames = [ + _t.txtScheme1, _t.txtScheme2, _t.txtScheme3, _t.txtScheme4, _t.txtScheme5, + _t.txtScheme6, _t.txtScheme7, _t.txtScheme8, _t.txtScheme9, _t.txtScheme10, + _t.txtScheme11, _t.txtScheme12, _t.txtScheme13, _t.txtScheme14, _t.txtScheme15, + _t.txtScheme16, _t.txtScheme17, _t.txtScheme18, _t.txtScheme19, _t.txtScheme20, + _t.txtScheme21, _t.txtScheme22 + ]; return ( @@ -45,8 +52,9 @@ const PagePresentationColorSchemes = props => { { allSchemes ? allSchemes.map((scheme, index) => { + const name = scheme.get_name(); return ( - { if(index !== curScheme) { setScheme(index); diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index a5fe60013..ce0f9d7ef 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -545,7 +545,27 @@ "textValues": "Values", "textNoTextFound": "Text not found", "textReplaceAll": "Replace All", - "textCollaboration": "Collaboration" + "textCollaboration": "Collaboration", + "txtScheme1": "Office", + "txtScheme2": "Grayscale", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme22": "New Office" } }, "Statusbar": { diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx index 47705562d..78feb66f4 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx @@ -11,6 +11,13 @@ const PageSpreadsheetColorSchemes = props => { const _t = t('View.Settings', {returnObjects: true}); const storeSpreadsheetSettings = props.storeSpreadsheetSettings; const allSchemes = storeSpreadsheetSettings.allSchemes; + const SchemeNames = [ + _t.txtScheme1, _t.txtScheme2, _t.txtScheme3, _t.txtScheme4, _t.txtScheme5, + _t.txtScheme6, _t.txtScheme7, _t.txtScheme8, _t.txtScheme9, _t.txtScheme10, + _t.txtScheme11, _t.txtScheme12, _t.txtScheme13, _t.txtScheme14, _t.txtScheme15, + _t.txtScheme16, _t.txtScheme17, _t.txtScheme18, _t.txtScheme19, _t.txtScheme20, + _t.txtScheme21, _t.txtScheme22 + ]; return ( @@ -18,8 +25,9 @@ const PageSpreadsheetColorSchemes = props => { { allSchemes ? allSchemes.map((scheme, index) => { + const name = scheme.get_name(); return ( - { if(index !== curScheme) { setScheme(index);