diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index a340d34f4b..16794501ef 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -332,7 +332,8 @@ url: 'document url', fileType: 'document file type', key: 'key', - vkey: 'vkey' + vkey: 'vkey', + isForm: 'pdf form' / false/true }, editorConfig: { licenseUrl: , diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index ae4be1f344..bd944955d6 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -924,6 +924,14 @@ define([ t == utils.defines.FileFormat.FILE_CROSSPLATFORM_PDF || t == utils.defines.FileFormat.FILE_CROSSPLATFORM_DJVU || t == utils.defines.FileFormat.FILE_CROSSPLATFORM_XPS; + } else + if ( window.VE ) { + return t == utils.defines.FileFormat.FILE_DRAW_VSDX || + t == utils.defines.FileFormat.FILE_DRAW_VSDM || + t == utils.defines.FileFormat.FILE_DRAW_VSTX || + t == utils.defines.FileFormat.FILE_DRAW_VSTM || + t == utils.defines.FileFormat.FILE_DRAW_VSSX || + t == utils.defines.FileFormat.FILE_DRAW_VSSM; } return false; diff --git a/apps/common/main/lib/view/Draw.js b/apps/common/main/lib/view/Draw.js index af353c503f..72d672fcd8 100644 --- a/apps/common/main/lib/view/Draw.js +++ b/apps/common/main/lib/view/Draw.js @@ -112,6 +112,7 @@ define([ ], lock = (this.appPrefix === 'de-') ? [_set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockViewIns, _set.docLockForms, _set.docLockCommentsIns, _set.viewMode] : (this.appPrefix === 'pe-') ? [_set.slideDeleted, _set.lostConnect, _set.noSlides] : + (this.appPrefix === 'pdfe-') ? [_set.pageDeleted, _set.lostConnect] : [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']], me = this; penOptions.forEach(function (props) { diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 68538357e4..1a4c7a7b5b 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2948,7 +2948,7 @@ define([ // Numbering var loadPreset = function(url, lang, callback) { - lang = lang.replace('_', '-').toLowerCase(); + lang = (lang || 'en').replace('_', '-').toLowerCase(); Common.Utils.loadConfig(url, function (langJson) { var presets; if (langJson !== 'error') { diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm index 8a016b84f3..843c1c9556 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm @@ -91,11 +91,6 @@
  • The Alignment guides option is used to turn on/off alignment guides that appear when you move objects. It allows for a more precise object positioning on the page.
  • The Use Alt key to navigate the user interface using the keyboard option is used to enable using the Alt / Option key in keyboard shortcuts.
  • Show the Quick Print button in the editor header is used in the desktop version to enable quick printing via the corresponding button at the top toolbar. The file will be printed on the last selected or default printer.
    • -
  • - The RTL Interface (Beta) option is used to change the direction in which elements of the interface are displayed. - In the desktop editors, the RTL Interface (Beta) option can be accessed on the main settings page. To learn more, please refer to the desktop getting started guide. -

    This option is available only for interface languages that require RTL.

    -
  • The Customize quick access button is used to choose which buttons shall be available in the top toolbar, i.e., Save, Print, Undo, and Redo.
  • The Unit of measurement option is used to specify what units are used on the rulers and in properties of objects when setting such parameters as width, height, spacing, margins etc. The available units are Centimeter, Point, and Inch.
    • diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm index bf46e0b2df..8b3643d210 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm @@ -34,6 +34,7 @@

    Note: The direct link allows downloading the file directly without opening it in a web browser. For example, to get a direct link in Nextcloud, find the necessary document in the file list, select the Details option from the file menu. Click the Copy direct link (only works for users who have access to this file/folder) icon on the right of the file name on the details panel. To find out how to get a direct link for downloading the file in a different third-party web storage, please refer to the corresponding third-party service documentation.

  • the Document from Storage option will open the Select Data Source window. It displays the list of all the .docx documents stored on your portal you have corresponding access rights to. To navigate through the sections of the Documents module, use the menu on the left part of the window. Select the necessary .docx document and click the OK button.
    • +
  • the Comparison settings option will open the settings window for document comparison. Choose whether you want to show changes at character level, where all characters are included, or at word level, where the process relies on words rather than characters.
    • @@ -51,6 +52,8 @@ the Document from URL option will open the window where you can enter a link to the file stored in a third-party web storage (for example, Nextcloud) if you have corresponding access rights to it. The link must be a direct link for downloading the file. When the link is specified, click the OK button.

    Note: The direct link allows downloading the file directly without opening it in a web browser. For example, to get a direct link in Nextcloud, find the necessary document in the file list, select the Details option from the file menu. Click the Copy direct link (only works for users who have access to this file/folder) icon on the right of the file name on the details panel. To find out how to get a direct link for downloading the file in a different third-party web storage, please refer to the corresponding third-party service documentation.

    +
  • the Document from Storage option will open the Select Data Source window. It displays the list of all the .docx documents stored on your portal you have corresponding access rights to. To navigate through the sections of the Documents module, use the menu on the left part of the window. Select the necessary .docx document and click the OK button.
    • +
  • the Comparison settings option will open the settings window for document comparison. Choose whether you want to show changes at character level, where all characters are included, or at word level, where the process relies on words rather than characters.
    • diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm index c7b9b6d3cd..ec13a9644f 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm @@ -104,6 +104,22 @@ + + + HWP + Hangul Word Processor
    Hanword document file + + + + + + + + + HWPX + Hangul Word Processor 2010 Document
    Hanword document file + + + + + + + MHTML MIME (Multipurpose Internet Mail Extensions) HTML
    A web archive format that combines all the contents of a webpage. diff --git a/apps/documenteditor/main/resources/help/en/ProgramInterface/HomeTab.htm b/apps/documenteditor/main/resources/help/en/ProgramInterface/HomeTab.htm index ef16bf79d5..ae0233b237 100644 --- a/apps/documenteditor/main/resources/help/en/ProgramInterface/HomeTab.htm +++ b/apps/documenteditor/main/resources/help/en/ProgramInterface/HomeTab.htm @@ -33,6 +33,7 @@
  • change paragraph indents,
  • set paragraph line spacing,
  • align your text in a paragraph,
    • +
  • change the text direction,
  • show/hide non-printing characters,
  • copy/clear text formatting,
  • manage styles.
    • diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/AlignArrangeObjects.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/AlignArrangeObjects.htm index 8bde257702..3ca5f204d9 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/AlignArrangeObjects.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/AlignArrangeObjects.htm @@ -10,40 +10,42 @@ -
    -
    - -
    -

    Align and arrange objects on the page

    +
    +
    + +
    +

    Align and arrange objects on the page

    In the Document Editor, the added autoshapes, images, charts or text boxes can be aligned, grouped and ordered on the page. To perform any of these actions, first select a separate object or several objects on the page. To select several objects, hold down the Ctrl key and left-click the required objects. To select a text box, click on its border, not the text within it. After that, you can use either the icons on the Layout tab of the top toolbar, described below, or the corresponding options from the right-click menu.

    -

    Align objects

    +

    Align objects

    To align two or more selected objects,

    -
      -
    1. Click the
      Align icon on the Layout tab of the top toolbar and select one of the following options: -
        -
      • Align to Page to align objects relative to the edges of the page,
        • -
      • Align to Margin to align objects relative to the page margins,
        • -
      • Align Selected Objects (this option is selected by default) to align objects relative to each other,
        • -
      -
      2. -
    2. Click the
      Align icon once again and select the necessary alignment type from the list: -
        -
      • Align Left
        - to line up the objects horizontally by the left edge of the leftmost object/left edge of the page/left page margin,
        • -
      • Align Center
        - to line up the objects horizontally by their centers/center of the page/center of the space between the left and right page margins,
        • -
      • Align Right
        - to line up the objects horizontally by the right edge of the rightmost object/right edge of the page/right page margin,
        • -
      • Align Top
        - to line up the objects vertically by the top edge of the topmost object/top edge of the page/top page margin,
        • -
      • Align Middle
        - to line up the objects vertically by their middles/middle of the page/middle of the space between the top and bottom page margins,
        • -
      • Align Bottom
        - to line up the objects vertically by the bottom edge of the bottommost object/bottom edge of the page/bottom page margin.
        • -
      -
      3. -
    +
      +
    1. + Click the
      Align icon on the Layout tab of the top toolbar and select one of the following options: +
        +
      • Align to Page to align objects relative to the edges of the page,
        • +
      • Align to Margin to align objects relative to the page margins,
        • +
      • Align Selected Objects (this option is selected by default) to align objects relative to each other,
        • +
      +
      2. +
    2. + Click the
      Align icon once again and select the necessary alignment type from the list: +
        +
      • Align Left
        - to line up the objects horizontally by the left edge of the leftmost object/left edge of the page/left page margin,
        • +
      • Align Center
        - to line up the objects horizontally by their centers/center of the page/center of the space between the left and right page margins,
        • +
      • Align Right
        - to line up the objects horizontally by the right edge of the rightmost object/right edge of the page/right page margin,
        • +
      • Align Top
        - to line up the objects vertically by the top edge of the topmost object/top edge of the page/top page margin,
        • +
      • Align Middle
        - to line up the objects vertically by their middles/middle of the page/middle of the space between the top and bottom page margins,
        • +
      • Align Bottom
        - to line up the objects vertically by the bottom edge of the bottommost object/bottom edge of the page/bottom page margin.
        • +
      +
      3. +

    Alternatively, you can right-click the selected objects, choose the Align option from the contextual menu and then use one of the available alignment options.

    If you want to align a single object, it can be aligned relative to the edges of the page or to the page margins. The Align to Margin option is selected by default in this case.

    Distribute objects

    To distribute three or more selected objects horizontally or vertically so that there is equal space between them,

    1. - Click the
      Align icon on the Layout tab of the top toolbar and select one of the following options: + Click the
      Align icon on the Layout tab of the top toolbar and select one of the following options:
      • Align to Page to distribute objects between the edges of the page,
      • Align to Margin to distribute objects between the page margins,
        • @@ -51,36 +53,45 @@
    2. - Click the
      Align icon once again and select the necessary distribution type from the list: + Click the
      Align icon once again and select the necessary distribution type from the list:
        -
      • Distribute Horizontally
        - to distribute objects evenly between the leftmost and rightmost selected objects/left and right edges of the page/left and right page margins.
        • -
      • Distribute Vertically
        - to distribute objects evenly between the topmost and bottommost selected objects/top and bottom edges of the page/top and bottom page margins.
        • +
      • Distribute Horizontally
        - to distribute objects evenly between the leftmost and rightmost selected objects/left and right edges of the page/left and right page margins.
        • +
      • Distribute Vertically
        - to distribute objects evenly between the topmost and bottommost selected objects/top and bottom edges of the page/top and bottom page margins.

    Alternatively, you can right-click the selected objects, choose the Align option from the contextual menu and then use one of the available distribution options.

    Note: the distribution options are disabled if you select less than three objects.

    Group objects

    -

    To group two or more selected objects or ungroup them, click the arrow next to the Group icon at the Layout tab on the top toolbar and select the necessary option from the list:

    +

    To group two or more selected objects or ungroup them, click the arrow next to the Group icon at the Layout tab on the top toolbar and select the necessary option from the list:

      -
    • Group
      - to combine several objects into a group so that they can be simultaneously rotated, moved, resized, aligned, arranged, copied, pasted, formatted like a single object.
      • -
    • Ungroup
      - to ungroup the selected group of the previously combined objects.
      • +
    • Group
      - to combine several objects into a group so that they can be simultaneously rotated, moved, resized, aligned, arranged, copied, pasted, formatted like a single object.
      • +
    • Ungroup
      - to ungroup the selected group of the previously combined objects.

    Alternatively, you can right-click the selected objects, choose the Arrange option from the contextual menu and then use the Group or Ungroup option.

    Note: the Group option is disabled if you select less than two objects. The Ungroup option is available only when a group of the previously combined objects is selected.

    Arrange objects

    -

    To arrange objects (i.e., to change their order when several objects overlap each other), you can use the Bring Forward and Send Backward icons on the Layout tab of the top toolbar and select the required arrangement type from the list.

    -

    To move the selected object(s) forward, click the arrow next to the Bring Forward icon on the Layout tab of the top toolbar and select the required arrangement type from the list:

    +

    To arrange objects (i.e., to change their order when several objects overlap each other), you can use the Bring Forward and Send Backward icons on the Layout tab of the top toolbar and select the required arrangement type from the list.

    +

    To move the selected object(s) forward, click the arrow next to the Bring Forward icon on the Layout tab of the top toolbar and select the required arrangement type from the list:

      -
    • Bring To Foreground
      - to move the object(s) in front of all other objects,
      • -
    • Bring Forward
      - to move the selected object(s) by one level forward as related to other objects.
      • +
    • Bring To Foreground
      - to move the object(s) in front of all other objects,
      • +
    • Bring Forward
      - to move the selected object(s) by one level forward as related to other objects.
    -

    To move the selected object(s) backward, click the arrow next to the Send Backward icon on the Layout tab of the top toolbar and select the required arrangement type from the list:

    +

    To move the selected object(s) backward, click the arrow next to the Send Backward icon on the Layout tab of the top toolbar and select the required arrangement type from the list:

      -
    • Send To Background
      - to move the object(s) behind all other objects,
      • -
    • Send Backward
      - to move the selected object(s) by one level backward as related to other objects.
      • +
    • Send To Background
      - to move the object(s) behind all other objects,
      • +
    • Send Backward
      - to move the selected object(s) by one level backward as related to other objects.

    Alternatively, you can right-click the selected object(s), choose the Arrange option from the contextual menu and then use one of the available arrangement options.

    -
    +

    Boolean operations on shapes

    +

    To access the logical operations on shapes, select the Merge shapes menu item in the context menu. The Boolean operations include the following:

    + +
    \ No newline at end of file diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/AlignText.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/AlignText.htm index 1750966a6f..a257582e92 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/AlignText.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/AlignText.htm @@ -36,6 +36,11 @@
  • click the OK button to apply the changes.

    • Paragraph Advanced Settings - Indents & Spacing

    +

    Here, you can change the text direction as well in the Direction section:

    + \ No newline at end of file diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/CreateFillableForms.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/CreateFillableForms.htm index 06a5523cd8..7968b60813 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/CreateFillableForms.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/CreateFillableForms.htm @@ -589,6 +589,18 @@ +

    Editing fields

    +
      +
    1. Select the required field and click with the right mouse button to open the context menu.
      2. +
    2. +
        +
      • Update field - update the information in the field.
        • +
      • Edit field - open the window for editing the field.
        • +
      • Toggle field codes - display the field code.
        • +
      +
      3. +
    +

    Managing Roles

    You can create new roles that will determine who can fill in certain form fields.

    diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertFieldCodes.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertFieldCodes.htm index b6c60b68a1..e11cabed58 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertFieldCodes.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertFieldCodes.htm @@ -217,6 +217,17 @@
    +

    The field codes can be edited and updated on the go:

    +
      +
    1. Select the required field and click with the right mouse button to open the context menu.
      2. +
    2. +
        +
      • Update field - update the information in the field.
        • +
      • Edit field - open the window for editing the field.
        • +
      • Toggle field codes - display the field code.
        • +
      +
      3. +
    \ No newline at end of file diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm index 4c215e4881..b035edbd21 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm @@ -47,9 +47,10 @@

    Adjust image settings

    Image Settings tab

    Some of the image settings can be altered using the Image settings tab of the right sidebar. To activate it click the image and choose the Image settings icon on the right. Here you can change the following properties:

    -

    You can also find some of these options in the right-click menu. The menu options are:

    - +

    When pasting the contents of a single cell or some text within autoshapes, the following options are available: