Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-01 16:23:08 +02:00
Code Issues Projects Releases Wiki Activity

Pull from driver-dev

Browse source
This commit is contained in:
Kovid Goyal 2009-06-05 19:27:58 -07:00
commit 3011d1e002
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/calibre/ebooks/pml/output.py
View file

@ -40,7 +40,7 @@ def convert(self, oeb_book, output_path, input_plugin, opts, log):
pmlmlizer = PMLMLizer(ignore_tables=opts.linearize_tables)
content = pmlmlizer.extract_content(oeb_book, opts)
with open(os.path.join(tdir, 'index.pml'), 'wb') as out:
out.write(content.encode(self.opts.output_encoding, 'replace'))
out.write(content.encode(opts.output_encoding, 'replace'))
self.write_images(oeb_book.manifest, tdir)

2
src/calibre/ebooks/txt/output.py
View file

@ -46,7 +46,7 @@ def convert(self, oeb_book, output_path, input_plugin, opts, log):
out_stream.seek(0)
out_stream.truncate()
out_stream.write(txt.encode(self.opts.output_encoding, 'replace'))
out_stream.write(txt.encode(opts.output_encoding, 'replace'))
if close:
out_stream.close()

3
src/calibre/gui2/widgets.py
View file

@ -257,6 +257,9 @@ def location_changed(self, row):
if 0 <= row and row <= 3:
self.model().location_changed(row)
def leaveEvent(self, event):
self.eject_button.hide()
def show_eject(self, location):
self.eject_button.hide()