From aa2effb67c94fc3e684f64fc55d52d2a5d18fdc4 Mon Sep 17 00:00:00 2001 From: kiwidude Date: Tue, 14 Jun 2011 20:34:33 +0100 Subject: [PATCH 1/2] When plugin updater dialog closes, update the icon --- src/calibre/gui2/dialogs/plugin_updater.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py index 855dbd148a..146a7cd64a 100644 --- a/src/calibre/gui2/dialogs/plugin_updater.py +++ b/src/calibre/gui2/dialogs/plugin_updater.py @@ -12,7 +12,7 @@ from lxml import html from PyQt4.Qt import (Qt, QUrl, QFrame, QVBoxLayout, QLabel, QBrush, QTextEdit, QComboBox, QAbstractItemView, QHBoxLayout, QDialogButtonBox, QAbstractTableModel, QVariant, QTableView, QModelIndex, - QSortFilterProxyModel, pyqtSignal, QAction, QIcon, QDialog, + QSortFilterProxyModel, QAction, QIcon, QDialog, QFont, QPixmap, QSize) from calibre import browser, prints from calibre.constants import numeric_version, iswindows, isosx, DEBUG @@ -447,7 +447,6 @@ class DisplayPluginModel(QAbstractTableModel): class PluginUpdaterDialog(SizePersistedDialog): - update_found = pyqtSignal(object) initial_extra_size = QSize(350, 100) def __init__(self, gui, initial_filter=FILTER_UPDATE_AVAILABLE): @@ -587,7 +586,7 @@ class PluginUpdaterDialog(SizePersistedDialog): # Force our toolbar/action to be updated based on uninstalled updates if self.model: update_plugins = filter(filter_upgradeable_plugins, self.model.display_plugins) - self.update_found.emit(update_plugins) + self.gui.plugin_update_found(len(update_plugins)) self.reject() def _plugin_current_changed(self, current, previous): From 92576b8efc87c6d58e2b2214b1ebc223ad161f7b Mon Sep 17 00:00:00 2001 From: kiwidude Date: Thu, 16 Jun 2011 12:08:35 +0100 Subject: [PATCH 2/2] Change name of Plugin Updates back to Plugin Updater so built in logic to uninstall plugin for existing users will kick in --- src/calibre/customize/builtins.py | 8 ++++---- src/calibre/gui2/actions/plugin_updates.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index c281405eee..d1c5b6ccd5 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -867,11 +867,11 @@ class ActionStore(InterfaceActionBase): from calibre.gui2.store.config.store import save_settings as save save(config_widget) -class ActionPluginUpdates(InterfaceActionBase): - name = 'Plugin Updates' +class ActionPluginUpdater(InterfaceActionBase): + name = 'Plugin Updater' author = 'Grant Drake' description = 'Queries the MobileRead forums for updates to plugins to install' - actual_plugin = 'calibre.gui2.actions.plugin_updates:PluginUpdatesAction' + actual_plugin = 'calibre.gui2.actions.plugin_updates:PluginUpdaterAction' plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog, ActionConvert, ActionDelete, ActionEditMetadata, ActionView, @@ -880,7 +880,7 @@ plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog, ActionSendToDevice, ActionHelp, ActionPreferences, ActionSimilarBooks, ActionAddToLibrary, ActionEditCollections, ActionChooseLibrary, ActionCopyToLibrary, ActionTweakEpub, ActionNextMatch, ActionStore, - ActionPluginUpdates] + ActionPluginUpdater] # }}} diff --git a/src/calibre/gui2/actions/plugin_updates.py b/src/calibre/gui2/actions/plugin_updates.py index e624361ad2..f8adbbe98f 100644 --- a/src/calibre/gui2/actions/plugin_updates.py +++ b/src/calibre/gui2/actions/plugin_updates.py @@ -12,10 +12,10 @@ from calibre.gui2.actions import InterfaceAction from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog, FILTER_ALL, FILTER_UPDATE_AVAILABLE) -class PluginUpdatesAction(InterfaceAction): +class PluginUpdaterAction(InterfaceAction): - name = 'Plugin Updates' - action_spec = (_('Plugin Updates'), None, None, None) + name = 'Plugin Updater' + action_spec = (_('Plugin Updater'), None, None, None) action_type = 'current' def genesis(self):