diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index 59b5fa22f..37eb26758 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -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; diff --git a/apps/common/main/lib/controller/HintManager.js b/apps/common/main/lib/controller/HintManager.js index 67571b283..b723d50c8 100644 --- a/apps/common/main/lib/controller/HintManager.js +++ b/apps/common/main/lib/controller/HintManager.js @@ -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(); diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index bdbc41433..ae03dcea2 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -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; diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index fcbd572ef..5133e0101 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -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()); } }; diff --git a/apps/common/main/lib/mods/perfect-scrollbar.js b/apps/common/main/lib/mods/perfect-scrollbar.js index fe1879cc3..e81b30fdc 100644 --- a/apps/common/main/lib/mods/perfect-scrollbar.js +++ b/apps/common/main/lib/mods/perfect-scrollbar.js @@ -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'); diff --git a/apps/common/main/lib/util/desktopinit.js b/apps/common/main/lib/util/desktopinit.js new file mode 100644 index 000000000..9c3c810ad --- /dev/null +++ b/apps/common/main/lib/util/desktopinit.js @@ -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)) || ''); +} diff --git a/apps/common/main/lib/util/htmlutils.js b/apps/common/main/lib/util/htmlutils.js index 518c01c1a..ba77f887a 100644 --- a/apps/common/main/lib/util/htmlutils.js +++ b/apps/common/main/lib/util/htmlutils.js @@ -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 ) { diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 5fb543ca8..ab3912fe9 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -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({ diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 8f915506c..98208a7e1 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -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; diff --git a/apps/common/mobile/lib/controller/collaboration/Comments.jsx b/apps/common/mobile/lib/controller/collaboration/Comments.jsx index 8faa8277c..47a72a6b6 100644 --- a/apps/common/mobile/lib/controller/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/controller/collaboration/Comments.jsx @@ -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(), diff --git a/apps/common/mobile/lib/view/Search.jsx b/apps/common/mobile/lib/view/Search.jsx index d38dbd2f1..6a9b165f3 100644 --- a/apps/common/mobile/lib/view/Search.jsx +++ b/apps/common/mobile/lib/view/Search.jsx @@ -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 { {/* this.onReplaceClick()}>{_t.textReplace} this.onReplaceAllClick()}>{_t.textReplaceAll} */} {isReplaceAll ? ( - this.onReplaceAllClick()}>{_t.textReplaceAll} + this.onReplaceAllClick()}>{_t.textReplaceAll} ) : usereplace ? ( - this.onReplaceClick()}>{_t.textReplace} + this.onReplaceClick()}>{_t.textReplace} ) : null}
diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less index 2866ec15d..d6db70510 100644 --- a/apps/common/mobile/resources/less/about.less +++ b/apps/common/mobile/resources/less/about.less @@ -13,9 +13,9 @@ .content-block { margin: 0 auto 15px; - a { - // color: @text-normal; - } + // a { + // color: @text-normal; + // } } .settings-about-logo { diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 30d682c10..435e7e547 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -154,8 +154,8 @@ .about { .content-block { margin: 0 auto 15px; - a { - color: @text-normal; + p:last-child { + text-decoration: underline; } } } diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 72e203bdc..163d6e0ab 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -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; diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy index e46ed25ca..e596da871 100644 --- a/apps/documenteditor/forms/index.html.deploy +++ b/apps/documenteditor/forms/index.html.deploy @@ -127,19 +127,12 @@ } - + + diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 72cba6913..da2f99dc2 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -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() { diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 79cf76b64..c91525b3a 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -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', ''); - } + diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy index e2775e1fd..14ec083f8 100644 --- a/apps/documenteditor/main/index_loader.html.deploy +++ b/apps/documenteditor/main/index_loader.html.deploy @@ -285,6 +285,7 @@ + diff --git a/apps/documenteditor/main/resources/help/en/Contents.json b/apps/documenteditor/main/resources/help/en/Contents.json index 62a0f8265..0c2cfe0b4 100644 --- a/apps/documenteditor/main/resources/help/en/Contents.json +++ b/apps/documenteditor/main/resources/help/en/Contents.json @@ -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"}, diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm index add7415bd..cfbb0f5fa 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm @@ -17,7 +17,7 @@

The Document Editor is an online application that allows you to view through and edit documents directly in your browser.

Using the Document Editor, 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.

+ 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.

To view the current software version and licensor details in the online version, click the About icon icon on the left sidebar. To view the current software version and licensor details in the desktop version for Windows, select the About menu item on the left sidebar of the main program window. In the desktop version for Mac OS, open the ONLYOFFICE menu at the top of the screen and select the About ONLYOFFICE menu item.

diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm index ad89662fb..386d25d49 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm @@ -23,6 +23,11 @@
  • Turn on display of the resolved comments - 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 Comments Comments icon icon on the left sidebar. Enable this option if you want to display resolved comments in the document text.
    • +
  • Track Changes Display is used to select an option for displaying changes: +
  • Spell Checking is used to turn on/off the spell checking option.
  • Proofing - used to automatically replace word or symbol typed in the Replace: box or chosen from the list by a new word or symbol displayed in the By: box.
  • Alternate Input is used to turn on/off hieroglyphs.
    • @@ -48,10 +53,12 @@ +
  • Dark color scheme incorporates black, dark-gray, and light-gray colors suitable for working during nighttime. The Turn on document dark mode is active by default when the editor is set to Dark interface theme. Check the Turn dark document mode box to enable it. +

    Note: Apart from the available Light, Classic Light, and Dark interface themes, ONLYOFFICE editors can now be customized with your own color theme. Please follow these instructions to learn how you can do that.

    +
    • + -
  • Default Zoom Value 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 Fit to Page or Fit to Width option.
    • +
  • Default Zoom Value 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 Fit to Page or Fit to Width option.
  • Font Hinting is used to select the type a font is displayed in the Document Editor:

    Adding mentions

    +

    Note: Mentions can be added to comments to text and not to comments to the entire document.

    When entering comments, you can use the mentions feature that allows you to attract somebody's attention to the comment and send a notification to the mentioned user via email and Talk.

    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 Sharing Settings window will open. Read only access type is selected by default. Change it if necessary and click OK.

    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.

    diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm index 9fe342f25..210534d74 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm @@ -14,7 +14,6 @@

    Compare documents

    -

    Note: this option is available in the paid online version only starting from Document Server v. 5.5. To enable this feature in the desktop version, refer to this article.

    If you need to compare and merge two documents, the Document Editor provides you with the document Compare feature. It allows displaying the differences between two documents and merge the documents by accepting the changes one by one or all at once.

    After comparing and merging two documents, the result will be stored on the portal as a new version of the original file.

    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.

    diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm index 22c304588..665a05819 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm @@ -12,23 +12,39 @@
    -
    - -
    +
    + +

    Keyboard Shortcuts

    -

    The keyboard shortcut list used for a faster and easier access to the features of the Document Editor using the keyboard.

    - +

    Keyboard Shortcuts for Key Tips

    +

    Use keyboard shortcuts to gain immediate access to a certain document parameter and to configure it without using a mouse.

    +
      +
    1. Press Alt key to turn on all key tips for the editor header, the top toolbar, the right and the left sidebars and the status bar.
      2. +
    2. + 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. +

      For example, to access the Insert tab, press Alt to see all primary key tips.

      +

      Primary Key Tips

      +

      Press letter I to access the Insert tab, and to see all the available shortcuts for this tab.

      +

      Secondary Key Tips

      +

      Then press the letter that corresponds to the item you wish to configure.

      +
      3. +
    3. Press Alt to hide all key tips, or press Escape to go back to the previous group of key tips.
      4. +
    +

    The keyboard shortcut list used for a faster and easier access to the features of the Document Editor using the keyboard.

    + - - + + @@ -37,18 +53,18 @@ - - - - - - - - - + + + + + + + + + - + @@ -83,7 +99,7 @@ - + @@ -91,36 +107,36 @@ - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - + + + + - - - - - - - - + + + + + + + + + @@ -196,52 +212,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -374,54 +390,54 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -443,12 +459,12 @@ - - - + + + - + @@ -522,69 +538,69 @@ - - - + + + + --> + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -606,90 +622,90 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + +
    Working with Document
    Open 'File' panelAlt+F⌥ Option+FAlt+F⌥ Option+F Open the File 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.
    ^ Ctrl+F,
    ⌘ Cmd+F    		 Open the Find and Replace dialog box to start searching for a character/word/phrase in the currently edited document.
    Open 'Find and Replace' dialog box with replacement fieldCtrl+H^ Ctrl+HOpen the Find and Replace dialog box with the replacement field to replace one or more occurrences of the found characters.
    Repeat the last 'Find' action⇧ Shift+F4
    Open 'Find and Replace' dialog box with replacement fieldCtrl+H^ Ctrl+HOpen the Find and Replace dialog box with the replacement field to replace one or more occurrences of the found characters.
    Repeat the last 'Find' action⇧ Shift+F4 ⇧ Shift+F4,
    ⌘ Cmd+G,
    ⌘ Cmd+⇧ Shift+F4    		 Repeat the previous Find performed before the key combination was pressed.
    Open 'Comments' panel Ctrl+⇧ Shift+HDownload As... Ctrl+⇧ Shift+S ^ Ctrl+⇧ Shift+S,
    ⌘ Cmd+⇧ Shift+S    		Open the Download as... 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.Open the Download as... 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.
    Full screen Switch to the full screen view to fit the Document Editor into your screen.
    Help menuF1F1Open the Document Editor Help menu.
    Open existing file (Desktop Editors)Ctrl+O
    Help menuF1F1Open the Document Editor Help menu.
    Open existing file (Desktop Editors)Ctrl+O On the Open local file tab in the Desktop Editors, opens the standard dialog box that allows to select an existing file.
    Close file (Desktop Editors)Ctrl+W,
    Ctrl+F4    		On the Open local file tab in the Desktop Editors, opens the standard dialog box that allows to select an existing file.
    Close file (Desktop Editors)Ctrl+W,
    Ctrl+F4    		 ^ Ctrl+W,
    ⌘ Cmd+W    		Close the current document window in the Desktop Editors.
    Element contextual menu⇧ Shift+F10Close the current document window in the Desktop Editors.
    Element contextual menu ⇧ Shift+F10Open the selected element contextual menu.
    Reset the ‘Zoom’ parameterCtrl+0^ Ctrl+0 or ⌘ Cmd+0Reset the ‘Zoom’ parameter of the current document to a default 100%.
    ⇧ Shift+F10Open the selected element contextual menu.
    Reset the ‘Zoom’ parameterCtrl+0^ Ctrl+0 or ⌘ Cmd+0Reset the ‘Zoom’ parameter of the current document to a default 100%.
    Navigation
    ^ Ctrl+-,
    ⌘ Cmd+-    		 Zoom out the currently edited document.
    Move one character to the left←←Move the cursor one character to the left.
    Move one character to the right→→Move the cursor one character to the right.
    Move to the beginning of a word or one word to the leftCtrl+←^ Ctrl+←,
    ⌘ Cmd+←    		Move the cursor to the beginning of a word or one word to the left.
    Move one word to the rightCtrl+→^ Ctrl+→,
    ⌘ Cmd+→    		Move the cursor one word to the right.
    Move one line up↑↑Move the cursor one line up.
    Move one line down↓↓Move the cursor one line down.
    Move one character to the left←←Move the cursor one character to the left.
    Move one character to the right→→Move the cursor one character to the right.
    Move to the beginning of a word or one word to the leftCtrl+←^ Ctrl+←,
    ⌘ Cmd+←    		Move the cursor to the beginning of a word or one word to the left.
    Move one word to the rightCtrl+→^ Ctrl+→,
    ⌘ Cmd+→    		Move the cursor one word to the right.
    Move one line up↑↑Move the cursor one line up.
    Move one line down↓↓Move the cursor one line down.
    Navigate between controls in modal dialogues ↹ Tab/⇧ Shift+↹ Tab⇧ Shift+End Select a text fragment from the cursor to the end of the current line.
    Select one character to the right⇧ Shift+→⇧ Shift+→Select one character to the right of the cursor position.
    Select one character to the left⇧ Shift+←⇧ Shift+←Select one character to the left of the cursor position.
    Select to the end of a wordCtrl+⇧ Shift+→
    Select one character to the right⇧ Shift+→⇧ Shift+→Select one character to the right of the cursor position.
    Select one character to the left⇧ Shift+←⇧ Shift+←Select one character to the left of the cursor position.
    Select to the end of a wordCtrl+⇧ Shift+→ Select a text fragment from the cursor to the end of a word.
    Select to the beginning of a wordCtrl+⇧ Shift+←Select a text fragment from the cursor to the end of a word.
    Select to the beginning of a wordCtrl+⇧ Shift+← Select a text fragment from the cursor to the beginning of a word.
    Select one line up⇧ Shift+↑⇧ Shift+↑Select one line up (with the cursor at the beginning of a line).
    Select one line down⇧ Shift+↓⇧ Shift+↓Select one line down (with the cursor at the beginning of a line).
    Select the page up⇧ Shift+Page Up⇧ Shift+Page UpSelect the page part from the cursor position to the upper part of the screen.
    Select the page down⇧ Shift+Page Down⇧ Shift+Page DownSelect the page part from the cursor position to the lower part of the screen.
    Select a text fragment from the cursor to the beginning of a word.
    Select one line up⇧ Shift+↑⇧ Shift+↑Select one line up (with the cursor at the beginning of a line).
    Select one line down⇧ Shift+↓⇧ Shift+↓Select one line down (with the cursor at the beginning of a line).
    Select the page up⇧ Shift+Page Up⇧ Shift+Page UpSelect the page part from the cursor position to the upper part of the screen.
    Select the page down⇧ Shift+Page Down⇧ Shift+Page DownSelect the page part from the cursor position to the lower part of the screen.
    Text Styling
    ^ Ctrl+U,
    ⌘ Cmd+U    		 Make the selected text fragment underlined with a line going below the letters.
    StrikeoutCtrl+5
    StrikeoutCtrl+5 ^ Ctrl+5,
    ⌘ Cmd+5    		 Make the selected text fragment struck out with a line going through the letters.
    Subscript Ctrl+.Switch a paragraph between right-aligned and left-aligned.
    Apply subscript formatting (automatic spacing)Ctrl+=Align leftCtrl+LAlign 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
    Apply subscript formatting (automatic spacing)Ctrl+= Apply subscript formatting to the selected text fragment.
    Apply superscript formatting (automatic spacing)Ctrl+⇧ Shift++Apply subscript formatting to the selected text fragment.
    Apply superscript formatting (automatic spacing)Ctrl+⇧ Shift++ Apply superscript formatting to the selected text fragment.
    Insert page breakCtrl+↵ Enter^ Ctrl+↵ ReturnInsert a page break at the current cursor position.
    Apply superscript formatting to the selected text fragment.
    Insert page breakCtrl+↵ Enter^ Ctrl+↵ ReturnInsert a page break at the current cursor position.
    Increase indent Ctrl+M ^ Ctrl+M Indent a paragraph from the left incrementally.
    Decrease indentCtrl+⇧ Shift+M^ Ctrl+⇧ Shift+MRemove a paragraph indent from the left incrementally.
    Add page numberCtrl+⇧ Shift+P^ Ctrl+⇧ Shift+PAdd the current page number at the current cursor position.
    Decrease indentCtrl+⇧ Shift+M^ Ctrl+⇧ Shift+MRemove a paragraph indent from the left incrementally.
    Add page numberCtrl+⇧ Shift+P^ Ctrl+⇧ Shift+PAdd the current page number at the current cursor position.
    Nonprinting characters Ctrl+⇧ Shift+Num8 Show or hide the display of nonprinting characters.
    Delete one character to the left← Backspace← BackspaceDelete one character to the left of the cursor.
    Delete one character to the rightDeleteDeleteDelete one character to the right of the cursor.
    Delete one character to the left← Backspace← BackspaceDelete one character to the left of the cursor.
    Delete one character to the rightDeleteDeleteDelete one character to the right of the cursor.
    Modifying Objects
    ⇧ Shift + drag (when resizing) Maintain the proportions of the selected object when resizing.
    Draw straight line or arrow⇧ Shift + drag (when drawing lines/arrows)⇧ Shift + drag (when drawing lines/arrows)Draw a straight vertical/horizontal/45-degree line or arrow.
    Draw straight line or arrow⇧ Shift + drag (when drawing lines/arrows)⇧ Shift + drag (when drawing lines/arrows)Draw a straight vertical/horizontal/45-degree line or arrow.
    Movement by one-pixel increments Ctrl+← → ↑ ↓ Hold down the Ctrl key and use the keybord arrows to move the selected object by one pixel at a time.
    Working with Tables
    Move to the next cell in a row↹ Tab↹ TabGo to the next cell in a table row.
    Move to the previous cell in a row⇧ Shift+↹ Tab⇧ Shift+↹ TabGo to the previous cell in a table row.
    Move to the next row↓↓Go to the next row in a table.
    Move to the previous row↑↑Go to the previous row in a table.
    Start new paragraph↵ Enter↵ ReturnStart a new paragraph within a cell.
    Add new row↹ Tab in the lower right table cell.↹ Tab in the lower right table cell.Add a new row at the bottom of the table.
    Inserting special characters
    Insert formulaAlt+=
    Working with Tables
    Move to the next cell in a row↹ Tab↹ TabGo to the next cell in a table row.
    Move to the previous cell in a row⇧ Shift+↹ Tab⇧ Shift+↹ TabGo to the previous cell in a table row.
    Move to the next row↓↓Go to the next row in a table.
    Move to the previous row↑↑Go to the previous row in a table.
    Start new paragraph↵ Enter↵ ReturnStart a new paragraph within a cell.
    Add new row↹ Tab in the lower right table cell.↹ Tab in the lower right table cell.Add a new row at the bottom of the table.
    Inserting special characters
    Insert formulaAlt+= Insert a formula at the current cursor position.
    Insert an em dashAlt+Ctrl+Num-Insert an em dash ‘—’ within the current document and to the right of the cursor.
    Insert a non-breaking hyphenCtrl+⇧ Shift+_^ Ctrl+⇧ Shift+HyphenInsert a non-breaking hyphen ‘-’ within the current document and to the right of the cursor.
    Insert a formula at the current cursor position.
    Insert an em dashAlt+Ctrl+Num-Insert an em dash ‘—’ within the current document and to the right of the cursor.
    Insert a non-breaking hyphenCtrl+⇧ Shift+_^ Ctrl+⇧ Shift+HyphenInsert a non-breaking hyphen ‘-’ within the current document and to the right of the cursor.
    Insert a no-break spaceCtrl+⇧ Shift+␣ Spacebar^ Ctrl+⇧ Shift+␣ SpacebarInsert a no-break space ‘o’ within the current document and to the right of the cursor.
    Ctrl+⇧ Shift+␣ Spacebar^ Ctrl+⇧ Shift+␣ SpacebarInsert a no-break space ‘o’ within the current document and to the right of the cursor.
    diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/Navigation.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/Navigation.htm index 404bebac6..12af2a2fe 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/Navigation.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/Navigation.htm @@ -26,7 +26,11 @@
  • Hide Status Bar - hides the bottommost bar where the Page Number Indicator and Zoom buttons are situated. To show the hidden Status Bar click this option once again.
  • Hide Rulers - 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 Rulers click this option once again.
    • - +
  • + Dark mode – enables or disables the dark mode if you have chosen the Dark interface theme. You can also turn on the dark mode using the Advanced Settings from the File tab menu. +

    Dark Mode

    +
    • +

    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.

    When the Comments or Chat panel is opened, the width of the left sidebar is adjusted by simple drag-and-drop: @@ -36,7 +40,7 @@

    To navigate through your document, use the following tools:

    The Zoom 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 Zoom in Zoom in button or Zoom out Zoom out button buttons. Click the Fit to width Fit to width button 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 Fit to page Fit to page button icon. diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm index 6baf4daa6..17f3520a2 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm @@ -133,6 +133,20 @@ + + + DOCXF + A format to create, edit and collaborate on a Form Template. + + + + + + + + + OFORM + A format to fill out a Form. Form fields are fillable but users cannot change the formatting or parameters of the form elements. + + + + + + +

    Removing form fields

    +

    To remove a form field and leave all its contents, select it and click the delete form icon Delete icon (make sure the field is not locked) or press the Delete key on the keyboard.

    + + + \ No newline at end of file diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/CreateTableOfContents.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/CreateTableOfContents.htm index 345c2494b..b853485c6 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/CreateTableOfContents.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/CreateTableOfContents.htm @@ -3,7 +3,7 @@ Create a Table of Contents - + @@ -15,14 +15,14 @@

    Create a Table of Contents

    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 Document Editor, 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.

    -

    Define the heading structure

    +

    Heading structure in the table of contents

    Format headings

    First of all, format the headings in your document using one of the predefined styles. To do that,

    1. Select the text you want to include into the table of contents.
    2. Open the style menu on the right side of the Home tab at the top toolbar.
    3. Click the required style to be applied. By default, you can use the Heading 1 - Heading 9 styles. -

      Note: if you want to use other styles (e.g. Title, Subtitle 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 this page.

      +

      If you want to use other styles (e.g. Title, Subtitle 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 this page.

    @@ -44,7 +44,7 @@

    To manually expand or collapse separate heading levels, use the arrows to the left of the headings.

    To close the Navigation panel, click the Navigation icon Navigation icon on the left sidebar once again.

    -

    Insert a Table of Contents into the document

    +

    Insert a Table of Contents into the document

    To insert a table of contents into your document:

    1. Position the insertion point where the table of contents should be added.
      2. @@ -52,15 +52,15 @@
    2. Click the Table of Contents icon Table of Contents icon on the top toolbar, or
      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.

      Table of Contents options

      -

      Note: the table of content appearance can be adjusted later via the table of contents settings.

      +

      The table of contents appearance can be adjusted later in the settings.

    -

    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 Table of Contents content control button 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.

    +

    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 Table of Contents content control button 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.

    Moving the table of contents

    To navigate between headings, press the Ctrl key and click the necessary heading within the table of contents field. You will go to the corresponding page.

    -

    Adjust the created Table of Contents

    +

    Adjust the created Table of Contents

    Refresh the Table of Contents

    -

    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 Refresh option to automatically apply all changes to the table of contents.

    +

    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 Refresh option to automatically apply all changes.

    Click the arrow next to the Refresh icon Refresh icon on the References tab of the top toolbar and select the necessary option from the menu: