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

[DE mobile] Make encoding

Browse source
This commit is contained in:
SergeyEzhin 2021-07-13 14:14:08 +03:00
parent a041dddc7b
commit 2ae5c222f5
7 changed files with 211 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/mobile/locale/en.json
View file

@ -340,7 +340,10 @@
"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",
"textChooseTxtOptions": "Choose TXT Options",
"txtDownloadTxt": "Download TXT",
"textChooseEncoding": "Choose Encoding"
},
"Edit": {
"textClose": "Close",

127
apps/documenteditor/mobile/src/controller/settings/Download.jsx
View file

@ -25,7 +25,6 @@ class DownloadController extends Component {
const _t = t("Settings", { returnObjects: true });
if(format) {
this.closeModal();
if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) {
f7.dialog.confirm(
(format === Asc.c_oAscFileType.TXT) ? _t.textDownloadTxt : _t.textDownloadRtf,
@ -33,9 +32,13 @@ class DownloadController extends Component {
() => {
if (format == Asc.c_oAscFileType.TXT) {
const isDocReady = this.props.storeAppOptions.isDocReady;
onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, isDocReady, isDRM);
const advOptions = api.asc_getAdvancedOptions();
this.props.storeEncoding.initOptions({type: Asc.c_oAscAdvancedOptionsID.TXT, advOptions, formatOptions: new Asc.asc_CDownloadOptions(format)});
onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, isDocReady);
}
else {
this.closeModal();
setTimeout(() => {
api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
}, 400);
@ -44,6 +47,7 @@ class DownloadController extends Component {
);
}
else {
this.closeModal();
setTimeout(() => {
api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
}, 400);
@ -58,71 +62,72 @@ class DownloadController extends Component {
}
}
const DownloadWithTranslation = inject("storeAppOptions")(observer(withTranslation()(DownloadController)));
const DownloadWithTranslation = inject("storeAppOptions", "storeEncoding")(observer(withTranslation()(DownloadController)));
const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady, canRequestClose, isDRM) => {
if ($$('.dlg-adv-options.modal-in').length > 0) return;
const api = Common.EditorApi.get();
if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
let picker;
const pages = [];
const pagesName = [];
for (let page of advOptions.asc_getCodePages()) {
pages.push(page.asc_getCodePage());
pagesName.push(page.asc_getCodePageName());
}
Common.Notifications.trigger('preloader:close');
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
const buttons = [];
if (mode === 2) {
buttons.push({
text: _t.textCancel
});
}
buttons.push({
text: 'OK',
bold: true,
onClick: function() {
const encoding = picker.value;
if (mode==2) {
formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding));
api.asc_DownloadAs(formatOptions);
} else {
api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding));
}
if (!isDocReady) {
Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256);
}
}
});
const dialog = f7.dialog.create({
title: _t.advTxtOptions,
text: '',
content:
'<div class="content-block">' +
'<div class="row">' +
'<div class="col-100">' + _t.textEncoding + '</div>' +
'</div>' +
'<div id="txt-encoding"></div>' +
'</div>',
buttons: buttons,
cssClass: 'dlg-adv-options'
}).open();
dialog.on('opened', () => {
picker = f7.picker.create({
containerEl: document.getElementById('txt-encoding'),
cols: [
{
values: pages,
displayValues: pagesName
}
],
toolbar: false,
rotateEffect: true,
value: [advOptions.asc_getRecommendedSettings().asc_getCodePage()],
});
});
f7.views.current.router.navigate('/encoding/');
// let picker;
// const pages = [];
// const pagesName = [];
// for (let page of advOptions.asc_getCodePages()) {
// pages.push(page.asc_getCodePage());
// pagesName.push(page.asc_getCodePageName());
// }
// Common.Notifications.trigger('preloader:close');
// Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
// const buttons = [];
// if (mode === 2) {
// buttons.push({
// text: _t.textCancel
// });
// }
// buttons.push({
// text: 'OK',
// bold: true,
// onClick: function() {
// const encoding = picker.value;
// if (mode==2) {
// formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding));
// api.asc_DownloadAs(formatOptions);
// } else {
// api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding));
// }
// if (!isDocReady) {
// Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256);
// }
// }
// });
// const dialog = f7.dialog.create({
// title: _t.advTxtOptions,
// text: '',
// content:
// '<div class="content-block">' +
// '<div class="row">' +
// '<div class="col-100">' + _t.textEncoding + '</div>' +
// '</div>' +
// '<div id="txt-encoding"></div>' +
// '</div>',
// buttons: buttons,
// cssClass: 'dlg-adv-options'
// }).open();
// dialog.on('opened', () => {
// picker = f7.picker.create({
// containerEl: document.getElementById('txt-encoding'),
// cols: [
// {
// values: pages,
// displayValues: pagesName
// }
// ],
// toolbar: false,
// rotateEffect: true,
// value: [advOptions.asc_getRecommendedSettings().asc_getCodePage()],
// });
// });
} else if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
Common.Notifications.trigger('preloader:close');
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);

25
apps/documenteditor/mobile/src/controller/settings/Encoding.jsx Normal file
View file

