Make the editor dialog class available for general use

src/calibre/gui2/tweak_book/widgets.py

@@ -11,17 +11,18 @@ from itertools import izip
 from collections import OrderedDict
 
 from PyQt5.Qt import (
-    QDialog, QDialogButtonBox, QGridLayout, QLabel, QLineEdit, QVBoxLayout,
+    QGridLayout, QLabel, QLineEdit, QVBoxLayout, QFormLayout, QHBoxLayout,
-    QFormLayout, QHBoxLayout, QToolButton, QIcon, QApplication, Qt, QWidget,
+    QToolButton, QIcon, QApplication, Qt, QWidget, QPoint, QSizePolicy,
-    QPoint, QSizePolicy, QPainter, QStaticText, pyqtSignal, QTextOption,
+    QPainter, QStaticText, pyqtSignal, QTextOption, QAbstractListModel,
-    QAbstractListModel, QModelIndex, QStyledItemDelegate, QStyle, QCheckBox,
+    QModelIndex, QStyledItemDelegate, QStyle, QCheckBox, QListView,
-    QListView, QTextDocument, QSize, QComboBox, QFrame, QCursor, QGroupBox,
+    QTextDocument, QSize, QComboBox, QFrame, QCursor, QGroupBox, QSplitter,
-    QSplitter, QPixmap, QRect)
+    QPixmap, QRect)
 
 from calibre import prepare_string_for_xml, human_readable
 from calibre.ebooks.oeb.polish.utils import lead_text, guess_type
 from calibre.gui2 import error_dialog, choose_files, choose_save_file, info_dialog, choose_images
 from calibre.gui2.tweak_book import tprefs, current_container
+from calibre.gui2.widgets2 import Dialog as BaseDialog
 from calibre.utils.icu import primary_sort_key, sort_key, primary_contains
 from calibre.utils.matcher import get_char, Matcher
 from calibre.gui2.complete2 import EditWithComplete
@@ -36,41 +37,10 @@ class BusyCursor(object):
     def __exit__(self, *args):
         QApplication.restoreOverrideCursor()
 
-class Dialog(QDialog):
+class Dialog(BaseDialog):
 
     def __init__(self, title, name, parent=None):
-        QDialog.__init__(self, parent)
+        BaseDialog.__init__(self, title, name, parent=parent, prefs=tprefs)
-        self.setWindowTitle(title)
-        self.name = name
-        self.bb = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
-        self.bb.accepted.connect(self.accept)
-        self.bb.rejected.connect(self.reject)
-
-        self.setup_ui()
-
-        self.resize(self.sizeHint())
-        geom = tprefs.get(name + '-geometry', None)
-        if geom is not None:
-            self.restoreGeometry(geom)
-        if hasattr(self, 'splitter'):
-            state = tprefs.get(name + '-splitter-state', None)
-            if state is not None:
-                self.splitter.restoreState(state)
-
-    def accept(self):
-        tprefs.set(self.name + '-geometry', bytearray(self.saveGeometry()))
-        if hasattr(self, 'splitter'):
-            tprefs.set(self.name + '-splitter-state', bytearray(self.splitter.saveState()))
-        QDialog.accept(self)
-
-    def reject(self):
-        tprefs.set(self.name + '-geometry', bytearray(self.saveGeometry()))
-        if hasattr(self, 'splitter'):
-            tprefs.set(self.name + '-splitter-state', bytearray(self.splitter.saveState()))
-        QDialog.reject(self)
-
-    def setup_ui(self):
-        raise NotImplementedError('You must implement this method in Dialog subclasses')
 
 class InsertTag(Dialog):  # {{{
 

src/calibre/gui2/widgets2.py

@@ -8,8 +8,9 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 from PyQt5.Qt import (
     QPushButton, QPixmap, QIcon, QColor, Qt, QColorDialog, pyqtSignal,
-    QKeySequence, QToolButton)
+    QKeySequence, QToolButton, QDialog, QDialogButtonBox)
 
+from calibre.gui2 import gprefs
 from calibre.gui2.complete2 import LineEdit, EditWithComplete
 from calibre.gui2.widgets import history
 
@@ -131,3 +132,40 @@ class RightClickButton(QToolButton):
             return
         return QToolButton.mousePressEvent(self, ev)
 
+class Dialog(QDialog):
+
+    def __init__(self, title, name, parent=None, prefs=gprefs):
+        QDialog.__init__(self, parent)
+        self.prefs_for_persistence = prefs
+        self.setWindowTitle(title)
+        self.name = name
+        self.bb = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.bb.accepted.connect(self.accept)
+        self.bb.rejected.connect(self.reject)
+
+        self.setup_ui()
+
+        self.resize(self.sizeHint())
+        geom = self.prefs_for_persistence.get(name + '-geometry', None)
+        if geom is not None:
+            self.restoreGeometry(geom)
+        if hasattr(self, 'splitter'):
+            state = self.prefs_for_persistence.get(name + '-splitter-state', None)
+            if state is not None:
+                self.splitter.restoreState(state)
+
+    def accept(self):
+        self.prefs_for_persistence.set(self.name + '-geometry', bytearray(self.saveGeometry()))
+        if hasattr(self, 'splitter'):
+            self.prefs_for_persistence.set(self.name + '-splitter-state', bytearray(self.splitter.saveState()))
+        QDialog.accept(self)
+
+    def reject(self):
+        self.prefs_for_persistence.set(self.name + '-geometry', bytearray(self.saveGeometry()))
+        if hasattr(self, 'splitter'):
+            self.prefs_for_persistence.set(self.name + '-splitter-state', bytearray(self.splitter.saveState()))
+        QDialog.reject(self)
+
+    def setup_ui(self):
+        raise NotImplementedError('You must implement this method in Dialog subclasses')
+