Merge c848b69 into d6a193a

LeonarddeR · web-flow · commit 3016b96849ea · 2022-07-16T05:44:32.000+10:00
diff --git a/source/buildVersion.py b/source/buildVersion.py
@@ -70,6 +70,7 @@ def formatVersionForGUI(year, major, minor):
 version_minor = 0
 version_build = 0  # Should not be set manually. Set in 'sconscript' provided by 'appVeyor.yml'
 version=_formatDevVersionString()
+version_full = formatBuildVersionString()
 publisher="unknown"
 updateVersionType=None
 try:
diff --git a/source/installer.py b/source/installer.py
@@ -21,6 +21,7 @@
 import easeOfAccess
 import COMRegistrationFixes
 import winKernel
+from typing import Dict
 
 _wsh=None
 def _getWSH():
@@ -226,17 +227,19 @@ def removeOldProgramFiles(destPath):
 				except RetriableFailure:
 					log.warning(f"Couldn't remove file: {path!r}")
 
-uninstallerRegInfo={
-	"DisplayName":versionInfo.name,
-	"DisplayVersion":versionInfo.version,
-	"DisplayIcon":u"{installDir}\\images\\nvda.ico",
-	"InstallDir":u"{installDir}",
-	"Publisher":versionInfo.publisher,
-	"UninstallDirectory":u"{installDir}",
-	"UninstallString":u"{installDir}\\uninstall.exe",
-	"URLInfoAbout":versionInfo.url,
+
+uninstallerRegInfo: Dict[str, str] = {
+	"DisplayName": f"{versionInfo.name} {versionInfo.version}",
+	"DisplayVersion": versionInfo.version_full,
+	"DisplayIcon": r"{installDir}\images\nvda.ico",
+	"InstallDir": "{installDir}",
+	"Publisher": versionInfo.publisher,
+	"UninstallDirectory": "{installDir}",
+	"UninstallString": r"{installDir}\uninstall.exe",
+	"URLInfoAbout": versionInfo.url,
 }
 
+
 def registerInstallation(installDir,startMenuFolder,shouldCreateDesktopShortcut,startOnLogonScreen,configInLocalAppData=False):
 	with winreg.CreateKeyEx(winreg.HKEY_LOCAL_MACHINE,"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\NVDA",0,winreg.KEY_WRITE) as k:
 		for name,value in uninstallerRegInfo.items(): 
diff --git a/source/versionInfo.py b/source/versionInfo.py
@@ -21,7 +21,7 @@
 aboutMessage = _(
 	# Translators: "About NVDA" dialog box message
 	u"""{longName} ({name})
-Version: {version}
+Version: {version} ({version_full})
 URL: {url}
 {copyright}
 
