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 'toolbar-sort' of https://github.com/eli-schwartz/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2019-05-07 07:55:18 +05:30
commit 1dce5118b9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/gui2/preferences/toolbar.py
View File

@ -8,6 +8,7 @@ __docformat__ = 'restructuredtext en'
from PyQt5.Qt import QAbstractListModel, Qt, QIcon, \ from PyQt5.Qt import QAbstractListModel, Qt, QIcon, \
QItemSelectionModel QItemSelectionModel
from calibre import force_unicode
from calibre.gui2.preferences.toolbar_ui import Ui_Form from calibre.gui2.preferences.toolbar_ui import Ui_Form
from calibre.gui2 import gprefs, warning_dialog, error_dialog from calibre.gui2 import gprefs, warning_dialog, error_dialog
from calibre.gui2.preferences import ConfigWidgetBase, test_widget, AbortCommit from calibre.gui2.preferences import ConfigWidgetBase, test_widget, AbortCommit
@ -15,6 +16,15 @@ from calibre.utils.icu import primary_sort_key
from polyglot.builtins import unicode_type from polyglot.builtins import unicode_type
def sort_key_for_action(ac):
q = getattr(ac, 'action_spec', None)
if q is None:
q = q.name
else:
q = q[0]
return primary_sort_key(force_unicode(q))
class FakeAction(object): class FakeAction(object):
def __init__(self, name, gui_name, icon, tooltip=None, def __init__(self, name, gui_name, icon, tooltip=None,
@ -105,12 +115,7 @@ class AllModel(BaseModel):
all = [self.name_to_action(x, self.gui) for x in all] all = [self.name_to_action(x, self.gui) for x in all]
all = [x for x in all if self.key not in x.dont_add_to] all = [x for x in all if self.key not in x.dont_add_to]
def sk(ac): all.sort(key=sort_key_for_action)
try:
return primary_sort_key(ac.action_spec[0])
except Exception:
pass
all.sort(key=sk)
return all return all
def add(self, names): def add(self, names):
@ -121,7 +126,7 @@ class AllModel(BaseModel):
actions.append(self.name_to_action(name, self.gui)) actions.append(self.name_to_action(name, self.gui))
self.beginResetModel() self.beginResetModel()
self._data.extend(actions) self._data.extend(actions)
self._data.sort() self._data.sort(key=sort_key_for_action)
self.endResetModel() self.endResetModel()
def remove(self, indices, allowed): def remove(self, indices, allowed):