Merge f7e7aff into 20bdb39

nvdaes · web-flow · commit 31746862f497 · 2024-09-10T14:10:45.000Z
diff --git a/include/liblouis b/include/liblouis
@@ -1 +1 @@
-Subproject commit 466c4c8d0165380e51033d79a6f775d2ee56c298
+Subproject commit 7b1843ae6395a3c3f2274c823be338dd584ee6f0
diff --git a/source/gui/addonStoreGui/controls/storeDialog.py b/source/gui/addonStoreGui/controls/storeDialog.py
@@ -155,6 +155,19 @@ def _createFilterControls(self, filterCtrlHelper: guiHelper.BoxSizerHelper) -> N
 		filterCtrlsLine1.sizer.AddSpacer(FILTER_MARGIN_PADDING)
 		filterCtrlHelper.addItem(filterCtrlsLine1.sizer, flag=wx.EXPAND, proportion=1)
 
+		self._storeVM.listVM.setColumnChoices()
+		self.columnFilterCtrl = cast(
+			wx.Choice,
+			filterCtrlsLine0.addLabeledControl(
+				# Translators: The label of a selection field to sort the list of add-ons in the add-on store dialog.
+				labelText=pgettext("addonStore", "Sort by colu&mn:"),
+				wxCtrlClass=wx.Choice,
+				choices=self._storeVM.listVM._columnChoices,
+			),
+		)
+		self.columnFilterCtrl.Bind(wx.EVT_CHOICE, self.onColumnFilterChange, self.columnFilterCtrl)
+		self.bindHelpEvent("AddonStoreSortByColumn", self.columnFilterCtrl)
+
 		self.channelFilterCtrl = cast(
 			wx.Choice,
 			filterCtrlsLine0.addLabeledControl(
@@ -323,6 +336,10 @@ def _setListLabels(self):
 		self.SetTitle(self._titleText)
 
 	def _toggleFilterControls(self):
+		self.columnFilterCtrl.Clear()
+		self._storeVM.listVM.setColumnChoices()
+		for c in self._storeVM.listVM._columnChoices:
+			self.columnFilterCtrl.Append(c)
 		self.channelFilterCtrl.Clear()
 		for c in _channelFilters:
 			if c != Channel.EXTERNAL:
@@ -358,6 +375,9 @@ def onListTabPageChange(self, evt: wx.EVT_CHOICE):
 		self._storeVM._filteredStatusKey = self._statusFilterKey
 		self.addonListView._refreshColumns()
 		self._toggleFilterControls()
+		self.columnFilterCtrl.SetSelection(0)
+		self._storeVM.listVM.setSortField(self._storeVM.listVM.presentedFields[0])
+		self._storeVM.listVM.setReverse(False)
 
 		channelFilterIndex = list(_channelFilters.keys()).index(self._storeVM._filterChannelKey)
 		self.channelFilterCtrl.SetSelection(channelFilterIndex)
@@ -370,6 +390,20 @@ def onListTabPageChange(self, evt: wx.EVT_CHOICE):
 		if not self.addonListTabs.HasFocus():
 			self.addonListTabs.SetFocus()
 
+	def onColumnFilterChange(self, evt: wx.EVT_CHOICE):
+		# Each col index will correspond to 2 choices in the combo box (ascending and descending)
+		colIndex = evt.GetSelection() // 2
+		self._storeVM.listVM.setSortField(self._storeVM.listVM.presentedFields[colIndex])
+		# Descending sort should be applied for odd choices of the combo box
+		reverse = evt.GetSelection() % 2
+		self._storeVM.listVM.setReverse(reverse)
+		log.debug(f"sortered by: {colIndex}; reversed: {reverse}")
+		self._storeVM.refresh()
+
+	def onDescendingOrderFilterChange(self, evt: wx.EVT_CHECKBOX):
+		self._storeVM.listVM.setReverse(self.descendingOrderFilterCtrl.GetValue())
+		self._storeVM.refresh()
+
 	def onChannelFilterChange(self, evt: wx.EVT_CHOICE):
 		self._storeVM._filterChannelKey = self._channelFilterKey
 		self._storeVM.listVM.setSelection(None)
diff --git a/source/gui/addonStoreGui/viewModels/addonList.py b/source/gui/addonStoreGui/viewModels/addonList.py
@@ -220,6 +220,8 @@ def __init__(
 		self.lastSelectedAddonId = self.selectedAddonId
 		self._sortByModelField: AddonListField = AddonListField.displayName
 		self._filterString: Optional[str] = None
+		self._columnChoices: list[str] = []
+		self._reverse: bool = False
 
 		self._setSelectionPending = False
 		self._addonsFilteredOrdered: List[str] = self._getFilteredSortedIds()
@@ -349,6 +351,20 @@ def setSortField(self, modelField: AddonListField):
 			# ensure calling on the main thread.
 			core.callLater(delay=0, callable=self.updated.notify)
 
+	def setColumnChoices(self) -> None:
+		# Translators: Presented when a list will be sorted in ascending order.
+		ascendingOrderLabel = pgettext("addonStore", "Ascending")
+		# Translators: Presented when a list will be sorted in descending order.
+		descendingOrderLabel = pgettext("addonStore", "Descending")
+		columnChoices = []
+		for c in self.presentedFields:
+			columnChoices.append(f"{c.displayString} ({ascendingOrderLabel})")
+			columnChoices.append(f"{c.displayString} ({descendingOrderLabel})")
+		self._columnChoices = columnChoices
+
+	def setReverse(self, reverse: bool) -> None:
+		self._reverse = reverse
+
 	def _getFilteredSortedIds(self) -> List[str]:
 		def _getSortFieldData(listItemVM: AddonListItemVM) -> "SupportsLessThan":
 			return strxfrm(self._getAddonFieldText(listItemVM, self._sortByModelField))
@@ -371,7 +387,9 @@ def _containsTerm(detailsVM: AddonListItemVM, term: str) -> bool:
 			for vm in self._addons.values()
 			if self._filterString is None or _containsTerm(vm, self._filterString)
 		)
-		filteredSorted = list([vm.Id for vm in sorted(filtered, key=_getSortFieldData)])
+		filteredSorted = list(
+			[vm.Id for vm in sorted(filtered, key=_getSortFieldData, reverse=self._reverse)],
+		)
 		return filteredSorted
 
 	def _tryPersistSelection(
diff --git a/tests/manual/addonStore.md b/tests/manual/addonStore.md
@@ -30,6 +30,14 @@ Add-ons can be filtered by display name, publisher and description.
 1. Enable the "Include incompatible add-ons" filter
 1. Ensure add-ons with status "incompatible" are included in the list with the available add-ons.
 
+### Sorting the add-ons list by column
+1. Open the Add-on Store
+1. Jump to the sort by column field (`alt+m`)
+1. Select different columns, and ensure that the add-ons list is sorted accordingly
+1. Alternatively, perform a left mouse click on different columns
+1. Check and uncheck the descending order checkbox (`alt+d`), and ensure that add-ons are sorted in descending order only when the checkbox is checked.
+1. Change to different tabs, and repeat the previous steps.
+
 ### Failure to fetch add-ons available for download
 1. Disable your internet connection
 1. Go to your [NVDA user configuration folder](#editing-user-configuration)
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -15,6 +15,7 @@ In order to use this feature, the application volume adjuster needs to be enable
 * Added an action in the Add-on Store to cancel the install of add-ons. (#15578, @hwf1324)
 * Added an action in the Add-on Store to retry the installation if the download/installation of an add-on fails. (#17090, @hwf1324)
 * It is now possible to specify a mirror URL to use for the Add-on Store. (#14974)
+* The add-ons lists in the Add-on Store can be sorted by columns. (#15277, @nvdaes)
 * When decreasing or increasing the font size in LibreOffice Writer using the corresponding keyboard shortcuts, NVDA announces the new font size. (#6915, @michaelweghorn)
 
 ### Changes
diff --git a/user_docs/en/userGuide.md b/user_docs/en/userGuide.md
@@ -3637,6 +3637,14 @@ You can reach it by pressing `shift+tab` from the list of add-ons.
 Type a keyword or two for the kind of add-on you're looking for, then `tab` to the list of add-ons.
 Add-ons will be listed if the search text can be found in the add-on ID, display name, publisher, author or description.
 
+#### Sorting the add-ons list by column {#AddonStoreSortByColumn}
+
+By default, the add-ons list is sorted by the add-ons' display name.
+The "Sort by column" combo box can be used to sort the list by the available columns for each tab.
+For example, you may wish to sort add-ons by publisher, available version, etc.
+
+Add-ons can be sortered in ascending or descending order.
+
 ### Add-on actions {#AddonStoreActions}
 
 Add-ons have associated actions, such as install, help, disable, and remove.
