Supresses repeated announcements of 'ruta'.

Author: towebo

addon/appModules/vismaAdmin/__init__.py

@@ -6,6 +6,7 @@
 from ctypes import *
 import config
 import gui
+from gui.settingsDialogs import SettingsPanel
 import appModuleHandler
 import addonHandler
 import locale
@@ -189,7 +190,7 @@ def getCurrentVismaModule(self, ctrl):
             global module_lines
             lines = [k for k in module_lines if ("%s\t" % wndtxt) in k]
             if len(lines ) == 0:
-                log.info("Ny modul: %s" % module)
+                #log.info("Ny modul: %s" % module)
                 return module
             lineparts = lines[0].split('\t')
             module = lineparts[1]
@@ -454,7 +455,7 @@ def GetCurrentRow(self):
             return None
 
 
-class VismaAdministrationSettingsPanel(gui.SettingsPanel):
+class VismaAdministrationSettingsPanel(SettingsPanel):
     # Translators: the label/title for the Visma Administration settings panel.
     title = _('Visma Administration')
 

addon/globalPlugins/vismaAdministration/__init__.py

@@ -1,17 +1,81 @@
 import appModuleHandler
+import os
 import globalPluginHandler
+import api
+from typing import Iterable, List, Any
+import speech
+from logHandler import log
+
+
+TARGET_EXE = "spcsadm.exe"
+TEXT_TO_SUPPRESS = "ruta"
+
+
+def _is_target_context() -> bool:
+	f = api.getFocusObject()
+	if not f:
+		return False
+	# App check
+	am = getattr(f, "appModule", None)
+	app_ok = False
+	if am:
+		appPath = (getattr(am, "appPath", "") or "")
+		app_ok = os.path.basename(appPath).lower() == TARGET_EXE.lower()
+		if not app_ok:
+			appName = (getattr(am, "appName", "") or "").lower()
+			app_ok = appName in {TARGET_EXE.lower(), TARGET_EXE.lower().removesuffix(".exe")}
+	return app_ok
+
+
+def _item_text(item: Any) -> str | None:
+	"""Best-effort: speech sequences can contain strings and command objects."""
+	if isinstance(item, str):
+		return item
+	# Many speech command objects expose .text (e.g. TextCommand).
+	txt = getattr(item, "text", None)
+	return txt if isinstance(txt, str) else None
+
+def _filter_sequence(seq: Iterable[Any]) -> List[Any]:
+	if not _is_target_context():
+		return list(seq)
+	out: List[Any] = []
+	suppress = TEXT_TO_SUPPRESS.lower()
+	for item in seq:
+		txt = _item_text(item)
+		if txt is not None and txt.strip().lower() == suppress:
+			# Skip this piece entirely.
+			continue
+
+
+		out.append(item)
+	return out
 
 
 class GlobalPlugin(globalPluginHandler.GlobalPlugin):
 
 	def __init__(self, *args, **kwargs):
 		super().__init__(*args, **kwargs)
+		# Defensive: confirm we're bound to NVDA's real module
+		try:
+			modpath = getattr(speech, "__file__", "")
+			if not modpath or "nvda" not in modpath.lower():
+				raise RuntimeError(f"Unexpected 'speech' module import: {modpath}")
+		except Exception:
+			# If this triggers, there’s still a name collision.
+			pass
+		self._reg = speech.filter_speechSequence.register(_filter_sequence)
 		appModuleHandler.registerExecutableWithAppModule("spcsadm", "vismaAdmin")
 		appModuleHandler.registerExecutableWithAppModule("spcsfkt", "vismaAdmin")
 		appModuleHandler.registerExecutableWithAppModule("spcsfor", "vismaAdmin")
 
+
 	def terminate(self, *args, **kwargs):
 		super().terminate(*args, **kwargs)
 		appModuleHandler.unregisterExecutable("spcsadm")
 		appModuleHandler.unregisterExecutable("spcsfkt")
 		appModuleHandler.unregisterExecutable("spcsfor")
+		try:
+			self._reg.remove()
+		except:
+			pass
+

buildVars.py

@@ -25,10 +25,10 @@ def _(arg):
 	# Translators: Long description to be shown for this add-on on add-on information from add-ons manager
 	"addon_description": _("""Fixes accessibility issues in Visma Administration/Fakturering/forening."""),
 	# version
-	"addon_version": "2025.1.4",
+	"addon_version": "2025.1.5",
 	# Brief changelog for this version
 	# Translators: what's new content for the add-on version to be shown in the add-on store
-	"addon_changelog": _("""Kortvyn för beställningar har fått tillgängliga etiketter.."""),
+	"addon_changelog": _("""Irriterande upprepning av texten 'ruta' filtreras bort."""),
 	# Author(s)
 	"addon_author": "Karl-Otto Rosenqvist <karl-otto@mawingu.se>",
 	# URL for the add-on documentation support