Olaf Hering
b6d44fd48e
- Update to version 1.4.0 * Bugfix: AcoustID submission fails with code 299 (PICARD-82) * Bugfix: Ignoring "hip hop rap" folksonomy tags also ignores "rap", "hip hop", etc. (PICARD-335) * Bugfix: Picard downloads multiple 'front' images instead of just first one. (PICARD-350) * Bugfix: Saving hidden file with only an extension drops the extension (PICARD-357) * Bugfix: Add directory opens in "wrong" dir (PICARD-366) * Bugfix: Picard should de-duplicate work lists (PICARD-375) * Bugfix: Tree selector in Options window is partially obscured, pane too narrow (PICARD-408) * Bugfix: tag acoustid_id can not be removed or deleted in script, renaming or plugin (PICARD-419) * Bugfix: Can't remove value from field (PICARD-546) * Bugfix: Can't open Options (PICARD-592) * Bugfix: "Tags from filenames" action stays enabled even if it is unavailable. (PICARD-688) * Bugfix: Using the first image type as filename changes the name of front images (PICARD-701) * Bugfix: Fingerprint Submission Failes if AcoustID tags are present and/or invalid (PICARD-706) * Bugfix: Picard moves into the selected folder (PICARD-726) * Bugfix: Picard does not support (recording) relationship credits (PICARD-730) * Bugfix: Picard repeats/duplicates field data (PICARD-748) * Bugfix: Number of pending web requests is not decremented on exceptions in the handler (PICARD-751) * Bugfix: Divide by zero error in _convert_folksonomy_tags_to_genre when no tag at the release/release group level ( PICARD-753) * Bugfix: Directory tree (file browser) not sorted for non-system drives under Windows (PICARD-754) * Bugfix: Crash when loading release with only zero count tags (PICARD-759) * Bugfix: No name and no window grouping in gnome-shell Alt-Tab app switcher (PICARD-761) * Bugfix: Lookup in Browser does not and can not load HTTPS version of musicbrainz.org (PICARD-764) * Bugfix: Unable to login using oauth via Picard options with Server Port set to 443 (PICARD-766) * Bugfix: "AttributeError: 'MetadataBox' object has no attribute 'resize_columns'" when enabling the cover art box ( PICARD-775) * Bugfix: Pre-gap tracks are not counted in absolutetracknumber (PICARD-778) * Bugfix: CAA cover art provider runs even if cover art has already been loaded (PICARD-780) * Bugfix: Toggling Embed Cover Art in Tags and restarting doesn't have the expected behavior (PICARD-782) * Bugfix: XMLWS redirects incorrectly (PICARD-788) * Bugfix: Handle empty collection-list in web server response (PICARD-798) OBS-URL: https://build.opensuse.org/request/show/457107 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/picard?expand=0&rev=47
147 lines
5.6 KiB
Diff
147 lines
5.6 KiB
Diff
From 569510e9761b80db9e9aac60dffdd207f59a1647 Mon Sep 17 00:00:00 2001
|
|
From: Sambhav Kothari <sambhavs.email@gmail.com>
|
|
Date: Sun, 22 Jan 2017 18:50:52 +0530
|
|
Subject: [PATCH 3/9] Update coverartbox class to include new and original
|
|
coverart
|
|
|
|
---
|
|
picard/ui/coverartbox.py | 101 +++++++++++++++--------------------------------
|
|
1 file changed, 32 insertions(+), 69 deletions(-)
|
|
|
|
diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py
|
|
index b7e4b21c..f09326ab 100644
|
|
--- a/picard/ui/coverartbox.py
|
|
+++ b/picard/ui/coverartbox.py
|
|
@@ -137,88 +137,50 @@ class CoverArtThumbnail(ActiveLabel):
|
|
def fetch_remote_image(self, url):
|
|
return self.parent().fetch_remote_image(url)
|
|
|
|
-
|
|
class CoverArtBox(QtGui.QGroupBox):
|
|
|
|
def __init__(self, parent):
|
|
QtGui.QGroupBox.__init__(self, "")
|
|
self.layout = QtGui.QVBoxLayout()
|
|
- self.layout.setSpacing(0)
|
|
+ self.layout.setSpacing(6)
|
|
# Kills off any borders
|
|
self.setStyleSheet('''QGroupBox{background-color:none;border:1px;}''')
|
|
self.setFlat(True)
|
|
- self.release = None
|
|
- self.data = None
|
|
self.item = None
|
|
- self.shadow = QtGui.QPixmap(":/images/CoverArtShadow.png")
|
|
- self.coverArt = ActiveLabel(False, parent)
|
|
- self.coverArt.setPixmap(self.shadow)
|
|
- self.coverArt.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignHCenter)
|
|
- self.coverArt.clicked.connect(self.open_release_page)
|
|
- self.coverArt.imageDropped.connect(self.fetch_remote_image)
|
|
- self.layout.addWidget(self.coverArt, 0)
|
|
+ self.cover_art_label = QtGui.QLabel('Cover-Art')
|
|
+ self.cover_art_label.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignHCenter)
|
|
+ self.cover_art = CoverArtThumbnail(False, True, parent)
|
|
+ self.orig_cover_art_label = QtGui.QLabel('')
|
|
+ self.orig_cover_art = CoverArtThumbnail(False, False, parent)
|
|
+ self.orig_cover_art_label.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignHCenter)
|
|
+ self.orig_cover_art.setHidden(True)
|
|
+ self.layout.addWidget(self.cover_art_label)
|
|
+ self.layout.addWidget(self.cover_art)
|
|
+ self.layout.addWidget(self.orig_cover_art_label)
|
|
+ self.layout.addWidget(self.orig_cover_art)
|
|
self.setLayout(self.layout)
|
|
|
|
+ def _show(self):
|
|
+ if self.cover_art.data == self.orig_cover_art.data:
|
|
+ self.orig_cover_art.setHidden(True)
|
|
+ else:
|
|
+ self.orig_cover_art.setHidden(False)
|
|
+ self.cover_art_label.setText('New Cover-Art')
|
|
+ self.orig_cover_art_label.setText('Original Cover-Art')
|
|
+
|
|
def show(self):
|
|
- self.__set_data(self.data, True)
|
|
+ self.cover_art.show()
|
|
+ if self.orig_cover_art.data:
|
|
+ self.orig_cover_art.show()
|
|
+ self._show()
|
|
QtGui.QGroupBox.show(self)
|
|
|
|
- def __set_data(self, data, force=False, pixmap=None):
|
|
- if not force and self.data == data:
|
|
- return
|
|
-
|
|
- self.data = data
|
|
- if not force and self.isHidden():
|
|
- return
|
|
-
|
|
- cover = self.shadow
|
|
- if self.data:
|
|
- if pixmap is None:
|
|
- pixmap = QtGui.QPixmap()
|
|
- pixmap.loadFromData(self.data.data)
|
|
- if not pixmap.isNull():
|
|
- offx, offy, w, h = (1, 1, 121, 121)
|
|
- cover = QtGui.QPixmap(self.shadow)
|
|
- pixmap = pixmap.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
|
|
- painter = QtGui.QPainter(cover)
|
|
- bgcolor = QtGui.QColor.fromRgb(0, 0, 0, 128)
|
|
- painter.fillRect(QtCore.QRectF(offx, offy, w, h), bgcolor)
|
|
- x = offx + (w - pixmap.width()) / 2
|
|
- y = offy + (h - pixmap.height()) / 2
|
|
- painter.drawPixmap(x, y, pixmap)
|
|
- painter.end()
|
|
- self.coverArt.setPixmap(cover)
|
|
-
|
|
- def set_metadata(self, metadata, item):
|
|
- self.item = item
|
|
- data = None
|
|
- if metadata and metadata.images:
|
|
- for image in metadata.images:
|
|
- if image.is_front_image():
|
|
- data = image
|
|
- break
|
|
- else:
|
|
- # There's no front image, choose the first one available
|
|
- data = metadata.images[0]
|
|
- self.__set_data(data)
|
|
- if item and metadata:
|
|
- self.coverArt.setAcceptDrops(True)
|
|
- else:
|
|
- self.coverArt.setAcceptDrops(False)
|
|
- release = None
|
|
- if metadata:
|
|
- release = metadata.get("musicbrainz_albumid", None)
|
|
- if release:
|
|
- self.coverArt.setActive(True)
|
|
- self.coverArt.setToolTip(_(u"View release on MusicBrainz"))
|
|
- else:
|
|
- self.coverArt.setActive(False)
|
|
- self.coverArt.setToolTip("")
|
|
- self.release = release
|
|
-
|
|
- def open_release_page(self):
|
|
- lookup = self.tagger.get_file_lookup()
|
|
- lookup.albumLookup(self.release)
|
|
+ def set_metadata(self, metadata, orig_metadata, item):
|
|
+ self.cover_art.set_metadata(metadata)
|
|
+ self.orig_cover_art.set_metadata(orig_metadata)
|
|
+ self._show()
|
|
+ if item:
|
|
+ self.item = item
|
|
|
|
def fetch_remote_image(self, url):
|
|
if self.item is None:
|
|
@@ -261,7 +223,8 @@ class CoverArtBox(QtGui.QGroupBox):
|
|
return
|
|
pixmap = QtGui.QPixmap()
|
|
pixmap.loadFromData(data)
|
|
- self.__set_data([mime, data], pixmap=pixmap)
|
|
+ self.cover_art.set_data([mime, data], pixmap=pixmap)
|
|
+ self._show()
|
|
if isinstance(self.item, Album):
|
|
album = self.item
|
|
album.metadata.append_image(coverartimage)
|
|
--
|
|
2.11.0
|
|
|