This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 85b2fe493216603bd85da9da2d0e92e71344ee61 Author: mseidel <[email protected]> AuthorDate: Mon Aug 10 20:00:51 2020 +0200 Resized dialog for custom slideshows (cherry picked from commit 594a32bbe94f2c10f14af2c93221b638f9752e1f) --- .../source/text/simpress/01/06100100.xhp | 42 +++++++++++----------- .../source/text/simpress/guide/individual.xhp | 10 +++--- main/sd/source/ui/dlg/custsdlg.src | 24 ++++++------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/main/helpcontent2/source/text/simpress/01/06100100.xhp b/main/helpcontent2/source/text/simpress/01/06100100.xhp index 05cfc8c..ae0c285 100644 --- a/main/helpcontent2/source/text/simpress/01/06100100.xhp +++ b/main/helpcontent2/source/text/simpress/01/06100100.xhp @@ -2,7 +2,7 @@ <!--*********************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -10,18 +10,20 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * ***********************************************************--> + + <helpdocument version="1.0"> <meta> <topic id="textsimpress0106100100xml" indexer="include" status="PUBLISH"> @@ -34,22 +36,20 @@ </history> </meta> <body> - - - <paragraph role="heading" level="1" id="hd_id3154020" l10n="U" xml-lang="en-US" oldref="1">Define Custom Slide Show</paragraph> - <paragraph id="par_id3154659" l10n="U" role="paragraph" oldref="2" xml-lang="en-US"><variable id="neu"><ahelp hid="" visibility="visible">Creates a custom slide show.</ahelp></variable><comment>called from 06100000, so do not delete avis/aend!!!</comment></paragraph> - <section id="howtoget"> - <embed href="text/simpress/00/00000406.xhp#neuprae"/> +<paragraph role="heading" level="1" id="hd_id3154020" l10n="U" xml-lang="en-US" oldref="1">Define Custom Slide Show</paragraph> +<paragraph id="par_id3154659" l10n="U" role="paragraph" oldref="2" xml-lang="en-US"><variable id="neu"><ahelp hid="" visibility="visible">Creates a custom slide show.</ahelp></variable><comment>called from 06100000, so do not delete avis/aend!!!</comment></paragraph> +<section id="howtoget"> +<embed href="text/simpress/00/00000406.xhp#neuprae"/> </section> - <embed href="text/simpress/guide/individual.xhp#individual"/> - <paragraph xml-lang="en-US" oldref="3" role="paragraph" id="par_id3155379" l10n="U">Select a slide and click <emph>>></emph> or <emph><<</emph> to add or remove the slide from the list.</paragraph> - <bookmark branch="hid/sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD" xml-lang="en-US" id="bm_id3148704"/><paragraph l10n="U" role="paragraph" id="par_id3156449" xml-lang="en-US" oldref="4"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_ADD">Adds an existing slide to the bottom of the <emph>Selected slides</emph> list. You need to select a slide in the <emph>Existing slides</emph> list before you can use this button.</ahelp></paragraph> - <bookmark branch="hid/sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE" xml-lang="en-US" id="bm_id3148868"/><paragraph l10n="U" role="paragraph" id="par_id3151240" xml-lang="en-US" oldref="5"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_REMOVE">Removes a slide from the <emph>Selected slides </emph>list. You need to choose a slide in the <emph>Selected slides </emph>list before you can use this button.</ahelp></paragraph> - <bookmark branch="hid/sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME" xml-lang="en-US" id="bm_id3159204"/><paragraph role="heading" level="2" id="hd_id3156018" l10n="U" xml-lang="en-US" oldref="6">Name</paragraph> - <paragraph l10n="U" role="paragraph" id="par_id3152871" xml-lang="en-US" oldref="7"><ahelp hid="SD_EDIT_DLG_DEFINE_CUSTOMSHOW_EDT_NAME" visibility="visible">Displays the name of the custom slide show. If you want, you can enter a new name.</ahelp></paragraph> - <bookmark branch="hid/sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES" xml-lang="en-US" id="bm_id3154762"/><paragraph role="heading" level="2" id="hd_id3149050" l10n="U" xml-lang="en-US" oldref="8">Existing slides</paragraph> - <paragraph l10n="U" role="paragraph" id="par_id3154767" xml-lang="en-US" oldref="9"><ahelp hid="SD_MULTILISTBOX_DLG_DEFINE_CUSTOMSHOW_LB_PAGES" visibility="visible">Lists all of the slides in the order in which they appear in the current document.</ahelp></paragraph> - <bookmark branch="hid/SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL" xml-lang="en-US" id="bm_id3145118"/><paragraph role="heading" level="2" id="hd_id3146965" l10n="U" xml-lang="en-US" oldref="10">Selected slides</paragraph> - <paragraph l10n="U" role="paragraph" id="par_id3149874" xml-lang="en-US" oldref="11"><ahelp hid="HID_DLG_DEFINE_CUSTOMSHOW_CTL" visibility="visible">Lists all of the slides in the custom slide show. If you want, you can change the order of the list by dragging the slides up or down.</ahelp></paragraph> - </body> +<embed href="text/simpress/guide/individual.xhp#individual"/> +<paragraph xml-lang="en-US" oldref="3" role="paragraph" id="par_id3155379" l10n="U">Select a slide and click <emph>></emph> or <emph><</emph> to add or remove the slide from the list.</paragraph> +<bookmark branch="hid/sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD" xml-lang="en-US" id="bm_id3148704"/><paragraph l10n="U" role="paragraph" id="par_id3156449" xml-lang="en-US" oldref="4"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_ADD">Adds an existing slide to the bottom of the <emph>Selected slides</emph> list. You need to select a slide in the <emph>Existing slides</emph> list before you can use this button.</ahelp></paragraph> +<bookmark branch="hid/sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE" xml-lang="en-US" id="bm_id3148868"/><paragraph l10n="U" role="paragraph" id="par_id3151240" xml-lang="en-US" oldref="5"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_REMOVE">Removes a slide from the <emph>Selected slides </emph>list. You need to choose a slide in the <emph>Selected slides </emph>list before you can use this button.</ahelp></paragraph> +<bookmark branch="hid/sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME" xml-lang="en-US" id="bm_id3159204"/><paragraph role="heading" level="2" id="hd_id3156018" l10n="U" xml-lang="en-US" oldref="6">Name</paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3152871" xml-lang="en-US" oldref="7"><ahelp hid="SD_EDIT_DLG_DEFINE_CUSTOMSHOW_EDT_NAME" visibility="visible">Displays the name of the custom slide show. If you want, you can enter a new name.</ahelp></paragraph> +<bookmark branch="hid/sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES" xml-lang="en-US" id="bm_id3154762"/><paragraph role="heading" level="2" id="hd_id3149050" l10n="U" xml-lang="en-US" oldref="8">Existing slides</paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3154767" xml-lang="en-US" oldref="9"><ahelp hid="SD_MULTILISTBOX_DLG_DEFINE_CUSTOMSHOW_LB_PAGES" visibility="visible">Lists all of the slides in the order in which they appear in the current document.</ahelp></paragraph> +<bookmark branch="hid/SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL" xml-lang="en-US" id="bm_id3145118"/><paragraph role="heading" level="2" id="hd_id3146965" l10n="U" xml-lang="en-US" oldref="10">Selected slides</paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3149874" xml-lang="en-US" oldref="11"><ahelp hid="HID_DLG_DEFINE_CUSTOMSHOW_CTL" visibility="visible">Lists all of the slides in the custom slide show. If you want, you can change the order of the list by dragging the slides up or down.</ahelp></paragraph> +</body> </helpdocument> diff --git a/main/helpcontent2/source/text/simpress/guide/individual.xhp b/main/helpcontent2/source/text/simpress/guide/individual.xhp index a11a2fa..08954b2 100644 --- a/main/helpcontent2/source/text/simpress/guide/individual.xhp +++ b/main/helpcontent2/source/text/simpress/guide/individual.xhp @@ -2,7 +2,7 @@ <!--*********************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -10,16 +10,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * ***********************************************************--> @@ -56,7 +56,7 @@ <paragraph role="listitem" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="62">Click <emph>New</emph> and enter a name for your slide show in the <emph>Name </emph>box.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3150249" xml-lang="en-US" l10n="U" oldref="73">Under <emph>Existing Slides</emph>, select the slides you want to add to your slide show, and click the <emph>>></emph> button. Hold down Shift to select a range of slides, or Ctrl to select multiple slides.</paragraph> +<paragraph role="listitem" id="par_id3150249" xml-lang="en-US" l10n="U" oldref="73">Under <emph>Existing Slides</emph>, select the slides you want to add to your slide show, and click the <emph>></emph> button. Hold down Shift to select a range of slides, or Ctrl to select multiple slides.</paragraph> </listitem> </list> <paragraph role="listitem" id="par_id3153916" xml-lang="en-US" l10n="U" oldref="64">You can change the order of the slides in your custom slide show, by dragging and dropping the slides under <emph>Selected Slides</emph>.</paragraph> diff --git a/main/sd/source/ui/dlg/custsdlg.src b/main/sd/source/ui/dlg/custsdlg.src index 282b846..675aa68 100644 --- a/main/sd/source/ui/dlg/custsdlg.src +++ b/main/sd/source/ui/dlg/custsdlg.src @@ -112,25 +112,25 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW HelpID = HID_DLG_DEFINE_CUSTOMSHOW ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 248, 117 ) ; + Size = MAP_APPFONT ( 248, 147 ) ; Moveable = TRUE ; Closeable = TRUE ; OKButton BTN_OK { - Pos = MAP_APPFONT ( 187, 6 ) ; + Pos = MAP_APPFONT ( 188, 6 ) ; Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; DefButton = TRUE ; }; CancelButton BTN_CANCEL { - Pos = MAP_APPFONT ( 187, 23 ) ; + Pos = MAP_APPFONT ( 188, 23 ) ; Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; }; HelpButton BTN_HELP { - Pos = MAP_APPFONT ( 187, 43 ) ; + Pos = MAP_APPFONT ( 188, 43 ) ; Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; }; @@ -145,7 +145,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW HelpID = "sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME" ; Border = TRUE ; Pos = MAP_APPFONT ( 38, 6 ) ; - Size = MAP_APPFONT ( 141, 12 ) ; + Size = MAP_APPFONT ( 140, 12 ) ; TabStop = TRUE ; }; MultiListBox LB_PAGES @@ -153,16 +153,16 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW HelpID = "sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES" ; Border = TRUE ; Pos = MAP_APPFONT ( 6, 35 ) ; - Size = MAP_APPFONT ( 75, 75 ) ; + Size = MAP_APPFONT ( 75, 105 ) ; TabStop = TRUE ; SimpleMode = TRUE ; }; PushButton BTN_ADD { HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD" ; - Pos = MAP_APPFONT ( 84, 67 ) ; + Pos = MAP_APPFONT ( 85, 71 ) ; Size = MAP_APPFONT ( 14, 14 ) ; - Text = "~>>" ; + Text = "~>" ; TabStop = TRUE ; }; Control LB_CUSTOM_PAGES @@ -170,21 +170,21 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW HelpID = HID_DLG_DEFINE_CUSTOMSHOW_CTL ; Border = TRUE ; Pos = MAP_APPFONT ( 103, 35 ) ; - Size = MAP_APPFONT ( 75, 75 ) ; + Size = MAP_APPFONT ( 75, 105 ) ; TabStop = TRUE ; }; PushButton BTN_REMOVE { HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE" ; - Pos = MAP_APPFONT ( 84, 95 ) ; + Pos = MAP_APPFONT ( 85, 89 ) ; Size = MAP_APPFONT ( 14, 14 ) ; - Text = "~<<" ; + Text = "~<" ; TabStop = TRUE ; }; FixedText FT_PAGES { Pos = MAP_APPFONT ( 6, 24 ) ; - Size = MAP_APPFONT ( 83, 10 ) ; + Size = MAP_APPFONT ( 80, 10 ) ; Text [ en-US ] = "Existing slides" ; }; FixedText FT_CUSTOM_PAGES
