This commit is contained in:
Kovid Goyal 2010-04-27 17:59:24 -06:00
parent 66162850ca
commit ab195723c8
3 changed files with 16 additions and 6 deletions

View File

@ -56,9 +56,18 @@ if plugins is None:
plugin_path = sys.extensions_location plugin_path = sys.extensions_location
sys.path.insert(0, plugin_path) sys.path.insert(0, plugin_path)
for plugin in ['pictureflow', 'lzx', 'msdes', 'podofo', 'cPalmdoc', for plugin in [
'fontconfig', 'pdfreflow', 'progress_indicator', 'chmlib', 'pictureflow',
'chm_extra'] + \ 'lzx',
'msdes',
'podofo',
'cPalmdoc',
'fontconfig',
'pdfreflow',
'progress_indicator',
'chmlib',
'chm_extra'
] + \
(['winutil'] if iswindows else []) + \ (['winutil'] if iswindows else []) + \
(['usbobserver'] if isosx else []): (['usbobserver'] if isosx else []):
try: try:

View File

@ -1379,5 +1379,5 @@ void PictureFlow::dataChanged() { d->dataChanged(); }
void PictureFlow::emitcurrentChanged(int index) { emit currentChanged(index); } void PictureFlow::emitcurrentChanged(int index) { emit currentChanged(index); }
int FlowImages::count() { return 0; } int FlowImages::count() { return 0; }
QImage FlowImages::image(int index) { return QImage(); } QImage FlowImages::image(int index) { index=0; return QImage(); }
QString FlowImages::caption(int index) {return QString(); } QString FlowImages::caption(int index) {index=0; return QString(); }

View File

@ -19,12 +19,13 @@ __builtin__.__dict__['__'] = lambda s: s
from calibre.constants import iswindows, preferred_encoding, plugins from calibre.constants import iswindows, preferred_encoding, plugins
_run_once = False _run_once = False
winutil = winutilerror = None
if not _run_once: if not _run_once:
_run_once = True _run_once = True
################################################################################ ################################################################################
# Platform specific modules # Platform specific modules
winutil = winutilerror = None
if iswindows: if iswindows:
winutil, winutilerror = plugins['winutil'] winutil, winutilerror = plugins['winutil']
if not winutil: if not winutil: