fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-03-02 11:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Display existing cover art in file info dialog."

Browse Source 
This reverts commit 04de2502df. Display
existing cover in same tab.
This commit is contained in:
Rahul Raturi
2016-03-30 00:49:46 +05:30
parent 04de2502df
commit f741d4d02d
2 changed files with 5 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
picard/ui/infodialog.py
View File

@@ -45,12 +45,14 @@ class InfoDialog(PicardDialog):
self._display_info_tab()
self._display_artwork_tab()
def _display_artwork(self, tab, images, widget):
def _display_artwork_tab(self):
tab = self.ui.artwork_tab
images = self.obj.metadata.images
if not images:
self.tab_hide(tab)
return
widget.itemDoubleClicked.connect(self.show_item)
self.ui.artwork_list.itemDoubleClicked.connect(self.show_item)
for image in images:
data = None
try:
@@ -87,14 +89,8 @@ class InfoDialog(PicardDialog):
infos.append(u"%d x %d" % (image.width, image.height))
infos.append(image.mimetype)
item.setText(u"\n".join(infos))
widget.addItem(item)
self.ui.artwork_list.addItem(item)
def _display_artwork_tab(self):
tab = self.ui.artwork_tab
images = self.obj.metadata.images
widget = self.ui.artwork_list
self._display_artwork(tab, images, widget)
def tab_hide(self, widget):
tab = self.ui.tabWidget
index = tab.indexOf(widget)
@@ -112,10 +108,6 @@ class FileInfoDialog(InfoDialog):
def __init__(self, file, parent=None):
InfoDialog.__init__(self, file, parent)
self.setWindowTitle(_("Info") + " - " + file.base_filename)
if file.metadata.images == file.orig_metadata.images:
self.tab_hide(self.ui.old_artwork_tab)
else:
self._display_old_artwork_tab()
def _display_info_tab(self):
file = self.obj
@@ -151,19 +143,11 @@ class FileInfoDialog(InfoDialog):
cgi.escape(i[1])), info))
self.ui.info.setText(text)
def _display_old_artwork_tab(self):
file = self.obj
images = file.orig_metadata.images
tab = self.ui.old_artwork_tab
widget = self.ui.old_artwork_list
self._display_artwork(tab, images, widget)
class AlbumInfoDialog(InfoDialog):
def __init__(self, album, parent=None):
InfoDialog.__init__(self, album, parent)
self.tab_hide(self.ui.old_artwork_tab)
self.setWindowTitle(_("Album Info"))
def _display_info_tab(self):
@@ -190,7 +174,6 @@ class ClusterInfoDialog(InfoDialog):
def __init__(self, cluster, parent=None):
InfoDialog.__init__(self, cluster, parent)
self.tab_hide(self.ui.old_artwork_tab)
self.setWindowTitle(_("Cluster Info"))
def _display_info_tab(self):

17
picard/ui/ui_infodialog.py
View File

@@ -57,22 +57,6 @@ class Ui_InfoDialog(object):
self.artwork_list.setObjectName(_fromUtf8("artwork_list"))
self.vboxlayout1.addWidget(self.artwork_list)
self.tabWidget.addTab(self.artwork_tab, _fromUtf8(""))
self.old_artwork_tab = QtGui.QWidget()
self.old_artwork_tab.setObjectName(_fromUtf8("old_artwork_tab"))
self.vboxlayout2 = QtGui.QVBoxLayout(self.old_artwork_tab)
self.vboxlayout2.setObjectName(_fromUtf8("vboxlayout2"))
self.old_artwork_list = QtGui.QListWidget(self.old_artwork_tab)
self.old_artwork_list.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
self.old_artwork_list.setIconSize(QtCore.QSize(170, 170))
self.old_artwork_list.setMovement(QtGui.QListView.Static)
self.old_artwork_list.setFlow(QtGui.QListView.LeftToRight)
self.old_artwork_list.setProperty("isWrapping", False)
self.old_artwork_list.setResizeMode(QtGui.QListView.Fixed)
self.old_artwork_list.setSpacing(10)
self.old_artwork_list.setViewMode(QtGui.QListView.IconMode)
self.old_artwork_list.setObjectName(_fromUtf8("old_artwok_list"))
self.vboxlayout2.addWidget(self.old_artwork_list)
self.tabWidget.addTab(self.old_artwork_tab, _fromUtf8(""))
self.verticalLayout.addWidget(self.tabWidget)
self.buttonBox = QtGui.QDialogButtonBox(InfoDialog)
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
@@ -88,5 +72,4 @@ class Ui_InfoDialog(object):
def retranslateUi(self, InfoDialog):
self.tabWidget.setTabText(self.tabWidget.indexOf(self.info_tab), _("&Info"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.artwork_tab), _("A&rtwork"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.old_artwork_tab), _("&Old Artwork"))