From 04bef9c48889b4da6f332b1b31a9b45227b52c32 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Thu, 18 Nov 2021 15:11:55 -0300 Subject: Refactor database help files Change-Id: Ie8f983d2c49f61084c456f8c7e91b41a6b5ac22a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/125491 Tested-by: Jenkins Reviewed-by: Olivier Hallot --- AllLangHelp_sdatabase.mk | 5 ++ AllLangHelp_shared.mk | 5 -- source/text/sdatabase/dabawiz02.xhp | 2 +- source/text/sdatabase/tablewizard00.xhp | 48 +++++++++++++++ source/text/sdatabase/tablewizard01.xhp | 54 +++++++++++++++++ source/text/sdatabase/tablewizard02.xhp | 63 ++++++++++++++++++++ source/text/sdatabase/tablewizard03.xhp | 63 ++++++++++++++++++++ source/text/sdatabase/tablewizard04.xhp | 54 +++++++++++++++++ .../shared/explorer/database/tablewizard00.xhp | 48 --------------- .../shared/explorer/database/tablewizard01.xhp | 54 ----------------- .../shared/explorer/database/tablewizard02.xhp | 68 ---------------------- .../shared/explorer/database/tablewizard03.xhp | 68 ---------------------- .../shared/explorer/database/tablewizard04.xhp | 57 ------------------ source/text/shared/guide/data_new.xhp | 2 +- source/text/shared/guide/data_tables.xhp | 2 +- source/text/shared/guide/database_main.xhp | 2 +- source/text/shared/guide/main.xhp | 2 +- 17 files changed, 292 insertions(+), 305 deletions(-) create mode 100644 source/text/sdatabase/tablewizard00.xhp create mode 100644 source/text/sdatabase/tablewizard01.xhp create mode 100644 source/text/sdatabase/tablewizard02.xhp create mode 100644 source/text/sdatabase/tablewizard03.xhp create mode 100644 source/text/sdatabase/tablewizard04.xhp delete mode 100644 source/text/shared/explorer/database/tablewizard00.xhp delete mode 100644 source/text/shared/explorer/database/tablewizard01.xhp delete mode 100644 source/text/shared/explorer/database/tablewizard02.xhp delete mode 100644 source/text/shared/explorer/database/tablewizard03.xhp delete mode 100644 source/text/shared/explorer/database/tablewizard04.xhp diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk index a2ad6311ef..a83735de4b 100644 --- a/AllLangHelp_sdatabase.mk +++ b/AllLangHelp_sdatabase.mk @@ -73,6 +73,11 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\ helpcontent2/source/text/sdatabase/menuinsert \ helpcontent2/source/text/sdatabase/menutools \ helpcontent2/source/text/sdatabase/menuview \ + helpcontent2/source/text/sdatabase/tablewizard00 \ + helpcontent2/source/text/sdatabase/tablewizard01 \ + helpcontent2/source/text/sdatabase/tablewizard02 \ + helpcontent2/source/text/sdatabase/tablewizard03 \ + helpcontent2/source/text/sdatabase/tablewizard04 \ )) # vim: set noet sw=4 ts=4: diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index e758a8330f..2642366a70 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -888,11 +888,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/explorer/database/rep_pagenumbers \ helpcontent2/source/text/shared/explorer/database/rep_prop \ helpcontent2/source/text/shared/explorer/database/rep_sort \ - helpcontent2/source/text/shared/explorer/database/tablewizard00 \ - helpcontent2/source/text/shared/explorer/database/tablewizard01 \ - helpcontent2/source/text/shared/explorer/database/tablewizard02 \ - helpcontent2/source/text/shared/explorer/database/tablewizard03 \ - helpcontent2/source/text/shared/explorer/database/tablewizard04 \ ,shared/explorer/database)) # vim: set noet sw=4 ts=4: diff --git a/source/text/sdatabase/dabawiz02.xhp b/source/text/sdatabase/dabawiz02.xhp index 4bb8556ae6..368bf6a156 100644 --- a/source/text/sdatabase/dabawiz02.xhp +++ b/source/text/sdatabase/dabawiz02.xhp @@ -36,7 +36,7 @@

Open the database for editing

Select to display the database file, where you can edit the database structure.

Create tables using the table wizard

