source/text/shared/guide/startcenter.xhp | 60 ++++++++++++++++++++-----------
source/text/swriter/01/mailmerge03.xhp | 2 +
2 files changed, 42 insertions(+), 20 deletions(-)
New commits:
commit 8f80dbc1121b3d95df2b2f74501a1657f5cecd5b
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Sun Jun 18 17:51:01 2017 +0200
tdf#73229 Update Start Center page
Sync with current UI
Document all buttons and features
Change-Id: Id9c8354a408d499067c42ca06ced00841b56c134
Reviewed-on: https://gerrit.libreoffice.org/38931
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/shared/guide/startcenter.xhp
b/source/text/shared/guide/startcenter.xhp
index e07b66ce3..9d9ad5442 100644
--- a/source/text/shared/guide/startcenter.xhp
+++ b/source/text/shared/guide/startcenter.xhp
@@ -31,58 +31,78 @@
<bookmark_value>start center</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/FWK_HID_BACKINGWINDOW"
id="bm_id0820200802550234" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/StartCenter"
id="bm_id0820200802550237" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/help"
id="bm_id0820200802550235" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/extensions"
id="bm_id0820200802550236" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/all_recent"
id="bm_id0820200802550238" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/StartCenter"
id="bm_id0820200802550237" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id0820200802524447" role="heading"
level="1"><variable id="startcenter"><link
href="text/shared/guide/startcenter.xhp">Start Center</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id0820200803204063"
role="paragraph">Welcome to %PRODUCTNAME.
Thank you for using the %PRODUCTNAME <link
href="text/shared/05/00000110.xhp">application help</link>.
Press F1 whenever you need help using the %PRODUCTNAME
software.</paragraph>
<paragraph xml-lang="en-US" id="par_id0820200802524413" role="paragraph">You
see the Start Center when no document is open in %PRODUCTNAME.
- It is divided into two panes. <ahelp hid=".">Click an icon on the left pane
to open a new document or a file dialog.</ahelp>
+ It is divided into two panes. <ahelp hid=".">Click a button on the left
pane to open a new document or a file dialog.</ahelp>
</paragraph>
+<paragraph xml-lang="en-US" id="par_id082020080310498" role="heading"
level="2">Open existing files</paragraph>
+ <list type="ordered">
+ <listitem>
+ <bookmark xml-lang="en-US"
branch="hid/sfx/ui/startcenter/open_all" id="bm_id1022200910595546"
localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id082020080310500"
role="paragraph"><ahelp hid=".">The <emph>Open File</emph> button presents a
<link href="text/shared/guide/doc_open.xhp">file open</link>
dialog.</ahelp></paragraph>
+ </listitem>
+ <listitem>
+ <bookmark xml-lang="en-US"
branch="hid/sfx/ui/startcenter/open_remote" id="bm_id1022200910595547"
localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id082020080310502"
role="paragraph"><ahelp hid=".">The <emph>Remote Files</emph> button presents a
<link href="text/shared/guide/cmis-remote-files.xhp">Remote files</link> dialog
to open files stored on remote servers.</ahelp></paragraph>
+ </listitem>
+ <listitem>
+ <bookmark xml-lang="en-US"
branch="hid/sfx/ui/startcenter/open_recent" id="bm_id1022200910595545"
localize="false"/>
+ <bookmark xml-lang="en-US"
branch="hid/sfx/ui/startcenter/all_recent" id="bm_id0820200802550238"
localize="false"/>
+ <bookmark xml-lang="en-US"
branch="hid/sfx/ui/startcenter/local_view" id="bm_id0820200802550239"
localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id0820200802525413"
role="paragraph"><ahelp hid=".">The <emph>Recent Files</emph> button shows
thumbnails of the most recent documents you opened.</ahelp> Hover your mouse
over the thumbnail to highlight the document, display a tip about the document
location and display an icon on the top right to delete the thumbnail from the
pane and from the recent files list. Click on the thumbnail to open the
document underneath.</paragraph>
+<paragraph role="tip" xml-lang="en-US" id="par_id0820200802626414">Press and
hold the <emph>Recent Files</emph> dropdown button to open a menu where you can
delete the list of recently opened documents.</paragraph>
+ </listitem>
+ <listitem>
+ <bookmark xml-lang="en-US"
branch="hid/sfx/ui/startcenter/templates_all" id="bm_id1022200910584084"
localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id0820200803105045"
role="paragraph"><ahelp hid=".">Click the <emph>Templates</emph> dropdown
button to display all existing templates on the right side of the
window.</ahelp></paragraph>
+<paragraph role="tip" xml-lang="en-US" id="par_id0820200802626412">Press and
hold the <emph>Templates</emph> dropdown button to open a menu where you can
filter the existing templates by document type or open the <link
href="text/shared/guide/template_manager.xhp">Templates</link>
dialog.</paragraph>
+<paragraph role="tip" xml-lang="en-US" id="par_id0820200802626416">Right click
on a template in the right pane to open a menu where you can either open the
template to create a new document based on the template or edit the template
itself.</paragraph>
+ </listitem>
+ </list>
+<paragraph xml-lang="en-US" id="par_id082020080310499" role="heading"
level="2">Create:</paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/writer_all"
id="bm_id1022200910564632" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/calc_all"
id="bm_id1022200910570124" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/draw_all"
id="bm_id1022200910571273" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/impress_all"
id="bm_id102220091057270" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/database_all"
id="bm_id102220091057437" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/math_all"
id="bm_id1022200910575575" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0820200803104810"
role="paragraph"><ahelp hid=".">The document icons each open a new document of
the specified type.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0820200803104810"
role="paragraph"><ahelp hid=".">The document buttons each open a new document
of the specified type.</ahelp></paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id0820200803104978"
role="paragraph">
- <emph>Text Document</emph> opens %PRODUCTNAME <link
href="text/swriter/main0000.xhp">Writer</link></paragraph>
+ <emph>Writer Document</emph> opens %PRODUCTNAME <link
href="text/swriter/main0000.xhp">Writer</link></paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id0820200803104998"
role="paragraph">
- <emph>Spreadsheet</emph> opens %PRODUCTNAME <link
href="text/scalc/main0000.xhp">Calc</link></paragraph>
+ <emph>Calc Spreadsheet</emph> opens %PRODUCTNAME <link
href="text/scalc/main0000.xhp">Calc</link></paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id0820200803104927"
role="paragraph">
- <emph>Presentation</emph> opens %PRODUCTNAME <link
href="text/simpress/main0000.xhp">Impress</link></paragraph>
+ <emph>Impress Presentation</emph> opens %PRODUCTNAME <link
href="text/simpress/main0000.xhp">Impress</link></paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id0820200803104948"
role="paragraph">
- <emph>Drawing</emph> opens %PRODUCTNAME <link
href="text/sdraw/main0000.xhp">Draw</link></paragraph>
+ <emph>Draw Drawing</emph> opens %PRODUCTNAME <link
href="text/sdraw/main0000.xhp">Draw</link></paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id0820200803105089"
role="paragraph">
- <emph>Database</emph> opens %PRODUCTNAME <link
href="text/shared/explorer/database/main.xhp">Base</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0820200803105015"
role="paragraph">
+ <emph>Math Formula</emph> opens %PRODUCTNAME <link
href="text/smath/main0000.xhp">Math</link></paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id0820200803105015"
role="paragraph">
- <emph>Formula</emph> opens %PRODUCTNAME <link
href="text/smath/main0000.xhp">Math</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0820200803105089"
role="paragraph">
+ <emph>Base Database</emph> opens %PRODUCTNAME <link
href="text/shared/explorer/database/main.xhp">Base</link></paragraph>
</listitem>
</list>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/templates_all"
id="bm_id1022200910584084" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id1022200911011855"
role="paragraph"><ahelp hid="." visibility="hidden">The Templates icon opens
the Templates dialog.</ahelp></paragraph>
-<paragraph xml-lang="en-US" id="par_id0820200803105045" role="paragraph">The
<emph>Templates</emph> icon opens the <link
href="text/shared/guide/aaa_start.xhp">Templates</link> dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/open_all"
id="bm_id1022200910595546" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id1022200911011975"
role="paragraph"><ahelp hid="." visibility="hidden">The Open a Document icon
presents a file open dialog.</ahelp></paragraph>
-<paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph">The
<emph>Open a document</emph> icon presents a <link
href="text/shared/guide/doc_open.xhp">file open</link>
dialog.</paragraph><comment>the four icons show a short explanation
already</comment>
-<paragraph xml-lang="en-US" id="par_id0820200802525413" role="paragraph">The
right pane contains thumbnails of the most recent documents you opened. Hover
your mouse over the thumbnail to highlight the document, display a tip about
the document location and display an icon on the top right to delete the
thumbnail from the pane and from the recent files list. Click on the thumbnail
to open the document underneath.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/startcenter/extensions"
id="bm_id0820200802550233" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id082020080310501" role="paragraph"><ahelp
hid=".">The <emph>Extensions</emph> button opens the <link
href="https://extensions.libreoffice.org/";>https://extensions.libreoffice.org/</link>
page, where you can download templates and additional features for
%PRODUCTNAME.</ahelp></paragraph>
+
<paragraph role="warning" xml-lang="en-US" id="par_id0820200802626413">Not
every file type will display a thumbnail image of its content. Instead, you may
see a large icon used by your computer for that filetype.</paragraph>
</body>
</helpdocument>
commit 5e623a924db3b7de6c39419f1a7b764a23de1b96
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Wed Jun 7 22:57:40 2017 +0200
tdf#98799 tdf#102930 Document the logic of the MM wizard 3rd page
On the Insert Address Block page after selecting the 2nd substep
one has to match the address elements of the document with
fields of the data source.
Otherwise one cannot continue to the next step or close the wizard.
Try to convey these as warnings on the page.
Change-Id: I98fb1c7473fec1d7c2c2b532f3a2f52bb538d606
Reviewed-on: https://gerrit.libreoffice.org/38546
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/swriter/01/mailmerge03.xhp
b/source/text/swriter/01/mailmerge03.xhp
index 807d7e5a4..85a45cbf9 100644
--- a/source/text/swriter/01/mailmerge03.xhp
+++ b/source/text/swriter/01/mailmerge03.xhp
@@ -46,6 +46,7 @@
<paragraph role="paragraph" id="par_idN10581" xml-lang="en-US"><ahelp
hid=".">Adds an address block to the mail merge document.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/settingspreview"
id="bm_id934477" localize="false"/>
<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US"><ahelp
hid=".">Select the address block layout that you want to
use.</ahelp></paragraph>
+<paragraph role="warning" id="par_id7805416" xml-lang="en-US">If you select
<emph>This document shall contain an address block</emph>, the third and fourth
substeps become enabled on this page. Then you have to match the <link
href="text/swriter/01/mailmerge03.xhp">address block elements</link> and the
<link href="text/swriter/01/mm_matfie.xhp">field names</link> used in the
mail.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/hideempty" id="bm_id59205"
localize="false"/>
<paragraph role="heading" id="hd_id9355754" xml-lang="en-US"
level="3">Suppress lines with just empty fields</paragraph>
<paragraph role="paragraph" id="par_id3109225" xml-lang="en-US"><ahelp
hid=".">Enable to leave empty lines out of the address.</ahelp></paragraph>
@@ -55,6 +56,7 @@
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/assign" id="bm_id8653523"
localize="false"/>
<paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="3">Match
fields</paragraph>
<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US"><ahelp
hid=".">Opens the <link href="text/swriter/01/mm_matfie.xhp">Match
Fields</link> dialog.</ahelp></paragraph>
+<paragraph role="warning" id="par_id7805417" xml-lang="en-US">Unless all
address elements are matched with a column header, you cannot finish the Mail
Merge wizard with the <emph>Finish</emph> button or continue to the <link
href="text/swriter/01/mailmerge04.xhp">fourth step</link> of the
wizard.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/addresspreview"
id="bm_id8653524" localize="false"/>
<paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US"><ahelp hid="."
visibility="hidden">Shows a preview of the address block template filled with
data.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/prev" id="bm_id2950224"
localize="false"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
