Update to version 1.17.8

Fix: Qt6 compatibility - time conversions and column sort order

__init__.py

@@ -13,7 +13,7 @@ class AnnotationsPlugin(InterfaceActionBase):
     description         = 'Import annotations'
     supported_platforms = ['linux', 'osx', 'windows']
     author              = 'David Forrester'
-    version             = (1, 17, 6)
+    version             = (1, 17, 8)
     minimum_calibre_version = (1, 0, 0)
 
     actual_plugin       = 'calibre_plugins.annotations.action:AnnotationsAction'

about.txt

@@ -1,4 +1,7 @@
 Version history:
+1.17.8 - 09 July 2022
+• Fix: Qt6 compatibility - time conversions and column sort order
+
 1.17.6 - 30 June 2022
 • Change: Remove Qt compileUi as no longer used and blocking calibre6/Qt6.
 • Fix: Missed a spot where need to use "current_friendly_name" for MTP devices

annotated_books.py

@@ -17,23 +17,27 @@
     from PyQt5 import QtCore
     from PyQt5 import QtWidgets as QtGui
     from PyQt5.Qt import (Qt, QAbstractItemModel, QAbstractTableModel, QBrush,
-                          QCheckBox, QColor, QDialog, QDialogButtonBox, QFont, QFontMetrics,
-                          QLabel, QVariant,
-                          QTableView, QTableWidgetItem,
-                          QVBoxLayout,
-                          pyqtSignal)
+                          QCheckBox, QColor, QDialogButtonBox, QFont, QFontMetrics,
+                          QLabel, QTableView, QTableWidgetItem, QVBoxLayout
+                          )
     from PyQt5.Qt import QTextEdit as QWebView # Renaming to keep backwards compatibility.
 except ImportError as e:
     debug_print("Error loading QT5: ", e)
     from PyQt4 import QtCore, QtGui
     from PyQt4.Qt import (Qt, QAbstractItemModel, QAbstractTableModel, QBrush,
-                          QCheckBox, QColor, QDialog, QDialogButtonBox, QFont, QFontMetrics,
-                          QLabel, QVariant,
-                          QTableView, QTableWidgetItem,
-                          QVBoxLayout,
-                          pyqtSignal)
+                          QCheckBox, QColor, QDialogButtonBox, QFont, QFontMetrics,
+                          QLabel, QTableView, QTableWidgetItem, QVBoxLayout
+                          )
     from PyQt4.QtWebKit import QWebView
 