-Select to call the Table Wizard after the Database Wizard is finished. +Select to call the Table Wizard after the Database Wizard is finished. diff --git a/source/text/sdatabase/tablewizard00.xhp b/source/text/sdatabase/tablewizard00.xhp new file mode 100644 index 0000000000..fd8c0b9eb0 --- /dev/null +++ b/source/text/sdatabase/tablewizard00.xhp @@ -0,0 +1,48 @@ + + + + + + + + +Table Wizard +/text/sdatabase/tablewizard00.xhp + + + +
+wizards;database tables (Base) +Table Wizard (Base) +mw added "(Base)" to all entries + +

Table Wizard

+The Table Wizard helps you to create a database table. +
+ + + + + + + + +Table Wizard - Select fields + + diff --git a/source/text/sdatabase/tablewizard01.xhp b/source/text/sdatabase/tablewizard01.xhp new file mode 100644 index 0000000000..d039a58e79 --- /dev/null +++ b/source/text/sdatabase/tablewizard01.xhp @@ -0,0 +1,54 @@ + + + + + + + + +Table Wizard - Select Fields +/text/sdatabase/tablewizard01.xhp + + + +
+

Table Wizard - Select Fields

+Select fields from the provided sample tables as a starting point to create your own table. +
+ +

Business

+Select the business category to see only business sample tables. + +

Private

+Select the private category to see only private sample tables. + +

Sample tables

+Select one of the sample tables. Then select fields from that table from the left list box. Repeat this step until you have selected all the fields that you need. + + + + + + + +

Selected Fields

+Displays all fields that will be included in the new table. +Table Wizard - Set types and formats + + diff --git a/source/text/sdatabase/tablewizard02.xhp b/source/text/sdatabase/tablewizard02.xhp new file mode 100644 index 0000000000..59f972f45a --- /dev/null +++ b/source/text/sdatabase/tablewizard02.xhp @@ -0,0 +1,63 @@ + + + + + +Table Wizard - Set Types and Formats +/text/sdatabase/tablewizard02.xhp + + + +
+

Table Wizard - Set Types and Formats

+Specifies the field information for your selected fields. +
+

Selected fields

+Select a field in order to edit the field information. + +

−

+Remove the selected field from the list box. +

+

+Add a new data field to the list box. +

Field information

+

Field name

+Displays the name of the selected data field. If you want, you can enter a new name. + +

Field type

+Select a field type. +

AutoValue

+If set to Yes, the values for this data field are generated by the database engine. +

Entry required

+If set to Yes, this field must not be empty.not in spec doc + +

Length

+Specifies the number of characters for the data field. + +

Decimal places

+Specifies the number of decimal places for the data field. This option is only available for numerical or decimal data fields. + +

Default value

+Specifies the default value for a Yes/No field. +

Auto-increment statement

+Enter the SQL command specifier that instructs the data source to auto-increment a specified Integer data field. For example, the following MySQL statement used the AUTO_INCREMENT statement to increase the "id" field each time the statement creates a data field: +CREATE TABLE "table1" ("id" INTEGER AUTO_INCREMENT) +For this example, you must enter AUTO_INCREMENT into the Auto-increment statement box. +Table Wizard - Set primary key + + diff --git a/source/text/sdatabase/tablewizard03.xhp b/source/text/sdatabase/tablewizard03.xhp new file mode 100644 index 0000000000..2862ca439c --- /dev/null +++ b/source/text/sdatabase/tablewizard03.xhp @@ -0,0 +1,63 @@ + + + + + +Table Wizard - Set Primary Key +/text/sdatabase/tablewizard03.xhp + + +UFI: new Table Wizard page 3 + + + +
+

Table Wizard - Set Primary Key

+Specifies a field in the table to be used as a primary key. +
+ +

Create a primary key

+Select to create a primary key. Add a primary key to every database table to uniquely identify each record. For some database systems within %PRODUCTNAME, a primary key is mandatory for editing the tables. + +

Automatically add a primary key

+Select to automatically add a primary key as an additional field. + +

Use an existing field as a primary key

+Select to use an existing field with unique values as a primary key. + +

Field name

+Select the field name. + + +

Auto value

+Select to automatically insert a value and increment the field's value for each new record. The database must support automatic incrementation in order to use the Auto value feature. + +

Define primary key by several fields

+Select to create a primary key from a combination of several existing fields. + +

