From 6edc3562dea5534d80a3a951a88baf15d9f80208 Mon Sep 17 00:00:00 2001 From: DelazJ Date: Fri, 6 Dec 2024 10:43:16 +0100 Subject: [PATCH 1/2] Update the layout fixed table item properties --- .../composer_items/composer_tables.rst | 75 +++++++++++++------ 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/docs/user_manual/print_composer/composer_items/composer_tables.rst b/docs/user_manual/print_composer/composer_items/composer_tables.rst index b60c130e3d9..87519edd21d 100644 --- a/docs/user_manual/print_composer/composer_items/composer_tables.rst +++ b/docs/user_manual/print_composer/composer_items/composer_tables.rst @@ -11,10 +11,11 @@ The Table Items You can use table items to decorate and explain your map: -* :ref:`Attribute table `: shows a subset of the - attributes of a layer, based on predefined rules -* :ref:`Fixed table `: inserts a - manual text table where information can be independent from the layers. +* :ref:`Attribute table `: automatically extracts + a subset of the attributes of a layer, based on predefined rules +* :ref:`Fixed table `: allows for creation of tables + with contents manually entered (i.e. spreadsheet style), so that you can + create completely custom tables. .. _layout_attribute_table_item: @@ -263,26 +264,51 @@ Main properties Fixed table Item Properties Panel with Table designer -In :guilabel:`Main properties` you can work with the :guilabel:`Table designer` -when clicking the :guilabel:`Edit table ...`: +In :guilabel:`Main properties`, press :guilabel:`Edit table...` +to open the :guilabel:`Table designer` dialog where you can build your table: + +* On the left hand of the dialog, a table frame displays the active table item + with its content and settings. + Click or double-click on a cell and write a text to modify its contents. + Press :kbd:`Ctrl+Enter` to add linebreak (for a multiline text). + The logic for selecting multiple cells in the table + is the same as in the vector layer :ref:`attribute table `. + Grab and move a row or column separator to resize the row above or the column before. + A double-click on the separator will resize the row above or the column before to fit their contents. + A right-click over column or row headers shows a contextual menu to insert + columns or rows around the selection or to delete them. +* Through the menus on top of the dialog, it is possible to: + + * :menuselection:`File --> Import Content From Clipboard`: it overrides contents of the table. + * :menuselection:`File --> Close editor`: it closes the :guilabel:`Table Designer` dialog. + * From the :menuselection:`Edit` menu, you can work with selection functionalities for rows and columns: + + * :guilabel:`Select all` cells in the table + * :guilabel:`Select columns` or :guilabel:`Select Rows`: when cells are selected in the table, + you can extend the selection respectively to their column(s) or row(s) + * :guilabel:`Clear Cells`: deletes the content of the selected cells + + * The :menuselection:`Table` menu is the place where you design the structure of the table. + You can: + + * :menuselection:`Insert rows -->` above or below the selection + * :menuselection:`Insert columns -->` before or after the selection + * :guilabel:`Delete Rows` or :guilabel:`Delete Columns` of selected cells + * :guilabel:`Merge selected cells`: select multiple cells in a rectangular shape + and you can concatenate their contents into the top left cell + (whole styling is also applied to the merged cell, unless there is a last row/column cell in the selection). + * :guilabel:`Split selected cells`: spreads content of a merged cell into their original cell. + Each cell is reapplied its original styling. + * |checkbox| :guilabel:`Include Header Row` whose styling can only be controlled + from the :ref:`layout_table_fonts_and_styling` widget + +* Select the cells and, on the right of the table frame, you can provide the :guilabel:`Cell Contents`: + + * Either manually enter the contents of each cell, + or use an |expression| :guilabel:`Expression` to automatically populate it. + * Under the :guilabel:`Formatting` group, set specific options that apply to the selection + and take precedence over the `global table content styling `: -* You can click into the table and insert texts manually. -* Through the menus on top it is possible to: - - * :guilabel:`Import Content From Clipboard` by going to :guilabel:`File` - (it overrides given inputs). - * work with selection functionalities for rows and columns by going - to :guilabel:`Edit`. - * :guilabel:`Insert rows`, :guilabel:`Insert columns`, - :guilabel:`Delete Rows`, :guilabel:`Delete Columns` as well as - using the option to |checkbox| :guilabel:`Include Header Row`. - -* You can work with the :guilabel:`Cell Contents` section on the right and: - - * Define the text format of selected cells in :guilabel:`Formatting` - - * by clicking on the given |expression| expression button and using a - regular expression for the input of the cell * by choosing the :guilabel:`Text format` * by |checkbox| :guilabel:`Format as number` (several formats are available) * by defining the :guilabel:`Horizontal alignment` and the @@ -335,6 +361,7 @@ the following functionalities (see :numref:`figure_layout_table_grid`): * With :guilabel:`Line width` you can set the thickness of the lines used in the grid. * The :guilabel:`Color` of the grid can be set using the color selection widget. +.. _layout_table_fonts_and_styling: Fonts and text styling ...................... @@ -358,7 +385,7 @@ provides the following functionalities (see :numref:`figure_layout_table_fonts`) * For :guilabel:`Table heading` you can additionally set the :guilabel:`Alignment` to ``Follow column alignment`` or override this setting by choosing ``Left``, ``Center`` or ``Right``. The column alignment is set using the :guilabel:`Select - Attributes` dialog (see :numref:`figure_layout_table_select` ). + Attributes` dialog (see :numref:`figure_layout_table_select`). Frames From 513bdaa29d039da46ac5034053a4650c12b9d547 Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Fri, 13 Dec 2024 15:20:30 +0100 Subject: [PATCH 2/2] Detail behavior of merge/split cells actions in layout fixed table --- .../print_composer/composer_items/composer_tables.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/user_manual/print_composer/composer_items/composer_tables.rst b/docs/user_manual/print_composer/composer_items/composer_tables.rst index 87519edd21d..c23ae52d9f3 100644 --- a/docs/user_manual/print_composer/composer_items/composer_tables.rst +++ b/docs/user_manual/print_composer/composer_items/composer_tables.rst @@ -295,10 +295,12 @@ to open the :guilabel:`Table designer` dialog where you can build your table: * :menuselection:`Insert columns -->` before or after the selection * :guilabel:`Delete Rows` or :guilabel:`Delete Columns` of selected cells * :guilabel:`Merge selected cells`: select multiple cells in a rectangular shape - and you can concatenate their contents into the top left cell - (whole styling is also applied to the merged cell, unless there is a last row/column cell in the selection). - * :guilabel:`Split selected cells`: spreads content of a merged cell into their original cell. - Each cell is reapplied its original styling. + and you can merge them and concatenate their contents into the top left cell + (whose styling is also applied to the merged cell, unless there is a last row/column cell in the selection). + * :guilabel:`Split selected cells`: select a merged cell and you can split it back to its individual cells. + The current text is kept in the top left cell, and the other cells are filled with their contents + before they get merged. + They are also reapplied their original styling. * |checkbox| :guilabel:`Include Header Row` whose styling can only be controlled from the :ref:`layout_table_fonts_and_styling` widget