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

Bulk conversion dialog: Fix page margin settings being ignored when converting to DOCX

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-04 16:26:33 +05:30
parent 0d810cc05d
commit dba833795f
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/ebooks/conversion/plumber.py
View File

@ -831,13 +831,16 @@ OptionRecommendation(name='search_replace',
if help is not None: if help is not None:
return help.replace('%default', str(rec.recommended_value)) return help.replace('%default', str(rec.recommended_value))
def merge_plugin_recs(self, plugin):
for name, val, level in plugin.recommendations:
rec = self.get_option_by_name(name)
if rec is not None and rec.level <= level:
rec.recommended_value = val
rec.level = level
def merge_plugin_recommendations(self): def merge_plugin_recommendations(self):
for source in (self.input_plugin, self.output_plugin): for source in (self.input_plugin, self.output_plugin):
for name, val, level in source.recommendations: self.merge_plugin_recs(source)
rec = self.get_option_by_name(name)
if rec is not None and rec.level <= level:
rec.recommended_value = val
rec.level = level
def merge_ui_recommendations(self, recommendations): def merge_ui_recommendations(self, recommendations):
''' '''

4
src/calibre/gui2/convert/bulk.py
View File

@ -70,8 +70,8 @@ class BulkConfig(Config):
output_path = 'dummy.'+output_format output_path = 'dummy.'+output_format
log = Log() log = Log()
log.outputs = [] log.outputs = []
self.plumber = Plumber(input_path, output_path, log, self.plumber = Plumber(input_path, output_path, log, merge_plugin_recs=False)
merge_plugin_recs=False) self.plumber.merge_plugin_recs(self.plumber.output_plugin)
def widget_factory(cls): def widget_factory(cls):
return cls(self.stack, self.plumber.get_option_by_name, return cls(self.stack, self.plumber.get_option_by_name,

7
src/calibre/gui2/tools.py
View File

@ -196,6 +196,13 @@ class QueueBulk(QProgressDialog):
combined_recs[item[0]] = item[1] combined_recs[item[0]] = item[1]
save_specifics(self.db, book_id, combined_recs) save_specifics(self.db, book_id, combined_recs)
lrecs = list(combined_recs.to_recommendations()) lrecs = list(combined_recs.to_recommendations())
from calibre.customize.ui import plugin_for_output_format
op = plugin_for_output_format(self.output_format)
if op and op.recommendations:
prec = {x[0] for x in op.recommendations}
for i, r in enumerate(list(lrecs)):
if r[0] in prec:
lrecs[i] = (r[0], r[1], OptionRecommendation.HIGH)
cover_file = create_cover_file(self.db, book_id) cover_file = create_cover_file(self.db, book_id)