From 80ff954f498082eba69545e47f855a64f1964773 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Mon, 8 Jan 2024 12:44:56 -0300 Subject: tdf#155876 UI cmds Calc-Tools menu (56) + Tools menu for Calc, Form _ Share Spreadsheet + fixes + refactoring Change-Id: I62b37cf492300cd92ca069496c76a3d3b85c69a4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161793 Tested-by: Jenkins Reviewed-by: Olivier Hallot --- source/text/scalc/00/00000406.xhp | 10 ++- source/text/scalc/01/shared_spreadsheet.xhp | 60 +++++++-------- source/text/shared/guide/collab.xhp | 113 +++++++++++++++------------- source/text/shared/menu/forms.xhp | 4 +- 4 files changed, 99 insertions(+), 88 deletions(-) (limited to 'source/text') diff --git a/source/text/scalc/00/00000406.xhp b/source/text/scalc/00/00000406.xhp index 5e55d53ab7..c9cee36363 100644 --- a/source/text/scalc/00/00000406.xhp +++ b/source/text/scalc/00/00000406.xhp @@ -269,9 +269,15 @@ Choose Tools - Scenarios. -Choose Tools - Forms. +

+ Choose Tools - Forms. +

-Choose Tools - Share Spreadsheet +

+ Choose Tools - Share Spreadsheet +

Choose Tools - Protect Sheet. Choose Tools - Protect Spreadsheet Structure. diff --git a/source/text/scalc/01/shared_spreadsheet.xhp b/source/text/scalc/01/shared_spreadsheet.xhp index 04180bcfbb..f3cd997932 100644 --- a/source/text/scalc/01/shared_spreadsheet.xhp +++ b/source/text/scalc/01/shared_spreadsheet.xhp @@ -11,37 +11,37 @@ - Sharing Spreadsheets + Sharing Spreadsheets /text/scalc/01/shared_spreadsheet.xhp - - - - share spreadsheet - spreadsheet;collaboration - spreadsheet;share - -

- -

Share Spreadsheet

- Sharing a spreadsheet allows several users to open the same file for editing at the same time. -

- The spreadsheet needs to be on a shared drive, server, website, or similar. Some conditions must be met on operating systems with user permission management: - - - The shared file needs to reside in a location which is accessible by all collaborators. - - - The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files. - - - In order to correctly identify the changes, each collaborator should enter their name in %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - User Data on the Menu bar. - -

- -

+ + + + + share spreadsheet + spreadsheet;collaboration + spreadsheet;share + +

Share Spreadsheet

+ Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.Share Document dialog - Share this spreadsheet with other users + Sharing a spreadsheet allows several users to open the same file for editing at the same time. +

+The spreadsheet needs to be on a shared drive, server, website, or similar. Some conditions must be met on operating systems with user permission management: + + + The shared file needs to reside in a location which is accessible by all collaborators. + + + The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files. + + +In order to correctly identify the changes, each collaborator should enter their name in %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - User Data on the Menu bar. +

+ +

diff --git a/source/text/shared/guide/collab.xhp b/source/text/shared/guide/collab.xhp index abc7397d83..44db6dfe27 100644 --- a/source/text/shared/guide/collab.xhp +++ b/source/text/shared/guide/collab.xhp @@ -20,108 +20,113 @@ -Collaboration +Collaboration /text/shared/guide/collab.xhp - + sharing documents collaboration file locking with collaboration locked documents MW changed the index entries to one level entries.MW added two index entries with "lock" + + + +

Collaboration

-In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.Tools - Share Document menu - - - -Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.Share Document dialog - Share this spreadsheet with other users - -Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document. +In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.Tools - Share Document menu + +

Collaboration in Calc

-In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the %PRODUCTNAME - Preferences +In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the %PRODUCTNAME - Preferences Tools - Options - %PRODUCTNAME - User Data tab page. Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. Spec Doc owner told me that this is work in progress and may change any time

Creating a new spreadsheet

-User A creates a new spreadsheet document. The following conditions can apply: +User A creates a new spreadsheet document. The following conditions can apply: -The user does not want to share the spreadsheet for collaboration. -User A opens, edits, and saves the document as described above for Writer, Impress, and Draw document. +The user does not want to share the spreadsheet for collaboration. +User A opens, edits, and saves the document as described above for Writer, Impress, and Draw document. -The user wants to share the document for collaboration. -The user chooses Tools - Share Document to activate the collaboration features for this document. A dialog opens where the user can choose to enable or disable sharing. If the user enables sharing, the document will be saved in shared mode, which is also shown on the title bar. +The user wants to share the document for collaboration. +The user chooses Tools - Share Document to activate the collaboration features for this document. A dialog opens where the user can choose to enable or disable sharing. If the user enables sharing, the document will be saved in shared mode, which is also shown on the title bar. -The Tools - Share Document command can be used to switch the mode for the current document from unshared mode to shared mode. If you want to use a shared document in unshared mode, you would save the shared document using another name or path. This creates a copy of the spreadsheet that is not shared. +The Tools - Share Document command can be used to switch the mode for the current document from unshared mode to shared mode. If you want to use a shared document in unshared mode, you would save the shared document using another name or path. This creates a copy of the spreadsheet that is not shared.

