diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2019-06-05 22:29:41 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2019-06-06 15:37:49 +0200 |
| commit | 2c84c28bc30456c8eb4e0473887ce1d5ff3e4209 (patch) | |
| tree | bbe88ac97d0caef9dcf7c4ca1be3ee70fde2cac9 /source/text | |
| parent | 2eb1257145949b53d085edf37d7c599bf17f0051 (diff) | |
tdf#68103 Mark differences between Draw and Impress
Although the 2 modules share a common kernel, the nomeclature,
menus and master pages/slides are different.
Change-Id: Id4282b2ebaf48a57b753ff0cefa228c3f3bdc644
Reviewed-on: https://gerrit.libreoffice.org/73578
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'source/text')
| -rw-r--r-- | source/text/simpress/guide/background.xhp | 73 | ||||
| -rw-r--r-- | source/text/simpress/guide/masterpage.xhp | 76 |
2 files changed, 94 insertions, 55 deletions
diff --git a/source/text/simpress/guide/background.xhp b/source/text/simpress/guide/background.xhp index bee221d661..d469205a4d 100644 --- a/source/text/simpress/guide/background.xhp +++ b/source/text/simpress/guide/background.xhp @@ -27,46 +27,59 @@ </meta> <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3150199"> - <bookmark_value>backgrounds; changing</bookmark_value> - <bookmark_value>master slides; changing backgrounds</bookmark_value> - <bookmark_value>slides;changing backgrounds</bookmark_value> +<bookmark_value>backgrounds; changing</bookmark_value> +<bookmark_value>master slides; changing backgrounds</bookmark_value> +<bookmark_value>master pages; changing backgrounds</bookmark_value> +<bookmark_value>slides;changing backgrounds</bookmark_value> +<bookmark_value>pages;changing backgrounds</bookmark_value> </bookmark> <paragraph role="heading" id="hd_id3150199" xml-lang="en-US" level="1"> <variable id="background"> - <link href="text/simpress/guide/background.xhp" name="Changing the Slide Background Fill">Changing the Slide Background Fill</link> + <link href="text/simpress/guide/background.xhp" name="Changing the Slide Background Fill">Changing the <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline> Background Fill</link> </variable> </paragraph> - <paragraph role="paragraph" id="par_id3155067" xml-lang="en-US">You can change the background color or the background fill of the current slide or all of the slides in your document. For a background fill, you can use hatching, a gradient, or a bitmap image.</paragraph> - <paragraph role="paragraph" id="par_id3148701" xml-lang="en-US">If you want to change the background fill for all of the slides, choose <emph>View - Master Slide</emph>. To change the background fill of a single slide, choose <emph>View - Normal</emph>.</paragraph> + <switch select="appl"> + <case select="IMPRESS"> + <paragraph role="paragraph" id="par_id3155067">You can change the background color or the background fill of the current slide or all of the slides in your document. For a background fill, you can use hatching, a gradient, or a bitmap image.</paragraph> + <paragraph role="paragraph" id="par_id3148701">If you want to change the background fill for all of the slides, choose <menuitem>View - Master Slide</menuitem>. To change the background fill of a single slide, choose <menuitem>View - Normal</menuitem>.</paragraph> + <paragraph role="paragraph" id="par_id624713" xml-lang="en-US"> + <ahelp hid="." visibility="hidden">Click Set Background Picture for Slide in the context menu of a slide in Normal view to select a bitmap file. This file is used as a background picture.</ahelp> + </paragraph> + </case> + <default> + <paragraph role="paragraph" id="par_id4155067">You can change the background color or the background fill of the current page or all of the pages in your document. For a background fill, you can use hatching, a gradient, or a bitmap image.</paragraph> + <paragraph role="paragraph" id="par_id4148701">If you want to change the background fill for all of the pages, choose <menuitem>View - Master Page</menuitem>. To change the background fill of a single page, choose <menuitem>View - Normal</menuitem>.</paragraph> + <paragraph role="paragraph" id="par_id644713"> + <ahelp hid="." visibility="hidden">Click Set Background Picture for Page in the context menu of a page in Normal view to select a bitmap file. This file is used as a background picture.</ahelp> + </paragraph> + </default> + </switch> <comment>insert help id when available</comment> - <paragraph role="paragraph" id="par_id624713" xml-lang="en-US"> - <ahelp hid="." visibility="hidden">Click Set Background Picture for Slide in the context menu of a slide in Normal view to select a bitmap file. This file is used as a background picture.</ahelp> - </paragraph> <comment>removed a para, #63970</comment> - <paragraph role="heading" id="hd_id3150534" xml-lang="en-US" level="3">To use a color, gradient, or hatching pattern for the slide background</paragraph> + <h3 id="hd_id3150534">To use a color, gradient, or hatching pattern for the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline> background</h3> <list type="ordered"> <listitem> - <paragraph role="listitem" id="par_id3149942" xml-lang="en-US">Choose <emph>Slide - Properties</emph>, and then click on the <emph>Background</emph> tab.</paragraph> + <paragraph role="listitem" id="par_id3149942" xml-lang="en-US">Choose <switchinline select="appl"><caseinline select="IMPRESS"><menuitem>Slide</menuitem></caseinline><defaultinline><menuitem>Page</menuitem></defaultinline></switchinline>, and then click on the <emph>Background</emph> tab.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3148725" xml-lang="en-US">In the <emph>Fill </emph>area, do one of the following:</paragraph> - <paragraph role="listitem" id="par_id3153040" xml-lang="en-US">Select <emph>Color</emph>, and then click a color in the list.</paragraph> - <paragraph role="listitem" id="par_id3150866" xml-lang="en-US">Select <emph>Gradient</emph>, and then click a gradient style in the list.</paragraph> - <paragraph role="listitem" id="par_id3150338" xml-lang="en-US">Select <emph>Hatching</emph>, and then click a hatching style in the list.</paragraph> + <paragraph role="listitem" id="par_id3153040" xml-lang="en-US">Select <widget>Color</widget>, and then click a color in the list.</paragraph> + <paragraph role="listitem" id="par_id3150866" xml-lang="en-US">Select <widget>Gradient</widget>, and then click a gradient style in the list.</paragraph> + <paragraph role="listitem" id="par_id3150338" xml-lang="en-US">Select <widget>Hatching</widget>, and then click a hatching style in the list.</paragraph> </listitem> <listitem> - <paragraph role="listitem" id="par_id3150021" xml-lang="en-US">Click <emph>OK</emph>.</paragraph> + <paragraph role="listitem" id="par_id3150021" xml-lang="en-US">Click <widget>OK</widget>.</paragraph> </listitem> </list> - <paragraph role="heading" id="hd_id3145244" xml-lang="en-US" level="3">To use an image for the slide background</paragraph> - <paragraph role="paragraph" id="par_id3148394" xml-lang="en-US">You can display an entire image as a slide background, or you can tile the image to produce a patterned background.</paragraph> + <h3 id="hd_id3145244">To use an image for the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline> background</h3> + <paragraph role="paragraph" id="par_id3148394" xml-lang="en-US">You can display an entire image as a <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline> background, or you can tile the image to produce a patterned background.</paragraph> <list type="ordered"> <listitem> - <paragraph role="listitem" id="par_id3156064" xml-lang="en-US">Choose <emph>Slide - Properties</emph>, and then click on the <emph>Background</emph> tab.</paragraph> + <paragraph role="listitem" id="par_id3156064" xml-lang="en-US">Choose <switchinline select="appl"><caseinline select="IMPRESS"><menuitem>Slide - Properties</menuitem></caseinline><defaultinline><menuitem>Page - Properties</menuitem></defaultinline></switchinline>, and then click on the <emph>Background</emph> tab.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3145356" xml-lang="en-US">In the <emph>Fill </emph>area, select <emph>Bitmap</emph>, and then click an image in the list.</paragraph> - <paragraph role="note" id="par_id3150757" xml-lang="en-US">If you want to use a custom image for the slide background, close the <emph>Page Setup </emph>dialog, and then choose <emph>Format - Area</emph>. Click the <emph>Bitmaps </emph>tab, and then click <emph>Import</emph>. Locate the image you want to import and click <emph>Open</emph>. When you return to the <emph>Background </emph>tab, the image you imported will be in the <emph>Bitmap </emph>list.</paragraph> + <paragraph id="par_id3150757" role="note">If you want to use a custom image for the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline> background, close the <emph>Page Setup </emph>dialog, and then choose <menuitem>Format - Area</menuitem>. Click the <emph>Bitmaps </emph>tab, and then click <emph>Import</emph>. Locate the image you want to import and click <widget>Open</widget>. When you return to the <emph>Background</emph> tab, the image you imported will be in the <emph>Bitmap</emph> list.</paragraph> </listitem> <listitem> <paragraph role="paragraph" id="par_id3153151" xml-lang="en-US">Do one of the following:</paragraph> @@ -74,33 +87,35 @@ <paragraph role="paragraph" id="par_id3149756" xml-lang="en-US">To tile the image on the background, select <emph>Tile</emph>, and set the <emph>Size</emph>, <emph>Position</emph>, and <emph>Offset</emph> options for the image.</paragraph> </listitem> <listitem> - <paragraph role="paragraph" id="par_id3154934" xml-lang="en-US">Click <emph>OK</emph>.</paragraph> + <paragraph role="paragraph" id="par_id3154934" xml-lang="en-US">Click <widget>OK</widget>.</paragraph> </listitem> </list> - <paragraph role="paragraph" id="par_id3158403" xml-lang="en-US">This modification is only valid for the current presentation document.</paragraph> - <paragraph role="heading" id="par_idN10820" xml-lang="en-US" level="3">To save a new master slide as a template</paragraph> + <paragraph role="paragraph" id="par_id3158403">This modification is only valid for the current presentation or drawing document.</paragraph> + <h3 id="par_idN10820">To save a new master <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline> as a template</h3> <list type="ordered"> <listitem> - <paragraph role="paragraph" id="par_idN10827" xml-lang="en-US">Choose <emph>View - Master Slide</emph> to change to the master slide.</paragraph> + <paragraph role="paragraph" id="par_idN10827" xml-lang="en-US"><switchinline select="appl"><caseinline select="IMPRESS">Choose <menuitem>View - Master Slide</menuitem> to change to the master slide</caseinline><defaultinline>Choose <menuitem>View - Master Page</menuitem> to change to the master page</defaultinline></switchinline>.</paragraph> </listitem> <listitem> - <paragraph role="paragraph" id="par_idN1082F" xml-lang="en-US">Choose <emph>Slide - Properties</emph> to change the slide background, or choose other formatting commands. Objects that you add here will be visible on all slides that are based on this master slide.</paragraph> + <paragraph role="paragraph" id="par_idN1082F"><switchinline select="appl"><caseinline select="IMPRESS">Choose <menuitem>Slide - Properties</menuitem> to change the slide background, or choose other formatting commands. Objects that you add here will be visible on all slides that are based on this master slide.</caseinline><defaultinline>Choose <menuitem>Page - Properties</menuitem> to change the page background, or choose other formatting commands. Objects that you add here will be visible on all pages that are based on this master page.</defaultinline></switchinline>.</paragraph> </listitem> <listitem> - <paragraph role="paragraph" id="par_idN10837" xml-lang="en-US">Choose <emph>View - Normal</emph> to close the master view.</paragraph> + <paragraph role="paragraph" id="par_idN10837" xml-lang="en-US">Choose <menuitem>View - Normal</menuitem> to close the master view.</paragraph> </listitem> <listitem> - <paragraph role="paragraph" id="par_idN1083F" xml-lang="en-US">Choose <emph>File - Templates - Save As Template</emph> to save the document as a template.</paragraph> + <paragraph role="paragraph" id="par_idN1083F" xml-lang="en-US">Choose <menuitem>File - Templates - Save As Template</menuitem> to save the document as a template.</paragraph> </listitem> <listitem> - <paragraph role="paragraph" id="par_idN10847" xml-lang="en-US">Enter a name for the template. Do not change the category from "My Templates". Click OK.</paragraph> + <paragraph role="paragraph" id="par_idN10847" xml-lang="en-US">Enter a name for the template. Do not change the category from "My Templates". Click <widget>OK</widget>.</paragraph> </listitem> </list> - <paragraph role="paragraph" id="par_idN1084A" xml-lang="en-US">Now you can use the Templates window to open a new presentation based on your new template.</paragraph> + <paragraph role="paragraph" id="par_idN1084A" xml-lang="en-US">Now you can use the Templates window to open a new presentation or drawing based on your new template.</paragraph> <section id="relatedtopics"> <embed href="text/simpress/guide/masterpage.xhp#masterpage"/> <embed href="text/simpress/guide/layers.xhp#layers"/> - <embed href="text/simpress/guide/footer.xhp#footer"/> + <switch select="appl"> + <case select="IMPRESS"><embed href="text/simpress/guide/footer.xhp#footer"/></case> + </switch> </section> </body> </helpdocument> diff --git a/source/text/simpress/guide/masterpage.xhp b/source/text/simpress/guide/masterpage.xhp index d9da6f574c..835191cc29 100644 --- a/source/text/simpress/guide/masterpage.xhp +++ b/source/text/simpress/guide/masterpage.xhp @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - - <!-- * This file is part of the LibreOffice project. * @@ -20,54 +17,80 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - <helpdocument version="1.0"> +<helpdocument version="1.0"> <meta> <topic id="textsimpressguidemasterpagexml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Changing and Adding a Master Slide </title> +<title id="tit" xml-lang="en-US">Changing and Adding a Master Page </title> <filename>/text/simpress/guide/masterpage.xhp</filename> </topic> </meta> <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3152596"> <bookmark_value>slide designs</bookmark_value> +<bookmark_value>page designs</bookmark_value> <bookmark_value>master slides; designing</bookmark_value> +<bookmark_value>master pages; designing</bookmark_value> <bookmark_value>backgrounds; slides</bookmark_value> +<bookmark_value>backgrounds; pages</bookmark_value> <bookmark_value>slides; backgrounds</bookmark_value> -<bookmark_value>master pages, see master slides</bookmark_value> +<bookmark_value>pages; backgrounds</bookmark_value> +<bookmark_value>master pages</bookmark_value> +<bookmark_value>master slides</bookmark_value> </bookmark> -<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="1"><variable id="masterpage"><link href="text/simpress/guide/masterpage.xhp" name="Changing and Adding a Master Slide">Changing and Adding a Master Slide</link> -</variable></paragraph> -<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US">Every slide in a presentation has exactly one master slide, also known as master page. A master slide determines the text formatting style for the title and outline and the background design for all slides that use this master slide.</paragraph> -<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3">To apply a new master slide</paragraph> + +<h1 id="hd_id3152596"><variable id="masterpage"><link href="text/simpress/guide/masterpage.xhp" name="Changing and Adding a Master Slide">Changing and Adding a Master <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></link> +</variable></h1> + +<switch select="appl"> + <case select="IMPRESS"><paragraph role="paragraph" id="par_id3154017" xml-lang="en-US">Every slide in a presentation has exactly one master slide. A master slide determines the text formatting style for the title and outline and the background design for all slides that use this master slide.</paragraph></case> + <default><paragraph role="paragraph" id="par_id4154017" xml-lang="en-US">Every page in a drawing has exactly one master page. A master page determines the text formatting style for the title and outline and the background design for all pages that use this master page.</paragraph></default> +</switch> + +<h3 id="hd_id3149018">To apply a new <switchinline select="appl"><caseinline select="IMPRESS">master slide</caseinline><defaultinline>master page</defaultinline></switchinline></h3> + <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3154702" xml-lang="en-US">Select <emph>Slide - Change Slide Master</emph>.</paragraph> + <paragraph role="listitem" id="par_id3154702" xml-lang="en-US">Select <switchinline select="appl"><caseinline select="IMPRESS"><menuitem>Slide - Master Slide</menuitem></caseinline><defaultinline><menuitem>Page - Master Page</menuitem></defaultinline></switchinline>.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3148485" xml-lang="en-US">Click <emph>Load</emph>.</paragraph> + <paragraph role="listitem" id="par_id3148485" xml-lang="en-US">Click <widget>Load</widget>.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3145384" xml-lang="en-US">Under <emph>Categories</emph>, select the category of templates.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3153915" xml-lang="en-US">Under <emph>Templates</emph>, select a template with the master slide that you want to apply. To preview the template, click <emph>Preview</emph>.</paragraph> + <paragraph role="listitem" id="par_id3153915" xml-lang="en-US">Under <emph>Templates</emph>, select a template with the <switchinline select="appl"><caseinline select="IMPRESS">master slide</caseinline><defaultinline>master page</defaultinline></switchinline> that you want to apply. To preview the template, click <widget>Preview</widget>.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3154652" xml-lang="en-US">Click <emph>OK</emph>.</paragraph> + <paragraph role="listitem" id="par_id3154652" xml-lang="en-US">Click <widget>OK</widget>.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3145115" xml-lang="en-US">Do one of the following:</paragraph> </listitem> </list> -<list type="unordered"> -<listitem> -<paragraph role="listitem" id="par_id3150436" xml-lang="en-US">To apply the master slide to all of the slides in your presentation, select the <emph>Exchange background page</emph> check box, and then click <emph>OK</emph>.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3151387" xml-lang="en-US">To apply the slide design to the current slide only, clear the <emph>Exchange background page</emph> check box, and then click <emph>OK</emph>.</paragraph> -</listitem> -</list> +<switch select="appl"> + <case select="IMPRESS"> + <list type="unordered"> + <listitem> + <paragraph role="listitem" id="par_id5150436" xml-lang="en-US">To apply the master slide to all of the slides in your presentation, select the <emph>Exchange background page</emph> check box, and then click <widget>OK</widget>.</paragraph> + </listitem> + <listitem> + <paragraph role="listitem" id="par_id5151387" xml-lang="en-US">To apply the slide design to the current slide only, clear the <emph>Exchange background page</emph> check box, and then click <widget>OK</widget>.</paragraph> + </listitem> + </list> + </case> + <default> + <list type="unordered"> + <listitem> + <paragraph role="listitem" id="par_id4150436" xml-lang="en-US">To apply the master page to all of the pages in your presentation, select the <emph>Exchange background page</emph> check box, and then click <widget>OK</widget>.</paragraph> + </listitem> + <listitem> + <paragraph role="listitem" id="par_id4151387" xml-lang="en-US">To apply the page design to the current page only, clear the <emph>Exchange background page</emph> check box, and then click <widget>OK</widget>.</paragraph> + </listitem> + </list> + </default> +</switch> + <comment>Moved from taskpanel.xhp - the described controls belong on the Master Page sidebar</comment> <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_CURRENT" id="bm_id2108523" localize="false"/> <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_RECENT" id="bm_id433362" localize="false"/> @@ -82,8 +105,9 @@ <paragraph role="paragraph" id="par_idN10785" xml-lang="en-US"><ahelp hid="." visibility="hidden">Resizes the preview of the master slides.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS" id="bm_id6526688" localize="false"/> <paragraph role="paragraph" id="par_idN107CB" xml-lang="en-US"><ahelp hid="." visibility="hidden">Click to apply a slide design to all selected slides. Right-click for a context menu.</ahelp></paragraph> -<embed href="text/shared/00/00000004.xhp#related"/> -<embed href="text/simpress/guide/background.xhp#background"/> -<paragraph role="paragraph" id="par_id3149941" xml-lang="en-US"><link href="text/simpress/01/05100000.xhp" name="Styles">Styles</link></paragraph> +<section id="relatedtopics"> + <embed href="text/simpress/guide/background.xhp#background"/> + <paragraph role="paragraph" id="par_id3149941" xml-lang="en-US"><link href="text/simpress/01/05100000.xhp" name="Styles">Styles</link></paragraph> +</section> </body> </helpdocument> |