Merge from trunk

This commit is contained in:
Charles Haley 2010-08-18 23:13:37 +01:00
commit f551f60371
2 changed files with 4 additions and 1 deletions

View File

@ -438,7 +438,7 @@ from calibre.ebooks.txt.output import TXTOutput
from calibre.customize.profiles import input_profiles, output_profiles
from calibre.devices.apple.driver import ITUNES
from calibre.devices.hanlin.driver import HANLINV3, HANLINV5, BOOX
from calibre.devices.hanlin.driver import HANLINV3, HANLINV5, BOOX, SPECTRA
from calibre.devices.blackberry.driver import BLACKBERRY
from calibre.devices.cybook.driver import CYBOOK
from calibre.devices.eb600.driver import EB600, COOL_ER, SHINEBOOK, \
@ -567,6 +567,7 @@ plugins += [
MENTOR,
SWEEX,
PDNOVEL,
SPECTRA,
ITUNES,
]
plugins += [x for x in list(locals().values()) if isinstance(x, type) and \

View File

@ -88,6 +88,8 @@ class SPECTRA(HANLINV3):
FORMATS = ['epub', 'mobi', 'fb2', 'lit', 'prc', 'djvu', 'pdf', 'rtf', 'txt']
SUPPORTS_SUB_DIRS = True
class HANLINV5(HANLINV3):
name = 'Hanlin V5 driver'
gui_name = 'Hanlin V5'