Opening a spreadsheet

-User A opens a spreadsheet document. The following conditions can apply: +User A opens a spreadsheet document. The following conditions can apply: -The spreadsheet document is not in shared mode. -The user can open, edit, and save the document as described above for Writer, Impress, and Draw documents. +The spreadsheet document is not in shared mode. +The user can open, edit, and save the document as described above for Writer, Impress, and Draw documents. -The spreadsheet document is in shared mode. -The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode. -Resolve Conflicts dialog - - -If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.Keep Mine - -Keeps your change, voids the other change.Keep Other - -Keeps the change of the other user, voids your change.Keep All Mine - -Keeps all your changes, voids all other changes.Keep All Others - -Keeps the changes of all other users, voids your changes. +The spreadsheet document is in shared mode. +The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode. + + + +

Resolve Conflicts dialog

+If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep. + +

Keep Mine

+Keeps your change, voids the other change. + +

Keep Other

+Keeps the change of the other user, voids your change. + +

Keep All Mine

+Keeps all your changes, voids all other changes. + +

Keep All Others

+Keeps the changes of all other users, voids your changes.

Saving a shared spreadsheet document

-User A saves a shared document. The following conditions can apply: +User A saves a shared document. The following conditions can apply: -The document was not modified and saved by another user since user A opened the document. -The document is saved. +The document was not modified and saved by another user since user A opened the document. +The document is saved. -The document was modified and saved by another user since user A opened the document. -If the changes do not conflict, the document is saved. -If the changes conflict, the Resolve Conflicts dialog will be shown. User A must decide for the conflicts which version to keep, "Keep Mine" or "Keep Other". When all conflicts are resolved, the document is saved. While user A resolves the conflicts, no other user is able to save the shared document. +The document was modified and saved by another user since user A opened the document. +If the changes do not conflict, the document is saved. +If the changes conflict, the Resolve Conflicts dialog will be shown. User A must decide for the conflicts which version to keep, "Keep Mine" or "Keep Other". When all conflicts are resolved, the document is saved. While user A resolves the conflicts, no other user is able to save the shared document. -Another user tries to save the shared document and resolves conflicts in this moment. -User A sees a message that a merge-in is in progress. User A can choose to cancel the save command for now, or retry saving some time later. +Another user tries to save the shared document and resolves conflicts in this moment. +User A sees a message that a merge-in is in progress. User A can choose to cancel the save command for now, or retry saving some time later. -When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents. +When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents.

Collaboration in Writer, Impress, and Draw

-For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems: -User A opens a document. The following conditions can apply: +For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems: +User A opens a document. The following conditions can apply: -The document is not locked by any other user. -This document will be opened for read and write access by user A. The document will be locked for other users until user A closes the document. +The document is not locked by any other user. +This document will be opened for read and write access by user A. The document will be locked for other users until user A closes the document. -The document is marked as "read-only" by the file system. -This document will be opened in read-only mode. Editing is not allowed. User A can save the document using another document name or another path. User A can edit this copy. +The document is marked as "read-only" by the file system. +This document will be opened in read-only mode. Editing is not allowed. User A can save the document using another document name or another path. User A can edit this copy. -The document is locked by another user. -User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command. +The document is locked by another user. +User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command.

User access permissions and sharing documents

-Some conditions must be met on operating systems with a user permission management. +Some conditions must be met on operating systems with a user permission management. -The shared file needs to reside in a location which is accessible by all collaborators. +The shared file needs to reside in a location which is accessible by all collaborators. -The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files. +The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files. Write access also enables other users to (accidentally or deliberately) delete or change a file.

-Save As +Save As

diff --git a/source/text/shared/menu/forms.xhp b/source/text/shared/menu/forms.xhp index e273b70df1..13f5e9ba7a 100644 --- a/source/text/shared/menu/forms.xhp +++ b/source/text/shared/menu/forms.xhp @@ -11,13 +11,13 @@ - Forms submenu + Forms submenu /text/shared/menu/forms.xhp

- +

Forms Submenu

-- cgit