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

Merge branch 'develop' into feature/fix-bug-reactjs

Browse source 
# Conflicts:
#	apps/common/mobile/resources/less/about.less
#	apps/common/mobile/resources/less/common.less
This commit is contained in:
ShimaginAndrey 2021-12-24 18:53:13 +03:00
parent 21ae03d4b5 a170b138cb
commit d47fb111df
282 changed files with 2962 additions and 1601 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/controller/Desktop.js
View file

@ -63,7 +63,7 @@ define([
var is_win_xp = window.RendererProcessVariable && window.RendererProcessVariable.os === 'winxp';
if ( !!native ) {
native.features = {};
native.features = native.features || {};
window.on_native_message = function (cmd, param) {
if (/^style:change/.test(cmd)) {
var obj = JSON.parse(param);
@ -92,7 +92,7 @@ define([
if ( obj.lockthemes != undefined ) {
// TODO: remove after 7.0.2. depricated. used is_win_xp variable instead
// Common.UI.Themes.setAvailable(!obj.lockthemes);
} else
}
if ( obj.singlewindow !== undefined ) {
$('#box-document-title .hedset')[obj.singlewindow ? 'hide' : 'show']();
native.features.singlewindow = obj.singlewindow;

4
apps/common/main/lib/controller/HintManager.js
View file

@ -150,6 +150,9 @@ Common.UI.HintManager = new(function() {
var _showHints = function () {
_inputLetters = '';
if (_currentLevel === 0) {
Common.NotificationCenter.trigger('toolbar:collapse');
}
if (_currentHints.length === 0 || ($('#file-menu-panel').is(':visible' || _isEditDiagram) && _currentLevel === 1)) {
_getHints();
}
@ -476,6 +479,7 @@ Common.UI.HintManager = new(function() {
setTimeout(function () {
if (_currentLevel === 0) {
_hideHints();
_resetToDefault();
_lockedKeyEvents(false);
} else {
_prevLevel();

1
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -210,6 +210,7 @@ define([
this.dlgChanges.btnReject.setDisabled(btnlock);
}
this._state.lock = btnlock;
Common.Utils.InternalSettings.set(this.view.appPrefix + "accept-reject-lock", btnlock);
}
this._state.posx = posX;
this._state.posy = posY;

8
apps/common/main/lib/controller/Themes.js
View file

@ -251,12 +251,8 @@ define([
}
var on_document_open = function (data) {
var document = data.doc;
is_dark_mode_allowed = !/^pdf|djvu|xps|oxps$/.test(document.fileType);
if ( is_dark_mode_allowed ) {
if ( !!this.api.asc_setContentDarkMode && this.isDarkTheme() ) {
this.api.asc_setContentDarkMode(this.isContentThemeDark());
}
if ( !!this.api.asc_setContentDarkMode && this.isDarkTheme() ) {
this.api.asc_setContentDarkMode(this.isContentThemeDark());
}
};

2
apps/common/main/lib/mods/perfect-scrollbar.js
View file

@ -210,6 +210,7 @@
currentPageX;
$scrollbarX.bind('mousedown' + eventClassName, function (e) {
Common.NotificationCenter.trigger('hints:clear');
currentPageX = e.pageX;
currentLeft = $scrollbarX.position().left;
$scrollbarXRail.addClass('in-scrolling');
@ -240,6 +241,7 @@
currentPageY;
$scrollbarY.bind('mousedown' + eventClassName, function (e) {
Common.NotificationCenter.trigger('hints:clear');
currentPageY = e.pageY;
currentTop = $scrollbarY.position().top;
$scrollbarYRail.addClass('in-scrolling');

150
apps/common/main/lib/util/define.js
View file

@ -792,86 +792,86 @@ define(function(){ 'use strict';
getEffectGroupData: function () {
return [
{id: 'menu-effect-group-entrance', value: AscFormat.PRESET_CLASS_ENTR, caption: this.textEntrance},
{id: 'menu-effect-group-emphasis', value: AscFormat.PRESET_CLASS_EMPH, caption: this.textEmphasis},
{id: 'menu-effect-group-exit', value: AscFormat.PRESET_CLASS_EXIT, caption: this.textExit},
{id: 'menu-effect-group-path', value: AscFormat.PRESET_CLASS_PATH, caption: this.textPath}
{id: 'menu-effect-group-entrance', value: AscFormat.PRESET_CLASS_ENTR, caption: this.textEntrance, iconClsCustom: 'animation-entrance-custom'},
{id: 'menu-effect-group-emphasis', value: AscFormat.PRESET_CLASS_EMPH, caption: this.textEmphasis, iconClsCustom: 'animation-emphasis-custom'},
{id: 'menu-effect-group-exit', value: AscFormat.PRESET_CLASS_EXIT, caption: this.textExit, iconClsCustom: 'animation-exit-custom'},
{id: 'menu-effect-group-path', value: AscFormat.PRESET_CLASS_PATH, caption: this.textPath, iconClsCustom: 'animation-motion_paths-custom'}
];
},
getEffectData: function () {
return [
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_APPEAR, iconCls: 'animation-entrance-appear', displayValue: this.textAppear},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FADE, iconCls: 'animation-entrance-fade', displayValue: this.textFade},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLY_IN_FROM, iconCls: 'animation-entrance-fly_in', displayValue: this.textFlyIn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLOAT, iconCls: 'animation-entrance-float_in', displayValue: this.textFloatIn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_SPLIT, iconCls: 'animation-entrance-split', displayValue: this.textSplit},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WIPE_FROM, iconCls: 'animation-entrance-wipe', displayValue: this.textWipe},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_BOX, iconCls: 'animation-entrance-shape', displayValue: this.textBox},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_CIRCLE, iconCls: 'animation-entrance-shape', displayValue: this.textCircle},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_PLUS, iconCls: 'animation-entrance-shape', displayValue: this.textPlus},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_DIAMOND, iconCls: 'animation-entrance-shape', displayValue: this.textDiamond},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WHEEL, iconCls: 'animation-entrance-wheel', displayValue: this.textWheel},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_RANDOM_BARS, iconCls: 'animation-entrance-random_bars', displayValue: this.textRandomBars},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_GROW_AND_TURN, iconCls: 'animation-entrance-grow_turn', displayValue: this.textGrowTurn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_ZOOM, iconCls: 'animation-entrance-zoom', displayValue: this.textZoom},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_SWIVEL, iconCls: 'animation-entrance-swivel', displayValue: this.textSwivel},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_BOUNCE, iconCls: 'animation-entrance-bounce', displayValue: this.textBounce},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_PULSE, iconCls: 'animation-emphasis-pulse', displayValue: this.textPulse},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COLOR_PULSE, iconCls: 'animation-emphasis-color_pulse', displayValue: this.textColorPulse},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_TEETER, iconCls: 'animation-emphasis-teeter', displayValue: this.textTeeter},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_SPIN, iconCls: 'animation-emphasis-spin', displayValue: this.textSpin},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_GROW_SHRINK, iconCls: 'animation-emphasis-grow_or_Shrink', displayValue: this.textGrowShrink},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_DESATURATE, iconCls: 'animation-emphasis-desaturate', displayValue: this.textDesaturate},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_CONTRASTING_DARKEN, iconCls: 'animation-emphasis-darken', displayValue: this.textDarken},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LIGHTEN, iconCls: 'animation-emphasis-lighten', displayValue: this.textLighten},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_TRANSPARENCY, iconCls: 'animation-emphasis-transparency', displayValue: this.textTransparency},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_OBJECT_COLOR, iconCls: 'animation-emphasis-object_color', displayValue: this.textObjectColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR, iconCls: 'animation-emphasis-complementary_color', displayValue: this.textComplementaryColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LINE_COLOR, iconCls: 'animation-emphasis-line_color', displayValue: this.textLineColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_FILL_COLOR, iconCls: 'animation-emphasis-fill_color', displayValue: this.textFillColor},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_DISAPPEAR, iconCls: 'animation-exit-Disappear', displayValue: this.textDisappear},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FADE, iconCls: 'animation-exit-fade', displayValue: this.textFade},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLY_OUT_TO, iconCls: 'animation-exit-fly_out', displayValue: this.textFlyOut},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLOAT, iconCls: 'animation-exit-float_out', displayValue: this.textFloatOut},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_SPLIT, iconCls: 'animation-exit-split', displayValue: this.textSplit},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_WIPE_FROM, iconCls: 'animation-exit-wipe', displayValue: this.textWipe},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_BOX, iconCls: 'animation-exit-shape', displayValue: this.textBox},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_CIRCLE, iconCls: 'animation-exit-shape', displayValue: this.textCircle},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_PLUS, iconCls: 'animation-exit-shape', displayValue: this.textPlus},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_DIAMOND, iconCls: 'animation-exit-shape', displayValue: this.textDiamond},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_WHEEL, iconCls: 'animation-exit-wheel', displayValue: this.textWheel},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_RANDOM_BARS, iconCls: 'animation-exit-random_bars', displayValue: this.textRandomBars},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_SHRINK_AND_TURN, iconCls: 'animation-exit-shrink_turn', displayValue: this.textShrinkTurn},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_ZOOM, iconCls: 'animation-exit-zoom', displayValue: this.textZoom},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_BASIC_SWIVEL, iconCls: 'animation-exit-swivel', displayValue: this.textSwivel},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_BOUNCE, iconCls: 'animation-exit-bounce', displayValue: this.textBounce},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_DOWN, iconCls: 'animation-motion_paths-lines', displayValue: this.textDown},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_LEFT, iconCls: 'animation-motion_paths-lines', displayValue: this.textLeft},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_RIGHT, iconCls: 'animation-motion_paths-lines', displayValue: this.textRight},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_UP, iconCls: 'animation-motion_paths-lines', displayValue: this.textUp},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_DOWN, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcDown},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_LEFT, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcLeft},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_RIGHT, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcRight},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_UP, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcUp},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnDown},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN_RIGHT, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnDownRight},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_UP, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnUp},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_UP_RIGHT, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnUpRight},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_CIRCLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textCircle},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_DIAMOND, iconCls: 'animation-motion_paths-shapes', displayValue: this.textDiamond},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_EQUAL_TRIANGLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textEqualTriangle},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_HEXAGON, iconCls: 'animation-motion_paths-shapes', displayValue: this.textHexagon},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_OCTAGON, iconCls: 'animation-motion_paths-shapes', displayValue: this.textOctagon},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_PARALLELOGRAM, iconCls: 'animation-motion_paths-shapes', displayValue: this.textParallelogram},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_PENTAGON, iconCls: 'animation-motion_paths-shapes', displayValue: this.textPentagon},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_RIGHT_TRIANGLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textRightTriangle},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_SQUARE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textSquare},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TRAPEZOID, iconCls: 'animation-motion_paths-shapes', displayValue: this.textTrapezoid},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, iconCls: 'animation-motion_paths-loops', displayValue: this.textHorizontalFigure},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_VERTICAL_FIGURE_8, iconCls: 'animation-motion_paths-loops', displayValue: this.textVerticalFigure},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_LOOP_DE_LOOP, iconCls: 'animation-motion_paths-loops', displayValue: this.textLoopDeLoop},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_CUSTOM_PATH, iconCls: 'animation-motion_paths-custom_path', displayValue: this.textCustomPath}
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_APPEAR, iconCls: 'animation-entrance-appear', displayValue: this.textAppear},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FADE, iconCls: 'animation-entrance-fade', displayValue: this.textFade},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLY_IN_FROM, iconCls: 'animation-entrance-fly_in', displayValue: this.textFlyIn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLOAT, iconCls: 'animation-entrance-float_in', displayValue: this.textFloatIn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_SPLIT, iconCls: 'animation-entrance-split', displayValue: this.textSplit},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WIPE_FROM, iconCls: 'animation-entrance-wipe', displayValue: this.textWipe},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_BOX, iconCls: 'animation-entrance-shape', displayValue: this.textBox},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_CIRCLE, iconCls: 'animation-entrance-shape', displayValue: this.textCircle},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_PLUS, iconCls: 'animation-entrance-shape', displayValue: this.textPlus},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_DIAMOND, iconCls: 'animation-entrance-shape', displayValue: this.textDiamond},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WHEEL, iconCls: 'animation-entrance-wheel', displayValue: this.textWheel},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_RANDOM_BARS, iconCls: 'animation-entrance-random_bars', displayValue: this.textRandomBars},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_GROW_AND_TURN, iconCls: 'animation-entrance-grow_turn', displayValue: this.textGrowTurn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_ZOOM, iconCls: 'animation-entrance-zoom', displayValue: this.textZoom},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_SWIVEL, iconCls: 'animation-entrance-swivel', displayValue: this.textSwivel},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_BOUNCE, iconCls: 'animation-entrance-bounce', displayValue: this.textBounce},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_PULSE, iconCls: 'animation-emphasis-pulse', displayValue: this.textPulse},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COLOR_PULSE, iconCls: 'animation-emphasis-color_pulse', displayValue: this.textColorPulse},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_TEETER, iconCls: 'animation-emphasis-teeter', displayValue: this.textTeeter},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_SPIN, iconCls: 'animation-emphasis-spin', displayValue: this.textSpin},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_GROW_SHRINK, iconCls: 'animation-emphasis-grow_or_Shrink', displayValue: this.textGrowShrink},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_DESATURATE, iconCls: 'animation-emphasis-desaturate', displayValue: this.textDesaturate},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_CONTRASTING_DARKEN, iconCls: 'animation-emphasis-darken', displayValue: this.textDarken},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LIGHTEN, iconCls: 'animation-emphasis-lighten', displayValue: this.textLighten},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_TRANSPARENCY, iconCls: 'animation-emphasis-transparency', displayValue: this.textTransparency},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_OBJECT_COLOR, iconCls: 'animation-emphasis-object_color', displayValue: this.textObjectColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR, iconCls: 'animation-emphasis-complementary_color', displayValue: this.textComplementaryColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LINE_COLOR, iconCls: 'animation-emphasis-line_color', displayValue: this.textLineColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_FILL_COLOR, iconCls: 'animation-emphasis-fill_color', displayValue: this.textFillColor},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_DISAPPEAR, iconCls: 'animation-exit-disappear', displayValue: this.textDisappear},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FADE, iconCls: 'animation-exit-fade', displayValue: this.textFade},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLY_OUT_TO, iconCls: 'animation-exit-fly_out', displayValue: this.textFlyOut},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLOAT, iconCls: 'animation-exit-float_out', displayValue: this.textFloatOut},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_SPLIT, iconCls: 'animation-exit-split', displayValue: this.textSplit},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_WIPE_FROM, iconCls: 'animation-exit-wipe', displayValue: this.textWipe},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_BOX, iconCls: 'animation-exit-shape', displayValue: this.textBox},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_CIRCLE, iconCls: 'animation-exit-shape', displayValue: this.textCircle},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_PLUS, iconCls: 'animation-exit-shape', displayValue: this.textPlus},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_DIAMOND, iconCls: 'animation-exit-shape', displayValue: this.textDiamond},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_WHEEL, iconCls: 'animation-exit-wheel', displayValue: this.textWheel},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_RANDOM_BARS, iconCls: 'animation-exit-random_bars', displayValue: this.textRandomBars},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_SHRINK_AND_TURN, iconCls: 'animation-exit-shrink_turn', displayValue: this.textShrinkTurn},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_ZOOM, iconCls: 'animation-exit-zoom', displayValue: this.textZoom},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_BASIC_SWIVEL, iconCls: 'animation-exit-swivel', displayValue: this.textSwivel},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_BOUNCE, iconCls: 'animation-exit-bounce', displayValue: this.textBounce},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_DOWN, iconCls: 'animation-motion_paths-lines', displayValue: this.textDown},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_LEFT, iconCls: 'animation-motion_paths-lines', displayValue: this.textLeft},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_RIGHT, iconCls: 'animation-motion_paths-lines', displayValue: this.textRight},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_UP, iconCls: 'animation-motion_paths-lines', displayValue: this.textUp},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_DOWN, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcDown},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_LEFT, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcLeft},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_RIGHT, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcRight},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_UP, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcUp},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnDown},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN_RIGHT, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnDownRight},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_UP, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnUp},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_UP_RIGHT, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurnUpRight},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_CIRCLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textCircle},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_DIAMOND, iconCls: 'animation-motion_paths-shapes', displayValue: this.textDiamond},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_EQUAL_TRIANGLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textEqualTriangle},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_HEXAGON, iconCls: 'animation-motion_paths-shapes', displayValue: this.textHexagon},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_OCTAGON, iconCls: 'animation-motion_paths-shapes', displayValue: this.textOctagon},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_PARALLELOGRAM, iconCls: 'animation-motion_paths-shapes', displayValue: this.textParallelogram},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_PENTAGON, iconCls: 'animation-motion_paths-shapes', displayValue: this.textPentagon},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_RIGHT_TRIANGLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textRightTriangle},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_SQUARE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textSquare},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TRAPEZOID, iconCls: 'animation-motion_paths-shapes', displayValue: this.textTrapezoid},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, iconCls: 'animation-motion_paths-loops', displayValue: this.textHorizontalFigure},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_VERTICAL_FIGURE_8, iconCls: 'animation-motion_paths-loops', displayValue: this.textVerticalFigure},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_LOOP_DE_LOOP, iconCls: 'animation-motion_paths-loops', displayValue: this.textLoopDeLoop}//,
//{group: 'menu-effect-group-path', value: AscFormat.MOTION_CUSTOM_PATH, iconCls: 'animation-motion_paths-custom_path', displayValue: this.textCustomPath}
];
},

22
apps/common/main/lib/util/desktopinit.js Normal file
View file

@ -0,0 +1,22 @@
if ( window.AscDesktopEditor ) {
window.desktop = window.AscDesktopEditor;
desktop.features = {};
window.native_message_cmd = [];
window.on_native_message = function (cmd, param) {
if ( /window:features/.test(cmd) ) {
var obj = JSON.parse(param);
if ( obj.singlewindow !== undefined ) {
desktop.features.singlewindow = obj.singlewindow;
}
} else
window.native_message_cmd[cmd] = param;
}
if ( !!window.RendererProcessVariable ) {
desktop.theme = window.RendererProcessVariable.theme;
}
window.desktop.execCommand('webapps:entry', (window.features && JSON.stringify(window.features)) || '');
}

7
apps/common/main/lib/util/htmlutils.js
View file