+# Maintain backwards compatibility with older versions of Qt and calibre.
+try:
+    qSortOrder_AscendingOrder = Qt.SortOrder.AscendingOrder
+    qSortOrder_DescendingOrder = Qt.SortOrder.DescendingOrder
+except:
+    qSortOrder_AscendingOrder = Qt.AscendingOrder
+    qSortOrder_DescendingOrder = Qt.DescendingOrder
+
 from calibre.constants import islinux, isosx, iswindows
 
 from calibre_plugins.annotations.common_utils import (
@@ -153,19 +157,18 @@ def setData(self, index, value, role):
             else:
                 self.arraydata[row][self.ENABLED_COL].setCheckState(Qt.Checked)
 
-#        self.emit(pyqtSignal("dataChanged(QModelIndex,QModelIndex)"), index, index)
         self.dataChanged.emit(index, index)
         return True
 
-    def sort(self, Ncol, order=Qt.AscendingOrder):
+    def sort(self, Ncol, order=qSortOrder_AscendingOrder):
         """
         Sort table by given column number.
         """
         self.layoutAboutToBeChanged.emit()
         if Ncol == self.ENABLED_COL: # Don't sort on the checkbox column.
-            self.arraydata = sorted(self.arraydata, key=lambda row: row[Ncol].checkState(), reverse=(order == Qt.DescendingOrder))
+            self.arraydata = sorted(self.arraydata, key=lambda row: row[Ncol].checkState(), reverse=(order == qSortOrder_DescendingOrder))
         else:
-            self.arraydata = sorted(self.arraydata, key=operator.itemgetter(Ncol), reverse=(order == Qt.DescendingOrder))
+            self.arraydata = sorted(self.arraydata, key=operator.itemgetter(Ncol), reverse=(order == qSortOrder_DescendingOrder))
         self.layoutChanged.emit()
 
 
@@ -189,7 +192,6 @@ def __init__(self, parent, book_list, get_annotations_as_HTML, source):
         self.show_confidence_colors = self.opts.prefs.get('annotated_books_dialog_show_confidence_as_bg_color', True)
         self.source = source
 
-#         QDialog.__init__(self, parent=self.opts.gui)
         SizePersistedDialog.__init__(self, self.opts.gui, 'Annotations plugin:import annotations dialog')
         self.setWindowTitle(_('Import Annotations'))
         self.setWindowIcon(self.opts.icon)
@@ -328,8 +330,7 @@ def __init__(self, parent, book_list, get_annotations_as_HTML, source):
 
         sort_column = self.opts.prefs.get('annotated_books_dialog_sort_column',
                                           self.CONFIDENCE_COL)
-        sort_order = self.opts.prefs.get('annotated_books_dialog_sort_order',
-                                         Qt.DescendingOrder)
+        sort_order = qSortOrder_AscendingOrder if self.opts.prefs.get('annotated_books_dialog_sort_order', 0) == 0 else qSortOrder_DescendingOrder
         self.tv.sortByColumn(sort_column, sort_order)
         self.tv.setSortingEnabled(True)
 
@@ -363,7 +364,7 @@ def __init__(self, parent, book_list, get_annotations_as_HTML, source):
         self.resize_dialog()
 
     def capture_sort_column(self, sort_column):
-        sort_order = self.tv.horizontalHeader().sortIndicatorOrder()
+        sort_order = 0 if self.tv.horizontalHeader().sortIndicatorOrder() == qSortOrder_AscendingOrder else 1
         self.opts.prefs.set('annotated_books_dialog_sort_column', sort_column)
         self.opts.prefs.set('annotated_books_dialog_sort_order', sort_order)
 
@@ -481,7 +482,7 @@ def toggle_confidence_colors(self):
         if self.show_confidence_colors:
             self.show_confidence_button.setText(_("Hide match status"))
             self.show_confidence_button.setIcon(get_icon('images/matches_hide.png'))
-            self.tv.sortByColumn(self.CONFIDENCE_COL, Qt.DescendingOrder)
+            self.tv.sortByColumn(self.CONFIDENCE_COL, qSortOrder_DescendingOrder)
             self.capture_sort_column(self.CONFIDENCE_COL)
         else:
             self.show_confidence_button.setText(_("Show match status"))
@@ -495,7 +496,6 @@ class PreviewDialog(SizePersistedDialog):
     Render a read-only preview of formatted annotations
     """
     def __init__(self, book_mi, annotations, parent=None):
-        #QDialog.__init__(self, parent)
         self.prefs = plugin_prefs
         super(PreviewDialog, self).__init__(parent, 'annotations_preview_dialog')
         self.pl = QVBoxLayout(self)
@@ -515,8 +515,6 @@ def __init__(self, book_mi, annotations, parent=None):
         self.buttonbox.setOrientation(Qt.Horizontal)
 #        self.buttonbox.accepted.connect(self.close)
         self.buttonbox.rejected.connect(self.close)
-#        self.connect(self.buttonbox, pyqtSignal('accepted()'), self.close)
-#        self.connect(self.buttonbox, pyqtSignal('rejected()'), self.close)
         self.pl.addWidget(self.buttonbox)
 
         # Sizing

config.py

@@ -23,15 +23,17 @@
 try:
     from PyQt5 import QtWidgets as QtGui
     from PyQt5.Qt import (Qt, QCheckBox, QComboBox, QFrame, QGridLayout,
-        QGroupBox, QIcon, QLabel, QLineEdit, QPushButton, QSizePolicy,
+        QGroupBox, QIcon, QLabel, QLineEdit, QPushButton,
         QRect, QThread, QTimer, QToolButton, QVBoxLayout, QWidget,
         pyqtSignal)
+    from PyQt5.QtWidgets import QSizePolicy
 except ImportError as e:
     from PyQt4 import QtGui
     from PyQt4.Qt import (Qt, QCheckBox, QComboBox, QFrame, QGridLayout,
-        QGroupBox, QIcon, QLabel, QLineEdit, QPushButton, QSizePolicy,
+        QGroupBox, QIcon, QLabel, QLineEdit, QPushButton,
         QRect, QThread, QTimer, QToolButton, QVBoxLayout, QWidget,
         pyqtSignal)
+    from PyQt4.QtGui import QSizePolicy
 
 from calibre.ebooks.BeautifulSoup import BeautifulSoup
 from calibre.gui2.dialogs.message_box import MessageBox
@@ -53,6 +55,18 @@
     debug_print("Annotations::config.py - exception when loading translations")
     pass # load_translations() added in calibre 1.9
 
+# Maintain backwards compatibility with older versions of Qt and calibre.
+try:
+    qSizePolicy_Expanding = QSizePolicy.Policy.Expanding
+    qSizePolicy_Maximum   = QSizePolicy.Policy.Maximum
+    qSizePolicy_Minimum   = QSizePolicy.Policy.Minimum
+    qSizePolicy_Preferred = QSizePolicy.Policy.Preferred
+except:
+    qSizePolicy_Expanding = QSizePolicy.Expanding
+    qSizePolicy_Maximum   = QSizePolicy.Maximum
+    qSizePolicy_Minimum   = QSizePolicy.Minimum
+    qSizePolicy_Preferred = QSizePolicy.Preferred
+
 plugin_prefs = JSONConfig('plugins/annotations')
 
 dialog_resources_path = os.path.join(config_dir, 'plugins', 'annotations_resources', 'dialogs')
@@ -166,7 +180,7 @@ def __init__(self, plugin_action):
         self.cfg_annotation_options_qgl.addWidget(self.cfg_annotations_appearance_pushbutton, current_row, 0)
         current_row += 1
 
-        self.spacerItem = QtGui.QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+        self.spacerItem = QtGui.QSpacerItem(20, 40, qSizePolicy_Minimum, qSizePolicy_Expanding)
         self.cfg_annotation_options_qgl.addItem(self.spacerItem, current_row, 0, 1, 1)
 
         # ~~~~~~~~ Compilations group box ~~~~~~~~

find_annotations.py

@@ -24,15 +24,29 @@
     from PyQt5.Qt import (Qt, QComboBox, QDateTime, QDialogButtonBox,
         QEvent, QFrame, QGridLayout, QGroupBox, QIcon, QLabel, QLineEdit, QPushButton,
         QRect, QTimer,
-        QToolButton, QVBoxLayout,
+        QToolButton, QVBoxLayout, QSpacerItem,
         pyqtSignal)
+    from PyQt5.QtWidgets import QSizePolicy
 except ImportError as e:
     from PyQt4 import QtCore, QtGui
     from PyQt4.Qt import (Qt, QComboBox, QDateTime, QDialogButtonBox,
         QEvent, QFrame, QGridLayout, QGroupBox, QIcon, QLabel, QLineEdit, QPushButton,
         QRect, QTimer,
-        QToolButton, QVBoxLayout,
+        QToolButton, QVBoxLayout, QSpacerItem,
         pyqtSignal)
+    from PyQt4.QtGui import QSizePolicy
+
+# Maintain backwards compatibility with older versions of Qt and calibre.
+try:
+    qSizePolicy_Expanding = QSizePolicy.Policy.Expanding
+    qSizePolicy_Maximum   = QSizePolicy.Policy.Maximum
+    qSizePolicy_Minimum   = QSizePolicy.Policy.Minimum
+    qSizePolicy_Preferred = QSizePolicy.Policy.Preferred
+except:
+    qSizePolicy_Expanding = QSizePolicy.Expanding
+    qSizePolicy_Maximum   = QSizePolicy.Maximum
+    qSizePolicy_Minimum   = QSizePolicy.Minimum
+    qSizePolicy_Preferred = QSizePolicy.Preferred
 
 from calibre_plugins.annotations.annotations import COLOR_MAP
 from calibre_plugins.annotations.common_utils import (Logger, SizePersistedDialog,
@@ -204,7 +218,7 @@ def __init__(self, opts):
         self.result_label.setAlignment(Qt.AlignCenter)
         self.result_label.setWordWrap(False)
 
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Maximum)
+        sizePolicy = QtGui.QSizePolicy(qSizePolicy_Minimum, qSizePolicy_Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.result_label.sizePolicy().hasHeightForWidth())
@@ -230,14 +244,14 @@ def __init__(self, opts):
         self.dialogButtonBox.clicked.connect(self.find_annotations_dialog_clicked)
 
         # ~~~~~~~~ Add a spacer ~~~~~~~~
-        self.spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.spacerItem = QSpacerItem(20, 40, qSizePolicy_Minimum, qSizePolicy_Expanding)
         self.l.addItem(self.spacerItem)
 
         # ~~~~~~~~ Restore previously saved settings ~~~~~~~~
         self.restore_settings()
 
         # ~~~~~~~~ Declare sizing ~~~~~~~~
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy = QSizePolicy(qSizePolicy_Preferred, qSizePolicy_Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.sizePolicy().hasHeightForWidth())
@@ -368,8 +382,12 @@ def update_results(self, trigger):
         text_to_match = str(self.find_annotations_text_lineEdit.text())
         note_to_match = str(self.find_annotations_note_lineEdit.text())
 
-        from_date = self.find_annotations_date_from_dateEdit.dateTime().toTime_t()
-        to_date = self.find_annotations_date_to_dateEdit.dateTime().toTime_t()
+        try:
+            from_date = self.find_annotations_date_from_dateEdit.dateTime().toSecsSinceEpoch()
+            to_date = self.find_annotations_date_to_dateEdit.dateTime().toSecsSinceEpoch()
+        except: # For Python/Qt backwards compatability
+            from_date = self.find_annotations_date_from_dateEdit.dateTime().toTime_t()
+            to_date = self.find_annotations_date_to_dateEdit.dateTime().toTime_t()
 
         annotation_map = self.annotated_books_scanner.annotation_map
         #field = self.prefs.get("cfg_annotations_destination_field", None)