' +
+ '
',
+ buttons: [
+ {
+ text: _t.textCancel
+ },
+ {
+ text: 'OK',
+ bold: true,
+ onClick: function () {
+ const size = picker.value;
+
+ api.put_Table(parseInt(size[0]), parseInt(size[1]), type.toString());
+ }
+ }
+ ]
+ }).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 () {
return (
- ' +
+ '
' +
+ '' +
+ '' + _t.textColumns + '
' +
+ '' + _t.textRows + '
' +
+ '-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+ {dataFormatFootnote.map((format, index)=>{
+ return (
+
-
+
{stateStartAt}
}
+
+
+
+ {isAndroid && }
+
+
+
+ -
+ {dataPosFootnote.map((location, index)=>{
+ return (
+
-
+
-
+
+ {shapes.map((row, indexRow) => {
+ return (
+
)
};
-export {AddShape};
\ No newline at end of file
+export default inject("storeShapeSettings")(observer(AddShape));
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/src/view/add/AddTable.jsx b/apps/documenteditor/mobile/src/view/add/AddTable.jsx
index 0a71acac58..3e4635f435 100644
--- a/apps/documenteditor/mobile/src/view/add/AddTable.jsx
+++ b/apps/documenteditor/mobile/src/view/add/AddTable.jsx
@@ -5,11 +5,22 @@ import { useTranslation } from 'react-i18next';
import {Device} from '../../../../../common/mobile/utils/device';
const AddTable = props => {
+ const storeTableSettings = props.storeTableSettings;
+ const styles = storeTableSettings.styles;
return (
- -
+ {row.map((shape, index) => {
+ return (
+
- {props.onShapeClick(shape.type)}}>
+ ++
+ )
+ })}
+
+
)
};
-export {AddTable};
\ No newline at end of file
+export default inject("storeTableSettings")(observer(AddTable));
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx
index 93e20b4831..bd9bb4c7a1 100644
--- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx
@@ -19,7 +19,7 @@ import {ParagraphAdvSettings, PageParagraphBackColor, PageParagraphCustomColor}
import {PageShapeStyleNoFill, PageShapeStyle, PageShapeCustomFillColor, PageShapeBorderColor, PageShapeCustomBorderColor, PageWrap, PageReorder, PageReplace} from "./EditShape";
import {PageImageReorder, PageImageReplace, PageImageWrap, PageLinkSettings} from "./EditImage";
import {PageTableOptions, PageTableWrap, PageTableStyle, PageTableStyleOptions, PageTableCustomFillColor, PageTableBorderColor, PageTableCustomBorderColor} from "./EditTable";
-import {PageChartWrap, PageChartReorder} from "./EditChart";
+import {PageChartStyle, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, PageChartWrap, PageChartReorder} from "./EditChart";
const routes = [
//Edit text
@@ -159,6 +159,22 @@ const routes = [
{
path: '/edit-chart-reorder/',
component: PageChartReorder,
+ },
+ {
+ path: '/edit-chart-style/',
+ component: PageChartStyle,
+ },
+ {
+ path: '/edit-chart-custom-fill-color/',
+ component: PageChartCustomFillColor,
+ },
+ {
+ path: '/edit-chart-border-color/',
+ component: PageChartBorderColor,
+ },
+ {
+ path: '/edit-chart-custom-border-color/',
+ component: PageChartCustomBorderColor,
}
];
diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx
index 87eeeb8ae9..7c62b7bdce 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx
@@ -1,13 +1,224 @@
import React, {Fragment, useState} from 'react';
import {observer, inject} from "mobx-react";
-import {List, ListItem, ListButton, Icon, Row, Col, Button, Page, Navbar, Segmented, BlockTitle, Toggle, Range} from 'framework7-react';
+import {List, ListItem, ListButton, Icon, Row, Page, Navbar, BlockTitle, Toggle, Range, Link, Tabs, Tab} from 'framework7-react';
import { useTranslation } from 'react-i18next';
import {Device} from '../../../../../common/mobile/utils/device';
+import {CustomColorPicker, ThemeColorPalette} from "../../../../../common/mobile/lib/component/ThemeColorPalette.jsx";
+
+const PageCustomFillColor = props => {
+ const { t } = useTranslation();
+ const _t = t('Edit', {returnObjects: true});
+ let fillColor = props.storeChartSettings.fillColor;
+ if (typeof fillColor === 'object') {
+ fillColor = fillColor.color;
+ }
+ const onAddNewColor = (colors, color) => {
+ props.storePalette.changeCustomColors(colors);
+ props.onFillColor(color);
+ props.storeChartSettings.setFillColor(color);
+ props.f7router.back();
+ };
+ return(
+ -
+ {styles.map((style, index) => {
+ return (
+
- {props.onStyleClick(style.templateId)}}>
+
+
+ )
+ })}
+
-
+
-
+
+ {_t.textType}
+ {_t.textStyle}
+ {_t.textFill}
+ {_t.textBorder}
+
+
+ {types.map((row, rowIndex) => {
+ return (
+
+ -
+ {row.map((type, index)=>{
+ return(
+
- {props.onType(type.type)}}>
+ ++
+ )
+ })}
+
+ {styles.map((row, rowIndex) => {
+ return (
+
+ -
+ {row.map((style, index)=>{
+ return(
+
- {props.onStyle(style.asc_getName())}}>
+
+
+ )
+ })}
+
-
+
{_t.textSize}
+
+ {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}}
+ onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}}
+ >
+
+
+ {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
+
+ -
-
-
-
- {props.onBullet(bullet.type)}}> +
- {
+ if (bullet.type === -1) {
+ storeTextSettings.resetBullets(-1);
+ }
+ props.onBullet(bullet.type)
+ }}>
{bullet.thumb.length < 1 ?
@@ -171,12 +177,18 @@ const PageNumbers = props => { const storeTextSettings = props.storeTextSettings; const typeNumbers = storeTextSettings.typeNumbers; return( -
+ {numberArrays.map((numbers, index) => ( -
{numbers.map((number) => (
-
- {props.onNumber(number.type)}}> +
- {
+ if (number.type === -1) {
+ storeTextSettings.resetNumbers(-1);
+ }
+ props.onNumber(number.type)
+ }}>
{number.thumb.length < 1 ?
diff --git a/apps/documenteditor/mobile/src/view/search.jsx b/apps/documenteditor/mobile/src/view/search.jsx new file mode 100644 index 0000000000..dcbcb6de21 --- /dev/null +++ b/apps/documenteditor/mobile/src/view/search.jsx @@ -0,0 +1,116 @@ +import React, { Component } from 'react'; +import { Searchbar, Popover, Popup, View, Page, List, ListItem, Navbar, NavRight, Link } from 'framework7-react'; +import { f7ready, f7 } from 'framework7-react'; +import { Device } from '../../../../common/mobile/utils/device'; + +const popoverStyle = { + height: '300px' +}; + +class SearchSettingsView extends Component { + constructor(props) { + super(props); + + this.state = { + useReplace: false, + caseSensitive: false, + markResults: false + }; + } + + onFindReplaceClick(action) { + this.setState({ + useReplace: action == 'replace' + }); + } + + render() { + const show_popover = true; + const navbar = +
+ {!show_popover && + ; + const content = ++ Done + } ++ ; + return ( + show_popover ? ++ {navbar} + +-
+
this.onFindReplaceClick('find')}> +this.onFindReplaceClick('replace')}> +{content} : +{content} + ) + } +} + +class SearchView extends Component { + constructor(props) { + super(props); + + $$(document).on('page:init', (e, page) => { + if ( page.name == 'home' ) { + this.$f7.searchbar.create({ + el: '.searchbar', + customSearch: true, + expandable: true, + backdrop: false, + on: { + search: (bar, curval, prevval) => { + console.log('on search results ' + curval); + } + } + }); + } + }); + + this.onSettingsClick = this.onSettingsClick.bind(this); + } + + componentDidMount(){ + } + + onSettingsClick(e) { + if ( Device.phone ) { + // f7.popup.open('.settings-popup'); + } else this.$f7.popover.open('#idx-search-settings', '#idx-btn-search-settings'); + } + + render() { + return ( + + ) + } +} + +export {SearchView as default, SearchSettingsView};
-
{bullets.map((bullet) => (
-