From ac2e145b210aa8ab70ef3e2ea1c7a45bd964a43e Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Wed, 30 May 2018 18:30:50 -0300 Subject: tdf#58134 Some Options settings cannot be reset Add warnings in help pages when some options cannot be reset. This patch does not close the bug, which in some cases is a bug in the dialog controller. Change-Id: Ie6d0019a9c6611c2ad8784f593ceefa5748bf56b Reviewed-on: https://gerrit.libreoffice.org/55104 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos --- source/text/shared/00/00000001.xhp | 15 +++++++++++++-- source/text/shared/optionen/01000000.xhp | 11 +++++++---- source/text/shared/optionen/01010200.xhp | 2 ++ source/text/shared/optionen/01010400.xhp | 2 ++ source/text/shared/optionen/01010700.xhp | 7 ++++--- source/text/shared/optionen/01020000.xhp | 1 + source/text/shared/optionen/01020100.xhp | 2 ++ source/text/shared/optionen/01030300.xhp | 14 ++++++++++---- source/text/shared/optionen/01030500.xhp | 1 + source/text/shared/optionen/01110100.xhp | 1 + source/text/shared/optionen/01140000.xhp | 2 ++ source/text/shared/optionen/java.xhp | 12 +++++++----- 12 files changed, 52 insertions(+), 18 deletions(-) diff --git a/source/text/shared/00/00000001.xhp b/source/text/shared/00/00000001.xhp index 8e9696e4cb..278ddbe9f2 100644 --- a/source/text/shared/00/00000001.xhp +++ b/source/text/shared/00/00000001.xhp @@ -211,8 +211,8 @@
-Backin Tools - Options - Resets modified values back to the $[officename] default values. +Resetin Tools - Options +Resets changes made to the current tab to those applicable when this dialog was opened.
@@ -260,5 +260,16 @@ Press Shift+F1 and point to a control to learn more about that control. +
+ Options dialog buttons + OK + Save the changes in the page and close the Options dialog. + Cancel + Close the Options dialog and discard all changes done. + +
+ Some options cannot be reset once edited. Either edit back the changes manually or click Cancel and reopen the Options dialog. +
+
diff --git a/source/text/shared/optionen/01000000.xhp b/source/text/shared/optionen/01000000.xhp index 51f5cdcf50..1481da4398 100644 --- a/source/text/shared/optionen/01000000.xhp +++ b/source/text/shared/optionen/01000000.xhp @@ -1,6 +1,6 @@ - + - - + + Options @@ -43,7 +43,10 @@
Note for macOS users: The Help mentions the menu path Tools - Options at numerous places. Replace this path with %PRODUCTNAME - Preferences on your macOS main menu. Both menu entries open the Options dialog box. -
+
+ + Help + Opens the help contents for the Options page displayed. %PRODUCTNAME Load/Save diff --git a/source/text/shared/optionen/01010200.xhp b/source/text/shared/optionen/01010200.xhp index 451ca98bbd..0cc76bd248 100644 --- a/source/text/shared/optionen/01010200.xhp +++ b/source/text/shared/optionen/01010200.xhp @@ -41,6 +41,7 @@
+ Load Load user-specific settings with the document @@ -156,5 +157,6 @@ Always save as Specifies how documents of the type selected on the left will always be saved as this file type. You may select another file type for the current document in the Save as dialog. + diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index 522ba85d88..4f6694b233 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -45,6 +45,7 @@
+ Available Language Modules Contains the installed language modules. @@ -136,5 +137,6 @@ Hyphenate special regions Specifies that hyphenation will also be carried out in footnotes, headers and footers. + diff --git a/source/text/shared/optionen/01010700.xhp b/source/text/shared/optionen/01010700.xhp index 6ebfe438e0..5ed7a42c0a 100644 --- a/source/text/shared/optionen/01010700.xhp +++ b/source/text/shared/optionen/01010700.xhp @@ -1,7 +1,7 @@ - + - - + + Fonts @@ -42,6 +42,7 @@ Font replacement also affects the display of fonts on the $[officename] user interface. + Apply replacement table Enables the font replacement settings that you define. diff --git a/source/text/shared/optionen/01020000.xhp b/source/text/shared/optionen/01020000.xhp index 706c3a600c..cb66bbf8ba 100644 --- a/source/text/shared/optionen/01020000.xhp +++ b/source/text/shared/optionen/01020000.xhp @@ -43,5 +43,6 @@ + diff --git a/source/text/shared/optionen/01020100.xhp b/source/text/shared/optionen/01020100.xhp index 5f92db51be..61f5d52645 100644 --- a/source/text/shared/optionen/01020100.xhp +++ b/source/text/shared/optionen/01020100.xhp @@ -39,6 +39,7 @@
+ Settings Defines the settings for the proxy server. Proxy server @@ -63,5 +64,6 @@ Type the port for the corresponding proxy server. The maximum value of a port number is fixed at 65535. + diff --git a/source/text/shared/optionen/01030300.xhp b/source/text/shared/optionen/01030300.xhp index 941100ec17..efe7f2b977 100644 --- a/source/text/shared/optionen/01030300.xhp +++ b/source/text/shared/optionen/01030300.xhp @@ -41,18 +41,24 @@
-Options + +Security Options and Warnings Opens the "Security Options and Warnings" dialog. Passwords for web connections You can enter a master password to enable easy access to sites that require a user name and password. -Persistently save passwords protected by a master password +Persistently save passwords for web connections If enabled, %PRODUCTNAME will securely store all passwords that you use to access files from web servers. You can retrieve the passwords from the list after you enter the master password. -Master Password + +Protected by a master password (recommended) +Check to enable all connections' passwords to be protected by a master password. +Master Password Opens the Enter Master Password dialog. + Enter the master password. Enter the master password again. -Enter the master password to continue. + +Enter the master password to continue. Connections Asks for the master password. If master password is correct, shows the Stored Web Connection Information dialog. The Stored Web Connection Information dialog shows a list of web sites and user names that you entered previously. You can select any entry and remove it from the list. You can view the password for the selected entry.Remove diff --git a/source/text/shared/optionen/01030500.xhp b/source/text/shared/optionen/01030500.xhp index d40c203a25..e43776fb94 100644 --- a/source/text/shared/optionen/01030500.xhp +++ b/source/text/shared/optionen/01030500.xhp @@ -76,5 +76,6 @@ Character set Select the appropriate character set for the export. + diff --git a/source/text/shared/optionen/01110100.xhp b/source/text/shared/optionen/01110100.xhp index c13ccc5a36..d10e3ea48f 100644 --- a/source/text/shared/optionen/01110100.xhp +++ b/source/text/shared/optionen/01110100.xhp @@ -46,5 +46,6 @@ This table is used as a means of replacing the chart colors for the selected data rows. For example, if you selected data row 6 and then click on the color green 8, the old color of the data row is replaced by green 8. The name of the selected color is shown below the color table. Default Restores the color settings that were defined when the program was installed. + diff --git a/source/text/shared/optionen/01140000.xhp b/source/text/shared/optionen/01140000.xhp index 74da14719d..0b6e9e7269 100644 --- a/source/text/shared/optionen/01140000.xhp +++ b/source/text/shared/optionen/01140000.xhp @@ -47,6 +47,7 @@
+ Language of User interface @@ -102,5 +103,6 @@ Ignore system input language Indicates whether changes to the system input language/keyboard will be ignored. If ignored, when new text is typed that text will follow the language of the document or current paragraph, not the current system language. + diff --git a/source/text/shared/optionen/java.xhp b/source/text/shared/optionen/java.xhp index 45af368dfa..b7c98310ab 100644 --- a/source/text/shared/optionen/java.xhp +++ b/source/text/shared/optionen/java.xhp @@ -30,6 +30,7 @@
+ Java;setting options experimental features @@ -42,9 +43,10 @@ Specifies the support options for Java applications in %PRODUCTNAME, including which Java Runtime Environment (JRE) to use. It also specifies whether to use experimental (unstable) features such as macro recording and access expert configuration.
-
+
+
- + Java options @@ -67,13 +69,13 @@ Class Path Opens the Class Path dialog. -Optional (unstable) options +Optional Features Enable experimental features -It enables features that are not yet complete or contain known bugs. The list of these features is different version by version, or even it can be empty. +Enables features that are not yet complete or may contain known bugs. The list of these features is different version by version, or even it can be empty. Enable macro recording -It enables macro recording, so the Tools - Macros - Record Macro menu item will be available. +Enables macro recording. The Tools - Macros - Record Macro menu item is available. Expert Configuration Opens the Expert Configuration dialog for advanced settings and configuration of %PRODUCTNAME. -- cgit v1.2.3