Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source 
Fixes #2058472 [[Enhancement] Sort by tool](https://bugs.launchpad.net/calibre/+bug/2058472)
This commit is contained in:
Kovid Goyal 2024-03-21 08:02:55 +05:30
commit f0d4ceeed4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/calibre/gui2/actions/sort.py
View File

@ -68,8 +68,10 @@ class SortByAction(InterfaceAction):
self.gui.addAction(ac)
return ac
c('reverse_sort_action', _('Reverse current sort'), _('Reverse the current sort order'), self.reverse_sort, 'shift+f5')
c('reapply_sort_action', _('Re-apply current sort'), _('Re-apply the current sort'), self.reapply_sort, 'f5')
self.reverse_action = c('reverse_sort_action', _('Reverse current sort'),
_('Reverse the current sort order'), self.reverse_sort, 'shift+f5')
self.reapply_action = c('reapply_sort_action', _('Re-apply current sort'),
_('Re-apply the current sort'), self.reapply_sort, 'f5')
def about_to_show_menu(self):
self.update_menu()
@ -106,6 +108,11 @@ class SortByAction(InterfaceAction):
m = self.gui.library_view.model()
db = self.gui.current_db
# Use these actions so we get the shortcut(s) displayed
menu.addAction(self.reapply_action)
menu.addAction(self.reverse_action)
menu.addSeparator()
# Add saved sorts to the menu
saved_sorts = db.new_api.pref('saved_multisort_specs', {})
if saved_sorts:
@ -115,9 +122,9 @@ class SortByAction(InterfaceAction):
# Note the current sort column so it can be specially handled below
try:
sort_col, order = m.sorted_on
sort_col = m.sorted_on[0]
except TypeError:
sort_col, order = 'date', True
sort_col = 'date'
# The operations to choose which columns to display and to create saved sorts
menu.addAction(_('Select sortable columns')).triggered.connect(self.select_sortable_columns)
@ -136,19 +143,10 @@ class SortByAction(InterfaceAction):
continue
if key in hidden:
continue
ascending = None
if key == sort_col:
name = _('%s [reverse current sort]') % name
ascending = not order
sac = SortAction(name, key, ascending, menu)
sac = SortAction(name, key, None, menu)
if key == sort_col:
sac.setIcon(self.sorted_icon)
sac.sort_requested.connect(self.sort_requested)
if key == sort_col:
before = menu.actions()[0] if menu.actions() else None
menu.insertAction(before, sac)
menu.insertSeparator(before)
else:
menu.addAction(sac)
def select_sortable_columns(self):