This commit is contained in:
Kovid Goyal 2020-04-23 13:21:53 +05:30
parent 0d033196fc
commit 34d59bc672
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 5 additions and 4 deletions

View File

@ -274,7 +274,7 @@ class Quickview(QDialog, Ui_Quickview):
index = self.books_table.indexAt(point) index = self.books_table.indexAt(point)
item = self.books_table.item(index.row(), 0) item = self.books_table.item(index.row(), 0)
if item is None: if item is None:
return False; return False
book_id = int(item.data(Qt.UserRole)) book_id = int(item.data(Qt.UserRole))
self.context_menu = QMenu(self) self.context_menu = QMenu(self)
self.context_menu.addAction(self.view_icon, _('View'), self.context_menu.addAction(self.view_icon, _('View'),
@ -425,8 +425,7 @@ class Quickview(QDialog, Ui_Quickview):
try: try:
self.current_column = ( self.current_column = (
self.view.column_map.index('authors') if self.view.column_map.index('authors') if self.current_column is None and self.view.column_map[idx.column()] == 'title'
self.current_column is None and self.view.column_map[idx.column()] == 'title'
else idx.column()) else idx.column())
key = self.view.column_map[self.current_column] key = self.view.column_map[self.current_column]
book_id = self.view.model().id(idx.row()) book_id = self.view.model().id(idx.row())

View File

@ -210,7 +210,7 @@ class ConditionEditor(QWidget): # {{{
if dt == 'bool': if dt == 'bool':
from calibre.gui2.ui import get_gui from calibre.gui2.ui import get_gui
if not get_gui().current_db.prefs.get('bools_are_tristate'): if not get_gui().current_db.prefs.get('bools_are_tristate'):
dt = 'bool2' dt = 'bool2'
if dt in self.action_map: if dt in self.action_map:
actions = self.action_map[dt] actions = self.action_map[dt]
else: else:

View File

@ -1602,6 +1602,7 @@ class BuiltinAuthorSorts(BuiltinFormatterFunction):
names = [sort_data.get(n) for n in mi.authors if n.strip()] names = [sort_data.get(n) for n in mi.authors if n.strip()]
return val_sep.join(n for n in names) return val_sep.join(n for n in names)
class BuiltinCheckYesNo(BuiltinFormatterFunction): class BuiltinCheckYesNo(BuiltinFormatterFunction):
name = 'check_yes_no' name = 'check_yes_no'
arg_count = 4 arg_count = 4
@ -1633,6 +1634,7 @@ class BuiltinCheckYesNo(BuiltinFormatterFunction):
return 'yes' return 'yes'
return "" return ""
_formatter_builtins = [ _formatter_builtins = [
BuiltinAdd(), BuiltinAnd(), BuiltinApproximateFormats(), BuiltinAssign(), BuiltinAdd(), BuiltinAnd(), BuiltinApproximateFormats(), BuiltinAssign(),
BuiltinAuthorLinks(), BuiltinAuthorSorts(), BuiltinBooksize(), BuiltinAuthorLinks(), BuiltinAuthorSorts(), BuiltinBooksize(),