Merge 1ce1cc6 into f3194e6

CyrilleB79 · web-flow · commit aea7db67f654 · 2025-07-26T17:00:31.000+02:00
diff --git a/source/gui/addonStoreGui/controls/details.py b/source/gui/addonStoreGui/controls/details.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2022-2024 NV Access Limited, Cyrille Bougot
+# Copyright (C) 2022-2025 NV Access Limited, Cyrille Bougot
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -344,14 +344,15 @@ def _refresh(self):
 							details.reviewURL,
 						)
 
-					if isinstance(details, _AddonManifestModel):
-						# Installed add-ons with a manifest only
-						self._appendDetailsLabelValue(
-							# Translators: Label for an extra detail field for the selected add-on in the add-on store dialog.
-							pgettext("addonStore", "Install date:"),
-							details.installDate.strftime("%x"),
-						)
+				if isinstance(details, _AddonManifestModel):
+					# Installed add-ons with a manifest only
+					self._appendDetailsLabelValue(
+						# Translators: Label for an extra detail field for the selected add-on in the add-on store dialog.
+						pgettext("addonStore", "Install date:"),
+						details.installDate.strftime("%x"),
+					)
 
+				if isinstance(details, _AddonStoreModel):
 					if details.publicationDate is not None:
 						self._appendDetailsLabelValue(
 							# Translators: Label for an extra detail field for the selected add-on. In the add-on store dialog.
diff --git a/source/gui/addonStoreGui/viewModels/addonList.py b/source/gui/addonStoreGui/viewModels/addonList.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2022-2023 NV Access Limited, Cyrille Bougot
+# Copyright (C) 2022-2025 NV Access Limited, Cyrille Bougot
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -93,9 +93,15 @@ class AddonListField(_AddonListFieldData, Enum):
 	)
 	publicationDate = (
 		# Translators: The name of the column that contains the publication date of the add-on.
-		pgettext("addonStore", "Publication Date"),
+		pgettext("addonStore", "Publication date"),
 		50,
 	)
+	installDate = (
+		# Translators: The name of the column that contains the installation date of the add-on.
+		pgettext("addonStore", "Install date"),
+		50,
+		frozenset({_StatusFilterKey.AVAILABLE, _StatusFilterKey.UPDATE}),
+	)
 	minimumNVDAVersion = (
 		# Translators: The name of the column that contains the minimum version of NVDA required for this add-on.
 		pgettext("addonStore", "Minimum NVDA version"),
@@ -309,6 +315,8 @@ def _getAddonFieldText(self, listItemVM: AddonListItemVM, field: AddonListField)
 			return listItemVM.status.displayString
 		if field is AddonListField.channel:
 			return listItemVM.model.channel.displayString
+		if field is AddonListField.installDate:
+			return listItemVM.model.installDate.strftime("%x")
 		if field is AddonListField.minimumNVDAVersion:
 			return formatVersionForGUI(*listItemVM.model.minimumNVDAVersion)
 		if field is AddonListField.lastTestedVersion:
@@ -403,6 +411,8 @@ def _getSortFieldData(listItemVM: AddonListItemVM) -> "SupportsLessThan":
 				if getattr(listItemVM.model, "submissionTime", None):
 					return listItemVM.model.submissionTime
 				return 0
+			if self._sortByModelField == AddonListField.installDate:
+				return listItemVM.model.installDate
 			return strxfrm(self._getAddonFieldText(listItemVM, self._sortByModelField))
 
 		def _containsTerm(detailsVM: AddonListItemVM, term: str) -> bool:
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -6,8 +6,10 @@
 
 ### New Features
 
-* In the Add-on Store, add-ons can be sorted by minimum and last tested NVDA version.
-Additionally, minimum and last tested version will now be also shown in the details area for an add-on in the Available Add-ons tab. (#18440, @nvdaes)
+* Add-on Store:
+  * Add-ons can be sorted by minimum and last tested NVDA version as welle as by installation date. (#18440, #18560, @nvdaes, @CyrilleB79)
+  * Minimum and last tested version will now be also shown in the details area for an add-on in the Available Add-ons tab. (#18440, @nvdaes)
+  * Installation date will now be also shown in the details area for external add-ons. (#18560, @CyrilleB79)
 
 ### Changes
 
