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

Fix #2810 (/home/kovid/work/... path hard coded into binary distribution)

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-03 22:36:01 -06:00
parent 4ba8cb73d0
commit be192a155a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/customize/ui.py
View File

@ -289,6 +289,7 @@ def available_input_formats():
if not is_disabled(plugin): if not is_disabled(plugin):
for format in plugin.file_types: for format in plugin.file_types:
formats.add(format) formats.add(format)
formats.add('zip'), formats.add('rar')
return formats return formats
def output_format_plugins(): def output_format_plugins():

2
src/calibre/devices/prs500/driver.py
View File

@ -239,6 +239,8 @@ class PRS500(DeviceConfig, DevicePlugin):
Also initialize the device. Also initialize the device.
See the source code for the sequence of initialization commands. See the source code for the sequence of initialization commands.
""" """
if not hasattr(self, 'key'):
self.key = '-1\0\0\0\0\0\0'
self.device = get_device_by_id(self.VENDOR_ID, self.PRODUCT_ID) self.device = get_device_by_id(self.VENDOR_ID, self.PRODUCT_ID)
if not self.device: if not self.device:
raise DeviceError() raise DeviceError()

6
src/calibre/gui2/device.py
View File

@ -812,9 +812,9 @@ class DeviceGUI(object):
bad = '\n'.join('%s'%(i,) for i in bad) bad = '\n'.join('%s'%(i,) for i in bad)
d = warning_dialog(self, _('No suitable formats'), d = warning_dialog(self, _('No suitable formats'),
_('Could not upload the following books to the device, ' _('Could not upload the following books to the device, '
'as no suitable formats were found. Try changing the output ' 'as no suitable formats were found. Convert the book(s) to a '
'format in the upper right corner next to the red heart and ' 'format supported by your device first.'
're-converting.'), bad) ), bad)
d.exec_() d.exec_()
def upload_booklists(self): def upload_booklists(self):