Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2026-01-01 01:30:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

When merging books via drag and drop show the cover of the target book. Fixes #2118371 [[Enhancement] Show cover when merging books](https://bugs.launchpad.net/calibre/+bug/2118371)

Browse Source
This commit is contained in:
Kovid Goyal 2025-08-21 07:26:01 +05:30
parent 66e6d149c3
commit 041a64958d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/calibre/gui2/dialogs/confirm_merge.py
View File

@ -4,9 +4,10 @@
__license__ = 'GPL v3'
__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import os
from typing import NamedTuple
from qt.core import QCheckBox, QDialog, QDialogButtonBox, QLabel, QSplitter, Qt, QTextBrowser, QVBoxLayout, QWidget
from qt.core import QCheckBox, QDialog, QDialogButtonBox, QLabel, QSplitter, Qt, QTextBrowser, QUrl, QVBoxLayout, QWidget
from calibre.ebooks.metadata import authors_to_string
from calibre.ebooks.metadata.book.base import field_metadata
@ -26,6 +27,14 @@ class Target(QTextBrowser):
fm = field_metadata
if mi.series:
series = _('{num} of {series}').format(num=mi.format_series_index(), series=f'<i>{mi.series}</i>')
cover_html = has_cover_row = ''
if mi.cover:
cover_html = f'<img src="{QUrl.fromLocalFile(mi.cover).toString()}">'.format()
self.document().setDefaultStyleSheet(
'img { max-width: 100%; width: 100%; height: auto; display: block; }'
)
else:
has_cover_row = f"<tr><td>{_('Has cover')}:</td><td>{_('Yes') if mi.has_cover else _('No')}</td></tr>"
self.setHtml('''
<h3 style="text-align:center">{mb}</h3>
<p><b>{title}</b> - <i>{authors}</i><br></p>
@ -34,19 +43,25 @@ class Target(QTextBrowser):
<tr><td>{fm[pubdate][name]}:</td><td>{published}</td></tr>
<tr><td>{fm[formats][name]}:</td><td>{formats}</td></tr>
<tr><td>{fm[series][name]}:</td><td>{series}</td></tr>
<tr><td>{has_cover_title}:</td><td>{has_cover}</td></tr>
{has_cover_row}
</table>
{cover_html}
'''.format(
mb=_('Target book'),
title=mi.title,
has_cover_title=_('Has cover'), has_cover=_('Yes') if mi.has_cover else _('No'),
has_cover_row=has_cover_row,
authors=authors_to_string(mi.authors),
date=format_date(mi.timestamp, tweaks['gui_timestamp_display_format']), fm=fm,
published=(format_date(mi.pubdate, tweaks['gui_pubdate_display_format']) if mi.pubdate else ''),
formats=', '.join(mi.formats or ()),
series=series
series=series, cover_html=cover_html,
))
def sizeHint(self):
ans = super().sizeHint()
ans.setHeight(max(600, ans.height()))
return ans
class ConfirmMerge(Dialog):
@ -110,8 +125,13 @@ class ChooseMerge(Dialog):
def __init__(self, dest_id, src_ids, gui):
self.dest_id, self.src_ids = dest_id, src_ids
self.mi = gui.current_db.new_api.get_metadata(dest_id)
self.mi = gui.current_db.new_api.get_metadata(dest_id, get_cover=True)
Dialog.__init__(self, _('Merge books'), 'choose-merge-dialog', parent=gui)
self.finished.connect(self.cleanup_resources)
def cleanup_resources(self):
if self.mi.cover:
os.remove(self.mi.cover)
def setup_ui(self):
self.l = l = QVBoxLayout(self)