mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
d022c7e012
@ -266,6 +266,14 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
|
|||||||
self.mi.languages = ['eng']
|
self.mi.languages = ['eng']
|
||||||
if fm is not None:
|
if fm is not None:
|
||||||
self.mi.set_all_user_metadata(fm.custom_field_metadata())
|
self.mi.set_all_user_metadata(fm.custom_field_metadata())
|
||||||
|
else:
|
||||||
|
# No field metadata. Grab a copy from the current library so
|
||||||
|
# that we can validate any custom column names. The values for
|
||||||
|
# the columns will all be empty, which in some very unusual
|
||||||
|
# cases might cause formatter errors. We can live with that.
|
||||||
|
from calibre.gui2.ui import get_gui
|
||||||
|
self.mi.set_all_user_metadata(
|
||||||
|
get_gui().current_db.new_api.field_metadata.custom_field_metadata())
|
||||||
|
|
||||||
# Remove help icon on title bar
|
# Remove help icon on title bar
|
||||||
icon = self.windowIcon()
|
icon = self.windowIcon()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user