Misc backports

Author: nyalldawson

slyr_community/parser/stream.py

@@ -830,6 +830,7 @@ def read_ascii(self, debug_string: str = "", expected=None, length=None) -> str:
         length = (
             length if length is not None else unpack("<L", self.io_stream.read(4))[0]
         )
+
         self.log("string of length {}".format(int(length)), 4)
         if length == 0:
             return ""

slyr_community/plugin.py

@@ -65,6 +65,7 @@ def __init__(self, parent=None):
             self.label_mdb_tools_win.hide()
 
         s = QSettings()
+
         self.enable_verbose_log.setChecked(
             int(s.value("/plugins/slyr/enable_verbose_log", 0))
         )

slyr_community/qgis_plugin/algorithms/convert_annotations.py

@@ -59,14 +59,28 @@ def shortHelpString(self):
     def initAlgorithm(self, config=None):
         self.addParameter(QgsProcessingParameterVectorLayer(self.INPUT, "Input layer"))
 
-        self.addParameter(
-            QgsProcessingParameterField(
+        if Qgis.QGIS_VERSION_INT >= 33400:
+            field_param = QgsProcessingParameterField(
                 self.FIELD,
                 "Element field",
                 defaultValue="ELEMENT",
                 parentLayerParameterName=self.INPUT,
+                type=QgsProcessingParameterField.DataType.Binary,
             )
+        else:
+            field_param = QgsProcessingParameterField(
+                self.FIELD,
+                "Element field",
+                defaultValue="ELEMENT",
+                parentLayerParameterName=self.INPUT,
+            )
+        field_param.setHelp(
+            'Select the field containing the ELEMENT data. This is usually the "Element" field, unless a non-standard annotation class structure is in use.'
+        )
+        field_param.setFlags(
+            field_param.flags() | QgsProcessingParameterDefinition.Flag.FlagAdvanced
         )
+        self.addParameter(field_param)
 
     def processAlgorithm(
         self,  # pylint: disable=too-many-locals,too-many-statements,too-many-branches

slyr_community/qgis_plugin/integrations/lyr_items.py

@@ -71,6 +71,9 @@ def handleFileDrop(self, file):  # pylint: disable=missing-docstring
         elif file.lower().endswith(".lyrx"):
             self.open_lyrx(file)
             return True
+        elif file.lower().endswith(".lpkx"):
+            self.open_lpkx(file)
+            return True
         elif file.lower().endswith(".avl"):
             self.open_avl(file)
             return True
@@ -303,6 +306,21 @@ def open_lyrx(input_file):  # pylint: disable=too-many-locals,too-many-statement
         )
         return True
 
+    @staticmethod
+    def open_lpkx(input_file):  # pylint: disable=too-many-locals,too-many-statements
+        """
+        Opens a LPKX file in the current project
+        """
+        message = '<p>This functionality requires the licensed version of SLYR. Please see <a href="https://north-road.com/slyr/">here</a> for details.</p>'
+        BrowserUtils.show_warning(
+            "Licensed version required",
+            "Convert LPKX",
+            message,
+            level=Qgis.Critical,
+            message_bar=iface.messageBar(),
+        )
+        return True
+
     @staticmethod
     def open_avl(input_file):
         """