Available fields

+Select a field and click > to add it to the list of primary key fields. + + + +

Primary key fields

+Select a field and click < to remove it from the list of primary key fields. The primary key is created as a concatenation of the fields in this list, from top to bottom. +Table Wizard - Create table + + diff --git a/source/text/sdatabase/tablewizard04.xhp b/source/text/sdatabase/tablewizard04.xhp new file mode 100644 index 0000000000..a1144970c1 --- /dev/null +++ b/source/text/sdatabase/tablewizard04.xhp @@ -0,0 +1,54 @@ + + + + + +Table Wizard - Create Table +/text/sdatabase/tablewizard04.xhp + + +UFI: new Table Wizard page 4 + + + +
+

Table Wizard - Create Table

+Enter a name for the table and specify whether you want to modify the table after the wizard is finished. +
+ +

Table name

+Specifies the table name. + +

Catalog of the table

+Select the catalog for the table. (Available only if the database supports catalogs) + +

Schema of the table

+Select the schema for the table. (Available only if the database supports schemas) + +

Modify the table design

+Select to save and edit the table design. + +

Insert data immediately

+Select to save the table design and open the table to enter data. + +

Create a form based on this table

+Select to create a form based on this table. The form is created on a text document with the last used settings of the Form Wizard. +Table Wizard + + diff --git a/source/text/shared/explorer/database/tablewizard00.xhp b/source/text/shared/explorer/database/tablewizard00.xhp deleted file mode 100644 index 767b2d0afd..0000000000 --- a/source/text/shared/explorer/database/tablewizard00.xhp +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - -Table Wizard -/text/shared/explorer/database/tablewizard00.xhp - - - -
-wizards;database tables (Base) -Table Wizard (Base) -mw added "(Base)" to all entries - -Table Wizard -The Table Wizard helps you to create a database table. -
- - - - - - - - -Table Wizard - Select fields - - diff --git a/source/text/shared/explorer/database/tablewizard01.xhp b/source/text/shared/explorer/database/tablewizard01.xhp deleted file mode 100644 index 6f02a33735..0000000000 --- a/source/text/shared/explorer/database/tablewizard01.xhp +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - -Table Wizard - Select Fields -/text/shared/explorer/database/tablewizard01.xhp - - - -
-Table Wizard - Select Fields -Select fields from the provided sample tables as a starting point to create your own table. -
- -Business -Select the business category to see only business sample tables. - -Private -Select the private category to see only private sample tables. - -Sample tables -Select one of the sample tables. Then select fields from that table from the left list box. Repeat this step until you have selected all the fields that you need. - - - - - - - -Selected Fields -Displays all fields that will be included in the new table. -Table Wizard - Set types and formats - - diff --git a/source/text/shared/explorer/database/tablewizard02.xhp b/source/text/shared/explorer/database/tablewizard02.xhp deleted file mode 100644 index ac16b4f0c6..0000000000 --- a/source/text/shared/explorer/database/tablewizard02.xhp +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - -Table Wizard - Set Types and Formats -/text/shared/explorer/database/tablewizard02.xhp - - - -
-Table Wizard - Set Types and Formats -Specifies the field information for your selected fields. -
-Selected fields -Select a field in order to edit the field information. - -− -Remove the selected field from the list box. -+ -Add a new data field to the list box. -Field information -Field name -Displays the name of the selected data field. If you want, you can enter a new name. - -Field type -Select a field type. -AutoValue -If set to Yes, the values for this data field are generated by the database engine. -Entry required -If set to Yes, this field must not be empty.not in spec doc - -Length -Specifies the number of characters for the data field. - -Decimal places -Specifies the number of decimal places for the data field. This option is only available for numerical or decimal data fields. - -Default value -Specifies the default value for a Yes/No field. -Auto-increment statement -Enter the SQL command specifier that instructs the data source to auto-increment a specified Integer data field. For example, the following MySQL statement used the AUTO_INCREMENT statement to increase the "id" field each time the statement creates a data field: -CREATE TABLE "table1" ("id" INTEGER AUTO_INCREMENT) -For this example, you must enter AUTO_INCREMENT into the Auto-increment statement box. -Table Wizard - Set primary key - - diff --git a/source/text/shared/explorer/database/tablewizard03.xhp b/source/text/shared/explorer/database/tablewizard03.xhp deleted file mode 100644 index dabf01f8c1..0000000000 --- a/source/text/shared/explorer/database/tablewizard03.xhp +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - -Table Wizard - Set Primary Key -/text/shared/explorer/database/tablewizard03.xhp - - -UFI: new Table Wizard page 3 - - - -
-Table Wizard - Set Primary Key -Specifies a field in the table to be used as a primary key. -
- -Create a primary key -Select to create a primary key. Add a primary key to every database table to uniquely identify each record. For some database systems within %PRODUCTNAME, a primary key is mandatory for editing the tables. - -Automatically add a primary key -Select to automatically add a primary key as an additional field. - -Use an existing field as a primary key -Select to use an existing field with unique values as a primary key. - -Field name -Select the field name. - - -Auto value -Select to automatically insert a value and increment the field's value for each new record. The database must support automatic incrementation in order to use the Auto value feature. - -Define primary key by several fields -Select to create a primary key from a combination of several existing fields. - -Available fields -Select a field and click > to add it to the list of primary key fields. - - - -Primary key fields -Select a field and click < to remove it from the list of primary key fields. The primary key is created as a concatenation of the fields in this list, from top to bottom. -Table Wizard - Create table - - diff --git a/source/text/shared/explorer/database/tablewizard04.xhp b/source/text/shared/explorer/database/tablewizard04.xhp deleted file mode 100644 index 627fc8a8a1..0000000000 --- a/source/text/shared/explorer/database/tablewizard04.xhp +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - -Table Wizard - Create Table -/text/shared/explorer/database/tablewizard04.xhp - - -UFI: new Table Wizard page 4 - - - -
-Table Wizard - Create Table -Enter a name for the table and specify whether you want to modify the table after the wizard is finished. -
- -Table name -Specifies the table name. - -Catalog of the table -Select the catalog for the table. (Available only if the database supports catalogs) - -Schema of the table -Select the schema for the table. (Available only if the database supports schemas) - -Modify the table design -Select to save and edit the table design. - -Insert data immediately -Select to save the table design and open the table to enter data. - -Create a form based on this table -Select to create a form based on this table. The form is created on a text document with the last used settings of the Form Wizard. -Table Wizard - - diff --git a/source/text/shared/guide/data_new.xhp b/source/text/shared/guide/data_new.xhp index 12b2820969..c334ced605 100644 --- a/source/text/shared/guide/data_new.xhp +++ b/source/text/shared/guide/data_new.xhp @@ -39,7 +39,7 @@ In the Database Wizard, select the type of database, and select the option to open the Table Wizard as the next wizard. -The Table Wizard helps you to add a table to the new database file. +The Table Wizard helps you to add a table to the new database file.
diff --git a/source/text/shared/guide/data_tables.xhp b/source/text/shared/guide/data_tables.xhp index 8b3ecfcceb..76e92039bf 100644 --- a/source/text/shared/guide/data_tables.xhp +++ b/source/text/shared/guide/data_tables.xhp @@ -38,7 +38,7 @@ Data is stored in tables. As an example, your system address book that you use for your email addresses is a table of the address book database. Each address is a data record, presented as a row in that table. The data records consist of data fields, for example the first and the last name fields and the email field. Creating a New Table With the Table Wizard -In %PRODUCTNAME you can create a new table using the Table Wizard: +In %PRODUCTNAME you can create a new table using the Table Wizard: Open the database file where you want to create the new table. diff --git a/source/text/shared/guide/database_main.xhp b/source/text/shared/guide/database_main.xhp index 3ad0d52be8..6a142d0005 100644 --- a/source/text/shared/guide/database_main.xhp +++ b/source/text/shared/guide/database_main.xhp @@ -54,7 +54,7 @@ Enter, edit and copy records

Tables

Create new table, edit table structure, index, relations -Table Wizard +Table Wizard Enter, edit and copy records diff --git a/source/text/shared/guide/main.xhp b/source/text/shared/guide/main.xhp index 4ef130e211..c962100ac7 100644 --- a/source/text/shared/guide/main.xhp +++ b/source/text/shared/guide/main.xhp @@ -114,7 +114,7 @@

Data Sources

Working with databases in %PRODUCTNAME -Table Wizard +Table Wizard Query Wizard Forms Wizard Report Wizard -- cgit