raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

- Fixed "jumping images" bug

Browse Source 
- Show progressbar when adding new images
This commit is contained in:
Arjan Schrijver 2013-03-11 16:09:11 +01:00
parent 52523224ec
commit acc9014f55
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openlp/plugins/images/lib/mediaitem.py
View File

@ -330,6 +330,8 @@ class ImageMediaItem(MediaManagerItem):
""" """
Add new images to the database. This method is called when adding images using the Add button or DnD. Add new images to the database. This method is called when adding images using the Add button or DnD.
""" """
self.application.set_busy_cursor()
self.main_window.displayProgressBar(len(images))
if target_group is None: if target_group is None:
# Find out if a group must be pre-selected # Find out if a group must be pre-selected
preselect_group = None preselect_group = None
@ -400,6 +402,7 @@ class ImageMediaItem(MediaManagerItem):
imageFile.group_id = group_id imageFile.group_id = group_id
imageFile.filename = unicode(filename) imageFile.filename = unicode(filename)
self.manager.save_object(imageFile) self.manager.save_object(imageFile)
self.main_window.incrementProgressBar()
if reload_list: if reload_list:
self.loadFullList(self.manager.get_all_objects(ImageFilenames, order_by_ref=ImageFilenames.filename)) self.loadFullList(self.manager.get_all_objects(ImageFilenames, order_by_ref=ImageFilenames.filename))
@ -431,9 +434,20 @@ class ImageMediaItem(MediaManagerItem):
item_data.group_id = target_group.data(0, QtCore.Qt.UserRole).id item_data.group_id = target_group.data(0, QtCore.Qt.UserRole).id
items_to_save.append(item_data) items_to_save.append(item_data)
target_group.setExpanded(True) target_group.setExpanded(True)
target_group.sortChildren(0, QtCore.Qt.AscendingOrder)
# Update the group ID's of the images in the database # Update the group ID's of the images in the database
self.manager.save_objects(items_to_save) self.manager.save_objects(items_to_save)
# Sort the target group
group_items = []
image_items = []
for item in target_group.takeChildren():
if isinstance(item.data(0, QtCore.Qt.UserRole), ImageGroups):
group_items.append(item)
if isinstance(item.data(0, QtCore.Qt.UserRole), ImageFilenames):
image_items.append(item)
group_items.sort(cmp=locale_compare, key=lambda item: item.text(0))
target_group.addChildren(group_items)
image_items.sort(cmp=locale_compare, key=lambda item: item.text(0))
target_group.addChildren(image_items)
def generateSlideData(self, service_item, item=None, xmlVersion=False, def generateSlideData(self, service_item, item=None, xmlVersion=False,
remote=False, context=ServiceItemContext.Service): remote=False, context=ServiceItemContext.Service):