From 89ebbf38c76bc5ea6e8161adaa2c4a55772b4ecb Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Tue, 12 Oct 2021 14:13:12 -0300 Subject: tdf#139290 Help button for Load Styles to right page Actually there are multiple Help pages for the same dialog. The Load Style (writer), Change Master Slide (Impress) and Master Page (Draw) all use the same dialog sfx/ui/loadtemplatedialog Switches were added to select the contents for the right application. Still, slides and pages terms are mixed in the UI. Change-Id: I2d48dd8a72fe7b43e92b57299eed1577e355c060 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123529 Tested-by: Jenkins Reviewed-by: Olivier Hallot --- AllLangHelp_simpress.mk | 1 - source/text/sdraw/00/page_menu.xhp | 3 +- source/text/sdraw/main_page.xhp | 5 +- source/text/simpress/00/slide_menu.xhp | 3 +- source/text/simpress/01/05120000.xhp | 48 ++++++++++++--- source/text/simpress/01/05120100.xhp | 49 --------------- source/text/swriter/01/05170000.xhp | 107 +++++++++++++++++++++++---------- 7 files changed, 117 insertions(+), 99 deletions(-) delete mode 100644 source/text/simpress/01/05120100.xhp diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk index 0b4dbf68cd..b46409d25a 100644 --- a/AllLangHelp_simpress.mk +++ b/AllLangHelp_simpress.mk @@ -78,7 +78,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\ helpcontent2/source/text/simpress/01/05100000 \ helpcontent2/source/text/simpress/01/05110500m \ helpcontent2/source/text/simpress/01/05120000 \ - helpcontent2/source/text/simpress/01/05120100 \ helpcontent2/source/text/simpress/01/05120500m \ helpcontent2/source/text/simpress/01/05130000 \ helpcontent2/source/text/simpress/01/05150000 \ diff --git a/source/text/sdraw/00/page_menu.xhp b/source/text/sdraw/00/page_menu.xhp index 3e6802ab9e..0119a9e725 100644 --- a/source/text/sdraw/00/page_menu.xhp +++ b/source/text/sdraw/00/page_menu.xhp @@ -32,6 +32,7 @@ Choose Page - Master Page + Choose Page - Master Page - Load
Choose Page - New Page On the Insert bar, click @@ -39,7 +40,7 @@ - Icon + Icon New Page New Page diff --git a/source/text/sdraw/main_page.xhp b/source/text/sdraw/main_page.xhp index 48ac8523c4..2e33da0c05 100644 --- a/source/text/sdraw/main_page.xhp +++ b/source/text/sdraw/main_page.xhp @@ -43,8 +43,7 @@

Properties

- -

Master Page

+

New Master

Delete Master

Master background

@@ -52,7 +51,5 @@

Master Elements

Move

- - diff --git a/source/text/simpress/00/slide_menu.xhp b/source/text/simpress/00/slide_menu.xhp index 5ef3f59440..eeb135d6a5 100644 --- a/source/text/simpress/00/slide_menu.xhp +++ b/source/text/simpress/00/slide_menu.xhp @@ -34,6 +34,7 @@ Choose Slide - Change Slide Master + Choose Slide - Change Slide Master - Load
Choose Slide - New Slide On the Presentation bar, click @@ -41,7 +42,7 @@
- Icon + Icon New slide New Slide diff --git a/source/text/simpress/01/05120000.xhp b/source/text/simpress/01/05120000.xhp index a4a471a2d6..348c005d06 100644 --- a/source/text/simpress/01/05120000.xhp +++ b/source/text/simpress/01/05120000.xhp @@ -25,23 +25,51 @@ - -
-

Change Slide Master

- Displays the Available Master Slides dialog, where you can select a layout scheme for the current slide. Any objects in the slide design are inserted behind objects in the current slide. -
+ + + + +
+

Master Page

+ Displays the Available Master Slides dialog, where you can select a layout scheme for the current page. Any objects in the page design are inserted behind objects in the current page. +
+ + +
+

Change Slide Master

