fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-27 01:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into sophist_add_itunes_composer_support

Browse Source
This commit is contained in:
Sophist
2014-03-05 12:02:29 +00:00
parent 02c4ed64ed 005e591d80
commit 6054bb412a
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
picard/const.py
View File

@@ -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",

12
picard/ui/coverartbox.py
View File

@@ -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)