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

Fix display or custom columns of type rating in Tag Browser

Browse Source
This commit is contained in:
Kovid Goyal 2010-05-03 21:03:09 -06:00
parent d6bf59d83f
commit c1fd349e10
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/__init__.py
View File

@ -184,11 +184,14 @@ class MessageBox(QMessageBox):
def warning_dialog(parent, title, msg, det_msg='', show=False): def warning_dialog(parent, title, msg, det_msg='', show=False,
show_copy_button=True):
d = MessageBox(QMessageBox.Warning, 'WARNING: '+title, msg, QMessageBox.Ok, d = MessageBox(QMessageBox.Warning, 'WARNING: '+title, msg, QMessageBox.Ok,
parent, det_msg) parent, det_msg)
d.setEscapeButton(QMessageBox.Ok) d.setEscapeButton(QMessageBox.Ok)
d.setIconPixmap(QPixmap(I('dialog_warning.svg'))) d.setIconPixmap(QPixmap(I('dialog_warning.svg')))
if not show_copy_button:
d.cb.setVisible(False)
if show: if show:
return d.exec_() return d.exec_()
return d return d

2
src/calibre/gui2/dialogs/config/__init__.py
View File

@ -831,7 +831,7 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
warning_dialog(self, _('Must restart'), warning_dialog(self, _('Must restart'),
_('The changes you made require that Calibre be ' _('The changes you made require that Calibre be '
'restarted. Please restart as soon as practical.'), 'restarted. Please restart as soon as practical.'),
show=True) show=True, show_copy_button=False)
self.parent.must_restart_before_config = True self.parent.must_restart_before_config = True
QDialog.accept(self) QDialog.accept(self)

2
src/calibre/library/custom_columns.py
View File

@ -145,6 +145,8 @@ class CustomColumns(object):
if v['normalized']: if v['normalized']:
tn = 'custom_column_{0}'.format(i) tn = 'custom_column_{0}'.format(i)
self.tag_browser_categories[tn] = [v['label'], 'value'] self.tag_browser_categories[tn] = [v['label'], 'value']
if v['datatype'] == 'rating':
self.tag_browser_formatters[tn] = lambda x:u'\u2605'*int(round(x/2.))
def get_custom(self, idx, label=None, num=None, index_is_id=False): def get_custom(self, idx, label=None, num=None, index_is_id=False):

4
src/calibre/library/database2.py
View File

@ -127,6 +127,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
'authors' : ['author', 'name'], 'authors' : ['author', 'name'],
'news' : ['news', 'name'], 'news' : ['news', 'name'],
} }
self.tag_browser_formatters = {}
self.connect() self.connect()
self.is_case_sensitive = not iswindows and not isosx and \ self.is_case_sensitive = not iswindows and not isosx and \
@ -632,7 +633,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
else: else:
icon = icon_map['*custom'] icon = icon_map['*custom']
tooltip = self.custom_column_label_map[category]['name'] tooltip = self.custom_column_label_map[category]['name']
categories[category] = [Tag(r[1], count=r[2], id=r[0], icon=icon, tooltip = tooltip) formatter = self.tag_browser_formatters.get(tn, lambda x: x)
categories[category] = [Tag(formatter(r[1]), count=r[2], id=r[0], icon=icon, tooltip = tooltip)
for r in data if r[2] > 0] for r in data if r[2] > 0]
categories['format'] = [] categories['format'] = []
for fmt in self.conn.get('SELECT DISTINCT format FROM data'): for fmt in self.conn.get('SELECT DISTINCT format FROM data'):