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

Recover from more changes in delegates.py. Do robustness checks correctly in models.py.

Browse Source
This commit is contained in:
Charles Haley 2011-05-22 20:27:16 +01:00
commit 6d19e4279f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/library/delegates.py
View File

@ -7,12 +7,12 @@ __docformat__ = 'restructuredtext en'
from math import cos, sin, pi from math import cos, sin, pi
from PyQt4.Qt import QColor, Qt, QModelIndex, QSize, QPalette, \ from PyQt4.Qt import (QColor, Qt, QModelIndex, QSize, QApplication,
QPainterPath, QLinearGradient, QBrush, QApplication, \ QPainterPath, QLinearGradient, QBrush,
QPen, QStyle, QPainter, QStyleOptionViewItemV4, \ QPen, QStyle, QPainter, QStyleOptionViewItemV4,
QIcon, QDoubleSpinBox, QVariant, QSpinBox, \ QIcon, QDoubleSpinBox, QVariant, QSpinBox,
QStyledItemDelegate, QComboBox, QTextDocument, \ QStyledItemDelegate, QComboBox, QTextDocument,
QAbstractTextDocumentLayout QAbstractTextDocumentLayout)
from calibre.gui2 import UNDEFINED_QDATE, error_dialog from calibre.gui2 import UNDEFINED_QDATE, error_dialog
from calibre.gui2.widgets import EnLineEdit from calibre.gui2.widgets import EnLineEdit

12
src/calibre/gui2/library/models.py
View File

@ -714,9 +714,9 @@ class BooksModel(QAbstractTableModel): # {{{
mi = self.db.get_metadata(self.id(index), index_is_id=True) mi = self.db.get_metadata(self.id(index), index_is_id=True)
fmt = self.column_color_map[key] fmt = self.column_color_map[key]
try: try:
color = composite_formatter.safe_format(fmt, mi, '', mi) color = QColor(composite_formatter.safe_format(fmt, mi, '', mi))
if QColor.isValid(color): if color.isValid():
return QColor(color) return color
except: except:
return None return None
elif self.is_custom_column(key) and \ elif self.is_custom_column(key) and \
@ -727,9 +727,9 @@ class BooksModel(QAbstractTableModel): # {{{
txt = unicode(index.data(Qt.DisplayRole).toString()) txt = unicode(index.data(Qt.DisplayRole).toString())
if len(colors) > 0 and txt in values: if len(colors) > 0 and txt in values:
try: try:
color = colors[values.index(txt)] color = QColor(colors[values.index(txt)])
if QColor.isValid(color): if color.isValid():
return QColor(color) return color
except: except:
pass pass
return None return None