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

Comments editor: Dont insert blank lines between list elements

Browse Source 
Also remove the extra styling inserted by Qt. Now the spacing between
list items is controlled by the stylesheet.
This commit is contained in:
Kovid Goyal 2020-04-05 09:04:18 +05:30
parent 5dce5a527f
commit 8648e3ff2f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/comments_editor.py
View File

@ -196,6 +196,12 @@ def cleanup_qt_markup(root):
if tag.tag == 'p' and style_map[tag].get('-qt-paragraph-type') == 'empty': if tag.tag == 'p' and style_map[tag].get('-qt-paragraph-type') == 'empty':
del tag[:] del tag[:]
tag.text = '\xa0' tag.text = '\xa0'
if tag.tag in ('ol', 'ul'):
for li in tag.iterdescendants('li'):
ts = style_map.get(li)
if ts:
remove_margins(li, ts)
remove_zero_indents(ts)
for style in itervalues(style_map): for style in itervalues(style_map):
filter_qt_styles(style) filter_qt_styles(style)
for tag, style in iteritems(style_map): for tag, style in iteritems(style_map):
@ -236,7 +242,7 @@ class EditorWidget(QTextEdit, LineEditECM): # {{{
def __init__(self, parent=None): def __init__(self, parent=None):
QTextEdit.__init__(self, parent) QTextEdit.__init__(self, parent)
self.setTabChangesFocus(True) self.setTabChangesFocus(True)
self.document().setDefaultStyleSheet(css()) self.document().setDefaultStyleSheet(css() + '\n\nli { margin-top: 0.5ex; margin-bottom: 0.5ex; }')
font = self.font() font = self.font()
f = QFontInfo(font) f = QFontInfo(font)
delta = tweaks['change_book_details_font_size_by'] + 1 delta = tweaks['change_book_details_font_size_by'] + 1