From ce36e9f5a5d129bb8a23319cc77dd6806d4cad2a Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 3 Dec 2020 23:34:20 +0300 Subject: [PATCH] [DE mobile] Add check app options into Application Settings --- .../src/view/settings/ApplicationSettings.jsx | 105 ++++++++++-------- 1 file changed, 58 insertions(+), 47 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx index 8826a1a55..9a3a80060 100644 --- a/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, {Fragment} from "react"; import { observer, inject } from "mobx-react"; import { Page, Navbar, List, ListItem, BlockTitle, Toggle } from "framework7-react"; import { useTranslation } from "react-i18next"; @@ -19,49 +19,58 @@ const PageApplicationSettings = props => { props.setUnitMeasurement(value); }; + // set mode + const appOptions = props.storeAppOptions; + const _isEdit = appOptions.isEdit; + const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true; + return ( - {_t.textUnitOfMeasurement} - - changeMeasureSettings(0)}> - changeMeasureSettings(1)}> - changeMeasureSettings(2)}> - - - - {_t.textSpellcheck} - { - store.changeSpellCheck(!isSpellChecking); - props.switchSpellCheck(!isSpellChecking); - }} - /> - - - - - {_t.textNoCharacters} - { - store.changeNoCharacters(!isNonprintingCharacters); - props.switchNoCharacters(!isNonprintingCharacters); - }} - /> - - - {_t.textHiddenTableBorders} - { - store.changeShowTableEmptyLine(!isHiddenTableBorders); - props.switchShowTableEmptyLine(!isHiddenTableBorders); - }} - /> - - + {_isEdit && + + {_t.textUnitOfMeasurement} + + changeMeasureSettings(0)}> + changeMeasureSettings(1)}> + changeMeasureSettings(2)}> + + + + {_t.textSpellcheck} + { + store.changeSpellCheck(!isSpellChecking); + props.switchSpellCheck(!isSpellChecking); + }} + /> + + + + {/*ToDo: if (DisplayMode == "final" || DisplayMode == "original") {disabled} */} + {_t.textNoCharacters} + { + store.changeNoCharacters(!isNonprintingCharacters); + props.switchNoCharacters(!isNonprintingCharacters); + }} + /> + + {/*ToDo: if (DisplayMode == "final" || DisplayMode == "original") {disabled} */} + {_t.textHiddenTableBorders} + { + store.changeShowTableEmptyLine(!isHiddenTableBorders); + props.switchShowTableEmptyLine(!isHiddenTableBorders); + }} + /> + + + + } {_t.textCommentsDisplay} @@ -83,11 +92,13 @@ const PageApplicationSettings = props => { /> - - - + {_isShowMacros && + + + + } ); }; @@ -118,7 +129,7 @@ const PageMacrosSettings = props => { ); }; -const ApplicationSettings = inject("storeApplicationSettings")(observer(PageApplicationSettings)); +const ApplicationSettings = inject("storeApplicationSettings", "storeAppOptions")(observer(PageApplicationSettings)); const MacrosSettings = inject("storeApplicationSettings")(observer(PageMacrosSettings)); export {ApplicationSettings, MacrosSettings}; \ No newline at end of file