From b388524f3455b1248dba10a66bb5495a4db32576 Mon Sep 17 00:00:00 2001
From: Luke Davis <XLTechie+github@newanswertech.com>
Date: Thu, 13 Jul 2023 06:02:06 -0400
Subject: [PATCH] Added headings instead of table captions. Added add-on name
 in addition to summary. Both beta user requests.

---
 addon/globalPlugins/versionCollector/__init__.py | 10 +++++-----
 buildVars.py                                     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addon/globalPlugins/versionCollector/__init__.py b/addon/globalPlugins/versionCollector/__init__.py
index 2191739..bd4bdef 100644
--- a/addon/globalPlugins/versionCollector/__init__.py
+++ b/addon/globalPlugins/versionCollector/__init__.py
@@ -208,7 +208,8 @@ def retrieveInstalledAddons(self) -> None:
 		"""
 		for addon in addonHandler.getAvailableAddons():
 			self.addToCacheOrUpdateDate(_AppData(
-				name=addon.manifest["summary"], version=addon.version, isAddon=True, is64bit=False,
+				name=f"{addon.manifest['summary']} ({addon.name})",
+				version=addon.version, isAddon=True, is64bit=False,
 				extra={"name": addon.name, "author": addon.manifest["author"], "enabled": addon.isEnabled}
 			))
 
@@ -274,13 +275,12 @@ def getStructuredAddonList(self, useHTML=False) -> str:
 		)
 
 	def showHTMLReport(self) -> None:
-		output = """		<table style="margin-left: auto; margin-right: auto;">
-		<caption>Application information:</caption>
+		output = """<h1>Detected Applications:</h1>\n<table style="margin-left: auto; margin-right: auto;">
 		<tr><th>NAME</th> <th>VERSION</th> <th>BITNESS</th> <tr>
 		"""
 		output += self.getStructuredAppList(True)
-		output += """</table><br><table style="margin-left: auto; margin-right: auto;">
-		<caption>List of NVDA add-ons:</caption>
+		output += """</table><br>
+		<h1>Detected NVDA Add-ons:</h1>\n<table style="margin-left: auto; margin-right: auto;">
 		<tr><th>NAME</th> <th>VERSION</th> <th>STATUS</th> <th>AUTHOR/PUBLISHER</th></tr>
 		"""
 		output += self.getStructuredAddonList(True)
diff --git a/buildVars.py b/buildVars.py
index eb45959..faccb98 100644
--- a/buildVars.py
+++ b/buildVars.py
@@ -26,7 +26,7 @@ def _(arg):
 	"addon_description": _("""Keeps a record of all software names and versions used while running NVDA.
 Provides a list that can be copied/exported for diagnostics and support."""),
 	# version
-	"addon_version": "23.00.02",
+	"addon_version": "23.00.021",
 	# Author(s)
 	"addon_author": "Luke Davis <XLTechie@newanswertech.com>",
 	# URL for the add-on documentation support