'
+__docformat__ = 'restructuredtext en'
+
+from PyQt4.Qt import QDialog, QLabel, QVBoxLayout, QDialogButtonBox, \
+ QProgressBar, QSize, QTimer, pyqtSignal, Qt
+
+from calibre.library.restore import Restore
+from calibre.gui2 import error_dialog, question_dialog, warning_dialog, \
+ info_dialog
+
+class DBRestore(QDialog):
+
+ update_signal = pyqtSignal(object, object)
+
+ def __init__(self, parent, library_path):
+ QDialog.__init__(self, parent)
+ self.l = QVBoxLayout()
+ self.setLayout(self.l)
+ self.l1 = QLabel(''+_('Restoring database from backups, do not'
+ ' interrupt, this will happen in two stages')+'...')
+ self.setWindowTitle(_('Restoring database'))
+ self.l.addWidget(self.l1)
+ self.pb = QProgressBar(self)
+ self.l.addWidget(self.pb)
+ self.pb.setMaximum(0)
+ self.pb.setMinimum(0)
+ self.msg = QLabel('')
+ self.l.addWidget(self.msg)
+ self.msg.setWordWrap(True)
+ self.bb = QDialogButtonBox(QDialogButtonBox.Cancel)
+ self.l.addWidget(self.bb)
+ self.bb.rejected.connect(self.reject)
+ self.resize(self.sizeHint() + QSize(100, 50))
+ self.error = None
+ self.rejected = False
+ self.library_path = library_path
+ self.update_signal.connect(self.do_update, type=Qt.QueuedConnection)
+
+ self.restorer = Restore(library_path, self)
+ self.restorer.daemon = True
+
+ # Give the metadata backup thread time to stop
+ QTimer.singleShot(2000, self.start)
+
+
+ def start(self):
+ self.restorer.start()
+ QTimer.singleShot(10, self.update)
+
+ def reject(self):
+ self.rejected = True
+ self.restorer.progress_callback = lambda x, y: x
+ QDialog.rejecet(self)
+
+ def update(self):
+ if self.restorer.is_alive():
+ QTimer.singleShot(10, self.update)
+ else:
+ self.restorer.progress_callback = lambda x, y: x
+ self.accept()
+
+ def __call__(self, msg, step):
+ self.update_signal.emit(msg, step)
+
+ def do_update(self, msg, step):
+ if msg is None:
+ self.pb.setMaximum(step)
+ else:
+ self.msg.setText(msg)
+ self.pb.setValue(step)
+
+
+def restore_database(db, parent=None):
+ if not question_dialog(parent, _('Are you sure?'), ''+
+ _('Your list of books, with all their metadata is '
+ 'stored in a single file, called a database. '
+ 'In addition, metadata for each individual '
+ 'book is stored in that books\' folder, as '
+ 'a backup.'
+ '
This operation will rebuild '
+ 'the database from the individual book '
+ 'metadata. This is useful if the '
+ 'database has been corrupted and you get a '
+ 'blank list of books. Note that restoring only '
+ 'restores books, not any settings stored in the '
+ 'database, or any custom recipes.'
+ '
Do you want to restore the database?')):
+ return False
+ db.conn.close()
+ d = DBRestore(parent, db.library_path)
+ d.exec_()
+ r = d.restorer
+ d.restorer = None
+ if d.rejected:
+ return True
+ if r.tb is not None:
+ error_dialog(parent, _('Failed'),
+ _('Restoring database failed, click Show details to see details'),
+ det_msg=r.tb, show=True)
+ else:
+ if r.errors_occurred:
+ warning_dialog(parent, _('Success'),
+ _('Restoring the database succeeded with some warnings',
+ ' click Show details to see the details.'),
+ det_msg=r.report, show=True)
+ else:
+ info_dialog(parent, _('Success'),
+ _('Restoring database was successful'), show=True,
+ show_copy_button=False)
+ return True
+
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index b88b1d680d..976b679726 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal '
import sys, os, time, socket, traceback
from functools import partial
-from PyQt4.Qt import QCoreApplication, QIcon, QMessageBox, QObject, QTimer, \
+from PyQt4.Qt import QCoreApplication, QIcon, QObject, QTimer, \
QThread, pyqtSignal, Qt, QProgressDialog, QString, QPixmap, \
QSplashScreen, QApplication
@@ -319,9 +319,6 @@ def run_gui(opts, args, actions, listener, app, gui_debug=None):
def cant_start(msg=_('If you are sure it is not running')+', ',
what=None):
- d = QMessageBox(QMessageBox.Critical, _('Cannot Start ')+__appname__,
- ''+(_('%s is already running.')%__appname__)+'
',
- QMessageBox.Ok)
base = '%s
%s %s'
where = __appname__ + ' '+_('may be running in the system tray, in the')+' '
if isosx:
@@ -334,8 +331,10 @@ def cant_start(msg=_('If you are sure it is not running')+', ',
else:
what = _('try deleting the file')+': '+ADDRESS
- d.setInformativeText(base%(where, msg, what))
- d.exec_()
+ info = base%(where, msg, what)
+ error_dialog(None, _('Cannot Start ')+__appname__,
+ '
'+(_('%s is already running.')%__appname__)+'
'+info, show=True)
+
raise SystemExit(1)
def communicate(args):
diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index dc85bad012..590a8be3bb 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -10,7 +10,7 @@ import textwrap, re, os
from PyQt4.Qt import Qt, QDateEdit, QDate, \
QIcon, QToolButton, QWidget, QLabel, QGridLayout, \
QDoubleSpinBox, QListWidgetItem, QSize, QPixmap, \
- QPushButton, QSpinBox, QMessageBox, QLineEdit
+ QPushButton, QSpinBox, QLineEdit
from calibre.gui2.widgets import EnLineEdit, CompleteComboBox, \
EnComboBox, FormatList, ImageView, CompleteLineEdit
@@ -848,9 +848,7 @@ class TagsEdit(CompleteLineEdit): # {{{
if question_dialog(self, _('Tags changed'),
_('You have changed the tags. In order to use the tags'
' editor, you must either discard or apply these '
- 'changes'), show_copy_button=False,
- buttons=QMessageBox.Apply|QMessageBox.Discard,
- yes_button=QMessageBox.Apply):
+ 'changes. Apply changes?'), show_copy_button=False):
self.commit(db, id_)
db.commit()
self.original_val = self.current_val
diff --git a/src/calibre/gui2/preferences/plugins.py b/src/calibre/gui2/preferences/plugins.py
index ba5b921d44..1edd4fe5f9 100644
--- a/src/calibre/gui2/preferences/plugins.py
+++ b/src/calibre/gui2/preferences/plugins.py
@@ -17,11 +17,14 @@ from calibre.customize.ui import initialized_plugins, is_disabled, enable_plugin
remove_plugin
from calibre.gui2 import NONE, error_dialog, info_dialog, choose_files, \
question_dialog
+from calibre.utils.search_query_parser import SearchQueryParser
+from calibre.utils.icu import lower
-class PluginModel(QAbstractItemModel): # {{{
+class PluginModel(QAbstractItemModel, SearchQueryParser): # {{{
def __init__(self, *args):
QAbstractItemModel.__init__(self, *args)
+ SearchQueryParser.__init__(self, ['all'])
self.icon = QVariant(QIcon(I('plugins.png')))
p = QIcon(self.icon).pixmap(32, 32, QIcon.Disabled, QIcon.On)
self.disabled_icon = QVariant(QIcon(p))
@@ -40,6 +43,72 @@ class PluginModel(QAbstractItemModel): # {{{
for plugins in self._data.values():
plugins.sort(cmp=lambda x, y: cmp(x.name.lower(), y.name.lower()))
+ def universal_set(self):
+ ans = set([])
+ for c, category in enumerate(self.categories):
+ ans.add((c, -1))
+ for p, plugin in enumerate(self._data[category]):
+ ans.add((c, p))
+ return ans
+
+ def get_matches(self, location, query, candidates=None):
+ if candidates is None:
+ candidates = self.universal_set()
+ ans = set([])
+ if not query:
+ return ans
+ query = lower(query)
+ for c, p in candidates:
+ if p < 0:
+ if query in lower(self.categories[c]):
+ ans.add((c, p))
+ else:
+ try:
+ plugin = self._data[self.categories[c]][p]
+ except:
+ continue
+ if query in lower(plugin.name) or query in lower(plugin.author) or \
+ query in lower(plugin.description):
+ ans.add((c, p))
+ return ans
+
+ def find(self, query):
+ query = query.strip()
+ matches = self.parse(query)
+ if not matches:
+ return QModelIndex()
+ matches = list(sorted(matches))
+ c, p = matches[0]
+ cat_idx = self.index(c, 0, QModelIndex())
+ if p == -1:
+ return cat_idx
+ return self.index(p, 0, cat_idx)
+
+ def find_next(self, idx, query, backwards=False):
+ query = query.strip()
+ matches = self.parse(query)
+ if not matches:
+ return idx
+ if idx.parent().isValid():
+ loc = (idx.parent().row(), idx.row())
+ else:
+ loc = (idx.row(), -1)
+ if loc not in matches:
+ return self.find(query)
+ if len(matches) == 1:
+ return QModelIndex()
+ matches = list(sorted(matches))
+ i = matches.index(loc)
+ if backwards:
+ ans = i - 1 if i - 1 >= 0 else len(matches)-1
+ else:
+ ans = i + 1 if i + 1 < len(matches) else 0
+
+ ans = matches[ans]
+
+ return self.index(ans[0], 0, QModelIndex()) if ans[1] < 0 else \
+ self.index(ans[1], 0, self.index(ans[0], 0, QModelIndex()))
+
def index(self, row, column, parent):
if not self.hasIndex(row, column, parent):
return QModelIndex()
@@ -127,6 +196,7 @@ class PluginModel(QAbstractItemModel): # {{{
return plugin
return NONE
+
# }}}
class ConfigWidget(ConfigWidgetBase, Ui_Form):
@@ -144,6 +214,42 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.customize_plugin_button.clicked.connect(self.customize_plugin)
self.remove_plugin_button.clicked.connect(self.remove_plugin)
self.button_plugin_add.clicked.connect(self.add_plugin)
+ self.search.initialize('plugin_search_history',
+ help_text=_('Search for plugin'))
+ self.search.search.connect(self.find)
+ self.next_button.clicked.connect(self.find_next)
+ self.previous_button.clicked.connect(self.find_previous)
+
+ def find(self, query):
+ idx = self._plugin_model.find(query)
+ if not idx.isValid():
+ return info_dialog(self, _('No matches'),
+ _('Could not find any matching plugins'), show=True,
+ show_copy_button=False)
+ self.highlight_index(idx)
+
+ def highlight_index(self, idx):
+ self.plugin_view.scrollTo(idx)
+ self.plugin_view.selectionModel().select(idx,
+ self.plugin_view.selectionModel().ClearAndSelect)
+ self.plugin_view.setCurrentIndex(idx)
+
+ def find_next(self, *args):
+ idx = self.plugin_view.currentIndex()
+ if not idx.isValid():
+ idx = self._plugin_model.index(0, 0)
+ idx = self._plugin_model.find_next(idx,
+ unicode(self.search.currentText()))
+ self.highlight_index(idx)
+
+ def find_previous(self, *args):
+ idx = self.plugin_view.currentIndex()
+ if not idx.isValid():
+ idx = self._plugin_model.index(0, 0)
+ idx = self._plugin_model.find_next(idx,
+ unicode(self.search.currentText()), backwards=True)
+ self.highlight_index(idx)
+
def toggle_plugin(self, *args):
self.modify_plugin(op='toggle')
@@ -184,13 +290,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
show=True, show_copy_button=False)
idx = self._plugin_model.plugin_to_index_by_properties(plugin)
if idx.isValid():
- self.plugin_view.scrollTo(idx,
- self.plugin_view.PositionAtCenter)
- self.plugin_view.scrollTo(idx,
- self.plugin_view.PositionAtCenter)
- self.plugin_view.selectionModel().select(idx,
- self.plugin_view.selectionModel().ClearAndSelect)
- self.plugin_view.setCurrentIndex(idx)
+ self.highlight_index(idx)
else:
error_dialog(self, _('No valid plugin path'),
_('%s is not a valid plugin path')%path).exec_()
diff --git a/src/calibre/gui2/preferences/plugins.ui b/src/calibre/gui2/preferences/plugins.ui
index 83a904eb08..ebf422dfe3 100644
--- a/src/calibre/gui2/preferences/plugins.ui
+++ b/src/calibre/gui2/preferences/plugins.ui
@@ -24,6 +24,47 @@