Zone: Step towards zones not bound to a single node (#43)

Remaining stumble points:
 - AutoAction: Based on controlID
 - Context: Based on nodes

addon/globalPlugins/webAccess/gui/criteriaEditor.py

@@ -21,7 +21,7 @@
 
 
 
-__version__ = "2024.07.19"
+__version__ = "2024.07.25"
 __authors__ = (
 	"Shirley Noël <[email protected]>",
 	"Julien Cochuyt <[email protected]>",
@@ -616,7 +616,7 @@ def initData(self, context):
 				rule = result.rule
 				if (
 					rule.type in (ruleTypes.PARENT, ruleTypes.ZONE)
-					and node in result.node
+					and result.containsNode(node)
 				):
 					parents.insert(0, rule.name)
 			self.contextParentCombo.Set(parents)

addon/globalPlugins/webAccess/overlay.py

@@ -504,10 +504,10 @@ def _caretMovementScriptHelper(
 					msg += _("Press escape to cancel zone restriction.")
 				ui.message(msg)
 			if posConstant == textInfos.POSITION_FIRST:
-				pos = zone.startOffset
+				pos = zone.result.startOffset
 				posConstant = textInfos.offsets.Offsets(pos, pos)
 			elif posConstant == textInfos.POSITION_LAST:
-				pos = max(zone.endOffset - 1, zone.startOffset)
+				pos = max(zone.result.endOffset - 1, zone.result.startOffset)
 				posConstant = textInfos.offsets.Offsets(pos, pos)
 		super()._caretMovementScriptHelper(
 			gesture,
@@ -556,12 +556,12 @@ def _iterNodesByType(self, itemType, direction="next", pos=None):
 			direction
 		):
 			if zone:
-				if item.textInfo._startOffset < zone.startOffset:
+				if item.textInfo._startOffset < zone.result.startOffset:
 					if direction == "next":
 						continue
 					else:
 						return
-				elif item.textInfo._startOffset >= zone.endOffset:
+				elif item.textInfo._startOffset >= zone.result.endOffset:
 					if direction == "previous":
 						continue
 					else: