Skip to content
Permalink
Browse files

Merge pull request #36283 from nyalldawson/html_colors

Respect HTML colors in labels
  • Loading branch information
m-kuhn committed May 12, 2020
2 parents 3d132e6 + f2b03a8 commit b2890f0b6bce0e56efabe14bc7b08c50cda1be66
Showing with 11,212 additions and 8,363 deletions.
  1. +1 −1 .ci/travis/scripts/pr_has_label.py
  2. +1 −0 doc/CMakeLists.txt
  3. +2 −1 python/CMakeLists.txt
  4. +7 −0 python/core/auto_additions/qgstextcharacterformat.py
  5. +1 −0 python/core/auto_generated/labeling/qgspallabeling.sip.in
  6. +0 −2,100 python/core/auto_generated/qgstextrenderer.sip.in
  7. +612 −0 python/core/auto_generated/textrenderer/qgstextbackgroundsettings.sip.in
  8. +99 −0 python/core/auto_generated/textrenderer/qgstextblock.sip.in
  9. +259 −0 python/core/auto_generated/textrenderer/qgstextbuffersettings.sip.in
  10. +125 −0 python/core/auto_generated/textrenderer/qgstextcharacterformat.sip.in
  11. +125 −0 python/core/auto_generated/textrenderer/qgstextdocument.sip.in
  12. +514 −0 python/core/auto_generated/textrenderer/qgstextformat.sip.in
  13. +84 −0 python/core/auto_generated/textrenderer/qgstextfragment.sip.in
  14. +234 −0 python/core/auto_generated/textrenderer/qgstextmasksettings.sip.in
  15. +187 −0 python/core/auto_generated/textrenderer/qgstextrenderer.sip.in
  16. +75 −0 python/core/auto_generated/textrenderer/qgstextrendererutils.sip.in
  17. +365 −0 python/core/auto_generated/textrenderer/qgstextshadowsettings.sip.in
  18. +11 −1 python/core/core_auto.sip
  19. +1 −2 python/plugins/processing/algs/grass7/ext/r_proj.py
  20. +1 −2 python/plugins/processing/algs/grass7/ext/v_proj.py
  21. +1 −0 src/analysis/CMakeLists.txt
  22. +1 −0 src/app/CMakeLists.txt
  23. +3 −3 src/app/decorations/qgsdecorationcopyright.cpp
  24. +1 −1 src/app/decorations/qgsdecorationcopyright.h
  25. +1 −0 src/app/decorations/qgsdecorationlayoutextent.cpp
  26. +1 −1 src/app/decorations/qgsdecorationlayoutextent.h
  27. +1 −1 src/app/decorations/qgsdecorationlayoutextentdialog.h
  28. +3 −3 src/app/decorations/qgsdecorationtitle.cpp
  29. +1 −1 src/app/decorations/qgsdecorationtitle.h
  30. +2 −0 src/app/labeling/qgsmaptoollabel.cpp
  31. +28 −4 src/core/CMakeLists.txt
  32. +24 −4 src/core/labeling/qgspallabeling.cpp
  33. +8 −1 src/core/labeling/qgspallabeling.h
  34. +43 −4 src/core/labeling/qgstextlabelfeature.cpp
  35. +40 −1 src/core/labeling/qgstextlabelfeature.h
  36. +19 −8 src/core/labeling/qgsvectorlayerlabelprovider.cpp
  37. +1 −0 src/core/labeling/qgsvectorlayerlabelprovider.h
  38. +1 −0 src/core/layertree/qgslayertreemodellegendnode.cpp
  39. +1 −1 src/core/layertree/qgslayertreemodellegendnode.h
  40. +1 −1 src/core/qgsmaplayerlegend.h
  41. +1 −1 src/core/qgsmapsettingsutils.cpp
  42. +0 −4,121 src/core/qgstextrenderer.cpp
  43. +0 −1,886 src/core/qgstextrenderer.h
  44. +1 −0 src/core/scalebar/qgsdoubleboxscalebarrenderer.cpp
  45. +1 −0 src/core/scalebar/qgshollowscalebarrenderer.cpp
  46. +5 −4 src/core/scalebar/qgsnumericscalebarrenderer.cpp
  47. +10 −6 src/core/scalebar/qgsscalebarrenderer.cpp
  48. +1 −1 src/core/scalebar/qgsscalebarsettings.h
  49. +1 −0 src/core/scalebar/qgssingleboxscalebarrenderer.cpp
  50. +1 −0 src/core/scalebar/qgssteppedlinescalebarrenderer.cpp
  51. +1 −0 src/core/scalebar/qgsticksscalebarrenderer.cpp
  52. +1 −1 src/core/symbology/qgsstyle.h
  53. +769 −0 src/core/textrenderer/qgstextbackgroundsettings.cpp
  54. +517 −0 src/core/textrenderer/qgstextbackgroundsettings.h
  55. +69 −0 src/core/textrenderer/qgstextblock.cpp
  56. +126 −0 src/core/textrenderer/qgstextblock.h
  57. +359 −0 src/core/textrenderer/qgstextbuffersettings.cpp
  58. +236 −0 src/core/textrenderer/qgstextbuffersettings.h
  59. +116 −0 src/core/textrenderer/qgstextcharacterformat.cpp
  60. +178 −0 src/core/textrenderer/qgstextcharacterformat.h
  61. +200 −0 src/core/textrenderer/qgstextdocument.cpp
  62. +153 −0 src/core/textrenderer/qgstextdocument.h
  63. +858 −0 src/core/textrenderer/qgstextformat.cpp
  64. +471 −0 src/core/textrenderer/qgstextformat.h
  65. +70 −0 src/core/textrenderer/qgstextfragment.cpp
  66. +91 −0 src/core/textrenderer/qgstextfragment.h
  67. +210 −0 src/core/textrenderer/qgstextmasksettings.cpp
  68. +217 −0 src/core/textrenderer/qgstextmasksettings.h
  69. +1,636 −0 src/core/textrenderer/qgstextrenderer.cpp
  70. +297 −0 src/core/textrenderer/qgstextrenderer.h
  71. +6 −1 src/core/{ → textrenderer}/qgstextrenderer_p.h
  72. +152 −0 src/core/textrenderer/qgstextrendererutils.cpp
  73. +89 −0 src/core/textrenderer/qgstextrendererutils.h
  74. +438 −0 src/core/textrenderer/qgstextshadowsettings.cpp
  75. +315 −0 src/core/textrenderer/qgstextshadowsettings.h
  76. +1 −0 src/customwidgets/CMakeLists.txt
  77. +1 −0 src/gui/CMakeLists.txt
  78. +1 −0 src/gui/qgsfontbutton.cpp
  79. +1 −1 src/gui/qgsfontbutton.h
  80. +4 −1 src/gui/qgstextformatwidget.cpp
  81. +1 −1 src/gui/qgstextformatwidget.h
  82. +1 −0 src/gui/qgstextpreview.cpp
  83. +1 −1 src/gui/qgstextpreview.h
  84. +1 −1 src/gui/vector/qgsvectorlayerlegendwidget.h
  85. +1 −0 src/plugins/grass/CMakeLists.txt
  86. +1 −0 src/plugins/offline_editing/CMakeLists.txt
  87. +1 −0 src/providers/arcgisrest/CMakeLists.txt
  88. +1 −0 src/providers/virtual/CMakeLists.txt
  89. +1 −0 src/providers/wfs/CMakeLists.txt
  90. +1 −0 src/quickgui/CMakeLists.txt
  91. +1 −0 src/server/CMakeLists.txt
  92. +1 −0 src/server/services/wms/CMakeLists.txt
  93. +199 −188 src/ui/qgstextformatwidgetbase.ui
  94. +1 −0 tests/src/analysis/CMakeLists.txt
  95. +1 −0 tests/src/app/CMakeLists.txt
  96. +1 −0 tests/src/core/CMakeLists.txt
  97. +1 −0 tests/src/gui/CMakeLists.txt
  98. +1 −0 tests/src/providers/CMakeLists.txt
  99. +4 −0 tests/src/python/CMakeLists.txt
  100. +2 −2 tests/src/python/test_provider_ogr_gpkg.py
  101. +6 −0 tests/src/python/test_qgspallabeling_base.py
  102. +11 −0 tests/src/python/test_qgspallabeling_tests.py
  103. +87 −0 tests/src/python/test_qgstextblock.py
  104. +95 −0 tests/src/python/test_qgstextcharacterformat.py
  105. +165 −0 tests/src/python/test_qgstextdocument.py
  106. +2 −0 tests/src/python/test_qgstextformatwidget.py
  107. +54 −0 tests/src/python/test_qgstextfragment.py
  108. +77 −0 tests/src/python/test_qgstextrenderer.py
  109. +3 −6 tests/src/python/test_qgsunittypes.py
  110. +1 −0 tests/src/server/wms/CMakeLists.txt
  111. BIN ...ages/expected_pal_canvas_line/sp_curved_placement_online_html/sp_curved_placement_online_html.png
  112. BIN ...ted_pal_composer_line/sp_img_curved_placement_online_html/sp_img_curved_placement_online_html.png
  113. BIN ...ted_pal_composer_line/sp_pdf_curved_placement_online_html/sp_pdf_curved_placement_online_html.png
  114. BIN ...ted_pal_composer_line/sp_svg_curved_placement_online_html/sp_svg_curved_placement_online_html.png
  115. BIN tests/testdata/control_images/text_renderer/text_dd_buffer_color/text_dd_buffer_color_mask.png
  116. BIN tests/testdata/control_images/text_renderer/text_html_formatting/text_html_formatting.png
  117. BIN ...testdata/control_images/text_renderer/text_html_formatting_buffer/text_html_formatting_buffer.png
  118. BIN ...ata/control_images/text_renderer/text_html_formatting_buffer/text_html_formatting_buffer_mask.png
  119. BIN ...ol_images/text_renderer/text_html_formatting_buffer_shadow/text_html_formatting_buffer_shadow.png
  120. BIN ...ages/text_renderer/text_html_formatting_buffer_shadow/text_html_formatting_buffer_shadow_mask.png
  121. BIN ...mages/text_renderer/text_html_formatting_buffer_vertical/text_html_formatting_buffer_vertical.png
  122. BIN .../text_renderer/text_html_formatting_buffer_vertical/text_html_formatting_buffer_vertical_mask.png
  123. BIN ...testdata/control_images/text_renderer/text_html_formatting_shadow/text_html_formatting_shadow.png
  124. BIN ...data/control_images/text_renderer/text_html_formatting_vertical/text_html_formatting_vertical.png
