AllLangHelp_sdatabase.mk | 2 ++ AllLangHelp_shared.mk | 2 -- source/text/sdatabase/04000000.xhp | 18 +++++++----------- source/text/sdatabase/04030000.xhp | 12 ++++-------- source/text/shared/02/01170500.xhp | 2 +- source/text/shared/02/01171000.xhp | 2 +- source/text/shared/guide/database_main.xhp | 2 +- source/text/shared/main0213.xhp | 2 +- 8 files changed, 17 insertions(+), 25 deletions(-)
New commits: commit c1b3e8ec874a7d3fa2463a17bd55452315cec6df Author: Olivier Hallot <[email protected]> AuthorDate: Tue Oct 27 08:26:29 2020 -0300 Commit: Olivier Hallot <[email protected]> CommitDate: Tue Oct 27 13:13:00 2020 +0100 Refactor database Help pages Move pages to proper Help module (WIP) Change-Id: I15fce44e0f066439db88175d1fd3754f4b618e23 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104880 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk index 45fff73e8..05c6b48a9 100644 --- a/AllLangHelp_sdatabase.mk +++ b/AllLangHelp_sdatabase.mk @@ -21,6 +21,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\ helpcontent2/source/text/sdatabase/02000002 \ helpcontent2/source/text/sdatabase/02010100 \ helpcontent2/source/text/sdatabase/02010101 \ + helpcontent2/source/text/sdatabase/04000000 \ + helpcontent2/source/text/sdatabase/04030000 \ helpcontent2/source/text/sdatabase/toolbars \ )) diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index a55d39e6f..888d70baf 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -861,8 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ )) $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ - helpcontent2/source/text/shared/explorer/database/04000000 \ - helpcontent2/source/text/shared/explorer/database/04030000 \ helpcontent2/source/text/shared/explorer/database/05000000 \ helpcontent2/source/text/shared/explorer/database/05000001 \ helpcontent2/source/text/shared/explorer/database/05000003 \ diff --git a/source/text/shared/explorer/database/04000000.xhp b/source/text/sdatabase/04000000.xhp similarity index 67% rename from source/text/shared/explorer/database/04000000.xhp rename to source/text/sdatabase/04000000.xhp index ba25e9281..454f308d5 100644 --- a/source/text/shared/explorer/database/04000000.xhp +++ b/source/text/sdatabase/04000000.xhp @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - <!-- * This file is part of the LibreOffice project. * @@ -18,13 +16,11 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - <helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabase04000000xml" indexer="exclude" status="PUBLISH"> <title id="tit" xml-lang="en-US">Forms</title> -<filename>/text/shared/explorer/database/04000000.xhp</filename> +<filename>/text/sdatabase/04000000.xhp</filename> </topic> <history> <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> @@ -32,25 +28,25 @@ </meta> <body> <section id="forms"> -<paragraph role="heading" id="hd_id3150476" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/04000000.xhp" name="Forms">Forms</link></paragraph> +<h1 id="hd_id3150476"><link href="text/sdatabase/04000000.xhp" name="Forms">Forms</link></h1> <bookmark xml-lang="en-US" branch="index" id="bm_id3156136"><bookmark_value>forms; general information (Base)</bookmark_value> </bookmark><comment>mw added "(Base)"</comment> <paragraph role="paragraph" id="par_id3156136" xml-lang="en-US">Forms can be used to enter or to edit existing database contents easily.</paragraph> </section> -<paragraph role="heading" id="hd_id3157910" xml-lang="en-US" level="2"><link href="text/shared/autopi/01090000.xhp" name="Form Wizard">FormWizard</link></paragraph> -<paragraph role="heading" id="hd_id3156003" xml-lang="en-US" level="2"><link href="text/shared/02/01170000.xhp" name="Form Controls">Form Controls</link></paragraph> +<h2 id="hd_id3157910"><link href="text/shared/autopi/01090000.xhp" name="Form Wizard">FormWizard</link></h2> +<h2 id="hd_id3156003"><link href="text/shared/02/01170000.xhp" name="Form Controls">Form Controls</link></h2> <paragraph role="paragraph" id="par_id3156156" xml-lang="en-US">The Form Controls toolbar provides the tools required to create a form in a text, table, drawing, or presentation document.</paragraph> -<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2"><link href="text/shared/explorer/database/04030000.xhp" name="Form in Design Mode">Form in Design Mode</link></paragraph> +<h2 id="hd_id3155388"><link href="text/sdatabase/04030000.xhp" name="Form in Design Mode">Form in Design Mode</link></h2> <paragraph role="paragraph" id="par_id3150504" xml-lang="en-US">In design mode, the form is designed and the properties of the form and the controls contained in it are defined.</paragraph> <embed href="text/shared/02/12100200.xhp#datensatzsuche"/> <embed href="text/shared/02/12100200.xhp#suchentext"/> -<paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="2"><link href="text/shared/main0213.xhp" name="Sorting and Filtering Data">Sorting and Filtering Data</link></paragraph> +<h2 id="hd_id3149784"><link href="text/shared/main0213.xhp" name="Sorting and Filtering Data">Sorting and Filtering Data</link></h2> <paragraph role="paragraph" id="par_id3151384" xml-lang="en-US">You will find the sorting and filter functions in the toolbar when you open a form in user mode.</paragraph> <switch select="sys"> <case select="MAC"> </case> <default> -<paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="2"><link href="text/shared/02/01170203.xhp" name="Subforms">Subforms</link></paragraph> +<h2 id="hd_id3148944"><link href="text/shared/02/01170203.xhp" name="Subforms">Subforms</link></h2> <embed href="text/shared/02/01170203.xhp#wozu"/> </default> </switch> diff --git a/source/text/shared/explorer/database/04030000.xhp b/source/text/sdatabase/04030000.xhp similarity index 91% rename from source/text/shared/explorer/database/04030000.xhp rename to source/text/sdatabase/04030000.xhp index 2cbf9da84..dba9ddaff 100644 --- a/source/text/shared/explorer/database/04030000.xhp +++ b/source/text/sdatabase/04030000.xhp @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> - - +<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * @@ -18,13 +16,11 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - <helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabase04030000xml" indexer="exclude" status="PUBLISH"> <title id="tit" xml-lang="en-US">Form Design</title> -<filename>/text/shared/explorer/database/04030000.xhp</filename> +<filename>/text/sdatabase/04030000.xhp</filename> </topic> <history> <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> @@ -33,8 +29,8 @@ <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3148668"><bookmark_value>forms; designing (Base)</bookmark_value> </bookmark><comment>mw added "(Base)"</comment> -<paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="1"><variable id="formularentwurf"><link href="text/shared/explorer/database/04030000.xhp" name="Form Design">Form Design</link> -</variable></paragraph> +<h1 id="hd_id3148668"><variable id="formularentwurf"><link href="text/sdatabase/04030000.xhp" name="Form Design">Form Design</link> +</variable></h1> <paragraph role="paragraph" id="par_id3154230" xml-lang="en-US">Any $[officename] document can be expanded into a form. Simply add one or more form controls.</paragraph> <paragraph role="paragraph" id="par_id3145382" xml-lang="en-US">Open the Form Controls toolbar. The Form Controls toolbar contains the <link href="text/shared/02/01170000.xhp" name="functions">functions</link> needed to edit a form. More functions can be found in the <emph>Form Design</emph> bar and <emph>More Controls</emph> bar.</paragraph> <paragraph role="paragraph" id="par_id3153146" xml-lang="en-US">In form design mode you can <link href="text/shared/02/01170000.xhp" name="include controls">include controls</link>, <link href="text/shared/02/01170100.xhp" name="apply properties">apply properties</link> to them, define <link href="text/shared/02/01170200.xhp" name="Form properties">Form properties</link>, and <link href="text/shared/02/01170203.xhp" name="define subforms">define subforms</link>.</paragraph> diff --git a/source/text/shared/02/01170500.xhp b/source/text/shared/02/01170500.xhp index f31ae3aa0..23029402e 100644 --- a/source/text/shared/02/01170500.xhp +++ b/source/text/shared/02/01170500.xhp @@ -34,7 +34,7 @@ <bookmark xml-lang="en-US" branch="hid/.uno:SwitchControlDesignMode" id="bm_id3153255" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:SwitchXFormsDesignMode" id="bm_id1942197" localize="false"/> <paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1"><link href="text/shared/02/01170500.xhp" name="Design Mode On/Off">Design Mode On/Off</link></paragraph> -<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US"><ahelp hid=".">Toggles the Design mode on or off. This function is used to switch quickly between <link href="text/shared/explorer/database/04030000.xhp" name="Design">Design</link> and User mode. Activate to edit the form controls, deactivate to use the form controls.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US"><ahelp hid=".">Toggles the Design mode on or off. This function is used to switch quickly between <link href="text/sdatabase/04030000.xhp" name="Design">Design</link> and User mode. Activate to edit the form controls, deactivate to use the form controls.</ahelp></paragraph> </section> <section id="howtoget"> <embed href="text/shared/00/00040501.xhp#design"/> diff --git a/source/text/shared/02/01171000.xhp b/source/text/shared/02/01171000.xhp index 05a142e50..78c6bbee3 100644 --- a/source/text/shared/02/01171000.xhp +++ b/source/text/shared/02/01171000.xhp @@ -39,7 +39,7 @@ </bookmark> <bookmark xml-lang="en-US" branch="hid/.uno:OpenReadOnly" id="bm_id3148520" localize="false"/> <paragraph role="heading" id="hd_id3156211" xml-lang="en-US" level="1"><link href="text/shared/02/01171000.xhp" name="Open in Design Mode">Open in Design Mode</link></paragraph> -<paragraph role="paragraph" id="par_id3146130" xml-lang="en-US"><ahelp hid=".uno:OpenReadOnly">Opens forms in <link href="text/shared/explorer/database/04030000.xhp" name="Design Mode">Design Mode</link> so that the form can be edited.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3146130" xml-lang="en-US"><ahelp hid=".uno:OpenReadOnly">Opens forms in <link href="text/sdatabase/04030000.xhp" name="Design Mode">Design Mode</link> so that the form can be edited.</ahelp></paragraph> </section> <paragraph role="paragraph" id="par_id3155805" xml-lang="en-US">You cannot activate the controls of the form or edit contents of database records in Design Mode. However, you can change the position and size of the controls, edit other properties, and add or delete controls in Design Mode.</paragraph> <section id="howtoget"> diff --git a/source/text/shared/guide/database_main.xhp b/source/text/shared/guide/database_main.xhp index 612e8ee32..d5249088f 100644 --- a/source/text/shared/guide/database_main.xhp +++ b/source/text/shared/guide/database_main.xhp @@ -47,7 +47,7 @@ <paragraph role="paragraph" id="par_id3150398" xml-lang="en-US"><link href="text/shared/01/04180100.xhp" name="View data source contents">View data source contents</link></paragraph> <paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US"><link href="text/shared/explorer/database/menubar.xhp">Menu bar of a database file</link></paragraph> <paragraph role="heading" id="hd_id3154123" xml-lang="en-US" level="2">Forms and Reports</paragraph> -<paragraph role="paragraph" id="par_id3154909" xml-lang="en-US"><link href="text/shared/explorer/database/04030000.xhp" name="Create new form document">Create new form document</link>, <link href="text/shared/02/01170000.xhp" name="edit form functions">edit form controls</link>, <link href="text/shared/autopi/01090000.xhp">Form Wizard</link></paragraph> +<paragraph role="paragraph" id="par_id3154909" xml-lang="en-US"><link href="text/sdatabase/04030000.xhp" name="Create new form document">Create new form document</link>, <link href="text/shared/02/01170000.xhp" name="edit form functions">edit form controls</link>, <link href="text/shared/autopi/01090000.xhp">Form Wizard</link></paragraph> <paragraph role="paragraph" id="par_id3152920" xml-lang="en-US"><link href="text/shared/02/01170500.xhp" name="entering data versus editing form">Entering data versus editing form</link></paragraph> <paragraph role="paragraph" id="par_id3151380" xml-lang="en-US"><link href="text/shared/autopi/01100000.xhp" name="Report AutoPilot">Report Wizard</link></paragraph> <embed href="text/shared/guide/data_report.xhp#data_report"/> diff --git a/source/text/shared/main0213.xhp b/source/text/shared/main0213.xhp index 359c25412..b5625fadd 100644 --- a/source/text/shared/main0213.xhp +++ b/source/text/shared/main0213.xhp @@ -42,7 +42,7 @@ </section> <paragraph role="paragraph" id="par_id3157958" xml-lang="en-US">You can use the <emph>Form Navigation</emph> bar to move within records as well as to insert and to delete records. If data is saved in a form, the changes are transferred to the database. The <emph>Form Navigation</emph> bar also contains sort, filter, and search functions for data records.</paragraph> <paragraph role="tip" id="par_idN10717" xml-lang="en-US">You can use the Navigation bar icon on the <link href="text/shared/02/01170000.xhp">More Controls </link> bar to add a Navigation bar to a form.</paragraph> -<paragraph role="note" id="par_id3157910" xml-lang="en-US">The Navigation bar is only visible for forms connected to a database. In the <link href="text/shared/explorer/database/04030000.xhp" name="Design view">Design view</link> of a form, the Navigation bar is not available. See also <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph> +<paragraph role="note" id="par_id3157910" xml-lang="en-US">The Navigation bar is only visible for forms connected to a database. In the <link href="text/sdatabase/04030000.xhp" name="Design view">Design view</link> of a form, the Navigation bar is not available. See also <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph> <paragraph role="paragraph" id="par_id3153880" xml-lang="en-US">You can control the view of data with the sorting and filtering functions. Original tables are not changed.</paragraph> <paragraph role="paragraph" id="par_id3153062" xml-lang="en-US">The current sort order or filter is saved with the current document. If a filter is set, the <emph>Apply Filter</emph> icon on the <emph>Navigation</emph> bar is activated. Sorting and filtering features in the document can also be configured in the <emph>Form Properties</emph> dialog. (Choose <emph>Form Properties - Data</emph> - properties <link href="text/shared/02/01170203.xhp" name="Sort"><emph>Sort</emph></link> and <link href="text/shared/02/01170203.xhp" name="Filter"><emph>Filter</emph></link>).</paragraph> <paragraph role="note" id="par_id3149810" xml-lang="en-US">If an SQL statement is the basis for a form (see <emph>Form Properties</emph> - tab <emph>Data</emph> - <link href="text/shared/02/01170203.xhp" name="Data Source"><emph>Data Source</emph></link>), then the filter and sort functions are only available when the SQL statement refers to only one table and is not written in the native SQL mode.</paragraph> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
