- {props.onWrapType('inline')}}>
- {props.onWrapType('square')}}>
- {props.onWrapType('tight')}}>
- {props.onWrapType('through')}}>
- {props.onWrapType('top-bottom')}}>
- {props.onWrapType('infront')}}>
- {props.onWrapType('behind')}}>
+ {props.onWrapType('inline')}}>
+
+
+ {props.onWrapType('square')}}>
+
+
+ {props.onWrapType('tight')}}>
+
+
+ {props.onWrapType('through')}}>
+
+
+ {props.onWrapType('top-bottom')}}>
+
+
+ {props.onWrapType('infront')}}>
+
+
+ {props.onWrapType('behind')}}>
+
+
{
wrapType !== 'inline' &&
{_t.textAlign}
-
+
{
props.onAlign(Asc.c_oAscAlignH.Left)
- }}>left
+ }}>
+
+
{
props.onAlign(Asc.c_oAscAlignH.Center)
- }}>center
+ }}>
+
+
{
props.onAlign(Asc.c_oAscAlignH.Right)
- }}>right
+ }}>
+
+
@@ -125,10 +145,14 @@ const PageReplace = props => {
- {props.onReplaceByFile()}}>
+ {props.onReplaceByFile()}}>
+
+
+ }}>
+
+
)
@@ -141,10 +165,18 @@ const PageReorder = props => {
- {props.onReorder('all-up')}}>
- {props.onReorder('all-down')}}>
- {props.onReorder('move-up')}}>
- {props.onReorder('move-down')}}>
+ {props.onReorder('all-up')}} className='no-indicator'>
+
+
+ {props.onReorder('all-down')}} className='no-indicator'>
+
+
+ {props.onReorder('move-up')}} className='no-indicator'>
+
+
+ {props.onReorder('move-down')}} className='no-indicator'>
+
+
)
@@ -173,7 +205,7 @@ const EditImage = props => {
{props.onDefaulSize()}}/>
- {props.onRemoveImage()}}/>
+ {props.onRemoveImage()}} className='red'/>
)
diff --git a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
index 4745c1c82..0fc14cda8 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
@@ -35,8 +35,8 @@ const PageAdvancedSettings = props => {
{displayBefore}
-
-
+
+
@@ -44,8 +44,8 @@ const PageAdvancedSettings = props => {
{displayAfter}
-
-
+
+
@@ -53,8 +53,8 @@ const PageAdvancedSettings = props => {
{firstLine + ' ' + metricText}
-
-
+
+
diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
index 66e3befa2..58095486e 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
@@ -1,6 +1,6 @@
import React, {Fragment, useState} from 'react';
import {observer, inject} from "mobx-react";
-import {List, ListItem, ListItemCell, Icon, Row, Col, Button, Page, Navbar, Segmented, BlockTitle, Toggle, Range} from 'framework7-react';
+import {List, ListItem, Icon, Row, Page, Navbar, BlockTitle, Toggle, Range, ListButton} from 'framework7-react';
import { useTranslation } from 'react-i18next';
const PageStyle = props => {
@@ -27,33 +27,53 @@ const PageWrap = props => {
- {props.onWrapType('inline')}}>
- {props.onWrapType('square')}}>
- {props.onWrapType('tight')}}>
- {props.onWrapType('through')}}>
- {props.onWrapType('top-bottom')}}>
- {props.onWrapType('infront')}}>
- {props.onWrapType('behind')}}>
+ {props.onWrapType('inline')}}>
+
+
+ {props.onWrapType('square')}}>
+
+
+ {props.onWrapType('tight')}}>
+
+
+ {props.onWrapType('through')}}>
+
+
+ {props.onWrapType('top-bottom')}}>
+
+
+ {props.onWrapType('infront')}}>
+
+
+ {props.onWrapType('behind')}}>
+
+
{
wrapType !== 'inline' &&
{_t.textAlign}
-
+
{
props.onShapeAlign(Asc.c_oAscAlignH.Left)
- }}>left
+ }}>
+
+
{
props.onShapeAlign(Asc.c_oAscAlignH.Center)
- }}>center
+ }}>
+
+
{
props.onShapeAlign(Asc.c_oAscAlignH.Right)
- }}>right
+ }}>
+
+
@@ -125,10 +145,18 @@ const PageReorder = props => {
- {props.onReorder('all-up')}}>
- {props.onReorder('all-down')}}>
- {props.onReorder('move-up')}}>
- {props.onReorder('move-down')}}>
+ {props.onReorder('all-up')}} className='no-indicator'>
+
+
+ {props.onReorder('all-down')}} className='no-indicator'>
+
+
+ {props.onReorder('move-up')}} className='no-indicator'>
+
+
+ {props.onReorder('move-down')}} className='no-indicator'>
+
+
)
@@ -156,7 +184,7 @@ const EditShape = props => {
}}>
- {props.onRemoveShape()}}/>
+ {props.onRemoveShape()}} className='red'/>
)
diff --git a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx
index bb7499958..d169b8537 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx
@@ -1,6 +1,6 @@
import React, {Fragment, useState} from 'react';
import {observer, inject} from "mobx-react";
-import {Page, Navbar, List, ListItem, ListButton, Row, BlockTitle, Range, Toggle} from 'framework7-react';
+import {Page, Navbar, List, ListItem, ListButton, Row, BlockTitle, Range, Toggle, Icon} from 'framework7-react';
import { useTranslation } from 'react-i18next';
const PageTableOptions = props => {
@@ -67,8 +67,12 @@ const PageWrap = props => {
- {props.onWrapType(c_tableWrap.TABLE_WRAP_NONE)}}>
- {props.onWrapType(c_tableWrap.TABLE_WRAP_PARALLEL)}}>
+ {props.onWrapType(c_tableWrap.TABLE_WRAP_NONE)}}>
+
+
+ {props.onWrapType(c_tableWrap.TABLE_WRAP_PARALLEL)}}>
+
+
@@ -80,20 +84,26 @@ const PageWrap = props => {
{_t.textAlign}
-
+
{
props.onWrapAlign(c_tableAlign.TABLE_ALIGN_LEFT)
- }}>left
+ }}>
+
+
{
props.onWrapAlign(c_tableAlign.TABLE_ALIGN_CENTER)
- }}>center
+ }}>
+
+
{
props.onWrapAlign(c_tableAlign.TABLE_ALIGN_RIGHT)
- }}>right
+ }}>
+
+
@@ -137,21 +147,33 @@ const EditTable = props => {
return (
-
+
- {props.onAddColumnLeft()}}>col-left
- {props.onAddColumnRight()}}>col-right
- {props.onAddRowAbove()}}>row-above
- {props.onAddRowBelow()}}>row-below
+ {props.onAddColumnLeft()}}>
+
+
+ {props.onAddColumnRight()}}>
+
+
+ {props.onAddRowAbove()}}>
+
+
+ {props.onAddRowBelow()}}>
+
+
-
+
- {props.onRemoveColumn()}}>remove-column
- {props.onRemoveRow()}}>remove-row
+ {props.onRemoveColumn()}}>
+
+
+ {props.onRemoveRow()}}>
+
+
- {props.onRemoveTable()}}>
+ {props.onRemoveTable()}} className='red'>
{
{displaySize}
-
-
+
+
@@ -88,8 +88,8 @@ const PageAdditionalFormatting = props => {
{letterSpacing + ' ' + Common.Utils.Metric.getCurrentMetricName()}
-
-
+
+
@@ -213,7 +213,7 @@ const EditText = props => {
changeFontSize: props.changeFontSize,
changeFontFamily: props.changeFontFamily
}}/>
-
+
{ props.toggleBold(!isBold)}}>B
{props.toggleItalic(!isItalic)}}>I
@@ -238,18 +238,30 @@ const EditText = props => {
-
+
- {props.onParagraphAlign('left')}}>left
- {props.onParagraphAlign('center')}}>center
- {props.onParagraphAlign('right')}}>right
- {props.onParagraphAlign('just')}}>just
+ {props.onParagraphAlign('left')}}>
+
+
+ {props.onParagraphAlign('center')}}>
+
+
+ {props.onParagraphAlign('right')}}>
+
+
+ {props.onParagraphAlign('just')}}>
+
+
-
+
- {props.onParagraphMove(true)}}>moveleft
- {props.onParagraphMove(false)}}>moveright
+ {props.onParagraphMove(true)}}>
+
+
+ {props.onParagraphMove(false)}}>
+
+
{
{parseFloat(Common.Utils.Metric.fnRecalcFromMM(stateTop).toFixed(2)) + ' ' + metricText}
-
-
+
+
@@ -76,8 +76,8 @@ const PageDocumentMargins = props => {
{parseFloat(Common.Utils.Metric.fnRecalcFromMM(stateBottom).toFixed(2))+ ' ' + metricText}
-
-
+
+
@@ -85,8 +85,8 @@ const PageDocumentMargins = props => {
{parseFloat(Common.Utils.Metric.fnRecalcFromMM(stateLeft).toFixed(2))+ ' ' + metricText}
-
-
+
+
@@ -94,8 +94,8 @@ const PageDocumentMargins = props => {
{parseFloat(Common.Utils.Metric.fnRecalcFromMM(stateRight).toFixed(2))+ ' ' + metricText}
-
-
+
+