@ -52,11 +52,8 @@ var checkLocalStorage = (function () {
}
})();
!window.desktop && !!window.AscDesktopEditor &&
(window.desktop = window.AscDesktopEditor);
if ( window.desktop && !!window.RendererProcessVariable ) {
var theme = window.RendererProcessVariable.theme
if ( window.desktop ) {
var theme = desktop.theme
if ( theme ) {
if ( !theme.id && !!theme.type ) {

11
apps/common/main/lib/view/ReviewChanges.js
View file

@ -524,8 +524,8 @@ define([
me.btnCompare.updateHint(me.tipCompare);
}
me.btnAccept.setDisabled(config.isReviewOnly);
me.btnReject.setDisabled(config.isReviewOnly);
config.isReviewOnly && me.btnAccept.setDisabled(true);
config.isReviewOnly && me.btnReject.setDisabled(true);
}
if (me.appConfig.canViewReview) {
me.btnPrev.updateHint(me.hintPrev);
@ -947,6 +947,9 @@ define([
this.popoverChanges = this.options.popoverChanges;
this.mode = this.options.mode;
var filter = Common.localStorage.getKeysFilter();
this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -973,7 +976,7 @@ define([
cls : 'btn-toolbar',
caption : this.txtAccept,
split : true,
disabled : this.mode.isReviewOnly,
disabled : this.mode.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
menu : this.mode.canUseReviewPermissions ? false : new Common.UI.Menu({
items: [
this.mnuAcceptCurrent = new Common.UI.MenuItem({
@ -993,7 +996,7 @@ define([
cls : 'btn-toolbar',
caption : this.txtReject,
split : true,
disabled : this.mode.isReviewOnly,
disabled : this.mode.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
menu : this.mode.canUseReviewPermissions ? false : new Common.UI.Menu({
items: [
this.mnuRejectCurrent = new Common.UI.MenuItem({

4
apps/common/main/resources/less/toolbar.less
View file

@ -695,8 +695,8 @@
&, &:hover, &:focus {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed;
color: @text-normal-ie;
color: @text-normal;
color: @text-normal-pressed-ie;
color: @text-normal-pressed;
span.color {
border-color: @icon-normal-ie;
border-color: @icon-normal;

2
apps/common/mobile/lib/controller/collaboration/Comments.jsx
View file

@ -187,7 +187,7 @@ class CommentsController extends Component {
uid : id,
userId : data.asc_getUserId(),
userName : userName,
parsedName : Common.Utils.String.htmlEncode(parsedName),
parsedName,
userColor : (user) ? user.asc_getColor() : null,
date : dateToLocaleTimeString(date),
quote : data.asc_getQuoteText(),

25
apps/common/mobile/lib/view/Search.jsx
View file

@ -97,10 +97,13 @@ class SearchView extends Component {
componentDidMount(){
this.$replace = $$('#idx-replace-val');
const $editor = $$('#editor_sdk');
$editor.on('pointerdown', this.onEditorTouchStart.bind(this));
$editor.on('pointerup', this.onEditorTouchEnd.bind(this));
this.onEditorTouchStart = this.onEditorTouchStart.bind(this);
this.onEditorTouchEnd = this.onEditorTouchEnd.bind(this);
$editor.on('pointerdown', this.onEditorTouchStart);
$editor.on('pointerup', this.onEditorTouchEnd);
if( !this.searchbar ) {
this.searchbar = f7.searchbar.get('.searchbar');
@ -123,11 +126,8 @@ class SearchView extends Component {
}
componentWillUnmount() {
const $$ = Dom7;
const $editor = $$('#editor_sdk');
$editor.off('pointerdown', this.onEditorTouchStart.bind(this));
$editor.off('pointerup', this.onEditorTouchEnd.bind(this));
$$('#editor_sdk').off('pointerdown', this.onEditorTouchStart)
.off('pointerup', this.onEditorTouchEnd);
}
onSettingsClick(e) {
@ -162,7 +162,7 @@ class SearchView extends Component {
}
onReplaceClick() {
if (this.searchbar && this.state.searchQuery) {
if (this.searchbar && this.state.replaceQuery) {
if (this.props.onReplaceQuery) {
let params = this.searchParams();
params.find = this.state.searchQuery;
@ -174,7 +174,7 @@ class SearchView extends Component {
}
onReplaceAllClick() {
if (this.searchbar && this.state.searchQuery) {
if (this.searchbar && this.state.replaceQuery) {
if (this.props.onReplaceAllQuery) {
let params = this.searchParams();
params.find = this.state.searchQuery;
@ -192,6 +192,7 @@ class SearchView extends Component {
}
onEditorTouchStart(e) {
console.log('taouch start');
this.startPoint = this.pointerPosition(e);
}
@ -281,9 +282,9 @@ class SearchView extends Component {
{/* <a id="replace-link" className={"link " + (searchQuery.trim().length ? "" : "disabled")} style={!usereplace ? hidden: null} onClick={() => this.onReplaceClick()}>{_t.textReplace}</a>
<a id="replace-all-link" className={"link " + (searchQuery.trim().length ? "" : "disabled")} style={!usereplace ? hidden: null} onClick={() => this.onReplaceAllClick()}>{_t.textReplaceAll}</a> */}
{isReplaceAll ? (
<a id="replace-all-link" className={"link " + (searchQuery.trim().length ? "" : "disabled")} onClick={() => this.onReplaceAllClick()}>{_t.textReplaceAll}</a>
<a id="replace-all-link" className={"link " + (replaceQuery.trim().length ? "" : "disabled")} onClick={() => this.onReplaceAllClick()}>{_t.textReplaceAll}</a>
) : usereplace ? (
<a id="replace-link" className={"link " + (searchQuery.trim().length ? "" : "disabled")} onClick={() => this.onReplaceClick()}>{_t.textReplace}</a>
<a id="replace-link" className={"link " + (replaceQuery.trim().length ? "" : "disabled")} onClick={() => this.onReplaceClick()}>{_t.textReplace}</a>
) : null}
</div>
<div className="buttons-row">

4
apps/common/mobile/resources/less/about.less
View file

@ -13,10 +13,10 @@
.content-block {
margin: 0 auto 15px;
a {
a {
color: @text-normal;
}
}
}
.settings-about-logo {
display: flex;

2
apps/common/mobile/resources/less/common.less
View file

@ -159,7 +159,7 @@
color: var(--brand-word);
text-decoration: underline;
}
}
}
}
.content-block {

19
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -1877,12 +1877,13 @@ define([
window.on_native_message = function (cmd, param) {
if (/theme:changed/.test(cmd)) {
if ( !!Common.UI.Themes.setTheme )
if ( Common.UI.Themes && !!Common.UI.Themes.setTheme )
Common.UI.Themes.setTheme(param);
} else
if (/window:features/.test(cmd)) {
var obj = JSON.parse(param);
if ( obj.singlewindow !== undefined ) {
native.features.singlewindow = obj.singlewindow;
$("#title-doc-name")[obj.singlewindow ? 'hide' : 'show']();
}
}
@ -1901,15 +1902,17 @@ define([
native.execCommand("uitheme:changed", JSON.stringify({name:name, type:theme.type}));
},
});
Common.Gateway.on('opendocument', function () {
api = DE.getController('ApplicationController').api;
$("#title-doc-name")[native.features.singlewindow ? 'hide' : 'show']();
var is_win_xp = window.RendererProcessVariable && window.RendererProcessVariable.os === 'winxp';
Common.UI.Themes.setAvailable(!is_win_xp);
});
}
Common.Gateway.on('opendocument', function () {
api = DE.getController('ApplicationController').api;
var is_win_xp = window.RendererProcessVariable && window.RendererProcessVariable.os === 'winxp';
Common.UI.Themes.setAvailable(!is_win_xp);
});
return {
isActive: function () {
return !!native;

11
apps/documenteditor/forms/index.html.deploy
View file

@ -127,19 +127,12 @@
}
</style>
<script>
if ( window.AscDesktopEditor ) {
window.on_native_message = function (cmd, param) {
!window.native_message_cmd && (window.native_message_cmd = []);
window.native_message_cmd[cmd] = param;
}
//window.desktop.execCommand('webapps:entry', '');
}
</script>
<script>window.features={uitype:'fillform'}</script>
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"></script>
<![endif]-->
<script src="../../../../../apps/common/main/lib/util/desktopinit.js?__inline=true"></script>
</head>
<body class="embed-body">

8
apps/documenteditor/forms/locale/en.json
View file

@ -147,12 +147,15 @@
"DE.Views.ApplicationView.textClear": "Clear All Fields",
"DE.Views.ApplicationView.textCopy": "Copy",
"DE.Views.ApplicationView.textCut": "Cut",
"DE.Views.ApplicationView.textFitToPage": "Fit to Page",
"DE.Views.ApplicationView.textFitToWidth": "Fit to Width",
"DE.Views.ApplicationView.textNext": "Next Field",
"DE.Views.ApplicationView.textPaste": "Paste",
"DE.Views.ApplicationView.textPrintSel": "Print Selection",
"DE.Views.ApplicationView.textRedo": "Redo",
"DE.Views.ApplicationView.textSubmit": "Submit",
"DE.Views.ApplicationView.textUndo": "Undo",
"DE.Views.ApplicationView.textZoom": "Zoom",
"DE.Views.ApplicationView.txtDarkMode": "Dark mode",
"DE.Views.ApplicationView.txtDownload": "Download",
"DE.Views.ApplicationView.txtDownloadDocx": "Download as docx",
@ -162,8 +165,5 @@
"DE.Views.ApplicationView.txtFullScreen": "Full Screen",
"DE.Views.ApplicationView.txtPrint": "Print",
"DE.Views.ApplicationView.txtShare": "Share",
"DE.Views.ApplicationView.txtTheme": "Interface theme",
"DE.Views.ApplicationView.textZoom": "Zoom",
"DE.Views.ApplicationView.textFitToPage": "Fit to Page",
"DE.Views.ApplicationView.textFitToWidth": "Fit to Width"
"DE.Views.ApplicationView.txtTheme": "Interface theme"
}

3
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -234,6 +234,9 @@ define([
// Common.NotificationCenter.on('menu:afterkeydown', _.bind(this.onAfterKeydownMenu, this));
Common.NotificationCenter.on('style:commitsave', _.bind(this.onSaveStyle, this));
Common.NotificationCenter.on('style:commitchange', _.bind(this.onUpdateStyle, this));
Common.NotificationCenter.on('toolbar:collapse', _.bind(function () {
this.toolbar.collapse();
}, this));
},
onLaunch: function() {

11
apps/documenteditor/main/index.html.deploy
View file

@ -217,20 +217,11 @@
window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"];
if ( window.AscDesktopEditor ) {
window.desktop = window.AscDesktopEditor;
window.on_native_message = function (cmd, param) {
!window.native_message_cmd && (window.native_message_cmd = []);
window.native_message_cmd[cmd] = param;
}
window.desktop.execCommand('webapps:type', 'oform');
window.desktop.execCommand('webapps:entry', '');
}
</script>
<link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
<script src="../../../../../apps/common/main/lib/util/themeinit.js?__inline=true"></script>
<script src="../../../../../apps/common/main/lib/util/desktopinit.js?__inline=true"></script>
</head>
<body>
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>

1
apps/documenteditor/main/index_loader.html.deploy
View file

@ -285,6 +285,7 @@
</script>
<link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
<script src="../../../../../apps/common/main/lib/util/desktopinit.js?__inline=true"></script>
</head>
<body>
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>

2
apps/documenteditor/main/locale/ca.json
View file

@ -1810,7 +1810,7 @@
"DE.Views.FormsTab.capBtnNext": "Camp següent",
"DE.Views.FormsTab.capBtnPrev": "Camp anterior",
"DE.Views.FormsTab.capBtnRadioBox": "Botó d'opció",
"DE.Views.FormsTab.capBtnSaveForm": "Desa-ho com a formulari",
"DE.Views.FormsTab.capBtnSaveForm": "Desa-ho com a oformulari",
"DE.Views.FormsTab.capBtnSubmit": "Envia",
"DE.Views.FormsTab.capBtnText": "Camp de text",
"DE.Views.FormsTab.capBtnView": "Mostra el formulari",

16
apps/documenteditor/main/locale/da.json
View file

@ -391,7 +391,8 @@
"Common.Views.ReviewChanges.txtFinalCap": "Endelig",
"Common.Views.ReviewChanges.txtHistory": "Version historik",
"Common.Views.ReviewChanges.txtMarkup": "Alle ændringer {0}",
"Common.Views.ReviewChanges.txtMarkupCap": "Markup",
"Common.Views.ReviewChanges.txtMarkupCap": "Markup og balloner",
"Common.Views.ReviewChanges.txtMarkupSimple": "Alle ændringer {0}<br>Ingen balloner",
"Common.Views.ReviewChanges.txtMarkupSimpleCap": "Kun opmærkning",
"Common.Views.ReviewChanges.txtNext": "Til næste ændring",
"Common.Views.ReviewChanges.txtOff": "Slukket for mig",
@ -1721,7 +1722,7 @@
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Real tids samarbejdsændringer",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Slå stavekontrolstilstand til ",
"DE.Views.FileMenuPanels.Settings.strStrict": "Striks",
"DE.Views.FileMenuPanels.Settings.strTheme": "Tema",
"DE.Views.FileMenuPanels.Settings.strTheme": "Interface tema",
"DE.Views.FileMenuPanels.Settings.strUnit": "Måleenhed",
"DE.Views.FileMenuPanels.Settings.strZoom": "Standard zoomværdi",
"DE.Views.FileMenuPanels.Settings.text10Minutes": "Hvert 10. minut",
@ -1733,12 +1734,13 @@
"DE.Views.FileMenuPanels.Settings.textAutoSave": "Gem automatisk",
"DE.Views.FileMenuPanels.Settings.textCompatible": "Kompabilitet",
"DE.Views.FileMenuPanels.Settings.textDisabled": "deaktiveret",
"DE.Views.FileMenuPanels.Settings.textForceSave": "Gem til server",
"DE.Views.FileMenuPanels.Settings.textForceSave": "Gemmer mellem versioner",
"DE.Views.FileMenuPanels.Settings.textMinute": "Hvert minut",
"DE.Views.FileMenuPanels.Settings.textOldVersions": "Lav filerne kompatible med ældre MS Word-versionen, når de gemmes som DOCX",
"DE.Views.FileMenuPanels.Settings.txtAll": "Se alle",
"DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Autokorrektur valgmuligheder",
"DE.Views.FileMenuPanels.Settings.txtCacheMode": "Standard cache tilstand",
"DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Vis ved klik i balloner",
"DE.Views.FileMenuPanels.Settings.txtChangesTip": "Vis ved at svæve i værktøjstip",
"DE.Views.FileMenuPanels.Settings.txtCm": "Centimeter",
"DE.Views.FileMenuPanels.Settings.txtDarkMode": "Slå mørk tilstand dokument til",
@ -1808,7 +1810,7 @@
"DE.Views.FormsTab.capBtnNext": "Næste felt",
"DE.Views.FormsTab.capBtnPrev": "Foregående felt",
"DE.Views.FormsTab.capBtnRadioBox": "Radioknap",
"DE.Views.FormsTab.capBtnSaveForm": "Gem som en formular",
"DE.Views.FormsTab.capBtnSaveForm": "Gem som oform",
"DE.Views.FormsTab.capBtnSubmit": "Send",
"DE.Views.FormsTab.capBtnText": "Tekstfelt",
"DE.Views.FormsTab.capBtnView": "Vis formular",
@ -1830,7 +1832,7 @@
"DE.Views.FormsTab.tipSaveForm": "Gem en fil som et udfyldbart OFORM-dokument",
"DE.Views.FormsTab.tipSubmit": "Send formular",
"DE.Views.FormsTab.tipTextField": "Indsæt tekstfelt",
"DE.Views.FormsTab.tipViewForm": "Udfyld formulartilstand",
"DE.Views.FormsTab.tipViewForm": "Vis formularen",
"DE.Views.FormsTab.txtUntitled": "Unavngivet",
"DE.Views.HeaderFooterSettings.textBottomCenter": "Bund midt",
"DE.Views.HeaderFooterSettings.textBottomLeft": "Nederst venstre",
@ -2263,7 +2265,7 @@
"DE.Views.ShapeSettings.strPattern": "Mønster",
"DE.Views.ShapeSettings.strShadow": "Vis skygge",
"DE.Views.ShapeSettings.strSize": "Størrelse",
"DE.Views.ShapeSettings.strStroke": "Strøg",
"DE.Views.ShapeSettings.strStroke": "Linie",
"DE.Views.ShapeSettings.strTransparency": "Gennemsigtighed",
"DE.Views.ShapeSettings.strType": "Type",
"DE.Views.ShapeSettings.textAdvanced": "Vis avancerede indstillinger",
@ -2524,7 +2526,7 @@
"DE.Views.TextArtSettings.strColor": "Farve",
"DE.Views.TextArtSettings.strFill": "Fyld",
"DE.Views.TextArtSettings.strSize": "Størrelse",
"DE.Views.TextArtSettings.strStroke": "Strøg",
"DE.Views.TextArtSettings.strStroke": "Linie",
"DE.Views.TextArtSettings.strTransparency": "Gennemsigtighed",
"DE.Views.TextArtSettings.strType": "Type",
"DE.Views.TextArtSettings.textAngle": "Vinkel",

2
apps/documenteditor/main/locale/el.json
View file

@ -1810,7 +1810,7 @@
"DE.Views.FormsTab.capBtnNext": "Επόμενο Πεδίο",
"DE.Views.FormsTab.capBtnPrev": "Προηγούμενο Πεδίο",
"DE.Views.FormsTab.capBtnRadioBox": "Κουμπί Επιλογής",
"DE.Views.FormsTab.capBtnSaveForm": "Αποθήκευση ως Φόρμα",
"DE.Views.FormsTab.capBtnSaveForm": "Αποθήκευση ως oform",
"DE.Views.FormsTab.capBtnSubmit": "Υποβολή",
"DE.Views.FormsTab.capBtnText": "Πεδίο Κειμένου",
"DE.Views.FormsTab.capBtnView": "Προβολή Φόρμας",

2
apps/documenteditor/main/locale/ru.json
View file

@ -879,12 +879,12 @@
"DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"DE.Controllers.Navigation.txtBeginning": "Начало документа",
"DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
"DE.Controllers.Statusbar.textDisconnect": "<b>Соединение потеряно</b><br>Пытаемся восстановить соединение. Проверьте параметры подключения.",
"DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения",
"DE.Controllers.Statusbar.textSetTrackChanges": "Вы находитесь в режиме отслеживания изменений",
"DE.Controllers.Statusbar.textTrackChanges": "Документ открыт при включенном режиме отслеживания изменений",
"DE.Controllers.Statusbar.tipReview": "Отслеживать изменения",
"DE.Controllers.Statusbar.zoomText": "Масштаб {0}%",
"DE.Controllers.Statusbar.textDisconnect": "<b>Соединение потеряно</b><br>Пытаемся восстановить соединение. Проверьте параметры подключения.",
"DE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы хотите сохранить, недоступен на этом устройстве.<br>Стиль текста будет отображаться с помощью одного из системных шрифтов. Сохраненный шрифт будет использоваться, когда он станет доступен.<br>Вы хотите продолжить?",
"DE.Controllers.Toolbar.dataUrl": "Вставьте URL-адрес данных",
"DE.Controllers.Toolbar.notcriticalErrorTitle": "Внимание",

6
apps/documenteditor/main/resources/help/en/Contents.json
View file

@ -5,6 +5,7 @@
{"src": "ProgramInterface/InsertTab.htm", "name": "Insert tab"},
{"src": "ProgramInterface/LayoutTab.htm", "name": "Layout tab" },
{ "src": "ProgramInterface/ReferencesTab.htm", "name": "References tab" },
{"src": "ProgramInterface/FormsTab.htm", "name": "Forms tab"},
{"src": "ProgramInterface/ReviewTab.htm", "name": "Collaboration tab"},
{"src": "ProgramInterface/PluginsTab.htm", "name": "Plugins tab"},
{"src": "UsageInstructions/OpenCreateNew.htm", "name": "Create a new document or open an existing one", "headername": "Basic operations"},
@ -51,6 +52,8 @@
{"src": "UsageInstructions/InsertContentControls.htm", "name": "Insert content controls" },
{ "src": "UsageInstructions/CreateTableOfContents.htm", "name": "Create table of contents" },
{"src": "UsageInstructions/AddTableofFigures.htm", "name": "Add and Format a Table of Figures" },
{ "src": "UsageInstructions/CreateFillableForms.htm", "name": "Create fillable forms", "headername": "Fillable forms" },
{ "src": "UsageInstructions/FillingOutForm.htm", "headername": "Filling Out a Form" },
{"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge", "headername": "Mail Merge"},
{ "src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations", "headername": "Math equations" },
{"src": "HelpfulHints/CollaborativeEditing.htm", "name": "Collaborative document editing", "headername": "Document co-editing"},
@ -67,7 +70,8 @@
{"src": "UsageInstructions/Wordpress.htm", "name": "Upload a document to Wordpress"},
{"src": "UsageInstructions/WordCounter.htm", "name": "Count words"},
{"src": "UsageInstructions/HTML.htm", "name": "Edit HTML"},
{"src": "UsageInstructions/Typograf.htm", "name": "Correct typography"},
{ "src": "UsageInstructions/Typograf.htm", "name": "Correct typography" },
{"src": "UsageInstructions/CommunicationPlugins.htm", "name": "Communicate while editing"},
{"src": "UsageInstructions/ViewDocInfo.htm", "name": "View document information", "headername": "Tools and settings"},
{"src": "UsageInstructions/SavePrintDownload.htm", "name": "Save/download/print your document" },
{"src": "HelpfulHints/AdvancedSettings.htm", "name": "Advanced settings of Document Editor"},

2
apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm
View file

@ -17,7 +17,7 @@
<p>The <a href="https://www.onlyoffice.com/en/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a> is an <span class="onlineDocumentFeatures">online</span> application that allows you to view through
and edit documents<span class="onlineDocumentFeatures"> directly in your browser</span>.</p>
<p>Using the <b>Document Editor</b>, you can perform various editing operations like in any desktop editor,
print the edited documents keeping all the formatting details or download them onto your computer hard disk drive of your computer as DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB files.</p>
print the edited documents keeping all the formatting details or download them onto your computer hard disk drive of your computer as DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB, DOCXF and OFORM files.</p>
<p><span class="onlineDocumentFeatures">To view the current software version and licensor details in the <em>online version</em>, click the <img alt="About icon" src="../images/about.png" /> icon on the left sidebar.</span> <span class="desktopDocumentFeatures"> To view the current software version and licensor details in the <em>desktop version</em> for Windows, select the <b>About</b> menu item on the left sidebar of the main program window. In the <em>desktop version</em> for Mac OS, open the <b>ONLYOFFICE</b> menu at the top of the screen and select the <b>About ONLYOFFICE</b> menu item.</span></p>
</div>
</body>

13
apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm
View file

@ -23,6 +23,11 @@
<li><b>Turn on display of the resolved comments</b> - this feature is disabled by default so that the resolved comments were hidden in the document text. You can view such comments only if you click the <b>Comments</b> <img alt="Comments icon" src="../images/commentsicon.png" /> icon on the left sidebar. Enable this option if you want to display resolved comments in the document text.</li>
</ul>
</li>
<li><b>Track Changes Display</b> is used to select an option for displaying changes:
<ul>
<li><b>Show by click in balloons</b> displays the change in a balloon when you click the tracked change;</li>
<li><b>Show by hover in tooltips</b> displays a tooltip when you hover the mouse pointer over the tracked change.</li>
</ul>
<li><b>Spell Checking</b> is used to turn on/off the spell checking option.</li>
<li><b>Proofing</b> - used to automatically replace word or symbol typed in the <b>Replace:</b> box or chosen from the list by a new word or symbol displayed in the <b>By:</b> box.</li>
<li><b>Alternate Input</b> is used to turn on/off hieroglyphs.</li>
@ -48,10 +53,12 @@
<ul>
<li><b>Light</b> color scheme incorporates standard blue, white, and light-gray colors with less contrast in UI elements suitable for working during daytime.</li>
<li><b>Classic Light</b> color scheme incorporates standard blue, white, and light-gray colors.</li>
<li><b>Dark</b> color scheme incorporates black, dark-gray, and light-gray colors suitable for working during nighttime.</li>
</ul>
<li><b>Dark</b> color scheme incorporates black, dark-gray, and light-gray colors suitable for working during nighttime. The <b>Turn on document dark mode</b> is active by default when the editor is set to <b>Dark interface theme</b>. Check the <b>Turn dark document mode</b> box to enable it.
<p class="note"><b>Note</b>: Apart from the available <b>Light</b>, <b>Classic Light</b>, and <b>Dark</b> interface themes, ONLYOFFICE editors can now be customized with your own color theme. Please follow <a target="_blank" href="https://helpcenter.onlyoffice.com/installation/docs-developer-change-theme.aspx" onclick="onhyperlinkclick(this)">these instructions</a> to learn how you can do that.</p>
</li>
</ul>
</li>
<li><b>Default Zoom Value</b> is used to set the default zoom value selecting it in the list of available options from 50% to 200%. You can also choose the <b>Fit to Page</b> or <b>Fit to Width</b> option.</li>
<li><b>Default Zoom Value</b> is used to set the default zoom value selecting it in the list of available options from 50% to 500%. You can also choose the <b>Fit to Page</b> or <b>Fit to Width</b> option.</li>
<li>
<b>Font Hinting</b> is used to select the type a font is displayed in the Document Editor:
<ul>

14
apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
View file

@ -79,12 +79,22 @@
<p>The text passage you commented will be highlighted in the document. To view the comment, just click within the passage. If you need to disable this feature, click the <b>File</b> tab at the top toolbar, select the <b>Advanced Settings...</b> option and uncheck the <b>Turn on display of the comments</b> box. In this case the commented passages will be highlighted only if you click the <img alt="Comments icon" src="../images/commentsicon.png" /> icon.</p>
<p>You can manage the added comments using the icons in the comment balloon or on the <b>Comments</b> panel on the left:</p>
<ul>
<li>sort the added comments by clicking the <img alt="Sort icon" src="../images/sortcommentsicon.png" /> icon:
<ul>
<li>by date: <b>Newest</b> or <b>Oldest</b>. This is the sort order by default.</li>
<li>by author: <b>Author from A to Z</b> or <b>Author from Z to A</b></li>
<li>
by location: <b>From top</b> or <b>From bottom</b>. The usual sort order of comments by their location in a document is as follows (from top): <em>comments to text</em>, <em>comments to footnotes</em>, <em>comments to endnotes</em>, <em>comments to headers/footers</em>, <em>comments to the entire document</em>.
<p><img alt="Sort comments" src="../images/sortcomments.png" /></p>
</li>
</ul>
<li>edit the currently selected comment by clicking the <img alt="Edit icon" src="../images/editcommenticon.png" /> icon,</li>
<li>delete the currently selected comment by clicking the <img alt="Delete icon" src="../images/deletecommenticon.png" /> icon,</li>
<li>close the currently selected discussion by clicking the <img alt="Resolve icon" src="../images/resolveicon.png" /> icon if the task or problem you stated in your comment was solved, after that the discussion you opened with your comment gets the resolved status. To open it again, click the <img alt="Open again icon" src="../images/resolvedicon.png" /> icon. If you want to hide resolved comments, click the <b>File</b> tab on the top toolbar, select the <b>Advanced Settings...</b> option, uncheck the <b>Turn on display of the resolved comments</b> box and click <b>Apply</b>. In this case the resolved comments will be highlighted only if you click the <img alt="Comments icon" src="../images/commentsicon.png" /> icon,</li>
<li>if you want to manage comments in a bunch, open the <b>Resolve</b> drop-down menu on the <b>Collaboration</b> tab. Select one of the options for resolving comments: <b>resolve current comments</b>, <b>resolve my comments</b> or <b>resolve all comments</b> in the document.</li>
</ul>
<li>if you want to manage comments in a bunch, open the <b>Resolve</b> drop-down menu on the <b>Collaboration</b> tab. Select one of the options for resolving comments: <b>resolve current comments</b>, <b>resolve my comments</b> or <b>resolve all comments</b> in the document.</li>
</ul>
<h4>Adding mentions</h4>
<p class="note"> <b>Note</b>: Mentions can be added to comments to text and not to comments to the entire document.</p>
<p>When entering comments, you can use the <b>mentions</b> feature that allows you to attract somebody's attention to the comment and send a notification to the mentioned user via email and <b>Talk</b>.</p>
<p>To add a mention enter the "+" or "@" sign anywhere in the comment text - a list of the portal users will open. To simplify the search process, you can start typing a name in the comment field - the user list will change as you type. Select the necessary person from the list. If the file has not yet been shared with the mentioned user, the <b>Sharing Settings</b> window will open. <b>Read only</b> access type is selected by default. Change it if necessary and click <b>OK</b>.</p>
<p>The mentioned user will receive an email notification that he/she has been mentioned in a comment. If the file has been shared, the user will also receive a corresponding notification.</p>

1
apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm
View file

@ -14,7 +14,6 @@
<input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
</div>
<h1>Compare documents</h1>
<p class="note"><b>Note</b>: this option is available in the <b>paid</b> <em>online version</em> only starting from <b>Document Server</b> v. <b>5.5</b>. To enable this feature in the <em>desktop version</em>, refer to <a target="_blank" href="http://helpcenter.onlyoffice.com/installation/desktop-pro-features.aspx" onclick="onhyperlinkclick(this)">this article</a>.</p>
<p>If you need to compare and merge two documents, the <a href="https://www.onlyoffice.com/en/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a> provides you with the document <b>Compare</b> feature. It allows displaying the differences between two documents and merge the documents by accepting the changes one by one or all at once.</p>
<p>After comparing and merging two documents, the result will be stored on the portal as a new version of the original file<!-- (in the <em>online version</em> of editors)-->. <!--In the desktop version, when you click the <b>Save</b> button, the dialog window will appear where you will be suggested to save a new file.--></p>
<p>If you do not need to merge documents which are being compared, you can reject all the changes so that the original document remains unchanged.</p>

554
apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
View file

@ -12,23 +12,39 @@
</head>
<body>
<div class="mainpart">
<div class="search-field">
<input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
</div>
<div class="search-field">
<input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
</div>
<h1>Keyboard Shortcuts</h1>
<p>The keyboard shortcut list used for a faster and easier access to the features of the <a href="https://www.onlyoffice.com/en/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a> using the keyboard.</p>
<ul class="shortcut_variants">
<li class="shortcut_toggle pc_option left_option">Windows/Linux</li><!--
--><li class="shortcut_toggle mac_option right_option">Mac OS</li>
</ul>
<h3>Keyboard Shortcuts for Key Tips</h3>
<p>Use keyboard shortcuts to gain immediate access to a certain document parameter and to configure it without using a mouse.</p>
<ol>
<li>Press <b>Alt</b> key to turn on all key tips for the editor header, the top toolbar, the right and the left sidebars and the status bar.</li>
<li>
Press the letter that corresponds to the item you wish to use. The additional key tips may appear depending on the key you press. The first key tips hide when additional key tips appear.
<p>For example, to access the <b>Insert</b> tab, press <b>Alt</b> to see all primary key tips.</p>
<p><img alt="Primary Key Tips" src="../images/keytips1.png" /></p>
<p>Press letter <b>I</b> to access the <b>Insert</b> tab, and to see all the available shortcuts for this tab.</p>
<p><img alt="Secondary Key Tips" src="../images/keytips2.png" /></p>
<p>Then press the letter that corresponds to the item you wish to configure.</p>
</li>
<li>Press <b>Alt</b> to hide all key tips, or press <b>Escape</b> to go back to the previous group of key tips.</li>
</ol>
<p>The <b>keyboard shortcut list</b> used for a faster and easier access to the features of the <a href="https://www.onlyoffice.com/en/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a> using the keyboard.</p>
<ul class="shortcut_variants">
<li class="shortcut_toggle pc_option left_option">Windows/Linux</li>
<!--
-->
<li class="shortcut_toggle mac_option right_option">Mac OS</li>
</ul>
<table class="keyboard_shortcuts_table">
<tr>
<th colspan="4" class="keyboard_section">Working with Document</th>
</tr>
<tr>
<td>Open 'File' panel</td>
<td><kbd>Alt</kbd>+<kbd>F</kbd></td>
<td><kbd>⌥ Option</kbd>+<kbd>F</kbd></td>
<td width="20%"><kbd>Alt</kbd>+<kbd>F</kbd></td>
<td width="20%"><kbd>⌥ Option</kbd>+<kbd>F</kbd></td>
<td>Open the <b>File</b> panel panel to save, download, print the current document, view its info, create a new document or open an existing one, access the Document Editor Help Center or advanced settings.</td>
</tr>
<tr>
@ -37,18 +53,18 @@
<td><kbd>^ Ctrl</kbd>+<kbd>F</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>F</kbd></td>
<td>Open the <b>Find and Replace</b> dialog box to start searching for a character/word/phrase in the currently edited document.</td>
</tr>
<tr>
<td>Open 'Find and Replace' dialog box with replacement field</td>
<td><kbd>Ctrl</kbd>+<kbd>H</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>H</kbd></td>
<td>Open the <b>Find and Replace</b> dialog box with the replacement field to replace one or more occurrences of the found characters.</td>
</tr>
<tr>
<td>Repeat the last 'Find' action</td>
<td><kbd>⇧ Shift</kbd>+<kbd>F4</kbd></td>
<tr>
<td>Open 'Find and Replace' dialog box with replacement field</td>
<td><kbd>Ctrl</kbd>+<kbd>H</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>H</kbd></td>
<td>Open the <b>Find and Replace</b> dialog box with the replacement field to replace one or more occurrences of the found characters.</td>
</tr>
<tr>
<td>Repeat the last 'Find' action</td>
<td><kbd>⇧ Shift</kbd>+<kbd>F4</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>F4</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>G</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>⇧ Shift</kbd>+<kbd>F4</kbd></td>
<td>Repeat the previous <b>Find</b> performed before the key combination was pressed.</td>
</tr>
</tr>
<tr>
<td>Open 'Comments' panel</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>H</kbd></td>
@ -83,7 +99,7 @@
<td>Download As...</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>S</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>S</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>⇧ Shift</kbd>+<kbd>S</kbd></td>
<td>Open the <b>Download as...</b> panel to save the currently edited document to the hard disk drive of your computer in one of the supported formats: DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML.</td>
<td>Open the <b>Download as...</b> panel to save the currently edited document to the hard disk drive of your computer in one of the supported formats: DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, DOCXF, OFORM, HTML, FB2, EPUB.</td>
</tr>
<tr>
<td>Full screen</td>
@ -91,36 +107,36 @@
<td><!--<kbd>&#8984; Cmd</kbd>+<kbd>^ Ctrl</kbd>+<kbd>F</kbd>--></td>
<td>Switch to the full screen view to fit the Document Editor into your screen.</td>
</tr>
<tr>
<td>Help menu</td>
<td><kbd>F1</kbd></td>
<td><kbd>F1</kbd></td>
<td>Open the Document Editor <b>Help</b> menu.</td>
</tr>
<tr>
<td>Open existing file (Desktop Editors)</td>
<td><kbd>Ctrl</kbd>+<kbd>O</kbd></td>
<tr>
<td>Help menu</td>
<td><kbd>F1</kbd></td>
<td><kbd>F1</kbd></td>
<td>Open the Document Editor <b>Help</b> menu.</td>
</tr>
<tr>
<td>Open existing file (Desktop Editors)</td>
<td><kbd>Ctrl</kbd>+<kbd>O</kbd></td>
<td></td>
<td>On the <b>Open local file</b> tab in the <b>Desktop Editors</b>, opens the standard dialog box that allows to select an existing file.</td>
</tr>
<tr>
<td>Close file (Desktop Editors)</td>
<td><kbd>Ctrl</kbd>+<kbd>W</kbd>,<br /><kbd>Ctrl</kbd>+<kbd>F4</kbd></td>
<td>On the <b>Open local file</b> tab in the <b>Desktop Editors</b>, opens the standard dialog box that allows to select an existing file.</td>
</tr>
<tr>
<td>Close file (Desktop Editors)</td>
<td><kbd>Ctrl</kbd>+<kbd>W</kbd>,<br /><kbd>Ctrl</kbd>+<kbd>F4</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>W</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>W</kbd></td>
<td>Close the current document window in the <b>Desktop Editors</b>.</td>
</tr>
<tr>
<td>Element contextual menu</td>
<td><kbd>⇧ Shift</kbd>+<kbd>F10</kbd></td>
<td>Close the current document window in the <b>Desktop Editors</b>.</td>
</tr>
<tr>
<td>Element contextual menu</td>
<td><kbd>⇧ Shift</kbd>+<kbd>F10</kbd></td>
<td>Open the selected element <b>contextual menu</b>.</td>
</tr>
<tr>
<td>Reset the ‘Zoom’ parameter</td>
<td><kbd>Ctrl</kbd>+<kbd>0</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>0</kbd> or <kbd>&#8984; Cmd</kbd>+<kbd>0</kbd></td>
<td>Reset the ‘Zoom’ parameter of the current document to a default 100%.</td>
</tr>
<td><kbd>⇧ Shift</kbd>+<kbd>F10</kbd></td>
<td>Open the selected element <b>contextual menu</b>.</td>
</tr>
<tr>
<td>Reset the ‘Zoom’ parameter</td>
<td><kbd>Ctrl</kbd>+<kbd>0</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>0</kbd> or <kbd>&#8984; Cmd</kbd>+<kbd>0</kbd></td>
<td>Reset the ‘Zoom’ parameter of the current document to a default 100%.</td>
</tr>
<tr>
<th colspan="4" class="keyboard_section">Navigation</th>
</tr>
@ -196,52 +212,52 @@
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td>Zoom out the currently edited document.</td>
</tr>
<tr>
<td>Move one character to the left</td>
<td><kbd>←</kbd></td>
<td><kbd>←</kbd></td>
<td>Move the cursor one character to the left.</td>
</tr>
<tr>
<td>Move one character to the right</td>
<td><kbd>→</kbd></td>
<td><kbd>→</kbd></td>
<td>Move the cursor one character to the right.</td>
</tr>
<tr>
<td>Move to the beginning of a word or one word to the left</td>
<td><kbd>Ctrl</kbd>+<kbd>←</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>←</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>←</kbd></td>
<td>Move the cursor to the beginning of a word or one word to the left.</td>
</tr>
<tr>
<td>Move one word to the right</td>
<td><kbd>Ctrl</kbd>+<kbd>→</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>→</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>→</kbd></td>
<td>Move the cursor one word to the right.</td>
</tr>
<!--<tr>
<td>Move one paragraph up</td>
<td>Ctrl+Up arrow</td>
<td>Move the cursor one paragraph up.</td>
</tr>
<tr>
<td>Move one paragraph down</td>
<td>Ctrl+Down arrow</td>
<td>Move the cursor one paragraph down.</td>
</tr>-->
<tr>
<td>Move one line up</td>
<td><kbd>↑</kbd></td>
<td><kbd>↑</kbd></td>
<td>Move the cursor one line up.</td>
</tr>
<tr>
<td>Move one line down</td>
<td><kbd>↓</kbd></td>
<td><kbd>↓</kbd></td>
<td>Move the cursor one line down.</td>
</tr>
<tr>
<td>Move one character to the left</td>
<td><kbd>←</kbd></td>
<td><kbd>←</kbd></td>
<td>Move the cursor one character to the left.</td>
</tr>
<tr>
<td>Move one character to the right</td>
<td><kbd>→</kbd></td>
<td><kbd>→</kbd></td>
<td>Move the cursor one character to the right.</td>
</tr>
<tr>
<td>Move to the beginning of a word or one word to the left</td>
<td><kbd>Ctrl</kbd>+<kbd>←</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>←</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>←</kbd></td>
<td>Move the cursor to the beginning of a word or one word to the left.</td>
</tr>
<tr>
<td>Move one word to the right</td>
<td><kbd>Ctrl</kbd>+<kbd>→</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>→</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>→</kbd></td>
<td>Move the cursor one word to the right.</td>
</tr>
<!--<tr>
<td>Move one paragraph up</td>
<td>Ctrl+Up arrow</td>
<td>Move the cursor one paragraph up.</td>
</tr>
<tr>
<td>Move one paragraph down</td>
<td>Ctrl+Down arrow</td>
<td>Move the cursor one paragraph down.</td>
</tr>-->
<tr>
<td>Move one line up</td>
<td><kbd>↑</kbd></td>
<td><kbd>↑</kbd></td>
<td>Move the cursor one line up.</td>
</tr>
<tr>
<td>Move one line down</td>
<td><kbd>↓</kbd></td>
<td><kbd>↓</kbd></td>
<td>Move the cursor one line down.</td>
</tr>
<tr>
<td>Navigate between controls in modal dialogues</td>
<td><kbd>↹ Tab</kbd>/<kbd>⇧ Shift</kbd>+<kbd>↹ Tab</kbd></td>
@ -374,54 +390,54 @@
<td><kbd>⇧ Shift</kbd>+<kbd>End</kbd></td>
<td>Select a text fragment from the cursor to the end of the current line.</td>
</tr>
<tr>
<td>Select one character to the right</td>
<td><kbd>⇧ Shift</kbd>+<kbd>→</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>→</kbd></td>
<td>Select one character to the right of the cursor position.</td>
</tr>
<tr>
<td>Select one character to the left</td>
<td><kbd>⇧ Shift</kbd>+<kbd>←</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>←</kbd></td>
<td>Select one character to the left of the cursor position.</td>
</tr>
<tr>
<td>Select to the end of a word</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>→</kbd></td>
<tr>
<td>Select one character to the right</td>
<td><kbd>⇧ Shift</kbd>+<kbd>→</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>→</kbd></td>
<td>Select one character to the right of the cursor position.</td>
</tr>
<tr>
<td>Select one character to the left</td>
<td><kbd>⇧ Shift</kbd>+<kbd>←</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>←</kbd></td>
<td>Select one character to the left of the cursor position.</td>
</tr>
<tr>
<td>Select to the end of a word</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>→</kbd></td>
<td></td>
<td>Select a text fragment from the cursor to the end of a word.</td>
</tr>
<tr>
<td>Select to the beginning of a word</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>←</kbd></td>
<td>Select a text fragment from the cursor to the end of a word.</td>
</tr>
<tr>
<td>Select to the beginning of a word</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>←</kbd></td>
<td></td>
<td>Select a text fragment from the cursor to the beginning of a word.</td>
</tr>
<tr>
<td>Select one line up</td>
<td><kbd>⇧ Shift</kbd>+<kbd>↑</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>↑</kbd></td>
<td>Select one line up (with the cursor at the beginning of a line).</td>
</tr>
<tr>
<td>Select one line down</td>
<td><kbd>⇧ Shift</kbd>+<kbd>↓</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>↓</kbd></td>
<td>Select one line down (with the cursor at the beginning of a line).</td>
</tr>
<tr>
<td>Select the page up</td>
<td><kbd>⇧ Shift</kbd>+<kbd>Page Up</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>Page Up</kbd></td>
<td>Select the page part from the cursor position to the upper part of the screen.</td>
</tr>
<tr>
<td>Select the page down</td>
<td><kbd>⇧ Shift</kbd>+<kbd>Page Down</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>Page Down</kbd></td>
<td>Select the page part from the cursor position to the lower part of the screen.</td>
</tr>
<td>Select a text fragment from the cursor to the beginning of a word.</td>
</tr>
<tr>
<td>Select one line up</td>
<td><kbd>⇧ Shift</kbd>+<kbd>↑</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>↑</kbd></td>
<td>Select one line up (with the cursor at the beginning of a line).</td>
</tr>
<tr>
<td>Select one line down</td>
<td><kbd>⇧ Shift</kbd>+<kbd>↓</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>↓</kbd></td>
<td>Select one line down (with the cursor at the beginning of a line).</td>
</tr>
<tr>
<td>Select the page up</td>
<td><kbd>⇧ Shift</kbd>+<kbd>Page Up</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>Page Up</kbd></td>
<td>Select the page part from the cursor position to the upper part of the screen.</td>
</tr>
<tr>
<td>Select the page down</td>
<td><kbd>⇧ Shift</kbd>+<kbd>Page Down</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>Page Down</kbd></td>
<td>Select the page part from the cursor position to the lower part of the screen.</td>
</tr>
<tr>
<th colspan="4" class="keyboard_section">Text Styling</th>
</tr>
@ -443,12 +459,12 @@
<td><kbd>^ Ctrl</kbd>+<kbd>U</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>U</kbd></td>
<td>Make the selected text fragment underlined with a line going below the letters.</td>
</tr>
<tr>
<td>Strikeout</td>
<td><kbd>Ctrl</kbd>+<kbd>5</kbd></td>
<tr>
<td>Strikeout</td>
<td><kbd>Ctrl</kbd>+<kbd>5</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>5</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>5</kbd></td>
<td>Make the selected text fragment struck out with a line going through the letters.</td>
</tr>
</tr>
<tr>
<td>Subscript</td>
<td><kbd>Ctrl</kbd>+<kbd>.</kbd></td>
@ -522,69 +538,69 @@
<td>Switch a paragraph between right-aligned and left-aligned.</td>
</tr>
<!--<tr>
<td>Align left</td>
<td>Ctrl+L</td>
<td>Align left with the text lined up by the left side of the page, the right side remains unaligned. If your text is initially left-aligned</td>
</tr>-->
<tr>
<td>Apply subscript formatting (automatic spacing)</td>
<td><kbd>Ctrl</kbd>+<kbd>=</kbd></td>
<td>Align left</td>
<td>Ctrl+L</td>
<td>Align left with the text lined up by the left side of the page, the right side remains unaligned. If your text is initially left-aligned</td>
</tr>-->
<tr>
<td>Apply subscript formatting (automatic spacing)</td>
<td><kbd>Ctrl</kbd>+<kbd>=</kbd></td>
<td></td>
<td>Apply subscript formatting to the selected text fragment.</td>
</tr>
<tr>
<td>Apply superscript formatting (automatic spacing)</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>+</kbd></td>
<td>Apply subscript formatting to the selected text fragment.</td>
</tr>
<tr>
<td>Apply superscript formatting (automatic spacing)</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>+</kbd></td>
<td></td>
<td>Apply superscript formatting to the selected text fragment.</td>
</tr>
<tr>
<td>Insert page break</td>
<td><kbd>Ctrl</kbd>+<kbd>↵ Enter</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>↵ Return</kbd></td>
<td>Insert a page break at the current cursor position.</td>
</tr>
<td>Apply superscript formatting to the selected text fragment.</td>
</tr>
<tr>
<td>Insert page break</td>
<td><kbd>Ctrl</kbd>+<kbd>↵ Enter</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>↵ Return</kbd></td>
<td>Insert a page break at the current cursor position.</td>
</tr>
<tr>
<td>Increase indent</td>
<td><kbd>Ctrl</kbd>+<kbd>M</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>M</kbd></td>
<td>Indent a paragraph from the left incrementally.</td>
</tr>
<tr>
<td>Decrease indent</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>M</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>M</kbd></td>
<td>Remove a paragraph indent from the left incrementally.</td>
</tr>
<tr>
<td>Add page number</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>P</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>P</kbd></td>
<td>Add the current page number at the current cursor position.</td>
</tr>
<!--<tr>
<td>Add dash</td>
<td>Num-</td>
<td>Add a dash.</td>
</tr>-->
<tr>
<td>Decrease indent</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>M</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>M</kbd></td>
<td>Remove a paragraph indent from the left incrementally.</td>
</tr>
<tr>
<td>Add page number</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>P</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>P</kbd></td>
<td>Add the current page number at the current cursor position.</td>
</tr>
<!--<tr>
<td>Add dash</td>
<td>Num-</td>
<td>Add a dash.</td>
</tr>-->
<tr>
<td>Nonprinting characters</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>Num8</kbd></td>
<td></td>
<td>Show or hide the display of nonprinting characters.</td>
</tr>
<tr>
<td>Delete one character to the left</td>
<td><kbd>← Backspace</kbd></td>
<td><kbd>← Backspace</kbd></td>
<td>Delete one character to the left of the cursor.</td>
</tr>
<tr>
<td>Delete one character to the right</td>
<td><kbd>Delete</kbd></td>
<td><kbd>Delete</kbd></td>
<td>Delete one character to the right of the cursor.</td>
</tr>
<tr>
<td>Delete one character to the left</td>
<td><kbd>← Backspace</kbd></td>
<td><kbd>← Backspace</kbd></td>
<td>Delete one character to the left of the cursor.</td>
</tr>
<tr>
<td>Delete one character to the right</td>
<td><kbd>Delete</kbd></td>
<td><kbd>Delete</kbd></td>
<td>Delete one character to the right of the cursor.</td>
</tr>
<tr>
<th colspan="4" class="keyboard_section"><a id="workwithobjects"></a>Modifying Objects</th>
</tr>
@ -606,90 +622,90 @@
<td><kbd>⇧ Shift</kbd> + drag (when resizing)</td>
<td>Maintain the proportions of the selected object when resizing.</td>
</tr>
<tr>
<td>Draw straight line or arrow</td>
<td><kbd>⇧ Shift</kbd> + drag (when drawing lines/arrows)</td>
<td><kbd>⇧ Shift</kbd> + drag (when drawing lines/arrows)</td>
<td>Draw a straight vertical/horizontal/45-degree line or arrow.</td>
</tr>
<tr>
<td>Draw straight line or arrow</td>
<td><kbd>⇧ Shift</kbd> + drag (when drawing lines/arrows)</td>
<td><kbd>⇧ Shift</kbd> + drag (when drawing lines/arrows)</td>
<td>Draw a straight vertical/horizontal/45-degree line or arrow.</td>
</tr>
<tr>
<td>Movement by one-pixel increments</td>
<td><kbd>Ctrl</kbd>+<kbd>←</kbd> <kbd>→</kbd> <kbd>↑</kbd> <kbd>↓</kbd></td>
<td></td>
<td>Hold down the <kbd>Ctrl</kbd> key and use the keybord arrows to move the selected object by one pixel at a time.</td>
</tr>
<tr>
<th colspan="4" class="keyboard_section"><a id="workwithtables"></a>Working with Tables</th>
</tr>
<tr>
<td>Move to the next cell in a row</td>
<td><kbd>↹ Tab</kbd></td>
<td><kbd>↹ Tab</kbd></td>
<td>Go to the next cell in a table row.</td>
</tr>
<tr>
<td>Move to the previous cell in a row</td>
<td><kbd>⇧ Shift</kbd>+<kbd>↹ Tab</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>↹ Tab</kbd></td>
<td>Go to the previous cell in a table row.</td>
</tr>
<tr>
<td>Move to the next row</td>
<td><kbd>↓</kbd></td>
<td><kbd>↓</kbd></td>
<td>Go to the next row in a table.</td>
</tr>
<tr>
<td>Move to the previous row</td>
<td><kbd>↑</kbd></td>
<td><kbd>↑</kbd></td>
<td>Go to the previous row in a table.</td>
</tr>
<tr>
<td>Start new paragraph</td>
<td><kbd>↵ Enter</kbd></td>
<td><kbd>↵ Return</kbd></td>
<td>Start a new paragraph within a cell.</td>
</tr>
<tr>
<td>Add new row</td>
<td><kbd>↹ Tab</kbd> in the lower right table cell.</td>
<td><kbd>↹ Tab</kbd> in the lower right table cell.</td>
<td>Add a new row at the bottom of the table.</td>
</tr>
<tr>
<th colspan="4" class="keyboard_section">Inserting special characters</th>
</tr>
<!--<tr>
<td>Insert the Euro sign</td>
<td><kbd>Alt</kbd>+<kbd>Ctrl</kbd>+<kbd>E</kbd></td>
<td>Insert the Euro sign (€) at the current cursor position.</td>
</tr>-->
<tr>
<td>Insert formula</td>
<td><kbd>Alt</kbd>+<kbd>=</kbd></td>
<tr>
<th colspan="4" class="keyboard_section"><a id="workwithtables"></a>Working with Tables</th>
</tr>
<tr>
<td>Move to the next cell in a row</td>
<td><kbd>↹ Tab</kbd></td>
<td><kbd>↹ Tab</kbd></td>
<td>Go to the next cell in a table row.</td>
</tr>
<tr>
<td>Move to the previous cell in a row</td>
<td><kbd>⇧ Shift</kbd>+<kbd>↹ Tab</kbd></td>
<td><kbd>⇧ Shift</kbd>+<kbd>↹ Tab</kbd></td>
<td>Go to the previous cell in a table row.</td>
</tr>
<tr>
<td>Move to the next row</td>
<td><kbd>↓</kbd></td>
<td><kbd>↓</kbd></td>
<td>Go to the next row in a table.</td>
</tr>
<tr>
<td>Move to the previous row</td>
<td><kbd>↑</kbd></td>
<td><kbd>↑</kbd></td>
<td>Go to the previous row in a table.</td>
</tr>
<tr>
<td>Start new paragraph</td>
<td><kbd>↵ Enter</kbd></td>
<td><kbd>↵ Return</kbd></td>
<td>Start a new paragraph within a cell.</td>
</tr>
<tr>
<td>Add new row</td>
<td><kbd>↹ Tab</kbd> in the lower right table cell.</td>
<td><kbd>↹ Tab</kbd> in the lower right table cell.</td>
<td>Add a new row at the bottom of the table.</td>
</tr>
<tr>
<th colspan="4" class="keyboard_section">Inserting special characters</th>
</tr>
<!--<tr>
<td>Insert the Euro sign</td>
<td><kbd>Alt</kbd>+<kbd>Ctrl</kbd>+<kbd>E</kbd></td>
<td>Insert the Euro sign (€) at the current cursor position.</td>
</tr>-->
<tr>
<td>Insert formula</td>
<td><kbd>Alt</kbd>+<kbd>=</kbd></td>
<td></td>
<td>Insert a formula at the current cursor position.</td>
</tr>
<tr>
<td>Insert an em dash</td>
<td><kbd>Alt</kbd>+<kbd>Ctrl</kbd>+<kbd>Num-</kbd></td>
<td></td>
<td>Insert an em dash ‘—’ within the current document and to the right of the cursor.</td>
</tr>
<tr>
<td>Insert a non-breaking hyphen</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>_</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>Hyphen</kbd></td>
<td>Insert a non-breaking hyphen ‘-’ within the current document and to the right of the cursor.</td>
</tr>
<tr>
<td>Insert a formula at the current cursor position.</td>
</tr>
<tr>
<td>Insert an em dash</td>
<td><kbd>Alt</kbd>+<kbd>Ctrl</kbd>+<kbd>Num-</kbd></td>
<td></td>
<td>Insert an em dash ‘—’ within the current document and to the right of the cursor.</td>
</tr>
<tr>
<td>Insert a non-breaking hyphen</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>_</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>Hyphen</kbd></td>
<td>Insert a non-breaking hyphen ‘-’ within the current document and to the right of the cursor.</td>
</tr>
<tr>
<td>Insert a no-break space</td>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>␣ Spacebar</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>␣ Spacebar</kbd></td>
<td>Insert a no-break space ‘o’ within the current document and to the right of the cursor.</td>
</tr>
<td><kbd>Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>␣ Spacebar</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>⇧ Shift</kbd>+<kbd>␣ Spacebar</kbd></td>
<td>Insert a no-break space ‘o’ within the current document and to the right of the cursor.</td>
</tr>
</table>
</div>
</body>

8
apps/documenteditor/main/resources/help/en/HelpfulHints/Navigation.htm
View file

@ -26,7 +26,11 @@
</li>
<li><b>Hide Status Bar</b> - hides the bottommost bar where the <b>Page Number Indicator</b> and <b>Zoom</b> buttons are situated. To show the hidden <b>Status Bar</b> click this option once again.</li>
<li><b>Hide Rulers</b> - hides rulers which are used to align text, graphics, tables, and other elements in a document, set up margins, tab stops, and paragraph indents. To show the hidden <b>Rulers</b> click this option once again.</li>
</ul>
<li>
<b>Dark mode</b> – enables or disables the dark mode if you have chosen the <b>Dark interface theme</b>. You can also turn on the dark mode using the <b>Advanced Settings</b> from the <b>File</b> tab menu.
<p><img alt="Dark Mode" src="../images/viewsettings_darkmode.png" /></p>
</li>
</ul>
<p>The right sidebar is minimized by default. To expand it, select any object (e.g. image, chart, shape) or text passage and click the icon of the currently activated tab on the right. To minimize the right sidebar, click the icon once again.</p>
<p>
When the <b>Comments</b> <span class="onlineDocumentFeatures">or <b>Chat</b></span> panel is opened, the width of the left sidebar is adjusted by simple drag-and-drop:
@ -36,7 +40,7 @@
<p>To navigate through your document, use the following tools:</p>
<p>
The <b>Zoom</b> buttons are situated in the right lower corner and are used to zoom in and out the current document.
To change the currently selected zoom value that is displayed in percent, click it and select one of the available zoom options from the list (50% / 75% / 100% / 125% / 150% / 175% / 200%)
To change the currently selected zoom value that is displayed in percent, click it and select one of the available zoom options from the list (50% / 75% / 100% / 125% / 150% / 175% / 200% / 300% / 400% / 500%)
or use the <b>Zoom in</b> <img alt="Zoom in button" src="../images/zoomin.png" /> or <b>Zoom out</b> <img alt="Zoom out button" src="../images/zoomout.png" /> buttons.
Click the <b>Fit to width</b> <img alt="Fit to width button" src="../images/fitwidth.png" /> icon to fit the document page width to the visible part of the working area.
To fit the whole document page to the visible part of the working area, click the <b>Fit to page</b> <img alt="Fit to page button" src="../images/fitpage.png" /> icon.

14
apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm
View file

@ -133,6 +133,20 @@
<td>+</td>
<td></td>
</tr>
<tr>
<td>DOCXF</td>
<td>A format to create, edit and collaborate on a Form Template.</td>
<td>+</td>
<td>+</td>
<td>+</td>
</tr>
<tr>
<td>OFORM</td>
<td>A format to fill out a Form. Form fields are fillable but users cannot change the formatting or parameters of the form elements.</td>
<td>+</td>
<td></td>
<td>+</td>
</tr>
<!--<tr>
<td>PPTX</td>
<td>Office Open XML Presentation<br />Zipped, XML-based file format developed by Microsoft for representing spreadsheets, charts, presentations, and word processing documents</td>

45
apps/documenteditor/main/resources/help/en/ProgramInterface/FormsTab.htm Normal file
View file

@ -0,0 +1,45 @@
<!DOCTYPE html>
<html>
<head>
<title>Forms tab</title>
<meta charset="utf-8" />
<meta name="description" content="Introducing the Document Editor user interface - Forms tab" />
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
</head>
<body>
<div class="mainpart">
<div class="search-field">
<input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
</div>
<h1>Forms tab</h1>
<p class="note"><b>Note</b>: this tab is available with DOCXF files only.</p>
<p>The <b>Forms</b> tab allows you to create fillable forms such as agreements, applications or surveys. Add, format and configure text and form fields to draft a fillable form no matter how complex you need it to be.</p>
<div class="onlineDocumentFeatures">
<p>The corresponding window of the Online Document Editor:</p>
<p><img alt="Forms tab" src="../images/interface/formstab.png" /></p>
<p>The corresponding window of the Desktop Document Editor:</p>
<p><img alt="Forms tab" src="../images/interface/desktop_formstab.png" /></p>
</div>
<p>Using this tab, you can:</p>
<ul>
<li>
<a href="../UsageInstructions/CreateFillableForms.htm">insert and edit</a>
<ul>
<li> <a href="../UsageInstructions/CreateFillableForms.htm#textfield">text fields</a></li>
<li> <a href="../UsageInstructions/CreateFillableForms.htm#combobox">combo boxes</a></li>
<li> <a href="../UsageInstructions/CreateFillableForms.htm#dropdownlist">drop-down lists</a></li>
<li> <a href="../UsageInstructions/CreateFillableForms.htm#checkbox">checkboxes</a></li>
<li> <a href="../UsageInstructions/CreateFillableForms.htm#radiobutton">radio buttons</a></li>
<li> <a href="../UsageInstructions/CreateFillableForms.htm#image">images</a></li>
</ul>
<li>clear all fields and highlight settings,</li>
<li>navigate through form fields using <b>Previous Field</b> and <b>Next Field</b> buttons,</li>
<li>view the resulting forms in your document,</li>
<li>save form as a fillable OFORM file.</li>
</ul>
</div>
</body>
</html>

2
apps/documenteditor/main/resources/help/en/ProgramInterface/ProgramInterface.htm
View file

@ -37,7 +37,7 @@
<li><img alt="Favorites icon" src="../images/favorites_icon.png" /> <b>Mark as favorite</b> - click the star to add a file to favorites as to make it easy to find. The added file is just a shortcut so the file itself remains stored in its original location. Deleting a file from favorites does not remove the file from its original location.</li>
</ul>
</li>
<li>The <b>Top toolbar</b> displays a set of editing commands depending on the selected menu tab. Currently, the following tabs are available: <a href="../ProgramInterface/FileTab.htm" onclick="onhyperlinkclick(this)">File</a>, <a href="../ProgramInterface/HomeTab.htm" onclick="onhyperlinkclick(this)">Home</a>, <a href="../ProgramInterface/InsertTab.htm" onclick="onhyperlinkclick(this)">Insert</a>, <a href="../ProgramInterface/LayoutTab.htm" onclick="onhyperlinkclick(this)">Layout</a>, <a href="../ProgramInterface/ReferencesTab.htm" onclick="onhyperlinkclick(this)">References</a>, <a href="../ProgramInterface/ReviewTab.htm" onclick="onhyperlinkclick(this)">Collaboration</a>, <span class="desktopDocumentFeatures">Protection,</span> <a href="../ProgramInterface/PluginsTab.htm" onclick="onhyperlinkclick(this)">Plugins</a>.
<li>The <b>Top toolbar</b> displays a set of editing commands depending on the selected menu tab. Currently, the following tabs are available: <a href="../ProgramInterface/FileTab.htm" onclick="onhyperlinkclick(this)">File</a>, <a href="../ProgramInterface/HomeTab.htm" onclick="onhyperlinkclick(this)">Home</a>, <a href="../ProgramInterface/InsertTab.htm" onclick="onhyperlinkclick(this)">Insert</a>, <a href="../ProgramInterface/LayoutTab.htm" onclick="onhyperlinkclick(this)">Layout</a>, <a href="../ProgramInterface/ReferencesTab.htm" onclick="onhyperlinkclick(this)">References</a>, <a href="../ProgramInterface/FormsTab.htm" onclick="onhyperlinkclick(this)">Forms</a> (available with DOCXF files only), <a href="../ProgramInterface/ReviewTab.htm" onclick="onhyperlinkclick(this)">Collaboration</a>, <span class="desktopDocumentFeatures">Protection,</span> <a href="../ProgramInterface/PluginsTab.htm" onclick="onhyperlinkclick(this)">Plugins</a>.
<p>The <img alt="Copy icon" src="../images/copy.png" /> <b>Copy</b> and <img alt="Paste icon" src="../images/paste.png" /> <b>Paste</b> options are always available on the left side of the <b>Top toolbar</b> regardless of the selected tab.</p>
</li>
<li>The <b>Status bar</b> located at the bottom of the editor window indicates the page number and displays some notifications (for example, "All changes saved", etc.). It also allows <a href="../HelpfulHints/SpellChecking.htm" onclick="onhyperlinkclick(this)">setting the text language, enabling spell checking</a>, turning on the <a href="../HelpfulHints/Review.htm" onclick="onhyperlinkclick(this)">track changes mode</a> and adjusting <a href="../HelpfulHints/Navigation.htm" onclick="onhyperlinkclick(this)">zoom</a>.</li>

48
apps/documenteditor/main/resources/help/en/UsageInstructions/CommunicationPlugins.htm Normal file
View file

@ -0,0 +1,48 @@
<!DOCTYPE html>
<html>
<head>
<title>Communicate while editing</title>
<meta charset="utf-8" />
<meta name="description" content="In ONLYOFFICE Document Editor, you can always keep in touch with colleagues and use popular online messengers, such as Telegram and Rainbow" />
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
</head>
<body>
<div class="mainpart">
<div class="search-field">
<input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
</div>
<h1>Communicate while editing</h1>
<p>In ONLYOFFICE <a href="https://www.onlyoffice.com/en/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a>, you can always keep in touch with colleagues and use popular online messengers, such as Telegram and Rainbow.</p>
<div class="note">Telegram and Rainbow plugins are not installed by default. To find information on how to install them, please, refer to the corresponding article: <span class="desktopDocumentFeatures"><a target="_blank" href="https://helpcenter.onlyoffice.com/installation/desktop-getting-started.aspx#AddingPlugins_block" onclick="onhyperlinkclick(this)">Adding plugins to the ONLYOFFICE Desktop Editors</a></span><span class="onlineDocumentFeatures"> <a target="_blank" href="https://api.onlyoffice.com/plugin/installation/cloud" onclick="onhyperlinkclick(this)">Adding plugins to ONLYOFFICE Cloud</a>, or <a target="_blank" href="https://helpcenter.onlyoffice.com/installation/docs-add-plugin.aspx" onclick="onhyperlinkclick(this)">Adding new plugins to server editors</a></span>.</div>
<h2>Telegram</h2>
<p>To start chatting in the Telegram plugin,</p>
<ul>
<li>Switch to the <b>Plugins</b> tab and click <img alt="Telegram icon" src="../images/telegram_icon.png" /> <b>Telegram</b>,</li>
<li>enter your phone number into the corresponding field,</li>
<li>check the <b>Keep me signed in</b> checkbox if you want to save credentials for the current session and click the <b>Next</b> button,</li>
<li>
enter the code you've received in your Telegram app,
<p>or</p>
</li>
<li>log in using the <b>QR code</b>,</li>
<li>open Telegram app on your phone,</li>
<li>go to Settings > Devices > Scan QR,</li>
<li>scan the image to Log in.</li>
</ul>
<p>Now you can use Telegram for instant messaging within ONLYOFFICE editors interface.</p>
<img alt="Telegram gif" src="../images/telegram.gif" />
<h2>Rainbow</h2>
<p>To start chatting in the Rainbow plugin,</p>
<ol>
<li>Switch to the <b>Plugins</b> tab and click <img alt="Rainbow icon" src="../images/rainbow_icon.png" /> <b>Rainbow</b>,</li>
<li>register a new account by clicking the <b>Sign up</b> button, or log into an already created one. To do this, enter your email into the corresponding field and click <b>Continue</b>,</li>
<li>then enter your account password,</li>
<li>check the <b>Keep my session alive</b> checkbox if you want to save credentials for the current session, and click the <b>Connect</b> button.</li>
</ol>
<p>Now you're all set and can simultaneously chat in Rainbow and work within ONLYOFFICE editors interface.</p>
<img alt="Rainbow gif" src="../images/rainbow.gif" />
</div>
</body>
</html>

1
apps/documenteditor/main/resources/help/en/UsageInstructions/CopyPasteUndoRedo.htm
View file

@ -31,6 +31,7 @@
</ul>
<p class="note"><b>Note</b>: instead of cutting and pasting text fragments in the same document, you can just select the required text passage and drag and drop it to the necessary position.</p>
<h3>Use the Paste Special feature</h3>
<p class="note"><b>Note</b>: For collaborative editing, the <b>Pase Special</b> feature is available in the <b>Strict</b> co-editing mode only.</p>
<p>Once the copied text is pasted, the <b>Paste Special</b> <img alt="Paste Special" src="../images/pastespecialbutton.png" /> button appears next to the inserted text passage. Click this button to select the necessary paste option. </p>
<p>When pasting a text paragraph or some text within autoshapes, the following options are available:</p>
<ul>

309
apps/documenteditor/main/resources/help/en/UsageInstructions/CreateFillableForms.htm Normal file
View file

@ -0,0 +1,309 @@
<!DOCTYPE html>
<html>
<head>
<title>Create fillable forms</title>
<meta charset="utf-8" />
<meta name="description" content="Create fillable forms for advanced form interaction experience" />
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
</head>
<body>
<div class="mainpart">
<div class="search-field">
<input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
</div>
<h1>Create fillable forms</h1>
<p>ONLYOFFICE Document Editor allows you to effortlessly create <b>fillable forms</b> in your documents, e.g. agreement drafts or surveys.</p>
<p><b>Form Template</b> is DOCXF format that offers a range of tools to create a fillable form. Save the resulting form as a <b>DOCXF</b> file, and you will have a form template you can still edit, revise or collaborate on. To make a Form template fillable and to restrict file editing by other users, save it as an <b>OFORM</b> file. Please refer to <a href="../UsageInstructions/FillingOutForm.htm">form filling instructions</a> for further details.</p>
<p class="note"><b>DOCXF</b> and <b>OFORM</b> are new <b>ONLYOFFICE</b> formats that allow to create form templates and fill out forms. Use <b>ONLYOFFICE Document Editor</b> either online or desktop to make full use of form-associated elements and options.</p>
<p>You can also save any existing <b>DOCX</b> file as a <b>DOCXF</b> to use it as Form template. Go to the <b>File</b> tab, click the <b>Download as...</b> or <b>Save as...</b> option on the left side menu and choose the <b>DOCXF</b> icon. Now you can use all the available form editing functions to create a form.</p>
<p>It is not only the form fields that you can edit in a <b>DOCXF</b> file, you can still add, edit and format text or use other <b>Document Editor</b> functions.</p>
<p>Creating fillable forms is enabled through user-editable objects that ensure overall consistency of the resulting documents and allow for advanced form interaction experience.</p>
<p>Currently, you can insert editable <em>plain text</em> fields, <em>combo boxes</em>, <em>dropdown lists</em>, <em>checkboxes</em>, <em>radio buttons</em>, and assign designated areas for <em>images</em>. Access these features on the <b>Forms</b> tab that is available for <b>DOCXF</b> files only.</p>
<h2 id="textfield">Creating a new Plain Text Field</h2>
<p><em>Text fields</em> are user-editable plain text form fields; no other objects can be added.</p>
<div class="forms">
<details class="details-example">
<summary>To insert a text field,</summary>
<ol>
<li>position the insertion point within a line of the text where you want the field to be added,</li>
<li>switch to the <b>Forms</b> tab of the top toolbar,</li>
<li>
click the <img alt="text field icon" src="../images/text_field_icon.png" /> <b>Text Field</b> icon.
</li>
</ol>
<p><img alt="text field inserted" src="../images/text_field_inserted.png" /></p>
<p>The form field will appear at the insertion point within the existing text line. The <b>Form Settings</b> menu will open to the right.</p>
<p id="text_field_settings">
<img class="floatleft" alt="text field settings" src="../images/text_field_settings.png" />
<ul>
<li><b>Key</b>: a key to group fields to fill out simultaneously. To create a new key, enter its name in the field and press <b>Enter</b>, then assign the required key to each text field using the dropdown list. A message <em>Fields connected: 2/3/...</em> will be displayed. To disconnect the fields, click the <b>Disconnect</b> button.</li>
<li><b>Placeholder</b>: type in the text to be displayed in the inserted text field; <em>“Your text here”</em> is set by default.</li>
<li>
<b>Tip</b>: type in the text to be displayed as a tip when a user hovers their mouse pointer over the text field.
<br /> <img alt="tip inserted" src="../images/text_field_tip.png" />
</li>
<li>
<b>Fixed size field</b>: check this box to create a field with a fixed size. When this option is enabled, you can also use the <b>Autofit</b> and/or <b>Multiline field</b> settings.<br />
A fixed size field looks like an autoshape. You can set a wrapping style for it as well as adjust its position.
</li>
<li><b>Characters limit</b>: no limits by default; check this box to set the maximum characters number in the field to the right.</li>
<li>
<b>Comb of characters</b>: spread the text evenly within the inserted text field and configure its general appearance. Leave the box unchecked to preserve the default settings or check it to set the following parameters:
<ul>
<li><b>Cell width</b>: type in the required value or use the arrows to the right to set the width of the inserted text field. The text within will be justified accordingly.</li>
</ul>
<li><b>Border color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to set the color for the borders of the inserted text field. Choose the preferred border color from the palette. You can <b>add a new custom color</b> if necessary.</li>
<li><b>Background color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to apply a background color to the inserted text field. Choose the preferred color out of <b>Theme Colors</b>, <b>Standard Colors</b>, or <b>add a new custom color</b> if necessary.</li>
<li><b>Autofit</b>: this option can be enabled when the <b>Fixed size field</b> setting is selected, check it to automatically fit the font size to the field size.</li>
<li><b>Multiline field</b>: this option can be enabled when the <b>Fixed size field</b> setting is selected, check it to create a form with multiple lines, otherwise, the text will occupy a single line.</li>
</ul>
</p>
<p><img alt="comb of characters" src="../images/comb_of_characters.png" /></p>
<p>Click within the inserted text field and <a href="../UsageInstructions/FontTypeSizeColor.htm">adjust the font type, size, color</a>, apply <a href="../UsageInstructions/DecorationStyles.htm">decoration styles</a> and <a href="../UsageInstructions/FormattingPresets.htm">formatting presets</a>. Formatting will be applied to all the text inside the field.</p>
</details>
</div>
<h2 id="combobox">Creating a new Combo box</h2>
<p><em>Combo boxes</em> contain a dropdown list with a set of choices that can be edited by users.</p>
<div class="forms">
<details class="details-example">
<summary>To insert a combo box,</summary>
<ol>
<li>position the insertion point within a line of the text where you want the field to be added,</li>
<li>switch to the <b>Forms</b> tab of the top toolbar,</li>
<li>
click the <img alt="combo box icon" src="../images/combo_box_icon.png" /> <b>Combo box</b> icon.
</li>
</ol>
<p><img alt="combo box inserted" src="../images/combo_box_inserted.png" /></p>
<p>The form field will appear at the insertion point within the existing text line. The <b>Form Settings</b> menu will open to the right.</p>
<p id="combo_box_settings">
<img class="floatleft" alt="combo box settings" src="../images/combo_box_settings.png" />
<ul>
<li><b>Key</b>: a key to group combo boxes to fill out simultaneously. To create a new key, enter its name in the field and press <b>Enter</b>, then assign the required key to each combo box using the dropdown list. A message <em>Fields connected: 2/3/...</em> will be displayed. To disconnect the fields, click the <b>Disconnect</b> button.</li>
<li><b>Placeholder</b>: type in the text to be displayed in the inserted combo box; <em>“Choose an item”</em> is set by default.</li>
<li>
<b>Tip</b>: type in the text to be displayed as a tip when a user hovers their mouse pointer over the form field.
<br /> <img alt="tip inserted" src="../images/combo_box_tip.png" />
</li>
<li><b>Value Options</b>: add<img alt="add values" src="../images/combo_add_values.png" /> new values, delete<img alt="delete values" src="../images/combo_delete_values.png" /> them, or move them up<img alt="values up" src="../images/combo_values_up.png" /> and <img alt="values down" src="../images/combo_values_down.png" />down in the list.</li>
<li>
<b>Fixed size field</b>: check this box to create a field with a fixed size.<br />
A fixed size field looks like an autoshape. You can set a wrapping style for it as well as adjust its position.
</li>
<li><b>Border color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to set the color for the borders of the inserted combo box. Choose the preferred border color from the palette. You can <b>add a new custom color</b> if necessary.</li>
<li><b>Background color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to apply a background color to the inserted combo box. Choose the preferred color out of <b>Theme Colors</b>, <b>Standard Colors</b>, or <b>add a new custom color</b> if necessary.</li>
</ul>
</p>
<p>You can click the arrow button in the right part of the added <b>Combo box</b> to open the item list and choose the necessary one. Once the necessary item is selected, you can edit the displayed text entirely or partially by replacing it with yours.</p>
<p><img alt="combo box opened" src="../images/combo_box_opened.png" /></p>
</details>
<p>You can change font decoration, color, and size. Click within the inserted combo box and proceed according to the <a href="../UsageInstructions/FontTypeSizeColor.htm">instructions</a>. Formatting will be applied to all the text inside the field.</p>
</div>
<h2 id="dropdownlist">Creating a new Dropdown list form field</h2>
<p><em>Dropdown lists</em> contain a list with a set of choices that cannot be edited by the users.</p>
<div class="forms">
<details class="details-example">
<summary>To insert a dropdown list,</summary>
<ol>
<li>position the insertion point within a line of the text where you want the field to be added,</li>
<li>switch to the <b>Forms</b> tab of the top toolbar,</li>
<li>
click the <img alt="dropdown list icon" src="../images/dropdown_list_icon.png" /> <b>Dropdown</b> icon.
</li>
</ol>
<p><img alt="dropdown list inserted" src="../images/combo_box_inserted.png" /></p>
<p>The form field will appear at the insertion point within the existing text line. The <b>Form Settings</b> menu will open to the right.</p>
<p id="dropdown_list_settings">
<img class="floatleft" alt="dropdown list settings" src="../images/dropdown_list_settings.png" />
<ul>
<li><b>Key</b>: a key to group dropdown lists to fill out simultaneously. To create a new key, enter its name in the field and press <b>Enter</b>, then assign the required key to each form field using the dropdown list. A message <em>Fields connected: 2/3/...</em> will be displayed. To disconnect the fields, click the <b>Disconnect</b> button.</li>
<li><b>Placeholder</b>: type in the text to be displayed in the inserted dropdown list; <em>“Choose an item”</em> is set by default.</li>
<li>
<b>Tip</b>: type in the text to be displayed as a tip when a user hovers their mouse pointer over the form field.
<br /> <img alt="tip inserted" src="../images/combo_box_tip.png" />
</li>
<li><b>Value Options</b>: add<img alt="add values" src="../images/combo_add_values.png" /> new values, delete<img alt="delete values" src="../images/combo_delete_values.png" /> them, or move them up<img alt="values up" src="../images/combo_values_up.png" /> and <img alt="values down" src="../images/combo_values_down.png" />down in the list.</li>
<li>
<b>Fixed size field</b>: check this box to create a field with a fixed size.<br />
A fixed size field looks like an autoshape. You can set a wrapping style for it as well as adjust its position.
</li>
<li><b>Border color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to set the color for the borders of the inserted dropdown field. Choose the preferred border color from the palette. You can <b>add a new custom color</b> if necessary.</li>
<li><b>Background color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to apply a background color to the inserted dropdown field. Choose the preferred color out of <b>Theme Colors</b>, <b>Standard Colors</b>, or <b>add a new custom color</b> if necessary.</li>
</ul>
</p>
<p>You can click the arrow button in the right part of the added <b>Dropdown list</b> form field to open the item list and choose the necessary one.</p>
<p><img alt="dropdown list opened" src="../images/dropdown_list_opened.png" /></p>
</details>
</div>
<h2 id="checkbox">Creating a new Checkbox</h2>
<p><em>Checkboxes</em> are used to provide users with a variety of options, any number of which can be selected. Checkboxes operate individually, so they can be checked or unchecked independently.</p>
<div class="forms">
<details class="details-example">
<summary>To insert a checkbox,</summary>
<ol>
<li>position the insertion point within a line of the text where you want the field to be added,</li>
<li>switch to the <b>Forms</b> tab of the top toolbar,</li>
<li>
click the <img alt="checkbox icon" src="../images/checkbox_icon.png" /> <b>Checkbox</b> icon.
</li>
</ol>
<p><img alt="checkbox inserted" src="../images/checkbox_inserted.png" /></p>
<p>The form field will appear at the insertion point within the existing text line. The <b>Form Settings</b> menu will open to the right.</p>
<p id="checkbox_settings">
<img class="floatleft" alt="checkbox settings" src="../images/checkbox_settings.png" />
<ul>
<li><b>Key</b>: a key to group checkboxes to fill out simultaneously. To create a new key, enter its name in the field and press <b>Enter</b>, then assign the required key to each form field using the dropdown list. A message <em>Fields connected: 2/3/...</em> will be displayed. To disconnect the fields, click the <b>Disconnect</b> button.</li>
<li>
<b>Tip</b>: type in the text to be displayed as a tip when a user hovers their mouse pointer over the checkbox.
<br /> <img alt="tip inserted" src="../images/checkbox_tip.png" />
</li>
<li>
<b>Fixed size field</b>: check this box to create a field with a fixed size.<br />
A fixed size field looks like an autoshape. You can set a wrapping style for it as well as adjust its position.
</li>
<li><b>Border color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to set the color for the borders of the inserted checkbox. Choose the preferred border color from the palette. You can <b>add a new custom color</b> if necessary.</li>
<li><b>Background color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to apply a background color to the inserted checkbox. Choose the preferred color out of <b>Theme Colors</b>, <b>Standard Colors</b>, or <b>add a new custom color</b> if necessary.</li>
</ul>
</p>
<p>To check the box, click it once.</p>
<p><img alt="checkbox checked" src="../images/checkbox_checked.png" /></p>
</details>
</div>
<h2 id="radiobutton">Creating a new Radio Button</h2>
<p><em>Radio buttons</em> are used to provide users with a variety of options, only one of which can be selected. Radio buttons can be grouped so that there is no selecting several buttons within one group.</p>
<div class="forms">
<details class="details-example">
<summary>To insert a radio button,</summary>
<ol>
<li>position the insertion point within a line of the text where you want the field to be added,</li>
<li>switch to the <b>Forms</b> tab of the top toolbar,</li>
<li>
click the <img alt="radio button icon" src="../images/radio_button_icon.png" /> <b>Radio Button</b> icon.
</li>
</ol>
<p><img alt="radio button inserted" src="../images/radio_button_inserted.png" /></p>
<p>The form field will appear at the insertion point within the existing text line. The <b>Form Settings</b> menu will open to the right.</p>
<p id="radio_button_settings">
<img class="floatleft" alt="radio button settings" src="../images/radio_button_settings.png" />
<ul>
<li><b>Group key</b>: to create a new group of radio buttons, enter the name of the group in the field and press <b>Enter</b>, then assign the required group to each radio button.</li>
<li>
<b>Tip</b>: type in the text to be displayed as a tip when a user hovers their mouse pointer over the radio button.
<br /> <img alt="tip inserted" src="../images/radio_button_tip.png" />
</li>
<li>
<b>Fixed size field</b>: check this box to create a field with a fixed size.<br />
A fixed size field looks like an autoshape. You can set a wrapping style for it as well as adjust its position.
</li>
<li><b>Border color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to set the color for the borders of the inserted radi button. Choose the preferred border color from the palette. You can <b>add a new custom color</b> if necessary.</li>
<li><b>Background color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to apply a background color to the inserted radio button. Choose the preferred color out of <b>Theme Colors</b>, <b>Standard Colors</b>, or <b>add a new custom color</b> if necessary.</li>
</ul>
</p>
<p>To check the radio button, click it once.</p>
<p><img alt="radio button checked" src="../images/radio_button_checked.png" /></p>
</details>
</div>
<h2 id="image">Creating a new Image</h2>
<p><em>Images</em> are form fields which are used to enable inserting an image with the limitations you set, i.e. the location of the image or its size.</p>
<div class="forms">
<details class="details-example">
<summary>To insert an image form field,</summary>
<ol>
<li>position the insertion point within a line of the text where you want the field to be added,</li>
<li>switch to the <b>Forms</b> tab of the top toolbar,</li>
<li>
click the <img alt="image form icon" src="../images/image_form_icon.png" /> <b>Image</b> icon.
</li>
</ol>
<p><img alt="image form inserted" src="../images/image_form_inserted.png" /></p>
<p>The form field will appear at the insertion point within the existing text line. The <b>Form Settings</b> menu will open to the right.</p>
<p id="image_form_settings">
<img class="floatleft" alt="image form settings" src="../images/image_form_settings.png" />
<ul>
<li><b>Key</b>: a key to group images to fill out simultaneously. To create a new key, enter its name in the field and press <b>Enter</b>, then assign the required key to each form field using the dropdown list. A message <em>Fields connected: 2/3/...</em> will be displayed. To disconnect the fields, click the <b>Disconnect</b> button.</li>
<li><b>Placeholder</b>: type in the text to be displayed in the inserted image form field; <em>“Click to load image”</em> is set by default.</li>
<li>
<b>Tip</b>: type in the text to be displayed as a tip when a user hovers their mouse pointer over the bottom border of the image.
</li>
<li><b>When to scale</b>: click the drop down menu and select an appropriate image sizing option: <b>Always</b>, <b>Never</b>, when the <b>Image is Too Big</b>, or when the <b>Image is Too Small</b>. The selected image will scale inside the field correspondingly.</li>
<li><b>Lock aspect ratio</b>: check this box to maintain the image aspect ratio without distortion. When the box is checked, use the vertical and the horizontal slider to position the image inside the inserted field. The positioning slides are inactive when the box is checked.</li>
<li><b>Select Image</b>: click this button to upload an image either <b>From File</b>, <b>From URL</b>, or <b>From Storage</b>.</li>
<li><b>Border color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to set the color for the borders of the inserted image field. Choose the preferred border color from the palette. You can <b>add a new custom color</b> if necessary.</li>
<li><b>Background color</b>: click the icon <img alt="no fill" src="../images/nofill.png" /> to apply a background color to the inserted image field. Choose the preferred color out of <b>Theme Colors</b>, <b>Standard Colors</b>, or <b>add a new custom color</b> if necessary.</li>
</ul>
</p>
<p>To replace the image, click the <img alt="image icon" src="../images/image.png" /> image icon above the form field border and select another one.</p>
<p>To <b>adjust</b> the image settings, open the <b>Image Settings</b> tab on the right toolbar. To learn more, please read the guide on <a href="../UsageInstructions/InsertImages.htm">image settings</a>.</p>
</details>
</div>
<h2>Highlight forms</h2>
<p>You can highlight inserted form fields with a certain color.</p>
<div class="forms">
<details class="details-example">
<summary>To highlight fields,</summary>
<p id="highlight_settings">
<img alt="highlight settings" src="../images/highlight_settings.png" />
<ul>
<li>open the <b>Highlight Settings</b> on the <b>Forms</b> tab of the top toolbar,</li>
<li>choose a color from the <b>Standard Colors</b>. You can also <b>add a new custom color</b>,</li>
<li>to remove previously applied color highlighting, use the <b>No highlighting</b> option.</li>
</ul>
</p>
<p>The selected highlight options will be applied to all form fields in the document.</p>
<p class="note">
<b>Note</b>: The form field border is only visible when the field is selected. The borders do not appear on a printed version.
</p>
</details>
</div>
<h2>Enabling the View form</h2>
<p class="note">
<b>Note</b>: Once you have entered the <b>View form</b> mode, all editing options will become unavailable.
</p>
<p>Click the <img alt="view form button" src="../images/view_form_icon.png" /> <b>View form</b> button on the <b>Forms</b> tab of the top toolbar to see how all the inserted forms will be displayed in your document.</p>
<p><img alt="view form active" src="../images/view_form_active2.png" /></p>
<p>To <b>exit</b> the viewing mode, click the same icon again.</p>
<h2>Moving form fields</h2>
<p>Form fields can be moved to another place in the document: click the button on the left of the control border to select the field and drag it without releasing the mouse button to another position in the text.</p>
<p><img alt="moving form fields" src="../images/moving_form_fields.png" /></p>
<p>You can also <b>copy and paste</b> form fields: select the necessary field and use the <b>Ctrl+C/Ctrl+V</b> key combinations.</p>
<h2>Creating required fields</h2>
<p>To <b>make a field obligatory</b>, check the <b>Required</b> option. The form cannot be submitted until all required fields are filled in.</p>
<h2>Locking form fields</h2>
<p>To <b>prevent further editing</b> of the inserted form field, click the <img alt="lock form icon" src="../images/lock_form_icon.png" /> <b>Lock</b> icon. Filling the fields remains available.</p>
<h2>Clearing form fields</h2>
<p>To clear all inserted fields and delete all values, click the <img alt="clear fields icon" src="../images/clear_fields_icon.png" /> <b>Clear All Fields</b> button on the <b>Forms</b> tab on the top toolbar.</p>
<h2>Navigate, View and Save a Form</h2>
<p><img alt="fill form panel" src="../images/fill_form.png" /></p>
<p>Go to the <b>Forms</b> tab at the top toolbar.</p>
<p>Navigate through the form fields using the <img alt="Previous field icon" src="../images/previous_field_icon.png" /> <b>Previous field</b> and <img alt="Next field icon" src="../images/next_field_icon.png" /> <b>Next field</b> buttons at the top toolbar.</p>
<p>When you are finished, click the <img alt="Save form" src="../images/save_form_icon.png" /> <b>Save as oform</b> button at the top toolbar to save the form as an <b>OFORM</b> file ready to be filled out. You can save as many <b>OFORM</b> files as you need.</p>
<!--<p>To clear all fields and reset the form, click the <img alt="Clear fields icon" src="../images/clear_fields_icon.png" /> <b>Clear fields</b> button at the top toolbar.</p>
<p>When you are finished, click the <img alt="Submit form" src="../images/submit_form_icon.png" /> <b>Submit</b> button at the top toolbar to send the form for further processing. Please note that this action cannot be undone.</p>
<p class="note">If you are using the server version of ONLYOFFICE Docs, the presence of the <b>Submit</b> button depends on the configuration. Read <a href="https://api.onlyoffice.com/editors/config/editor/customization">this article</a> to learn more.</p>-->
<h2>Removing form fields</h2>
<p>To remove a form field and leave all its contents, select it and click the <img alt="delete form icon" src="../images/combo_delete_values.png" /> <b>Delete</b> icon (make sure the field is not locked) or press the <b>Delete</b> key on the keyboard.</p>
</div>
</body>
</html>

20
apps/documenteditor/main/resources/help/en/UsageInstructions/CreateTableOfContents.htm
View file

@ -3,7 +3,7 @@
<head>
<title>Create a Table of Contents</title>
<meta charset="utf-8" />
<meta name="description" content="Create a Table of Contents" />
<meta name="description" content="A table of contents contains a list of all the chapters (sections, etc.) in a document and displays the numbers of the pages where each chapter begins." />
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
@ -15,14 +15,14 @@
</div>
<h1>Create a Table of Contents</h1>
<p>A table of contents contains a list of all the chapters (sections, etc.) in a document and displays the numbers of the pages where each chapter begins. In the <a href="https://www.onlyoffice.com/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a>, it allows easily navigating through a multi-page document and quickly switching to the required part of the text. The table of contents is generated automatically on the basis of the document headings formatted using built-in styles. This makes it easy to update the created table of contents without having to edit the headings and change the page numbers manually if the text of the document has been changed.</p>
<h3>Define the heading structure</h3>
<h2>Heading structure in the table of contents</h2>
<p><b>Format headings</b></p>
<p>First of all, format the headings in your document using one of the predefined styles. To do that,</p>
<ol>
<li>Select the text you want to include into the table of contents.</li>
<li>Open the style menu on the right side of the <b>Home</b> tab at the top toolbar.</li>
<li>Click the required style to be applied. By default, you can use the <em>Heading 1 - Heading 9</em> styles.
<p class="note"><b>Note</b>: if you want to use other styles (e.g. <em>Title</em>, <em>Subtitle</em> etc.) to format headings that will be included into the table of contents, you will need to adjust the table of contents settings first (see the corresponding section below). To learn more about available formatting styles, please refer to <a href="../UsageInstructions/FormattingPresets.htm" onclick="onhyperlinkclick(this)">this page</a>.</p>
<p class="note">If you want to use other styles (e.g. <em>Title</em>, <em>Subtitle</em> etc.) to format headings, you will need to adjust the table of contents settings first (see the corresponding section below). To learn more about available formatting styles, please refer to <a href="../UsageInstructions/FormattingPresets.htm" onclick="onhyperlinkclick(this)">this page</a>.</p>
</li>
</ol>
<p id="navigation"><b>Manage headings</b></p>
@ -44,7 +44,7 @@
</ul>
<p>To manually expand or collapse separate heading levels, use the arrows to the left of the headings.</p>
<p>To close the <b>Navigation</b> panel, click the <img alt="Navigation icon" src="../images/navigationicon.png" /> <b>Navigation</b> icon on the left sidebar once again.</p>
<h3>Insert a Table of Contents into the document</h3>
<h2>Insert a Table of Contents into the document</h2>
<p>To insert a table of contents into your document:</p>
<ol>
<li>Position the insertion point where the table of contents should be added.</li>
@ -52,15 +52,15 @@
<li>Click the <img alt="Table of Contents icon" src="../images/tocicon.png" /> <b>Table of Contents</b> icon on the top toolbar, or<br />
click the arrow next to this icon and select the necessary layout option from the menu. You can select the table of contents that displays headings, page numbers and leaders, or headings only.
<p><img alt="Table of Contents options" src="../images/tociconmenu.png" /></p>
<p class="note"><b>Note</b>: the table of content appearance can be adjusted later via the table of contents settings.</p>
<p class="note">The table of contents appearance can be adjusted later in the settings.</p>
</li>
</ol>
<p>The table of contents will be added at the current cursor position. To change the position of the table of contents, you can select the table of contents field (content control) and simply drag it to the desired place. To do that, click the <img alt="Table of Contents content control button" src="../images/toccontentcontrol.png" /> button in the upper left corner of the table of contents field and drag it without releasing the mouse button to another position in the document text.</p>
<p>The table of contents will be added at the current cursor position. To change its position, you can select the table of contents field (content control) and simply drag it to the desired place. To do that, click the <img alt="Table of Contents content control button" src="../images/toccontentcontrol.png" /> button in the upper left corner of the table of contents field and drag it without releasing the mouse button to another position in the document text.</p>
<p><img alt="Moving the table of contents" src="../images/tocmove.png" /></p>
<p>To navigate between headings, press the <b>Ctrl</b> key and click the necessary heading within the table of contents field. You will go to the corresponding page.</p>
<h3>Adjust the created Table of Contents</h3>
<h2>Adjust the created Table of Contents</h2>
<p><b>Refresh the Table of Contents</b></p>
<p>After the table of contents is created, you can continue editing your text by adding new chapters, changing their order, removing some paragraphs, or expanding the text related to a heading so that the page numbers that correspond to the previous or the following section may change. In this case, use the <b>Refresh</b> option to automatically apply all changes to the table of contents.</p>
<p>After the table of contents is created, you can continue editing your text by adding new chapters, changing their order, removing some paragraphs, or expanding the text related to a heading so that the page numbers that correspond to the previous or the following section may change. In this case, use the <b>Refresh</b> option to automatically apply all changes.</p>
<p>Click the arrow next to the <img alt="Refresh icon" src="../images/tocrefreshicon.png" /> <b>Refresh</b> icon on the <b>References</b> tab of the top toolbar and select the necessary option from the menu:</p>
<ul>
<li><b>Refresh entire table</b> - to add the headings that you added to the document, remove the ones you deleted from the document, update the edited (renamed) headings as well as update page numbers.</li>
@ -74,7 +74,7 @@
<p>To open the table of contents settings, you can proceed in the following ways:</p>
<ul>
<li>Click the arrow next to the <img alt="Table of Contents icon" src="../images/tocicon.png" /> <b>Table of Contents</b> icon on the top toolbar and select the <b>Settings</b> option from the menu.</li>
<li>Select the table of contents in the document text, click the arrow next to the table of contents field title and select the <b>Settings</b> option from the menu.
<li>Select the table of contents in the document text, click the arrow next to its field title and select the <b>Settings</b> option from the menu.
<p><img alt="Table of Contents options" src="../images/tocsettingscc.png" /></p>
</li>
<li>Right-click anywhere within the table of contents and use the <b>Table of contents settings</b> option from the contextual menu.</li>
@ -89,7 +89,7 @@
<li><b>Build table of contents from</b> - this section allows specifying the necessary number of outline levels as well as the default styles that will be used to create the table of contents. Check the necessary radio button:
<ul>
<li>
<b>Outline levels</b> - when this option is selected, you will be able to adjust the number of hierarchical levels used in the table of contents. Click the arrows in the <b>Levels</b> field to decrease or increase the number of levels (the values from 1 to 9 are available). E.g., if you select the value of 3, headings that have levels 4 - 9 will not be included into the table of contents.
<b>Outline levels</b> - when this option is selected, you will be able to adjust the number of hierarchical levels used. Click the arrows in the <b>Levels</b> field to decrease or increase the number of levels (the values from 1 to 9 are available). E.g., if you select the value of 3, headings that have levels 4 - 9 will not be included into the table of contents.
</li>
<li>
<b>Selected styles</b> - when this option is selected, you can specify additional styles that can be used to build the table of contents and assign the corresponding outline level to each of them. Specify the desired level value in the field on the right of the style. Once you save the settings, you will be able to use this style when creating a table of contents.

35
apps/documenteditor/main/resources/help/en/UsageInstructions/FillingOutForm.htm Normal file
View file

@ -0,0 +1,35 @@
<!DOCTYPE html>
<html>
<head>
<title>Filling Out a Form</title>
<meta charset="utf-8" />
<meta name="description" content="Fill out a Form template" />
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
</head>
<body>
<div class="mainpart">
<div class="search-field">
<input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
</div>
<h1>Filling Out a Form</h1>
<p>A fillable form is an OFORM file. OFORM is a format for filling out template forms and downloading or printing the form after you have filled it out.</p>
<h2>How to fill in a form:</h2>
<ol>
<li>Open an OFORM file.
<p><img alt="oform" src="../images/oform.png" /><p>
</li>
<li>Fill in all the required fields. The mandatory fields are marked with red stroke. Use <img alt="Arrows form filling" src="../images/arrows_formfilling.png" /> or <img alt="Next form filling" src="../images/next_formfilling.png" /> on the top toolbar to navigate between fields, or click the field you wish to fill in.
<li>Use the <b>Clear All Fields</b> button <img alt="Clear all form filling" src="../images/clearall_formfilling.png" /> to empty all input fields.</li>
<li>After you have filled in all the fields, click the <b>Safe as PDF</b> button to save the form to your computer as a PDF file.</li>
<li>Click <img alt="More button" src="../images/morebutton.png" /> in the top right corner of the toolbar for additional options. You can <b>Print</b>, <b>Download as docx</b>, or <b>Download as pdf</b>.
<p><img alt="More OFORM" src="../images/more_oform.png" /></p>
<p>You can also change the form <b>Interface</b> theme by choosing <b>Light</b>, <b>Classic Light</b> or <b>Dark</b>. Once the <b>Dark interface theme</b> is enabled, the <b>Dark mode</b> becomes available</p>
<p><img alt="Dark Mode Form" src="../images/darkmode_oform.png" /></p>
<p><b>Open file location</b> when you need to browse the folder where the form is stored.</p>
</li>
</ol>
</div>
</body>
</html>

2
apps/documenteditor/main/resources/help/en/UsageInstructions/InsertContentControls.htm
View file

@ -14,9 +14,7 @@
<input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
</div>
<h1>Insert content controls</h1>
<p>Content controls are objects containing different types of content, such as text, objects, etc. Depending on the selected content control type, you can collaborate on documents by using the available content controls array, or lock the ones that do not need further editing and unlock those that require your colleagues’ input, etc. Content controls are typically used to facilitate data gathering and processing or to set necessary boundaries for documents edited by other users.</p>
<p>ONLYOFFICE <a href="https://www.onlyoffice.com/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a> allows you to insert <b>classic</b> content controls, i.e. they are fully <b>backward compatible</b> with the third-party word processors such as Microsoft Word.</p>
<p class="note"><b>Note</b>: the feature to add new content controls is available in the <b>paid</b> version only. In the free Community version, you can edit existing content controls, as well as copy and paste them. To enable this feature in the <em>desktop version</em>, refer to <a target="_blank" href="http://helpcenter.onlyoffice.com/installation/desktop-pro-features.aspx" onclick="onhyperlinkclick(this)">this article</a>.</p>
<p>ONLYOFFICE Document Editor supports the following classic content controls: <em>Plain Text</em>, <em>Rich Text</em>, <em>Picture</em>, <em>Combo box</em>, <em>Drop-down list</em>, <em>Date</em>, <em>Check box</em>.</p>
<ul>
<li><em>Plain Text</em> is an object containing text that cannot be formatted. Plain text content controls cannot contain more than one paragraph.</li>

2
apps/documenteditor/main/resources/help/en/UsageInstructions/MathAutoCorrect.htm
View file

@ -2546,7 +2546,7 @@
<p>Use the <b>Reset to default</b> button to restore default settings. Any function you added will be removed and the removed ones will be restored.</p>
<p><img alt="Recognized Functions" src="../images/recognizedfunctions.png" /></p>
<h2>AutoFormat As You Type</h2>
<p>By default, the editor formats the text while you are typing according to the auto-formatting presets, for instance, it automatically starts a bullet list or a numbered list when a list is detected, or replaces quotation marks, or converts hyphens to dashes.</p>
<p>By default, the editor formats the text while you are typing according to the auto-formatting presets: replaces quotation marks, converts hyphens to dashes, converts text recognized as internet or network path into a hyperlink, starts a bullet list or a numbered list when a list is detected.</p>
<p>If you need to disable auto-formatting presets, uncheck the box for the unnecessary options, go to the <b>File</b> tab -> <b>Advanced Settings</b> -> <b>Proofing</b> -> <b>AutoCorrect Options</b> -> <b>AutoFormat As You Type</b>.</p>
<p><img alt="AutoFormat As You Type" src="../images/autoformatasyoutype.png" /></p>
<h2>Text AutoCorrect</h2>

2
apps/documenteditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm
View file

@ -28,7 +28,7 @@
<ol>
<li>in the main program window, select the <b>Document</b> menu item from the <b>Create new</b> section on the left sidebar - a new file will open in a new tab,</li>
<li>when all the necessary changes are made, click the <b>Save</b> <img alt="Save icon" src="../images/save.png" /> icon in the upper left corner or switch to the <b>File</b> tab and choose the <b>Save as</b> menu item. </li>
<li>in the file manager window, select the file location, specify its name, choose the required format for saving (DOCX, Document template (DOTX), ODT, OTT, RTF, TXT, PDF or PDFA) and click the <b>Save</b> button.</li>
<li>in the file manager window, select the file location, specify its name, choose the required format for saving (DOCX, DOCXF, OFORM, Document template (DOTX), ODT, OTT, RTF, TXT, PDF or PDFA) and click the <b>Save</b> button.</li>
</ol>
</div>

8
apps/documenteditor/main/resources/help/en/UsageInstructions/SavePrintDownload.htm
View file

@ -13,7 +13,7 @@
<div class="search-field">
<input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
</div>
<h1>Save/<span class="onlineDocumentFeatures">download/</span>print your document</h1>
<h1>Save/download/print your document</h1>
<h3>Saving</h3>
<p class="onlineDocumentFeatures">By default, online <a href="https://www.onlyoffice.com/en/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a> automatically saves your file each 2 seconds when you work on it to prevent your data loss in case the program closes unexpectedly. If you co-edit the file in the <b>Fast</b> mode, the timer requests for updates 25 times a second and saves the changes if they have been made. When the file is being co-edited in the <b>Strict</b> mode, changes are automatically saved at 10-minute intervals. If necessary, you can easily select the preferred co-editing mode or disable the <b>Autosave</b> feature on the <a href="../HelpfulHints/AdvancedSettings.htm" onclick="onhyperlinkclick(this)">Advanced Settings</a> page.</p>
<p>To save your current document manually in the current format and location,</p>
@ -28,7 +28,7 @@
<ol>
<li>click the <b>File</b> tab of the top toolbar,</li>
<li>select the <b>Save as...</b> option,</li>
<li>choose one of the available formats depending on your needs: DOCX, ODT, RTF, TXT, PDF, PDF/A, HTML, FB2, EPUB. You can also choose the <b>Document template</b> (DOTX or OTT) option.</li>
<li>choose one of the available formats depending on your needs: DOCX, ODT, RTF, TXT, PDF, PDF/A, HTML, FB2, EPUB, DOCXF, OFORM. You can also choose the <b>Document template</b> (DOTX or OTT) option.</li>
</ol>
</div>
<div class="onlineDocumentFeatures">
@ -37,14 +37,14 @@
<ol>
<li>click the <b>File</b> tab of the top toolbar,</li>
<li>select the <b>Download as...</b> option,</li>
<li>choose one of the available formats depending on your needs: DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB.</li>
<li>choose one of the available formats depending on your needs: DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB, DOCXF, OFORM.</li>
</ol>
<h3>Saving a copy</h3>
<p>In the <em>online version</em>, you can save a copy of the file on your portal,</p>
<ol>
<li>click the <b>File</b> tab of the top toolbar,</li>
<li>select the <b>Save Copy as...</b> option,</li>
<li>choose one of the available formats depending on your needs: DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB,</li>
<li>choose one of the available formats depending on your needs: DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB, DOCXF, OFORM.</li>
<li>select a location of the file on the portal and press <b>Save</b>.</li>
</ol>
</div>

26
apps/documenteditor/main/resources/help/en/UsageInstructions/UseMailMerge.htm
View file

@ -16,19 +16,21 @@
<h1>Use Mail Merge</h1>
<p class="note"><b>Note</b>: this option is available in the <em>online version</em> only.</p>
<p>The <b>Mail Merge</b> feature is used to create a set of documents combining a common content which is taken from a text document and some individual components (variables, such as names, greetings etc.) taken from a spreadsheet (for example, a customer list). It can be useful if you need to create a lot of personalized letters and send them to recipients.</p>
<p>To start working with the <b>Mail Merge</b> feature in the <a href="https://www.onlyoffice.com/en/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a>,</p>
<ul>
<li><b>Prepare a data source and load it to the main document</b>
<ol>
<li><b>Prepare a data source and load it to the main document</b>
<ol>
<li>A data source used for the mail merge must be an <b>.xlsx</b> spreadsheet stored on your portal. Open an existing spreadsheet or create a new one and make sure that it meets the following requirements.
<p>The spreadsheet should have a header row with the column titles, as values in the first cell of each column will designate merge fields (i.e. variables that you can insert into the text). Each column should contain a set of actual values for a variable. Each row in the spreadsheet should correspond to a separate record (i.e. a set of values that belongs to a certain recipient). During the merge process, a copy of the main document will be created for each record and each merge field inserted into the main text will be replaced with an actual value from the corresponding column. If you are goung to send results by email, the spreadsheet must also include a column with the recipients' email addresses.</p>
</li>
<li>Open an existing text document or create a new one. It must contain the main text which will be the same for each version of the merged document. Click the <b>Mail Merge</b> <img alt="Mail Merge icon" src="../images/mailmergeicon.png" /> icon on the <b>Home</b> tab of the top toolbar.</li>
<li>The <b>Select Data Source</b> window will open. It displays the list of all your <b>.xlsx</b> spreadsheets stored in the <b>My Documents</b> section. To navigate between other <b>Documents</b> module sections, use the menu on the left part of the window. Select the required file and click <b>OK</b>.</li>
</ol>
<p>Once the data source is loaded, the <b>Mail Merge setting</b> tab will be available on the right sidebar.</p>
<p><img alt="Mail Merge setting tab" src="../images/right_mailmerge.png" /></p>
<li>A data source used for the mail merge must be an <b>.xlsx</b> spreadsheet stored on your portal. Open an existing spreadsheet or create a new one and make sure that it meets the following requirements.
<li>The spreadsheet should have a header row with the column titles, as values in the first cell of each column will designate merge fields (i.e. variables that you can insert into the text). Each column should contain a set of actual values for a variable. Each row in the spreadsheet should correspond to a separate record (i.e. a set of values that belongs to a certain recipient). During the merge process, a copy of the main document will be created for each record and each merge field inserted into the main text will be replaced with an actual value from the corresponding column. If you are goung to send results by email, the spreadsheet must also include a column with the recipients' email addresses.</li>
<li>
Open an existing text document or create a new one. It must contain the main text which will be the same for each version of the merged document. Click the <b>Mail Merge</b> <img alt="Mail Merge icon" src="../images/mailmergeicon.png" /> icon on the <b>Home</b> tab of the top toolbar and select the data source location: <b>From File</b>, <b>From URL</b> or <b>From Storage</b>.
<p><img alt="Mail Merge Options" src="../images/mailmerge_options.png" /></p>
</li>
<li>
Select the necesary file or paste a URL and click <b>OK</b>.
<p>Once the data source is loaded, the <b>Mail Merge setting</b> tab will be available on the right sidebar.</p>
<p><img alt="Mail Merge setting tab" src="../images/right_mailmerge.png" /></p>
</li>
</ol>
<li><b>Verify or change the recipients list</b>
<ol>
<li>Click the <b>Edit recipients list</b> button on the top of the right sidebar to open the <b>Mail Merge Recipients</b> window, where the content of the selected data source is displayed.
@ -117,7 +119,7 @@
</li>
</ol>
</li>
</ol>
</ul>
</div>
</body>
</html>

BIN
apps/documenteditor/main/resources/help/en/images/arrows_formfilling.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 257 B

BIN
apps/documenteditor/main/resources/help/en/images/autoformatasyoutype.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
apps/documenteditor/main/resources/help/en/images/checkbox_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
apps/documenteditor/main/resources/help/en/images/clearall_formfilling.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 576 B

BIN
apps/documenteditor/main/resources/help/en/images/combo_box_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
apps/documenteditor/main/resources/help/en/images/darkmode_form.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
apps/documenteditor/main/resources/help/en/images/darkmode_oform.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

BIN
apps/documenteditor/main/resources/help/en/images/dropdown_list_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 6 KiB

BIN
apps/documenteditor/main/resources/help/en/images/fill_form.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
apps/documenteditor/main/resources/help/en/images/image_form_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
apps/documenteditor/main/resources/help/en/images/interface/desktop_formstab.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
apps/documenteditor/main/resources/help/en/images/interface/filetab.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
apps/documenteditor/main/resources/help/en/images/interface/formstab.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
apps/documenteditor/main/resources/help/en/images/keytips1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 89 KiB

BIN
apps/documenteditor/main/resources/help/en/images/keytips2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 85 KiB

BIN
apps/documenteditor/main/resources/help/en/images/mailmerge_options.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 771 B

BIN
apps/documenteditor/main/resources/help/en/images/more_oform.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
apps/documenteditor/main/resources/help/en/images/morebutton.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 127 B

BIN
apps/documenteditor/main/resources/help/en/images/moving_form_fields.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
apps/documenteditor/main/resources/help/en/images/next_formfilling.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 852 B

BIN
apps/documenteditor/main/resources/help/en/images/oform.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 94 KiB

BIN
apps/documenteditor/main/resources/help/en/images/radio_button_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
apps/documenteditor/main/resources/help/en/images/rainbow.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 143 KiB

BIN
apps/documenteditor/main/resources/help/en/images/rainbow_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 507 B

BIN
apps/documenteditor/main/resources/help/en/images/save_form_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 266 B

BIN
apps/documenteditor/main/resources/help/en/images/sortcomments.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
apps/documenteditor/main/resources/help/en/images/sortcommentsicon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 159 B

BIN
apps/documenteditor/main/resources/help/en/images/telegram.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 208 KiB

BIN
apps/documenteditor/main/resources/help/en/images/telegram_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 848 B

BIN
apps/documenteditor/main/resources/help/en/images/text_field_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
apps/documenteditor/main/resources/help/en/images/view_form_active2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 85 KiB

BIN
apps/documenteditor/main/resources/help/en/images/viewsettings_darkmode.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

50
apps/documenteditor/main/resources/help/en/search/indexes.js
View file

File diff suppressed because one or more lines are too long

5
apps/documenteditor/main/resources/help/ru/ProgramInterface/InsertTab.htm
View file

@ -3,7 +3,8 @@
<head>
<title>Вкладка Вставка</title>
<meta charset="utf-8" />
<meta name="description" content="Знакомство с пользовательским интерфейсом редактора документов - Вкладка Вставка" />
<meta name="description" content="Узнайте, что такое вкладка Вставка, как она позволяет добавлять в документы Word элементы форматирования страницы, а также визуальные объекты и комментарии." />
<meta name="keywords" content="вкладка вставка">
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
@ -14,6 +15,7 @@
<input id="search" class="searchBar" placeholder="Поиск" type="text" onkeypress="doSearch(event)">
</div>
<h1>Вкладка Вставка</h1>
<h2>Что такое вкладка Вставка?</h2>
<p>Вкладка <b>Вставка</b> позволяет добавлять элементы форматирования страницы, а также визуальные объекты и комментарии.</p>
<div class="onlineDocumentFeatures">
<p>Окно онлайн-редактора документов:</p>
@ -23,6 +25,7 @@
<p>Окно десктопного редактора документов:</p>
<p><img alt="Вкладка Вставка" src="../images/interface/desktop_inserttab.png" /></p>
</div>
<h2>Назначение вкладки Вставка</h2>
<p>С помощью этой вкладки вы можете выполнить следующие действия:</p>
<ul>
<li>вставлять <a href="../UsageInstructions/PageBreaks.htm" onclick="onhyperlinkclick(this)">пустую страницу</a>,</li>

5
apps/documenteditor/main/resources/help/ru/ProgramInterface/LayoutTab.htm
View file

@ -3,7 +3,8 @@
<head>
<title>Вкладка Макет</title>
<meta charset="utf-8" />
<meta name="description" content="Знакомство с пользовательским интерфейсом редактора документов - Вкладка Макет" />
<meta name="description" content="Узнайте, что такое вкладка Макет, и как она позволяет изменить внешний вид документов Word, задать параметры страниц и определить расположение визуальных элементов." />
<meta name="keywords" content="вкладка макет word, вкладка макет в word, где вкладка макет, где найти вкладку макет">
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
@ -14,6 +15,7 @@
<input id="search" class="searchBar" placeholder="Поиск" type="text" onkeypress="doSearch(event)">
</div>
<h1>Вкладка Макет</h1>
<h2>Что такое вкладка Макет?</h2>
<p>Вкладка <b>Макет</b> позволяет изменить внешний вид документа: задать параметры страницы и определить расположение визуальных элементов.</p>
<div class="onlineDocumentFeatures">
<p>Окно онлайн-редактора документов:</p>
@ -23,6 +25,7 @@
<p>Окно десктопного редактора документов:</p>
<p><img alt="Вкладка Макет" src="../images/interface/desktop_layouttab.png" /></p>
</div>
<h2>Назначение вкладки Макет</h2>
<p>С помощью этой вкладки вы можете выполнить следующие действия:</p>
<ul>
<li>настраивать <a href="../UsageInstructions/SetPageParameters.htm#margins" onclick="onhyperlinkclick(this)">поля</a>, <a href="../UsageInstructions/SetPageParameters.htm#orientation" onclick="onhyperlinkclick(this)">ориентацию</a>, <a href="../UsageInstructions/SetPageParameters.htm#size" onclick="onhyperlinkclick(this)">размер</a> страницы,</li>

37
apps/documenteditor/main/resources/help/ru/UsageInstructions/CreateTableOfContents.htm
View file

@ -1,9 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>Создание оглавления</title>
<title>Как сделать оглавление в документах Word - ONLYOFFICE</title>
<meta charset="utf-8" />
<meta name="description" content="Создайте оглавление" />
<meta name="description" content="В оглавлении указан список всех глав документа и номера страниц, на которых начинаются главы. Это позволяет легко перемещаться по многостраничному документу." />
<meta name="keywords" content="как сделать оглавление в ворде, оглавление в ворде, оглавление, как вставить оглавление в ворде, как вставить содержание в ворде, как сделать автоматическое оглавление, как создать оглавление в ворде, оглавление это, как сделать оглавление, автособираемое оглавление, как сделать оглавление, автоматическое оглавление в ворде, как сделать автоматическое оглавление в ворде, оглавление ворд, word оглавление, как сделать автособираемое оглавление, оформление содержания, как сделать автоматическое содержание, оформление содержания в ворде, создать оглавление в ворде, автосодержание ворд, создание оглавления в ворде, как добавить содержание в word, автоматическое оглавление, вставить содержание ворд, как создать оглавление, как создать автоматическое оглавление, вставить оглавление в ворде, как добавить строку в оглавление в ворде, word как вставить оглавление, как написать содержание в ворде, как сделать оглавление с подзаголовками в ворде, как исправить оглавление в ворде, как сделать автооглавление">
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
@ -13,13 +14,13 @@
<div class="search-field">
<input id="search" class="searchBar" placeholder="Поиск" type="text" onkeypress="doSearch(event)">
</div>
<h1>Создание оглавления</h1>
<p>В оглавлении содержится список всех глав (разделов и т.д.) документа и отображаются номера страниц, на которых начинается каждая глава. Это позволяет легко перемещаться по многостраничному документу, быстро переходя к нужной части текста. Оглавление генерируется автоматически на основе заголовков документа, отформатированных с помощью встроенных стилей. Это позволяет легко обновлять созданное оглавление без необходимости редактировать заголовки и изменять номера страниц вручную при изменении текста документа.</p>
<h3>Определение структуры заголовков</h3>
<h1>Оглавление</h1>
<p>В оглавлении содержится список всех глав (разделов и т.д.) документа и отображаются номера страниц, на которых начинается каждая глава. Это позволяет легко перемещаться по многостраничному документу, быстро переходя к нужной части текста. Содержание генерируется автоматически на основе заголовков документа, отформатированных с помощью встроенных стилей. Это позволяет легко обновлять созданное содержание без необходимости редактировать заголовки и изменять номера страниц вручную при изменении текста документа.</p>
<h2>Структура заголовков оглавления</h2>
<p><b>Форматирование заголовков</b></p>
<p>Прежде всего отформатируйте заголовки в документе с помощью одного из предустановленных стилей. Для этого:</p>
<ol>
<li>Выделите текст, который требуется включить в оглавление.</li>
<li>Выделите текст, который требуется включить в содержание.</li>
<li>Откройте меню стилей в правой части вкладки <b>Главная</b> на верхней панели инструментов.</li>
<li>Щелкните по стилю, который хотите применить. По умолчанию можно использовать стили <em>Заголовок 1 - Заголовок 9</em>.
<p class="note"><b>Примечание</b>: если вы хотите использовать другие стили (например, <em>Название</em>, <em>Подзаголовок</em> и другие) для форматирования заголовков, которые будут включены в оглавление, сначала потребуется изменить настройки оглавления (обратитесь к соответствующему разделу ниже). Для получения дополнительной информации о доступных стилях форматирования можно обратиться к <a href="../UsageInstructions/FormattingPresets.htm" onclick="onhyperlinkclick(this)">этой странице</a>.</p>
@ -44,23 +45,23 @@
</ul>
<p>Чтобы вручную развернуть или свернуть определенные уровни заголовков, используйте стрелки слева от заголовков.</p>
<p>Чтобы закрыть панель <b>Навигации</b>, нажмите на значок <img alt="Значок Навигация" src="../images/navigationicon.png" /> <b>Навигация</b> на левой боковой панели еще раз.</p>
<h3>Вставка оглавления в документ</h3>
<h2>Вставка оглавления в документ</h2>
<p>Чтобы вставить в документ оглавление:</p>
<ol>
<li>Установите курсор там, где требуется добавить оглавление.</li>
<li>Установите курсор там, где требуется добавить содержание.</li>
<li>Перейдите на вкладку <b>Ссылки</b> верхней панели инструментов.</li>
<li>Нажмите на значок <img alt="Значок Оглавление" src="../images/tocicon.png" /> <b>Оглавление</b> на верхней панели инструментов или<br />
нажмите на стрелку рядом с этим значком и выберите из меню нужный вариант макета. Можно выбрать оглавление, в котором отображаются заголовки, номера страниц и заполнители или только заголовки.
нажмите на стрелку рядом с этим значком и выберите из меню нужный вариант макета. Можно выбрать макет, в котором отображаются заголовки, номера страниц и заполнители или только заголовки.
<p><img alt="Варианты макета оглавления" src="../images/tociconmenu.png" /></p>
<p class="note"><b>Примечание</b>: внешний вид оглавления можно изменить позже, используя настройки оглавления.</p>
<p class="note"><b>Примечание</b>: внешний вид оглавления можно изменить позже, используя настройки.</p>
</li>
</ol>
<p>Оглавление будет добавлено в текущей позиции курсора. Чтобы изменить местоположение оглавления, можно выделить поле оглавления (элемент управления содержимым) и просто перетащить его на нужное место. Для этого нажмите на кнопку <img alt="Кнопка поля оглавления" src="../images/toccontentcontrol.png" /> в левом верхнем углу поля оглавления и перетащите его, не отпуская кнопку мыши.</p>
<p>Оглавление будет добавлено в текущей позиции курсора. Чтобы изменить его местоположение, можно выделить поле оглавления (элемент управления содержимым) и просто перетащить его на нужное место. Для этого нажмите на кнопку <img alt="Кнопка поля оглавления" src="../images/toccontentcontrol.png" /> в левом верхнем углу поля оглавления и перетащите его, не отпуская кнопку мыши.</p>
<p><img alt="Перемещение оглавления" src="../images/tocmove.png" /></p>
<p>Для перемещения между заголовками нажмите клавишу <b>Ctrl</b> и щелкните по нужному заголовку в поле оглавления. Вы перейдете на соответствующую страницу.</p>
<h3>Изменение созданного оглавления</h3>
<h2>Изменение созданного оглавления</h2>
<p><b>Обновление оглавления</b></p>
<p>После того, как оглавление будет создано, вы можете продолжить редактирование текста, добавляя новые главы, изменяя их порядок, удаляя какие-то абзацы или дополняя текст, относящийся к заголовку, так что номера страниц, соответствующие предыдущему или следующему разделу могут измениться. В этом случае используйте опцию <b>Обновление</b>, чтобы автоматически применить все изменения к оглавлению.</p>
<p>После того, как содержание будет создано, вы можете продолжить редактирование текста, добавляя новые главы, изменяя их порядок, удаляя какие-то абзацы или дополняя текст, относящийся к заголовку, так что номера страниц, соответствующие предыдущему или следующему разделу могут измениться. В этом случае используйте опцию <b>Обновление</b>, чтобы автоматически применить все изменения.</p>
<p>Нажмите на стрелку рядом со значком <img alt="Значок Обновление" src="../images/tocrefreshicon.png" /> <b>Обновление</b> на вкладке <b>Ссылки</b> верхней панели инструментов и выберите в меню нужную опцию:</p>
<ul>
<li><b>Обновить целиком</b> - чтобы добавить в оглавление заголовки, добавленные в документ, удалить те, которые были удалены из документа, обновить отредактированные (переименованные) заголовки, а также обновить номера страниц.</li>
@ -88,23 +89,23 @@
<li><b>Форматировать оглавление как ссылки</b> - эта опция отмечена по умолчанию. Если убрать галочку, нельзя будет переходить к нужной главе, нажав клавишу <b>Ctrl</b> и щелкнув по соответствующему заголовку.</li>
<li><b>Собрать оглавление, используя</b> - в этом разделе можно указать нужное количество уровней структуры, а также стили по умолчанию, которые будут использоваться для создания оглавления. Выберите нужный переключатель:
<ul>
<li><b>Уровни структуры</b> - когда выбрана эта опция, вы сможете изменить количество иерархических уровней, используемых в оглавлении. Используйте стрелки в поле <b>Уровни</b>, чтобы уменьшить или увеличить число уровней (доступны значения от 1 до 9). Например, если выбрать значение 3, заголовки уровней 4 - 9 не будут включены в оглавление.
<li><b>Уровни структуры</b> - когда выбрана эта опция, вы сможете изменить количество используемых иерархических уровней. Используйте стрелки в поле <b>Уровни</b>, чтобы уменьшить или увеличить число уровней (доступны значения от 1 до 9). Например, если выбрать значение 3, заголовки уровней 4 - 9 не будут включены в оглавление.
</li>
<li><b>Выделенные стили</b> - когда выбрана эта опция, можно указать дополнительные стили, которые будут использоваться для создания оглавления, и назначить каждому из них соответствующий уровень структуры. Укажите нужное значение уровня в поле справа от стиля. После сохранения настроек вы сможете использовать этот стиль при создании оглавления.
<p><img alt="Окно настроек оглавления" src="../images/tocsettingswindow2.png" /></p>
</li>
</ul>
</li>
<li><b>Стили</b> - эта опция позволяет выбрать нужное оформление оглавления. Выберите нужный стиль из выпадающего списка. В поле предварительного просмотра выше отображается то, как должно выглядеть оглавление.
<p>Доступны следующие четыре стиля по умолчанию: <em>Простой</em>, <em>Стандартный</em>, <em>Современный</em>, <em>Классический</em>. Опция <em>Текущий</em> используется, если вы применили к стилю оглавления пользовательские настройки.</p>
<li><b>Стили</b> - эта опция позволяет выбрать нужное оформление. Выберите нужный стиль из выпадающего списка. В поле предварительного просмотра выше отображается то, как должно выглядеть оглавление.
<p>Доступны следующие четыре стиля по умолчанию: <em>Простой</em>, <em>Стандартный</em>, <em>Современный</em>, <em>Классический</em>. Опция <em>Текущий</em> используется, если вы применили к стилю пользовательские настройки.</p>
</li>
</ul>
<p>Нажмите кнопку <b>OK</b> в окне настроек, чтобы применить изменения.</p>
<p><b>Настройка стиля оглавления</b></p>
<p>После применения в окне настроек <b>Оглавления</b> одного из стилей оглавления по умолчанию этот стиль можно дополнительно изменить, чтобы текст в поле оглавления выглядел так, как вам нужно.</p>
<p>После применения в окне настроек <b>Оглавления</b> одного из стилей по умолчанию этот стиль можно дополнительно изменить, чтобы текст в поле оглавления выглядел так, как вам нужно.</p>
<ol>
<li>Выделите текст в поле оглавления, например, нажав на кнопку <img alt="Кнопка поля оглавления" src="../images/toccontentcontrol.png" /> в левом верхнем углу поля оглавления.</li>
<li>Отформатируйте элементы оглавления, изменив тип, размер, цвет шрифта или применив стили оформления шрифта.</li>
<li>Отформатируйте элементы, изменив тип, размер, цвет шрифта или применив стили оформления шрифта.</li>
<li>Последовательно обновите стили для элементов всех уровней. Чтобы обновить стиль, щелкните правой кнопкой мыши по отформатированному элементу, выберите в контекстном меню пункт <b>Форматирование как стиль</b> и используйте опцию <b>Обновить стиль toc N</b> (стиль <em>toc 2</em> соответствует элементам с <em>уровнем 2</em>, стиль <em>toc 3</em> соответствует элементам с <em>уровнем 3</em> и так далее).
<p><img alt="Обновление стиля оглавления" src="../images/toccustomize.png" /></p>
</li>

4
apps/documenteditor/main/resources/help/ru/search/indexes.js
View file

File diff suppressed because one or more lines are too long

30
apps/documenteditor/mobile/src/controller/Toolbar.jsx
View file

@ -4,10 +4,9 @@ import { f7 } from 'framework7-react';
import { useTranslation } from 'react-i18next';
import ToolbarView from "../view/Toolbar";
const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'storeFocusObjects', 'storeToolbarSettings')(observer(props => {
const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'storeFocusObjects', 'storeToolbarSettings','storeDocumentInfo')(observer(props => {
const {t} = useTranslation();
const _t = t("Toolbar", { returnObjects: true });
const appOptions = props.storeAppOptions;
const isDisconnected = props.users.isDisconnected;
const displayMode = props.storeReview.displayMode;
@ -20,11 +19,16 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
const storeToolbarSettings = props.storeToolbarSettings;
const isCanUndo = storeToolbarSettings.isCanUndo;
const isCanRedo = storeToolbarSettings.isCanRedo;
const disabledControls = storeToolbarSettings.disabledControls;
const disabledEditControls = storeToolbarSettings.disabledEditControls;
const disabledSettings = storeToolbarSettings.disabledSettings;
const showEditDocument = !appOptions.isEdit && appOptions.canEdit && appOptions.canRequestEditRights;
const docInfo = props.storeDocumentInfo;
const docTitle = docInfo.dataDoc ? docInfo.dataDoc.title : '';
useEffect(() => {
Common.Notifications.on('setdoctitle', setDocTitle);
Common.Gateway.on('init', loadConfig);
Common.Notifications.on('toolbar:activatecontrols', activateControls);
Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls);
@ -37,24 +41,19 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
}
return () => {
Common.Notifications.off('setdoctitle', setDocTitle);
Common.Notifications.off('toolbar:activatecontrols', activateControls);
Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls);
Common.Notifications.off('goback', goBack);
}
});
const [docTitle, resetDocTitle] = useState('');
const setDocTitle = (title) => {
resetDocTitle(title);
}
// Back button
const [isShowBack, setShowBack] = useState(false);
const [isShowBack, setShowBack] = useState(appOptions.canBackToFolder);
const loadConfig = (data) => {
if (data && data.config && data.config.canBackToFolder !== false &&
data.config.customization && data.config.customization.goback &&
(data.config.customization.goback.url || data.config.customization.goback.requestClose && data.config.canRequestClose)) {
(data.config.customization.goback.url || data.config.customization.goback.requestClose && data.config.canRequestClose))
{
setShowBack(true);
}
};
@ -108,20 +107,17 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
}
}
const [disabledEditControls, setDisabledEditControls] = useState(false);
const [disabledSettings, setDisabledSettings] = useState(false);
const deactivateEditControls = (enableDownload) => {
setDisabledEditControls(true);
storeToolbarSettings.setDisabledEditControls(true);
if (enableDownload) {
//DE.getController('Settings').setMode({isDisconnected: true, enableDownload: enableDownload});
} else {
setDisabledSettings(true);
storeToolbarSettings.setDisabledSettings(true);
}
};
const [disabledControls, setDisabledControls] = useState(true);
const activateControls = () => {
setDisabledControls(false);
storeToolbarSettings.setDisabledControls(false);
};
const onEditDocument = () => {

2
apps/documenteditor/mobile/src/page/main.jsx
View file

@ -101,7 +101,7 @@ class MainPage extends Component {
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */}
<Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
{showLogo && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
{showLogo && appOptions.canBranding !== undefined && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
<Subnavbar>
<Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
<Search useSuspense={false}/>

26
apps/documenteditor/mobile/src/store/toolbar.js
View file

@ -6,10 +6,34 @@ export class storeToolbarSettings {
isCanUndo: observable,
setCanUndo: action,
isCanRedo: observable,
setCanRedo: action
setCanRedo: action,
disabledControls: observable,
setDisabledControls: action,
disabledEditControls: observable,
setDisabledEditControls: action,
disabledSettings: observable,
setDisabledSettings: action
})
}
disabledControls = true;
setDisabledControls(value) {
this.disabledControls = value;
}
disabledEditControls = false;
setDisabledEditControls(value) {
this.disabledEditControls = value;
}
disabledSettings = false;
setDisabledSettings(value) {
this.disabledSettings = value;
}
isCanUndo = false;
setCanUndo(can) {

50
apps/documenteditor/mobile/src/view/edit/EditChart.jsx
View file

@ -1,6 +1,6 @@
import React, {Fragment, useState} from 'react';
import {observer, inject} from "mobx-react";
import {List, ListItem, ListButton, Icon, Row, Page, Navbar, NavRight, BlockTitle, Toggle, Range, Link, Tabs, Tab} from 'framework7-react';
import {List, ListItem, ListButton, Icon, Row, Page, Navbar, NavRight, BlockTitle, Toggle, Range, Link, Tabs, Tab, Swiper, SwiperSlide} from 'framework7-react';
import {f7} from 'framework7-react';
import { useTranslation } from 'react-i18next';
import {Device} from '../../../../../common/mobile/utils/device';
@ -143,6 +143,8 @@ const PageChartType = props => {
const { t } = useTranslation();
const storeChartSettings = props.storeChartSettings;
const types = storeChartSettings.types;
const countSlides = Math.floor(types.length / 3);
const arraySlides = Array(countSlides).fill(countSlides);
const storeFocusObjects = props.storeFocusObjects;
const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties();
const curType = chartProperties && chartProperties.getType();
@ -153,23 +155,35 @@ const PageChartType = props => {
<div id={"edit-chart-type"} className="page-content no-padding-top dataview">
<div className="chart-types">
{types.map((row, rowIndex) => {
return (
<ul className="row" key={`row-${rowIndex}`}>
{row.map((type, index)=>{
return(
<li key={`${rowIndex}-${index}`}
className={curType === type.type ? ' active' : ''}
onClick={() => {props.onType(type.type)}}>
<div className={'thumb'}
style={{backgroundImage: `url('resources/img/charts/${type.thumb}')`}}>
</div>
</li>
)
})}
</ul>
)
})}
{types && types.length ? (
<Swiper>
{arraySlides.map((_, indexSlide) => {
let typesSlide = types.slice(indexSlide * 3, (indexSlide * 3) + 3);
return (
<SwiperSlide key={indexSlide}>
{typesSlide.map((row, rowIndex) => {
return (
<ul className="row" key={`row-${rowIndex}`}>
{row.map((type, index) => {
return (
<li key={`${rowIndex}-${index}`}
className={curType === type.type ? ' active' : ''}
onClick={() => {props.onType(type.type)}}>
<div className={'thumb'}
style={{backgroundImage: `url('resources/img/charts/${type.thumb}')`}}>
</div>
</li>
)
})}
</ul>
)
})}
</SwiperSlide>
)
})}
</Swiper>
) : null}
</div>
</div>
</Page>

30
apps/presentationeditor/main/app/controller/Animation.js
View file

@ -105,6 +105,7 @@ define([
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this));
this.api.asc_registerCallback('asc_onAnimPreviewStarted', _.bind(this.onAnimPreviewStarted, this));
this.api.asc_registerCallback('asc_onAnimPreviewFinished', _.bind(this.onAnimPreviewFinished, this));
this.api.asc_onShowAnimTab(!!this._state.onactivetab)
return this;
},
@ -156,12 +157,13 @@ define([
onAnimationAdditional: function(replace) { // replace or add new additional effect
var me = this;
(new PE.Views.AnimationDialog({
api : this.api,
activeEffect : this._state.Effect,
handler: function(result, value) {
api : this.api,
activeEffect : this._state.Effect,
groupValue : this._state.EffectGroup,
handler : function(result, value) {
if (result == 'ok') {
if (me.api) {
me.addNewEffect(value.activeEffect, value.activeGroupValue, replace);
me.addNewEffect(value.activeEffect, value.activeGroupValue, value.activeGroup, replace);
}
}
}
@ -170,13 +172,13 @@ define([
onAddAnimation: function(picker, record) {
var type = record.get('value');
var group = _.findWhere(Common.define.effectData.getEffectGroupData(), {id: record.get('group')}).value;
this.addNewEffect(type, group, false);
var group = _.findWhere(this.EffectGroups, {id: record.get('group')}).value;
this.addNewEffect(type, group, record.get('group'), false);
},
addNewEffect: function (type, group, replace) {
addNewEffect: function (type, group, groupName, replace) {
if (this._state.Effect == type) return;
var parameter = this.view.setMenuParameters(type, undefined, group == this._state.EffectGroups);
var parameter = this.view.setMenuParameters(type, groupName, undefined);
this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace);
this._state.EffectGroups = group;
this._state.Effect = type;
@ -236,14 +238,13 @@ define([
onEffectSelect: function (combo, record) {
if (this.api) {
var type = record.get('value');
var group = (type != AscFormat.ANIM_PRESET_NONE) ? _.findWhere(Common.define.effectData.getEffectGroupData(), {id: record.get('group')}).value : undefined;
this.addNewEffect(type, group, this._state.Effect != AscFormat.ANIM_PRESET_NONE);
var group = (type != AscFormat.ANIM_PRESET_NONE) ? _.findWhere(this.EffectGroups, {id: record.get('group')}).value : undefined;
this.addNewEffect(type, group, record.get('group'),this._state.Effect != AscFormat.ANIM_PRESET_NONE);
}
},
onStartSelect: function (combo, record) {
if (this.api) {
// this._state.StartEffect = record.value;
this.AnimationProperties.asc_putStartType(record.value);
this.api.asc_SetAnimationProperties(this.AnimationProperties);
}
@ -325,7 +326,7 @@ define([
item = store.add(new Common.UI.DataViewModel({
group: group.get('id'),
value: this._state.Effect,
iconCls: 'transition-push',
iconCls: group.get('iconClsCustom'),
displayValue: rec ? rec.displayValue : '',
isCustom: true
}), {at:index+1});
@ -341,8 +342,8 @@ define([
}
this._state.EffectOption = this.AnimationProperties.asc_getSubtype();
if (this._state.EffectOption !== undefined)
this._state.noAnimationParam = view.setMenuParameters(this._state.Effect, this._state.EffectOption)===undefined;
if (this._state.EffectOption !== undefined && this._state.EffectOption !== null)
this._state.noAnimationParam = view.setMenuParameters(this._state.Effect, _.findWhere(this.EffectGroups,{value: this._state.EffectGroup}).id, this._state.EffectOption)===undefined;
value = this.AnimationProperties.asc_getDuration();
if (Math.abs(this._state.Duration - value) > 0.001 ||
@ -403,6 +404,7 @@ define([
this.setSettings();
}
else this._state.onactivetab = false;
this.api && this.api.asc_onShowAnimTab(!!this._state.onactivetab);
},
lockToolbar: function (causes, lock, opts) {

3
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -183,6 +183,9 @@ define([
'toolbar:setcompact': this.onChangeCompactView.bind(this)
}
});
Common.NotificationCenter.on('toolbar:collapse', _.bind(function () {
this.toolbar.collapse();
}, this));
var me = this;

10
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -119,7 +119,7 @@
<span class="btn-slot text x-huge slot-insertimg"></span>
<span class="btn-slot text x-huge" id="slot-btn-insertchart"></span>
</div>
<div class="group flex small" id="slot-combo-insertshape"></div>
<div class="group small" id="slot-combo-insertshape"></div>
<div class="separator long"></div>
<div class="group">
<span class="btn-slot text x-huge slot-comment"></span>
@ -253,7 +253,7 @@
<span id="animation-spin-duration" class="btn-slot text spinner" ></span>
</div>
<div class="elset font-normal">
<div class="btn-slot" style="width: 82px;" id="animation-trigger"></div>
<div class="btn-slot text" id="animation-trigger"></div>
</div>
</div>
<div class="separator long"></div>
@ -267,12 +267,12 @@
</div>
</div>
<div class="separator long"></div>
<div class="group small" style="width: 120px; min-width: 100px;">
<div class="group small" >
<div class="elset">
<div class="btn-slot" id="animation-moveearlier"></div>
<div class="btn-slot text" id="animation-moveearlier"></div>
</div>
<div class="elset font-normal">
<div class="btn-slot" id="animation-movelater"></div>
<div class="btn-slot text" id="animation-movelater"></div>
</div>
</div>
</section>

32
apps/presentationeditor/main/app/view/Animation.js
View file

@ -62,7 +62,7 @@ define([
me.fireEvent('animation:selecteffect', [combo, record]);
}, me));
me.listEffectsMore.on('click', _.bind(function () {
me.fireEvent('animation:additional', [true]); // replace effect
me.fireEvent('animation:additional', [me.listEffects.menuPicker.getSelectedRec().get('value') != AscFormat.ANIM_PRESET_NONE]); // replace effect
}, me));
}
@ -159,6 +159,7 @@ define([
this.lockedControls = [];
this._arrEffectName = [{group:'none', value: AscFormat.ANIM_PRESET_NONE, iconCls: 'animation-none', displayValue: this.textNone}].concat(Common.define.effectData.getEffectData());
_.forEach(this._arrEffectName,function (elm){elm.tip = elm.displayValue;});
this._arrEffectOptions = [];
var itemWidth = 87,
itemHeight = 40;
@ -183,6 +184,7 @@ define([
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '-16, 0',
delayRenderTips: true,
beforeOpenHandler: function (e) {
var cmp = this,
menu = cmp.openButton.menu;
@ -214,8 +216,8 @@ define([
iconCls: 'toolbar__icon transition-fade',
lock: [_set.slideDeleted, _set.noSlides, _set.noAnimationPreview],
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'medium'
dataHintDirection: 'bottom',
dataHintOffset: 'small'
});
this.lockedControls.push(this.btnPreview);
@ -259,7 +261,7 @@ define([
this.numDuration = new Common.UI.MetricSpinner({
el: this.$el.find('#animation-spin-duration'),
step: 1,
width: 52,
width: 55,
value: '',
defaultUnit: this.txtSec,
maxValue: 300,
@ -304,7 +306,7 @@ define([
this.numDelay = new Common.UI.MetricSpinner({
el: this.$el.find('#animation-spin-delay'),
step: 1,
width: 52,
width: 55,
value: '',
defaultUnit: this.txtSec,
maxValue: 300,
@ -318,7 +320,8 @@ define([
this.cmbStart = new Common.UI.ComboBox({
cls: 'input-group-nr',
menuStyle: 'width: 150px;',
menuStyle: 'min-width: 100%;',
editable: false,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation],
data: [
{value: AscFormat.NODE_TYPE_CLICKEFFECT, displayValue: this.textStartOnClick},
@ -326,7 +329,8 @@ define([
{value: AscFormat.NODE_TYPE_AFTEREFFECT, displayValue: this.textStartAfterPrevious}
],
dataHint: '1',
dataHintDirection: 'top'
dataHintDirection: 'top',
dataHintOffset: 'small'
});
this.lockedControls.push(this.cmbStart);
@ -343,15 +347,15 @@ define([
this.numRepeat = new Common.UI.MetricSpinner({
el: this.$el.find('#animation-spin-repeat'),
step: 1,
width: 88,
width: 55,
value: '',
maxValue: 1000,
minValue: 0,
defaultUnit: '',
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
dataHintDirection: 'top',
dataHintOffset: 'small'
});
this.lockedControls.push(this.numRepeat);
@ -477,10 +481,12 @@ define([
return this.lockedControls;
},
setMenuParameters: function (effectId, option)
setMenuParameters: function (effectId, effectGroup, option)
{
var effect = _.findWhere(this.allEffects, {value: effectId});
var arrEffectOptions = Common.define.effectData.getEffectOptionsData(effect.group, effect.value);
var arrEffectOptions;
var effect = _.findWhere(this.allEffects, {group: effectGroup, value: effectId});
if(effect)
arrEffectOptions = Common.define.effectData.getEffectOptionsData(effect.group, effect.value);
if(!arrEffectOptions) {
this.btnParameters.menu.removeAll();
this._effectId = effectId

20
apps/presentationeditor/main/app/view/AnimationDialog.js
View file

@ -70,12 +70,18 @@ define([
this._state.activeGroup = this.EffectGroupData[0].id;
this._state.activeGroupValue = this.EffectGroupData[0].value;
this.EffectGroupData.forEach(function (item) {item.displayValue = item.caption;});
if ((this.options.activeEffect != undefined) && (this.options.activeEffect != AscFormat.ANIM_PRESET_NONE)){
if ((this.options.activeEffect != undefined) && (this.options.activeEffect != AscFormat.ANIM_PRESET_NONE) && (this.options.activeEffect !== AscFormat.ANIM_PRESET_MULTIPLE)){
this._state.activeEffect = this.options.activeEffect;
var itemEffect = _.findWhere(this.allEffects,{value: this._state.activeEffect});
this._state.activeGroup = itemEffect.group;
this._state.activeGroupValue = _.findWhere(this.EffectGroupData, {id: this._state.activeGroup}).value;
this.activeLevel = itemEffect.level;
this._state.activeGroupValue = this.options.groupValue;
var group = _.findWhere(this.EffectGroupData, {value: this._state.activeGroupValue})
this._state.activeGroup = group.id;
var itemEffect = _.findWhere(this.allEffects, {
group: this._state.activeGroup,
value: this._state.activeEffect
});
if(itemEffect)
this.activeLevel = itemEffect.level;
}
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -154,7 +160,9 @@ define([
fillEffect: function () {
var arr = _.where(this.allEffects, {group: this._state.activeGroup, level: this.activeLevel });
this.lstEffectList.store.reset(arr);
var item = (this._state.activeEffect != undefined)?this.lstEffectList.store.findWhere({value: this._state.activeEffect}):this.lstEffectList.store.at(0);
var item = this.lstEffectList.store.findWhere({value: this._state.activeEffect});
if(!item)
item = this.lstEffectList.store.at(0);
this.lstEffectList.selectRecord(item);
this._state.activeEffect = item.get('value');
},

4
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -135,8 +135,8 @@ define([
{name: 'OTP', imgCls: 'otp', type: Asc.c_oAscFileType.OTP, ext: '.otp'}
], [
{name: 'PPSX', imgCls: 'ppsx', type: Asc.c_oAscFileType.PPSX, ext: '.ppsx'},
{name: 'PNG', imgCls: 'png', type: Asc.c_oAscFileType.PNG, ext: '.png'},
{name: 'JPG', imgCls: 'jpg', type: Asc.c_oAscFileType.JPG, ext: '.jpg'}
{name: 'PNG', imgCls: 'png', type: Asc.c_oAscFileType.PNG, ext: '.zip'},
{name: 'JPG', imgCls: 'jpg', type: Asc.c_oAscFileType.JPG, ext: '.zip'}
], [
{name: 'PPTM', imgCls: 'pptm', type: Asc.c_oAscFileType.PPTM, ext: '.pptm'}
]],

1
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1072,6 +1072,7 @@ define([
this.cmbInsertShape = new Common.UI.ComboDataViewShape({
cls: 'combo-styles shapes',
style: 'min-width: 140px;',
itemWidth: 20,
itemHeight: 20,
menuMaxHeight: 640,

4
apps/presentationeditor/main/app/view/Transitions.js
View file

@ -221,7 +221,7 @@ define([
this.numDuration = new Common.UI.MetricSpinner({
el: this.$el.find('#transit-spin-duration'),
step: 1,
width: 50,
width: 55,
value: '',
defaultUnit: this.txtSec,
maxValue: 300,
@ -236,7 +236,7 @@ define([
this.numDelay = new Common.UI.MetricSpinner({
el: this.$el.find('#transit-spin-delay'),
step: 1,
width: 60,
width: 55,
value: '',
defaultUnit: this.txtSec,
maxValue: 300,

11
apps/presentationeditor/main/index.html.deploy
View file

@ -252,19 +252,12 @@
window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"];
if ( window.AscDesktopEditor ) {
window.desktop = window.AscDesktopEditor;
window.on_native_message = function (cmd, param) {
!window.native_message_cmd && (window.native_message_cmd = []);
window.native_message_cmd[cmd] = param;
}
window.desktop.execCommand('webapps:entry', '');
}
window.uitype = 'slide';
</script>
<link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css">
<script src="../../../../../apps/common/main/lib/util/themeinit.js?__inline=true"></script>
<script src="../../../../../apps/common/main/lib/util/desktopinit.js?__inline=true"></script>
</head>
<body>
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>

2
apps/presentationeditor/main/index_loader.html.deploy
View file

@ -245,6 +245,7 @@
window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"];
window.uitype = 'slide';
if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...';
@ -285,6 +286,7 @@
</script>
<link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css">
<script src="../../../../../apps/common/main/lib/util/desktopinit.js?__inline=true"></script>
</head>
<body>
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>

14
apps/presentationeditor/main/locale/da.json
View file

@ -736,7 +736,7 @@
"PE.Controllers.Main.unsupportedBrowserErrorText": "Din browser understøttes ikke",
"PE.Controllers.Main.uploadImageExtMessage": "Ukendt billedeformat.",
"PE.Controllers.Main.uploadImageFileCountMessage": "Ingen billeder uploadet",
"PE.Controllers.Main.uploadImageSizeMessage": "Maksimum billedstørrelse begrænsning",
"PE.Controllers.Main.uploadImageSizeMessage": "Billedet er for stort. Den maksimale størrelse er 25 MB.",
"PE.Controllers.Main.uploadImageTextText": "Overføre billede...",
"PE.Controllers.Main.uploadImageTitleText": "Overfør billede",
"PE.Controllers.Main.waitText": "Vent venligst...",
@ -1109,7 +1109,7 @@
"PE.Views.DocumentHolder.addCommentText": "Tilføj kommentar",
"PE.Views.DocumentHolder.addToLayoutText": "Tilføj til layout",
"PE.Views.DocumentHolder.advancedImageText": "Billede avancerede indstillinger",
"PE.Views.DocumentHolder.advancedParagraphText": "Tekst avancerede indstillinger",
"PE.Views.DocumentHolder.advancedParagraphText": "Avancerede indstillinger for Afsnit ",
"PE.Views.DocumentHolder.advancedShapeText": "Form avancerede indstillinger",
"PE.Views.DocumentHolder.advancedTableText": "Tabel avancerede indstillinger",
"PE.Views.DocumentHolder.alignmentText": "Tilpasning",
@ -1355,7 +1355,7 @@
"PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Du skal acceptere ændringer før du kan se dem",
"PE.Views.FileMenuPanels.Settings.strFast": "Hurtig",
"PE.Views.FileMenuPanels.Settings.strFontRender": "Skrifttype hentydning",
"PE.Views.FileMenuPanels.Settings.strForcesave": "Gem altid til serveren (ellers gem til serveren når dokumentet lukkes)",
"PE.Views.FileMenuPanels.Settings.strForcesave": "Tilføj version til lageret efter at have klikket på Gem eller Ctrl+S",
"PE.Views.FileMenuPanels.Settings.strInputMode": "Slå hieroglyfher til ",
"PE.Views.FileMenuPanels.Settings.strMacrosSettings": "Makroindstillinger",
"PE.Views.FileMenuPanels.Settings.strPaste": "Klip, kopier og indsæt",
@ -1363,7 +1363,7 @@
"PE.Views.FileMenuPanels.Settings.strShowChanges": "Real tids samarbejdsændringer",
"PE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Slå stavekontrolstilstand til ",
"PE.Views.FileMenuPanels.Settings.strStrict": "Striks",
"PE.Views.FileMenuPanels.Settings.strTheme": "Tema",
"PE.Views.FileMenuPanels.Settings.strTheme": "Interface tema",
"PE.Views.FileMenuPanels.Settings.strUnit": "Måleenhed",
"PE.Views.FileMenuPanels.Settings.strZoom": "Standard zoomværdi",
"PE.Views.FileMenuPanels.Settings.text10Minutes": "Hvert 10. minut",
@ -1374,7 +1374,7 @@
"PE.Views.FileMenuPanels.Settings.textAutoRecover": "Automatisk gendannelse",
"PE.Views.FileMenuPanels.Settings.textAutoSave": "Gem automatisk",
"PE.Views.FileMenuPanels.Settings.textDisabled": "deaktiveret",
"PE.Views.FileMenuPanels.Settings.textForceSave": "Gem til server",
"PE.Views.FileMenuPanels.Settings.textForceSave": "Gemmer mellem versioner",
"PE.Views.FileMenuPanels.Settings.textMinute": "Hvert minut",
"PE.Views.FileMenuPanels.Settings.txtAll": "Se alle",
"PE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Autokorrektur valgmuligheder",
@ -1530,7 +1530,7 @@
"PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
"PE.Views.RightMenu.txtChartSettings": "Diagram indstillinger",
"PE.Views.RightMenu.txtImageSettings": "Billede indstillinger",
"PE.Views.RightMenu.txtParagraphSettings": "Tekstindstillinger",
"PE.Views.RightMenu.txtParagraphSettings": "Afsnit indstillinger",
"PE.Views.RightMenu.txtShapeSettings": "Form indstillinger",
"PE.Views.RightMenu.txtSignatureSettings": "Underskrift indstillinger",
"PE.Views.RightMenu.txtSlideSettings": "Dias indstillinger",
@ -1796,7 +1796,7 @@
"PE.Views.TextArtSettings.strForeground": "Forgrundsfarve",
"PE.Views.TextArtSettings.strPattern": "Mønster",
"PE.Views.TextArtSettings.strSize": "Størrelse",
"PE.Views.TextArtSettings.strStroke": "Strøg",
"PE.Views.TextArtSettings.strStroke": "Linie",
"PE.Views.TextArtSettings.strTransparency": "Gennemsigtighed",
"PE.Views.TextArtSettings.strType": "Type",
"PE.Views.TextArtSettings.textAngle": "Vinkel",

3
apps/presentationeditor/main/locale/en.json
View file

@ -1305,8 +1305,8 @@
"PE.Views.Animation.txtParameters": "Parameters",
"PE.Views.Animation.txtPreview": "Preview",
"PE.Views.Animation.txtSec": "s",
"PE.Views.AnimationDialog.textTitle": "More Effects",
"PE.Views.AnimationDialog.textPreviewEffect": "Preview Effect",
"PE.Views.AnimationDialog.textTitle": "More Effects",
"PE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"PE.Views.ChartSettings.textChartType": "Change Chart Type",
"PE.Views.ChartSettings.textEditData": "Edit Data",
@ -2126,6 +2126,7 @@
"PE.Views.Toolbar.textStrikeout": "Strikethrough",
"PE.Views.Toolbar.textSubscript": "Subscript",
"PE.Views.Toolbar.textSuperscript": "Superscript",
"PE.Views.Toolbar.textTabAnimation": "Animation",
"PE.Views.Toolbar.textTabCollaboration": "Collaboration",
"PE.Views.Toolbar.textTabFile": "File",
"PE.Views.Toolbar.textTabHome": "Home",

4
apps/presentationeditor/main/resources/help/en/Contents.json
View file

@ -2,7 +2,8 @@
{"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Presentation Editor user interface", "headername": "Program Interface"},
{"src": "ProgramInterface/FileTab.htm", "name": "File tab"},
{"src": "ProgramInterface/HomeTab.htm", "name": "Home Tab"},
{"src": "ProgramInterface/InsertTab.htm", "name": "Insert tab" },
{ "src": "ProgramInterface/InsertTab.htm", "name": "Insert tab" },
{"src": "ProgramInterface/TransitionsTab.htm", "name": "Transitions tab" },
{"src": "ProgramInterface/CollaborationTab.htm", "name": "Collaboration tab"},
{"src": "ProgramInterface/PluginsTab.htm", "name": "Plugins tab"},
{"src": "UsageInstructions/OpenCreateNew.htm", "name": "Create a new presentation or open an existing one", "headername": "Basic operations" },
@ -31,6 +32,7 @@
{"src": "UsageInstructions/HighlightedCode.htm", "name": "Insert highlighted code" },
{"src": "UsageInstructions/Translator.htm", "name": "Translate text" },
{"src": "UsageInstructions/Thesaurus.htm", "name": "Replace a word by a synonym" },
{"src": "UsageInstructions/CommunicationPlugins.htm", "name": "Communicate while editing"},
{"src": "UsageInstructions/ViewPresentationInfo.htm", "name": "View presentation information", "headername": "Tools and settings"},
{"src": "UsageInstructions/SavePrintDownload.htm", "name": "Save/print/download your presentation" },
{"src": "HelpfulHints/AdvancedSettings.htm", "name": "Advanced settings of Presentation Editor"},

6
apps/presentationeditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm
View file

@ -35,10 +35,12 @@
<ul>
<li><b>Light</b> color scheme incorporates standard orange, white, and light-gray colors with less contrast in UI elements suitable for working during daytime.</li>
<li><b>Classic Light</b> color scheme incorporates standard orange, white, and light-gray colors.</li>
<li><b>Dark</b> color scheme incorporates black, dark-gray, and light-gray colors suitable for working during nighttime.</li>
<li><b>Dark</b> color scheme incorporates black, dark-gray, and light-gray colors suitable for working during nighttime.
<p class="note"><b>Note</b>: Apart from the available <b>Light</b>, <b>Classic Light</b>, and <b>Dark</b> interface themes, ONLYOFFICE editors can now be customized with your own color theme. Please follow <a target="_blank" href="https://helpcenter.onlyoffice.com/installation/docs-developer-change-theme.aspx" onclick="onhyperlinkclick(this)">these instructions</a> to learn how you can do that.</p>
</li>
</ul>
</li>
<li><b>Default Zoom Value</b> is used to set the default zoom value selecting it in the list of available options from 50% to 200%. You can also choose the <b>Fit to Slide</b> or <b>Fit to Width</b> option.</li>
<li><b>Default Zoom Value</b> is used to set the default zoom value selecting it in the list of available options from 50% to 500%. You can also choose the <b>Fit to Slide</b> or <b>Fit to Width</b> option.</li>
<li>
<b>Font Hinting</b> is used to select a way fonts are displayed in the Presentation Editor:
<ul>

9
apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
View file

@ -78,12 +78,21 @@
<p>If you are using the <b>Strict</b> co-editing mode, new comments added by other users will become visible only after you click the <img alt="Save icon" src="../images/saveupdate.png" /> icon in the left upper corner of the top toolbar.</p>
<p>You can manage the added comments using the icons in the comment balloon or on the <b>Comments</b> panel on the left:</p>
<ul>
<li>sort the added comments by clicking the <img alt="Sort icon" src="../images/sortcommentsicon.png" /> icon:
<ul>
<li>by date: <b>Newest</b> or <b>Oldest</b></li>
<li>by author: <b>Author from A to Z</b> or <b>Author from Z to A</b>
<p><img alt="Sort comments" src="../images/sortcomments.png" /></p>
</li>
</ul>
</li>
<li>edit the currently selected by clicking the <img alt="Edit icon" src="../images/editcommenticon.png" /> icon,</li>
<li>delete the currently selected by clicking the <img alt="Delete icon" src="../images/deletecommenticon.png" /> icon,</li>
<li>close the currently selected discussion by clicking the <img alt="Resolve icon" src="../images/resolveicon.png" /> icon if the task or problem you stated in your comment was solved, after that the discussion you opened with your comment gets the resolved status. To open it again, click the <img alt="Open again icon" src="../images/resolvedicon.png" /> icon,</li>
<li>if you want to manage comments in a bunch, open the <b>Resolve</b> drop-down menu on the <b>Collaboration</b> tab. Select one of the options for resolving comments: <b>resolve current comments</b>, <b>resolve my comments</b> or <b>resolve all comments</b> in the presentation.</li>
</ul>
<h4>Adding mentions</h4>
<p class="note"> <b>Note</b>: Mentions can be added to comments to text and not to comments to the entire document.</p>
<p>When entering comments, you can use the <b>mentions</b> feature that allows you to attract somebody's attention to the comment and send a notification to the mentioned user via email and <b>Talk</b>.</p>
<p>To add a mention enter the "+" or "@" sign anywhere in the comment text - a list of the portal users will open. To simplify the search process, you can start typing a name in the comment field - the user list will change as you type. Select the necessary person from the list. If the file has not yet been shared with the mentioned user, the <b>Sharing Settings</b> window will open. <b>Read only</b> access type is selected by default. Change it if necessary and click <b>OK</b>.</p>
<p>The mentioned user will receive an email notification that he/she has been mentioned in a comment. If the file has been shared, the user will also receive a corresponding notification.</p>

Some files were not shown because too many files have changed in this diff Show more