From 9f1be392701a312bb7b314c61b986a3fe176e2e0 Mon Sep 17 00:00:00 2001 From: Francois Ferrand Date: Tue, 11 Feb 2014 19:14:24 +0100 Subject: [PATCH 1/2] Fix coverart drop indication. Disable drop if there is no selected item, and if the scheme is not supported. --- picard/ui/coverartbox.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py index a8f7acf29..b8bb6fd24 100644 --- a/picard/ui/coverartbox.py +++ b/picard/ui/coverartbox.py @@ -38,7 +38,7 @@ class ActiveLabel(QtGui.QLabel): QtGui.QLabel.__init__(self, *args) self.setMargin(0) self.setActive(active) - self.setAcceptDrops(True) + self.setAcceptDrops(False) def setActive(self, active): self.active = active @@ -52,8 +52,10 @@ class ActiveLabel(QtGui.QLabel): self.clicked.emit() def dragEnterEvent(self, event): - if event.mimeData().hasUrls(): - event.acceptProposedAction() + for url in event.mimeData().urls(): + if url.scheme() in ('http', 'file'): + event.acceptProposedAction() + break def dropEvent(self, event): accepted = False @@ -128,6 +130,10 @@ class CoverArtBox(QtGui.QGroupBox): # 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) From 7e3cb14a3822770f4ed78455699dd888ba85dc62 Mon Sep 17 00:00:00 2001 From: Sophist Date: Tue, 4 Mar 2014 20:47:14 +0000 Subject: [PATCH 2/2] Update links to help pages. --- picard/const.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/picard/const.py b/picard/const.py index 00a7dacc2..efd9bc1e4 100644 --- a/picard/const.py +++ b/picard/const.py @@ -48,11 +48,11 @@ CAA_PORT = 80 # URLs PICARD_URLS = { - 'documentation': "http://musicbrainz.org/doc/Picard_Documentation", - 'troubleshooting': "http://musicbrainz.org/doc/Picard_Troubleshooting", + 'documentation': "http://musicbrainz.org/doc/MusicBrainz_Picard/Documentation", + 'troubleshooting': "http://musicbrainz.org/doc/MusicBrainz_Picard/Troubleshooting", 'home': "http://musicbrainz.org/doc/MusicBrainz_Picard", - 'doc_options': "http://musicbrainz.org/doc/Picard_Documentation/Options", - 'plugins': "http://musicbrainz.org/doc/Picard_Plugins", + 'doc_options': "http://musicbrainz.org/doc/MusicBrainz_Picard/Documentation/Options", + 'plugins': "http://musicbrainz.org/doc/MusicBrainz_Picard/Plugins", 'forum': "http://forums.musicbrainz.org/viewforum.php?id=2", 'donate': "http://metabrainz.org/donate", 'chromaprint': "http://acoustid.org/chromaprint#download",