@ -0,0 +1,25 @@
import React, { Component } from 'react';
import { Device } from '../../../../../common/mobile/utils/device';
import { f7, Page, Navbar, List, ListItem, BlockTitle, ListButton, Popover, Popup } from "framework7-react";
import { withTranslation } from 'react-i18next';
import { observer, inject } from "mobx-react";
import { Encoding } from "../../view/settings/Encoding";
class EncodingController extends Component {
constructor(props) {
super(props);
}
onSaveFormat(type, value) {
const api = Common.EditorApi.get();
api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(value));
}
render() {
return (
<Encoding onSaveFormat={this.onSaveFormat} />
);
}
}
export default EncodingController;

44
apps/documenteditor/mobile/src/store/encoding.js Normal file
View file

@ -0,0 +1,44 @@
import {action, observable, makeObservable} from 'mobx';
export class storeEncoding {
constructor() {
makeObservable(this, {
type: observable,
advOptions: observable,
formatOptions: observable,
pages: observable,
pagesName: observable,
initOptions: action,
valueEncoding: observable,
nameEncoding: observable,
initPages: action,
changeEncoding: action
});
}
pages = [];
pagesName = [];
type;
advOptions;
formatOptions;
valueEncoding;
nameEncoding;
initOptions ({type, advOptions, formatOptions}) {
this.type= type;
this.advOptions = advOptions;
this.formatOptions = formatOptions;
}
initPages() {
for (let page of this.advOptions.asc_getCodePages()) {
this.pages.push(page.asc_getCodePage());
this.pagesName.push(page.asc_getCodePageName());
}
}
changeEncoding(value) {
this.nameEncoding = this.pagesName[this.pages.indexOf(value)];
this.valueEncoding = value;
}
}

2
apps/documenteditor/mobile/src/store/mainStore.js
View file

@ -10,6 +10,7 @@ import {storeTableSettings} from "./tableSettings";
import {storeChartSettings} from "./chartSettings";
import {storeDocumentInfo} from "./documentInfo";
import {storeApplicationSettings} from './applicationSettings';
import {storeEncoding} from "./encoding";
import {storeAppOptions} from "./appOptions";
import {storePalette} from "./palette";
import {storeReview} from "./review";
@ -20,6 +21,7 @@ export const stores = {
storeFocusObjects: new storeFocusObjects(),
storeDocumentSettings: new storeDocumentSettings(),
users: new storeUsers(),
storeEncoding: new storeEncoding(),
storeTextSettings: new storeTextSettings(),
storeParagraphSettings: new storeParagraphSettings(),
storeShapeSettings: new storeShapeSettings(),

60
apps/documenteditor/mobile/src/view/settings/Encoding.jsx Normal file
View file

@ -0,0 +1,60 @@
import React from 'react';
import { observer, inject } from "mobx-react";
import { f7, Page, Navbar, List, ListItem, BlockTitle, ListButton } from "framework7-react";
import { useTranslation } from "react-i18next";
const PageEncoding = props => {
const { t } = useTranslation();
const _t = t("Settings", { returnObjects: true });
const storeEncoding = props.storeEncoding;
const nameEncoding = storeEncoding.nameEncoding;
const type = storeEncoding.type;
storeEncoding.initPages();
const advOptions = storeEncoding.advOptions;
const pagesName = storeEncoding.pagesName;
return (
<Page>
<Navbar title={_t.textChooseTxtOptions} backLink={_t.textBack} />
<BlockTitle>{_t.textEncoding}</BlockTitle>
<List>
<ListItem title={nameEncoding} href="/encoding-list/"></ListItem>
</List>
<List className="buttons-list">
<ListButton className='button-fill button-raised' title={_t.textDownload} onClick={() => props.onSaveFormat(type, storeEncoding.valueEncoding)}></ListButton>
</List>
</Page>
)
}
const PageEncodingList = props => {
const { t } = useTranslation();
const _t = t("Settings", { returnObjects: true });
const storeEncoding = props.storeEncoding;
const encoding = storeEncoding.encoding;
// const advOptions = storeEncoding.advOptions;
const pages = storeEncoding.pages;
const pagesName = storeEncoding.pagesName;
return (
<Page>
<Navbar title={_t.txtDownloadTxt} backLink={_t.textBack} />
<BlockTitle>{_t.textChooseEncoding}</BlockTitle>
<List>
{pagesName.map((name, index) => {
return (
<ListItem radio checked={encoding === pages[index]} title={name} key={index} value={pages[index]} onChange={() => {
storeEncoding.changeEncoding(pages[index]);
f7.views.current.router.back();
}}></ListItem>
)
})}
</List>
</Page>
)
}
const Encoding = inject("storeEncoding")(observer(PageEncoding));
const EncodingList = inject("storeEncoding")(observer(PageEncodingList));
export {EncodingList, Encoding}

10
apps/documenteditor/mobile/src/view/settings/Settings.jsx
View file

@ -12,6 +12,8 @@ import ApplicationSettingsController from "../../controller/settings/Application
import { DocumentFormats, DocumentMargins, DocumentColorSchemes } from "./DocumentSettings";
import { MacrosSettings } from "./ApplicationSettings";
import About from '../../../../../common/mobile/lib/view/About';
import EncodingController from '../../controller/settings/Encoding';
import { EncodingList } from '../../view/settings/Encoding';
const routes = [
{
@ -53,6 +55,14 @@ const routes = [
{
path: '/about/',
component: About
},
{
path: '/encoding/',
component: EncodingController
},
{
path: '/encoding-list/',
component: EncodingList
}
];