@@ -23,7 +23,7 @@
try:
data = urlopen(url).read().decode('utf-8')
except URLError as err:
print("URLError: ".format(err.reason))
print("URLError: {}".format(err.reason))
sys.exit(1)

obj = json.loads(data)
@@ -98,6 +98,7 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/scalebar
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/textrenderer
${CMAKE_SOURCE_DIR}/src/core/validity
${CMAKE_SOURCE_DIR}/src/core/vectortile
${CMAKE_SOURCE_DIR}/src/gui
@@ -97,6 +97,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/annotations
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/callouts
${CMAKE_SOURCE_DIR}/src/core/classification
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/pal
${CMAKE_SOURCE_DIR}/src/core/diagram
@@ -121,7 +122,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/scalebar
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/classification
${CMAKE_SOURCE_DIR}/src/core/textrenderer
${CMAKE_SOURCE_DIR}/src/core/validity
${CMAKE_SOURCE_DIR}/src/core/vectortile
${CMAKE_SOURCE_DIR}/src/plugins
@@ -0,0 +1,7 @@
# The following has been generated automatically from src/core/textrenderer/qgstextcharacterformat.h
# monkey patching scoped based enum
QgsTextCharacterFormat.BooleanValue.NotSet.__doc__ = "Property is not set"
QgsTextCharacterFormat.BooleanValue.SetTrue.__doc__ = "Property is set and ``True``"
QgsTextCharacterFormat.BooleanValue.SetFalse.__doc__ = "Property is set and ``False``"
QgsTextCharacterFormat.BooleanValue.__doc__ = 'Status values for boolean format properties\n\n' + '* ``NotSet``: ' + QgsTextCharacterFormat.BooleanValue.NotSet.__doc__ + '\n' + '* ``SetTrue``: ' + QgsTextCharacterFormat.BooleanValue.SetTrue.__doc__ + '\n' + '* ``SetFalse``: ' + QgsTextCharacterFormat.BooleanValue.SetFalse.__doc__
# --
@@ -11,6 +11,7 @@




class QgsLabelPosition
{

0 comments on commit b2890f0

Please sign in to comment.
You can’t perform that action at this time.