Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect use of of customize.builtins

Browse Source
This commit is contained in:
Kovid Goyal 2014-11-08 17:08:06 +05:30
parent b20088191e
commit 9a68bed54c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/dialogs/catalog.py
View File

@ -14,6 +14,7 @@ from calibre.gui2 import dynamic, ResizableDialog, info_dialog
from calibre.customize.ui import catalog_plugins from calibre.customize.ui import catalog_plugins
class Catalog(ResizableDialog, Ui_Dialog): class Catalog(ResizableDialog, Ui_Dialog):
''' Catalog Dialog builder''' ''' Catalog Dialog builder'''
def __init__(self, parent, dbspec, ids, db): def __init__(self, parent, dbspec, ids, db):
@ -33,14 +34,12 @@ class Catalog(ResizableDialog, Ui_Dialog):
self.fmts, self.widgets = [], [] self.fmts, self.widgets = [], []
from calibre.customize.builtins import plugins as builtin_plugins
for plugin in catalog_plugins(): for plugin in catalog_plugins():
if plugin.name in config['disabled_plugins']: if plugin.name in config['disabled_plugins']:
continue continue
name = plugin.name.lower().replace(' ', '_') name = plugin.name.lower().replace(' ', '_')
if type(plugin) in builtin_plugins: if getattr(plugin, 'plugin_path', None) is None:
try: try:
catalog_widget = importlib.import_module('calibre.gui2.catalog.'+name) catalog_widget = importlib.import_module('calibre.gui2.catalog.'+name)
pw = catalog_widget.PluginWidget() pw = catalog_widget.PluginWidget()
@ -58,7 +57,7 @@ class Catalog(ResizableDialog, Ui_Dialog):
compiled_form = os.path.join(plugin.resources_path,'%s_ui.py' % name) compiled_form = os.path.join(plugin.resources_path,'%s_ui.py' % name)
if os.path.exists(form) and os.path.exists(klass): if os.path.exists(form) and os.path.exists(klass):
#info("Adding widget for user-installed Catalog plugin %s" % plugin.name) # info("Adding widget for user-installed Catalog plugin %s" % plugin.name)
# Compile the .ui form provided in plugin.zip # Compile the .ui form provided in plugin.zip
if not os.path.exists(compiled_form): if not os.path.exists(compiled_form):
@ -207,4 +206,3 @@ class Catalog(ResizableDialog, Ui_Dialog):
def reject(self): def reject(self):
dynamic.set('catalog_window_geom', bytearray(self.saveGeometry())) dynamic.set('catalog_window_geom', bytearray(self.saveGeometry()))
ResizableDialog.reject(self) ResizableDialog.reject(self)