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

...

Browse Source
This commit is contained in:
Kovid Goyal 2016-10-12 08:19:18 +05:30
parent 020cb2eeb8
commit ddec12a802
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/ebooks/conversion/plugins/pdf_output.py
View File

@ -84,11 +84,11 @@ class PDFOutput(OutputFormatPlugin):
'The font family used to render sans-serif fonts')), 'The font family used to render sans-serif fonts')),
OptionRecommendation(name='pdf_mono_family', OptionRecommendation(name='pdf_mono_family',
recommended_value='Liberation Mono' if islinux else 'Courier New', help=_( recommended_value='Liberation Mono' if islinux else 'Courier New', help=_(
'The font family used to render monospaced fonts')), 'The font family used to render monospace fonts')),
OptionRecommendation(name='pdf_standard_font', choices=['serif', OptionRecommendation(name='pdf_standard_font', choices=['serif',
'sans', 'mono'], 'sans', 'mono'],
recommended_value='serif', help=_( recommended_value='serif', help=_(
'The font family used to render monospaced fonts')), 'The font family used to render monospace fonts')),
OptionRecommendation(name='pdf_default_font_size', OptionRecommendation(name='pdf_default_font_size',
recommended_value=20, help=_( recommended_value=20, help=_(
'The default font size')), 'The default font size')),

2
src/calibre/ebooks/oeb/polish/download.py
View File

@ -45,7 +45,7 @@ def get_external_resources(container):
elif media_type in OEB_STYLES: elif media_type in OEB_STYLES:
for link in container.iterlinks(name): for link in container.iterlinks(name):
ans[link].append(name) ans[link].append(name)
return ans return dict(ans)
def get_filename(original_url_parsed, response): def get_filename(original_url_parsed, response):

2
src/calibre/gui2/convert/lrf_output.ui
View File

@ -168,7 +168,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>&amp;Monospaced font family:</string> <string>&amp;Monospace font family:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>opt_mono_family</cstring> <cstring>opt_mono_family</cstring>

8
src/calibre/gui2/progress_indicator/__init__.py
View File

@ -135,6 +135,14 @@ class WaitPanel(QWidget):
self.la.setStyleSheet('QLabel { font-size: 40px; font-weight: bold }') self.la.setStyleSheet('QLabel { font-size: 40px; font-weight: bold }')
l.addWidget(self.la, 0, Qt.AlignCenter), l.addStretch() l.addWidget(self.la, 0, Qt.AlignCenter), l.addStretch()
@property
def msg(self):
return self.la.text()
@msg.setter
def msg(self, val):
self.la.setText(val)
class WaitStack(QStackedWidget): class WaitStack(QStackedWidget):

4
src/calibre/gui2/viewer/config.py
View File

@ -100,9 +100,9 @@ def config(defaults=None):
fonts('sans_family', default='Verdana' if iswindows else 'Liberation Sans', fonts('sans_family', default='Verdana' if iswindows else 'Liberation Sans',
help=_('The sans-serif font family')) help=_('The sans-serif font family'))
fonts('mono_family', default='Courier New' if iswindows else 'Liberation Mono', fonts('mono_family', default='Courier New' if iswindows else 'Liberation Mono',
help=_('The monospaced font family')) help=_('The monospace font family'))
fonts('default_font_size', default=20, help=_('The standard font size in px')) fonts('default_font_size', default=20, help=_('The standard font size in px'))
fonts('mono_font_size', default=16, help=_('The monospaced font size in px')) fonts('mono_font_size', default=16, help=_('The monospace font size in px'))
fonts('standard_font', default='serif', help=_('The standard font type')) fonts('standard_font', default='serif', help=_('The standard font type'))
fonts('minimum_font_size', default=8, help=_('The minimum font size in px')) fonts('minimum_font_size', default=8, help=_('The minimum font size in px'))