+ Displays the Available Master Slides dialog, where you can select a layout scheme for the current slide. Any objects in the slide design are inserted behind objects in the current slide. +
+ +
- + + + + + + + +

Slide design

Displays the slide designs you can apply to your slide. Select a design and click OK to apply it to the current slide. -

Exchange background page

+ +

Exchange background page

Applies the background of the selected slide design to all of the slides in your document. -

Delete unused backgrounds

+ +

Delete unused backgrounds

Deletes unreferenced background slides and presentation layouts from your document. -

Load

- Displays the Load Master Slide dialog, where you can select additional slide designs. + +

Load

+ + + Displays the Load Master Page dialog, where you can select additional page designs. + + + Displays the Load Master Slide dialog, where you can select additional slide designs. + + diff --git a/source/text/simpress/01/05120100.xhp b/source/text/simpress/01/05120100.xhp deleted file mode 100644 index 66f5335e83..0000000000 --- a/source/text/simpress/01/05120100.xhp +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - -Load Master Slide -/text/simpress/01/05120100.xhp - - -Sun Microsystems, Inc. - - - - - -

Load Master Slide

-Load additional slide designs for your presentation. -Select a design category, and then a template you want to apply. - -Categories -Displays the available slide design categories. - -Templates -Displays the templates for the selected design category. - -More>> -Shows or hides a preview of a selected template. -Some templates may not contain visible text objects or drawing objects. - - diff --git a/source/text/swriter/01/05170000.xhp b/source/text/swriter/01/05170000.xhp index 4d87fe2021..014a7bb0e2 100644 --- a/source/text/swriter/01/05170000.xhp +++ b/source/text/swriter/01/05170000.xhp @@ -29,41 +29,82 @@ - -

Load Styles

- -Imports formatting styles from another document or template into the current document. - -
- -
- -

Categories

-Lists the available template categories. Click a category to view its contents in the Templates list. - -

Templates

-Lists the available templates for the selected category. + +

+ + Load Master Slide + Load Master Page + Load Styles + +

+ + + Load additional slide designs for your presentation. +
+ +
+ + + Load additional page designs for your drawing. +
+ +
+ + Imports formatting styles from another document or template into the current document. +
+ +
+ + -

Paragraph and Character

-Loads the paragraph and the character styles from the selected document into the current document. - -

Frame

-Loads the frame styles from the selected document into the current document. - -

Page

-Loads the page styles from the selected document into the current document. - -

List

-Loads the numbering styles from the selected document into the current document. - -

Overwrite

-Replaces styles in the current document that have the same name as the styles you are loading. No warning message is given. -Only applied styles and modified styles are loaded from a document or template. The styles shown in the sidebar cannot be used as a guide. - -

From File

-Locate the file containing the styles that you want to load, and then click Open. -To save styles from a document as a template, use From File to load the styles to an empty document, then choose File - Templates - Save as Template. + + + + +

Categories

+ Displays the available slide design categories. +

Templates

+ Displays the templates for the selected design category. +

Preview

+ Shows or hides a preview of a selected master slide. + Some master slides may not contain visible text objects or drawing objects. + + +

Categories

+ Displays the available page design categories. +

Templates

+ Displays the pages designs for the selected design category. +

Preview

+ Shows or hides a preview of a selected page design. + Some page designs may not contain visible text objects or drawing objects. + + +

Categories

+ Lists the available template categories. Click a category to view its contents in the Templates list. +

Templates

+ Lists the available templates for the selected category. +

Paragraph and Character

+ Loads the paragraph and the character styles from the selected document into the current document. + +

Frame

+ Loads the frame styles from the selected document into the current document. + +

Page

+ Loads the page styles from the selected document into the current document. + +

List

+ Loads the numbering styles from the selected document into the current document. + +

Overwrite

+ Replaces styles in the current document that have the same name as the styles you are loading. No warning message is given. + Only applied styles and modified styles are loaded from a document or template. The styles shown in the sidebar cannot be used as a guide. + +

From File

+ Locate the file containing the styles that you want to load, and then click Open. + To save styles from a document as a template, use From File to load the styles to an empty document, then choose File - Templates - Save as Template. + +
-- cgit