Fix Calibre 6 issue in Obok plugin

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d48de7e50b99c67fdd0dfaa35c948dad69e3cff..feb8a84a1424e6ecc39cb112346b52d1c0870d91 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,4 +69,5 @@ List of changes since the fork of Apprentice Harper's repository:
 
 ## Fixes on master (not yet released):
 
-- Fix a bug introduced with #48 that breaks DeDRM'ing on Calibre 4 (fixes #101).
\ No newline at end of file
+- 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).

diff --git a/Obok_plugin/common_utils.py b/Obok_plugin/common_utils.py
index 21b7f195e6d3646e969bc8aafe876ebf63b2ff09..fe67f42593afe428cc6a42fa125b8b9863f6b77c 100644 (file)
--- a/Obok_plugin/common_utils.py
+++ b/Obok_plugin/common_utils.py
@@ -265,13 +265,13 @@ class ReadOnlyTableWidgetItem(QTableWidgetItem):
     def __init__(self, text):
         if text is None:
             text = ''
-        QTableWidgetItem.__init__(self, text, QTableWidgetItem.UserType)
+        QTableWidgetItem.__init__(self, text, QTableWidgetItem.ItemType.UserType)
         self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
 
 class RatingTableWidgetItem(QTableWidgetItem):
 
     def __init__(self, rating, is_read_only=False):
-        QTableWidgetItem.__init__(self, '', QTableWidgetItem.UserType)
+        QTableWidgetItem.__init__(self, '', QTableWidgetItem.ItemType.UserType)
         self.setData(Qt.DisplayRole, rating)
         if is_read_only:
             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:
             date_read = now()
         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.setData(Qt.DisplayRole, QDateTime(date_read))
         else:
-            QTableWidgetItem.__init__(self, '', QTableWidgetItem.UserType)
+            QTableWidgetItem.__init__(self, '', QTableWidgetItem.ItemType.UserType)
             self.setData(Qt.DisplayRole, QDateTime(date_read))
 
 from calibre.gui2.library.delegates import DateDelegate as _DateDelegate

diff --git a/Obok_plugin/utilities.py b/Obok_plugin/utilities.py
index b2f02ade09943a2f649c6276e14342564a4b61d4..ba0d7fc51aa7898d23b51f00bd00f942f6fbb0ed 100644 (file)
--- a/Obok_plugin/utilities.py
+++ b/Obok_plugin/utilities.py
@@ -224,5 +224,5 @@ class ReadOnlyTableWidgetItem(QTableWidgetItem):
     def __init__(self, text):
         if text is None:
             text = ''
-        QTableWidgetItem.__init__(self, text, QTableWidgetItem.UserType)
+        QTableWidgetItem.__init__(self, text, QTableWidgetItem.ItemType.UserType)
         self.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)