From 5631a68c40cc16ba2456417671546dcbcc8eab51 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Fri, 25 Jan 2013 12:38:48 +0100 Subject: [PATCH] Fixes for QTreeWidget --- openlp/core/lib/mediamanageritem.py | 12 ++++++------ openlp/plugins/bibles/lib/mediaitem.py | 4 ++-- openlp/plugins/custom/lib/mediaitem.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 8 ++++---- openlp/plugins/media/lib/mediaitem.py | 6 +++--- openlp/plugins/presentations/lib/mediaitem.py | 2 +- openlp/plugins/songs/lib/mediaitem.py | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 0cc22c540..cedf86f6a 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -367,8 +367,8 @@ class MediaManagerItem(QtGui.QWidget): names = [] full_list = [] for count in range(self.listView.topLevelItemCount()): - names.append(self.listView.item(count).text()) - full_list.append(self.listView.item(count).data(QtCore.Qt.UserRole)) + names.append(self.listView.topLevelItem(count).text(0)) + full_list.append(self.listView.topLevelItem(count).data(0, QtCore.Qt.UserRole)) duplicates_found = False files_added = False for file in files: @@ -404,8 +404,8 @@ class MediaManagerItem(QtGui.QWidget): count = 0 file_list = [] while count < self.listView.topLevelItemCount(): - bitem = self.listView.item(count) - filename = bitem.data(QtCore.Qt.UserRole) + bitem = self.listView.topLevelItem(count) + filename = bitem.data(0, QtCore.Qt.UserRole) file_list.append(filename) count += 1 return file_list @@ -498,8 +498,8 @@ class MediaManagerItem(QtGui.QWidget): self.live_controller.addServiceItem(serviceItem) def createItemFromId(self, item_id): - item = QtGui.QListWidgetItem() - item.setData(QtCore.Qt.UserRole, item_id) + item = QtGui.QTreeWidgetItem() + item.setData(0, QtCore.Qt.UserRole, item_id) return item def onAddClick(self): diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 5fd80748b..626b595d6 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -76,7 +76,7 @@ class BibleMediaItem(MediaManagerItem): """ Check if the first item is a second bible item or not. """ - bitem = self.listView.item(0) + bitem = self.listView.topLevelItem(0) if not bitem.flags() & QtCore.Qt.ItemIsSelectable: # The item is the "No Search Results" item. self.listView.clear() @@ -972,7 +972,7 @@ class BibleMediaItem(MediaManagerItem): return [] def createItemFromId(self, item_id): - item = QtGui.QListWidgetItem() + item = QtGui.QTreeWidgetItem() bible = self.quickVersionComboBox.currentText() search_results = self.plugin.manager.get_verses(bible, item_id, False) items = self.buildDisplayResults(bible, u'', search_results) diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 2cf6bd92e..7006ad561 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -155,7 +155,7 @@ class CustomMediaItem(MediaManagerItem): """ if check_item_selected(self.listView, UiStrings().SelectEdit): item = self.listView.currentItem() - item_id = item.data(QtCore.Qt.UserRole) + item_id = item.data(0, QtCore.Qt.UserRole) self.edit_custom_form.loadCustom(item_id, False) self.edit_custom_form.exec_() self.autoSelectId = -1 diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 4924092e2..c3904b2b7 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -102,10 +102,10 @@ class ImageMediaItem(MediaManagerItem): Receiver.send_message(u'cursor_busy') self.main_window.displayProgressBar(len(row_list)) for row in row_list: - text = self.listView.item(row) + text = self.listView.topLevelItem(row) if text: - delete_file(os.path.join(self.servicePath, text.text())) - self.listView.takeItem(row) + delete_file(os.path.join(self.servicePath, text.text(0))) + self.listView.takeTopLevelItem(row) self.main_window.incrementProgressBar() SettingsManager.setValue(self.settingsSection + u'/images files', self.getFileList()) self.main_window.finishedProgressBar() @@ -209,7 +209,7 @@ class ImageMediaItem(MediaManagerItem): translate('ImagePlugin.MediaItem', 'You must select an image to replace the background with.')): background = QtGui.QColor(Settings().value(self.settingsSection + u'/background color')) item = self.listView.selectedIndexes()[0] - bitem = self.listView.item(item.row()) + bitem = self.listView.topLevelItem(item.row()) filename = bitem.data(QtCore.Qt.UserRole) if os.path.exists(filename): if self.plugin.liveController.display.directImage(filename, background): diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 773027847..e6ae464b3 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -147,7 +147,7 @@ class MediaMediaItem(MediaManagerItem): if check_item_selected(self.listView, translate('MediaPlugin.MediaItem', 'You must select a media file to replace the background with.')): item = self.listView.currentItem() - filename = item.data(QtCore.Qt.UserRole) + filename = item.data(0, QtCore.Qt.UserRole) if os.path.exists(filename): service_item = ServiceItem() service_item.title = u'webkit' @@ -171,7 +171,7 @@ class MediaMediaItem(MediaManagerItem): item = self.listView.currentItem() if item is None: return False - filename = item.data(QtCore.Qt.UserRole) + filename = item.data(0, QtCore.Qt.UserRole) if not os.path.exists(filename): if not remote: # File is no longer present @@ -253,7 +253,7 @@ class MediaMediaItem(MediaManagerItem): row_list = [item.row() for item in self.listView.selectedIndexes()] row_list.sort(reverse=True) for row in row_list: - self.listView.takeItem(row) + self.listView.takeTopLevelItem(row) Settings().setValue(self.settingsSection + u'/media files', self.getFileList()) def loadList(self, media): diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index f7358e8f0..79868e9ed 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -233,7 +233,7 @@ class PresentationMediaItem(MediaManagerItem): self.main_window.finishedProgressBar() Receiver.send_message(u'cursor_normal') for row in row_list: - self.listView.takeItem(row) + self.listView.takeTopLevelItem(row) Settings().setValue(self.settingsSection + u'/presentations files', self.getFileList()) def generateSlideData(self, service_item, item=None, xmlVersion=False, diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index d974f79e8..9566ea9d3 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -403,7 +403,7 @@ class SongMediaItem(MediaManagerItem): log.debug(u'onCloneClick') if check_item_selected(self.listView, UiStrings().SelectEdit): self.editItem = self.listView.currentItem() - item_id = self.editItem.data(QtCore.Qt.UserRole) + item_id = self.editItem.data(0, QtCore.Qt.UserRole) old_song = self.plugin.manager.get_object(Song, item_id) song_xml = self.openLyrics.song_to_xml(old_song) new_song = self.openLyrics.xml_to_song(song_xml)