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

Fix regression in defining formatter functions

Browse Source
This commit is contained in:
Charles Haley 2011-08-11 13:11:31 +01:00
parent 3467ba839b
commit 9a69b02f50
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/preferences/template_functions.py
View File

@ -83,7 +83,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.builtin_source_dict = {} self.builtin_source_dict = {}
self.funcs = formatter_functions.get_functions() self.funcs = formatter_functions.get_functions()
self.builtins = formatter_functions.get_builtins() self.builtins = formatter_functions.get_builtins_and_aliases()
self.build_function_names_box() self.build_function_names_box()
self.function_name.currentIndexChanged[str].connect(self.function_index_changed) self.function_name.currentIndexChanged[str].connect(self.function_index_changed)
@ -151,7 +151,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
name = unicode(self.function_name.currentText()) name = unicode(self.function_name.currentText())
if name in self.funcs: if name in self.funcs:
error_dialog(self.gui, _('Template functions'), error_dialog(self.gui, _('Template functions'),
_('Name already used'), show=True) _('Name %s already used')%(name,), show=True)
return return
if self.argument_count.value() == 0: if self.argument_count.value() == 0:
box = warning_dialog(self.gui, _('Template functions'), box = warning_dialog(self.gui, _('Template functions'),

8
src/calibre/utils/formatter_functions.py
View File

@ -46,6 +46,14 @@ class FormatterFunctions(object):
def get_builtins(self): def get_builtins(self):
return self._builtins return self._builtins
def get_builtins_and_aliases(self):
res = {}
for f in self._builtins.itervalues():
res[f.name] = f
for a in f.aliases:
res[a] = f
return res
def get_functions(self): def get_functions(self):
return self._functions return self._functions