Skip to content

Commit 38e6fec

Browse files
authored
Update annotations documentation (#9727)
2 parents e18b171 + 26aa774 commit 38e6fec

File tree

7 files changed

+111
-77
lines changed

7 files changed

+111
-77
lines changed

docs/documentation_guidelines/substitutions.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ Icon Substitution Icon S
285285
|text| ``|text|`` |histogram| ``|histogram|``
286286
|stackedBar| ``|stackedBar|`` |stackedDiagram| ``|stackedDiagram|``
287287
|createAnnotationLayer| ``|createAnnotationLayer|`` |annotationLayer| ``|annotationLayer|``
288-
|textAnnotation| ``|textAnnotation|`` |svgAnnotation| ``|svgAnnotation|``
289288
|formAnnotation| ``|formAnnotation|`` |htmlAnnotation| ``|htmlAnnotation|``
290289
|actionText| ``|actionText|`` |textAlongLine| ``|textAlongLine|``
290+
|addImage| ``|addImage|`` |textInsideRect| ``|textInsideRect|``
291291
|labelbackground| ``|labelbackground|`` |labelbuffer| ``|labelbuffer|``
292292
|labelformatting| ``|labelformatting|`` |labelplacement| ``|labelplacement|``
293293
|labelshadow| ``|labelshadow|`` |render| ``|render|``
@@ -1611,8 +1611,6 @@ Icon Substitution Icon
16111611
:width: 1.5em
16121612
.. |sumPoints| image:: /static/common/mAlgorithmSumPoints.png
16131613
:width: 1.5em
1614-
.. |svgAnnotation| image:: /static/common/mActionSvgAnnotation.png
1615-
:width: 1.5em
16161614
.. |symbology| image:: /static/common/symbology.png
16171615
:width: 2em
16181616
.. |symbologyAdd| image:: /static/common/symbologyAdd.png
@@ -1643,7 +1641,7 @@ Icon Substitution Icon
16431641
:width: 1.5em
16441642
.. |textAlongLine| image:: /static/common/mActionTextAlongLine.png
16451643
:width: 1.5em
1646-
.. |textAnnotation| image:: /static/common/mActionTextAnnotation.png
1644+
.. |textInsideRect| image:: /static/common/mActionTextInsideRect.png
16471645
:width: 1.5em
16481646
.. |tiledSceneLayer| image:: /static/common/mIconTiledSceneLayer.png
16491647
:width: 1.5em

docs/user_manual/introduction/qgis_gui.rst

-12
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,6 @@ menu options you need to switch to editing mode by clicking on |toggleEditing|
355355
-
356356
-
357357
- :ref:`sec_annotations`
358-
* - :menuselection:`-->` |textAnnotation| :menuselection:`Text Annotation`
359-
-
360-
- :guilabel:`Annotations`
361-
- :ref:`sec_annotations`
362358
* - :menuselection:`-->` |formAnnotation| :menuselection:`Form Annotation`
363359
-
364360
- :guilabel:`Annotations`
@@ -367,10 +363,6 @@ menu options you need to switch to editing mode by clicking on |toggleEditing|
367363
-
368364
- :guilabel:`Annotations`
369365
- :ref:`sec_annotations`
370-
* - :menuselection:`-->` |svgAnnotation| :menuselection:`SVG Annotation`
371-
-
372-
- :guilabel:`Annotations`
373-
- :ref:`sec_annotations`
374366
* - :menuselection:`Edit Attributes -->`
375367
-
376368
-
@@ -2502,14 +2494,10 @@ processes (QGIS startup, plugins loading, processing tools...)
25022494
:width: 1.5em
25032495
.. |sumPoints| image:: /static/common/mAlgorithmSumPoints.png
25042496
:width: 1.5em
2505-
.. |svgAnnotation| image:: /static/common/mActionSvgAnnotation.png
2506-
:width: 1.5em
25072497
.. |symmetricalDifference| image:: /static/common/mAlgorithmSymmetricalDifference.png
25082498
:width: 1.5em
25092499
.. |temporal| image:: /static/common/temporal.png
25102500
:width: 1.5em
2511-
.. |textAnnotation| image:: /static/common/mActionTextAnnotation.png
2512-
:width: 1.5em
25132501
.. |tiles| image:: /static/common/tiles.png
25142502
:width: 1.5em
25152503
.. |titleLabel| image:: /static/common/title_label.png

docs/user_manual/map_views/map_view.rst

+108-58
Large diffs are not rendered by default.
-825 Bytes
Binary file not shown.
-761 Bytes
Binary file not shown.
504 Bytes
Loading

substitutions.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1214,8 +1214,6 @@
12141214
:width: 1.5em
12151215
.. |sumPoints| image:: /static/common/mAlgorithmSumPoints.png
12161216
:width: 1.5em
1217-
.. |svgAnnotation| image:: /static/common/mActionSvgAnnotation.png
1218-
:width: 1.5em
12191217
.. |symbology| image:: /static/common/symbology.png
12201218
:width: 2em
12211219
.. |symbologyAdd| image:: /static/common/symbologyAdd.png
@@ -1250,7 +1248,7 @@
12501248
:width: 1.5em
12511249
.. |textAlongLine| image:: /static/common/mActionTextAlongLine.png
12521250
:width: 1.5em
1253-
.. |textAnnotation| image:: /static/common/mActionTextAnnotation.png
1251+
.. |textInsideRect| image:: /static/common/mActionTextInsideRect.png
12541252
:width: 1.5em
12551253
.. |tiledSceneLayer| image:: /static/common/mIconTiledSceneLayer.png
12561254
:width: 1.5em

0 commit comments

Comments
 (0)