Merge pull request #36283 from nyalldawson/html_colors

Respect HTML colors in labels
qgis · May 12, 2020 · b2890f0 · b2890f0
2 parents 3d132e6 + f2b03a8
commit b2890f0
Show file tree

Hide file tree

Showing 124 changed files with 11,212 additions and 8,363 deletions.
diff --git a/.ci/travis/scripts/pr_has_label.py b/.ci/travis/scripts/pr_has_label.py
@@ -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)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -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

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -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

diff --git a/python/core/auto_additions/qgstextcharacterformat.py b/python/core/auto_additions/qgstextcharacterformat.py
@@ -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__
+# --
diff --git a/python/core/auto_generated/labeling/qgspallabeling.sip.in b/python/core/auto_generated/labeling/qgspallabeling.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsLabelPosition
 {