Fix Calibre 6 issue in Obok plugin
This commit is contained in:
parent
c15135b12f
commit
59839ae5c7
|
@ -70,3 +70,4 @@ List of changes since the fork of Apprentice Harper's repository:
|
||||||
## Fixes on master (not yet released):
|
## Fixes on master (not yet released):
|
||||||
|
|
||||||
- Fix a bug introduced with #48 that breaks DeDRM'ing on Calibre 4 (fixes #101).
|
- Fix a bug introduced with #48 that breaks DeDRM'ing on Calibre 4 (fixes #101).
|
||||||
|
- Fix some more Calibre-6 bugs in the Obok plugin (should fix #114).
|
||||||
|
|
|
@ -265,13 +265,13 @@ class ReadOnlyTableWidgetItem(QTableWidgetItem):
|
||||||
def __init__(self, text):
|
def __init__(self, text):
|
||||||
if text is None:
|
if text is None:
|
||||||
text = ''
|
text = ''
|
||||||
QTableWidgetItem.__init__(self, text, QTableWidgetItem.UserType)
|
QTableWidgetItem.__init__(self, text, QTableWidgetItem.ItemType.UserType)
|
||||||
self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
|
self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
|
||||||
|
|
||||||
class RatingTableWidgetItem(QTableWidgetItem):
|
class RatingTableWidgetItem(QTableWidgetItem):
|
||||||
|
|
||||||
def __init__(self, rating, is_read_only=False):
|
def __init__(self, rating, is_read_only=False):
|
||||||
QTableWidgetItem.__init__(self, '', QTableWidgetItem.UserType)
|
QTableWidgetItem.__init__(self, '', QTableWidgetItem.ItemType.UserType)
|
||||||
self.setData(Qt.DisplayRole, rating)
|
self.setData(Qt.DisplayRole, rating)
|
||||||
if is_read_only:
|
if is_read_only:
|
||||||
self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
|
self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
|
||||||
|
@ -284,11 +284,11 @@ class DateTableWidgetItem(QTableWidgetItem):
|
||||||
if date_read is None or date_read == UNDEFINED_DATE and default_to_today:
|
if date_read is None or date_read == UNDEFINED_DATE and default_to_today:
|
||||||
date_read = now()
|
date_read = now()
|
||||||
if is_read_only:
|
if is_read_only:
|
||||||
QTableWidgetItem.__init__(self, format_date(date_read, fmt), QTableWidgetItem.UserType)
|
QTableWidgetItem.__init__(self, format_date(date_read, fmt), QTableWidgetItem.ItemType.UserType)
|
||||||
self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
|
self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
|
||||||
self.setData(Qt.DisplayRole, QDateTime(date_read))
|
self.setData(Qt.DisplayRole, QDateTime(date_read))
|
||||||
else:
|
else:
|
||||||
QTableWidgetItem.__init__(self, '', QTableWidgetItem.UserType)
|
QTableWidgetItem.__init__(self, '', QTableWidgetItem.ItemType.UserType)
|
||||||
self.setData(Qt.DisplayRole, QDateTime(date_read))
|
self.setData(Qt.DisplayRole, QDateTime(date_read))
|
||||||
|
|
||||||
from calibre.gui2.library.delegates import DateDelegate as _DateDelegate
|
from calibre.gui2.library.delegates import DateDelegate as _DateDelegate
|
||||||
|
|
|
@ -224,5 +224,5 @@ class ReadOnlyTableWidgetItem(QTableWidgetItem):
|
||||||
def __init__(self, text):
|
def __init__(self, text):
|
||||||
if text is None:
|
if text is None:
|
||||||
text = ''
|
text = ''
|
||||||
QTableWidgetItem.__init__(self, text, QTableWidgetItem.UserType)
|
QTableWidgetItem.__init__(self, text, QTableWidgetItem.ItemType.UserType)
|
||||||
self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
|
self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
|
||||||
|
|
Loading…
Reference in New Issue