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

Change the default template for the Formats custom column to include spaces after the commas

Browse Source
This commit is contained in:
Kovid Goyal 2018-06-18 15:01:10 +05:30
parent 4df998fdd2
commit 17fc7b06f0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/calibre/gui2/preferences/create_custom_column.py
View File

@ -210,7 +210,7 @@ class CreateCustomColumn(QDialog):
self.composite_box.setText( self.composite_box.setText(
{ {
'isbn': '{identifiers:select(isbn)}', 'isbn': '{identifiers:select(isbn)}',
'formats': "{:'approximate_formats()'}", 'formats': "{:'re(approximate_formats(), ',', ', ')'}",
}[which]) }[which])
self.composite_sort_by.setCurrentIndex(0) self.composite_sort_by.setCurrentIndex(0)
if which == 'text': if which == 'text':
@ -372,19 +372,19 @@ class CreateCustomColumn(QDialog):
cmc.setToolTip(_("If checked, this column will appear in the Tag browser as a category")) cmc.setToolTip(_("If checked, this column will appear in the Tag browser as a category"))
l.addWidget(cmc) l.addWidget(cmc)
self.composite_contains_html = cch = QCheckBox(_("Show as HTML in Book details")) self.composite_contains_html = cch = QCheckBox(_("Show as HTML in Book details"))
cch.setToolTip('<p>' + cch.setToolTip('<p>' + _(
_('If checked, this column will be displayed as HTML in ' 'If checked, this column will be displayed as HTML in '
'Book details and the Content server. This can be used to ' 'Book details and the Content server. This can be used to '
'construct links with the template language. For example, ' 'construct links with the template language. For example, '
'the template ' 'the template '
'<pre>&lt;big&gt;&lt;b&gt;{title}&lt;/b&gt;&lt;/big&gt;' '<pre>&lt;big&gt;&lt;b&gt;{title}&lt;/b&gt;&lt;/big&gt;'
'{series:| [|}{series_index:| [|]]}</pre>' '{series:| [|}{series_index:| [|]]}</pre>'
'will create a field displaying the title in bold large ' 'will create a field displaying the title in bold large '
'characters, along with the series, for example <br>"<big><b>' 'characters, along with the series, for example <br>"<big><b>'
'An Oblique Approach</b></big> [Belisarius [1]]". The template ' 'An Oblique Approach</b></big> [Belisarius [1]]". The template '
'<pre>&lt;a href="https://www.beam-ebooks.de/ebook/{identifiers' '<pre>&lt;a href="https://www.beam-ebooks.de/ebook/{identifiers'
':select(beam)}"&gt;Beam book&lt;/a&gt;</pre> ' ':select(beam)}"&gt;Beam book&lt;/a&gt;</pre> '
'will generate a link to the book on the Beam e-books site.') + '</p>') 'will generate a link to the book on the Beam e-books site.') + '</p>')
l.addWidget(cch) l.addWidget(cch)
add_row(None, l) add_row(None, l)
@ -414,13 +414,13 @@ class CreateCustomColumn(QDialog):
'<p>' + _('Default: Not formatted. For format language details see' '<p>' + _('Default: Not formatted. For format language details see'
' <a href="https://docs.python.org/library/string.html#format-string-syntax">the Python documentation</a>')) ' <a href="https://docs.python.org/library/string.html#format-string-syntax">the Python documentation</a>'))
if col_type == 'int': if col_type == 'int':
self.format_box.setToolTip('<p>' + self.format_box.setToolTip('<p>' + _(
_('Examples: The format <code>{0:0>4d}</code> ' 'Examples: The format <code>{0:0>4d}</code> '
'gives a 4-digit number with leading zeros. The format ' 'gives a 4-digit number with leading zeros. The format '
'<code>{0:d}&nbsp;days</code> prints the number then the word "days"')+ '</p>') '<code>{0:d}&nbsp;days</code> prints the number then the word "days"')+ '</p>')
else: else:
self.format_box.setToolTip('<p>' + self.format_box.setToolTip('<p>' + _(
_('Examples: The format <code>{0:.1f}</code> gives a floating ' 'Examples: The format <code>{0:.1f}</code> gives a floating '
'point number with 1 digit after the decimal point. The format ' 'point number with 1 digit after the decimal point. The format '
'<code>Price:&nbsp;$&nbsp;{0:,.2f}</code> prints ' '<code>Price:&nbsp;$&nbsp;{0:,.2f}</code> prints '
'"Price&nbsp;$&nbsp;" then displays the number with 2 digits ' '"Price&nbsp;$&nbsp;" then displays the number with 2 digits '
@ -447,7 +447,7 @@ class CreateCustomColumn(QDialog):
return self.simple_error('', _('No lookup name was provided')) return self.simple_error('', _('No lookup name was provided'))
if col.startswith('#'): if col.startswith('#'):
col = col[1:] col = col[1:]
if re.match('^\w*$', col) is None or not col[0].isalpha() or col.lower() != col: if re.match(r'^\w*$', col) is None or not col[0].isalpha() or col.lower() != col:
return self.simple_error('', _('The lookup name must contain only ' return self.simple_error('', _('The lookup name must contain only '
'lower case letters, digits and underscores, and start with a letter')) 'lower case letters, digits and underscores, and start with a letter'))
if col.endswith('_index'): if col.endswith('_index'):